Modified: openoffice/trunk/main/dbaccess/source/ui/browser/sbamultiplex.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/sbamultiplex.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/browser/sbamultiplex.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/browser/sbamultiplex.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _SBA_MULTIPLEX_HXX #include "sbamultiplex.hxx"
Modified: openoffice/trunk/main/dbaccess/source/ui/browser/unodatbr.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/browser/unodatbr.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/browser/unodatbr.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/browser/unodatbr.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "browserids.hxx" #include "dbaccess_helpid.hrc" @@ -119,7 +119,7 @@ #include <svx/dataaccessdescriptor.hxx> #include <svx/databaseregistrationui.hxx> #include <svx/gridctrl.hxx> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <tools/multisel.hxx> #include <tools/urlobj.hxx> @@ -316,7 +316,8 @@ void SAL_CALL SbaTableQueryBrowser::disp // doin' a lot of VCL stuff here -> lock the SolarMutex // kiss our listeners goodbye - EventObject aEvt(*this); + + ::com::sun::star::lang::EventObject aEvt(*this); m_aSelectionListeners.disposeAndClear(aEvt); m_aContextMenuInterceptors.disposeAndClear(aEvt); @@ -1394,7 +1395,7 @@ void SbaTableQueryBrowser::implCheckExte } // ------------------------------------------------------------------------- -void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) throw(RuntimeException) +void SAL_CALL SbaTableQueryBrowser::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw(RuntimeException) { // our frame ? Reference< ::com::sun::star::frame::XFrame > xSourceFrame(_rSource.Source, UNO_QUERY); @@ -1693,7 +1694,7 @@ void SbaTableQueryBrowser::LoadFinished( } // if the form has been loaded, this means that our "selection" has changed - EventObject aEvent( *this ); + ::com::sun::star::lang::EventObject aEvent( *this ); m_aSelectionListeners.notifyEach( &XSelectionChangeListener::selectionChanged, aEvent ); } Modified: openoffice/trunk/main/dbaccess/source/ui/control/ColumnControlWindow.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/ColumnControlWindow.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/ColumnControlWindow.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/ColumnControlWindow.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_COLUMNCONTROLWINDOW_HXX #include "ColumnControlWindow.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/control/FieldDescControl.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/FieldDescControl.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/FieldDescControl.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/FieldDescControl.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY #define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY Modified: openoffice/trunk/main/dbaccess/source/ui/control/RelationControl.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/RelationControl.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/RelationControl.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/RelationControl.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_RELATIONCONTROL_HXX #include "RelationControl.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/control/ScrollHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/ScrollHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/ScrollHelper.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/ScrollHelper.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_SCROLLHELPER_HXX #include "ScrollHelper.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/control/SqlNameEdit.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/SqlNameEdit.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/SqlNameEdit.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/SqlNameEdit.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_SQLNAMEEDIT_HXX #include "SqlNameEdit.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/control/TableGrantCtrl.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/TableGrantCtrl.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/TableGrantCtrl.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/TableGrantCtrl.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_TABLEGRANTCONTROL_HXX #include "TableGrantCtrl.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/control/VertSplitView.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/VertSplitView.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/VertSplitView.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/VertSplitView.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_VERTSPLITVIEW_HXX #include "VertSplitView.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/control/charsetlistbox.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/charsetlistbox.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/charsetlistbox.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/charsetlistbox.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "charsetlistbox.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/control/curledit.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/curledit.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/curledit.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/curledit.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_CURLEDIT_HXX_ #include "curledit.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/control/dbtreelistbox.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/dbtreelistbox.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/dbtreelistbox.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/dbtreelistbox.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_DBTREELISTBOX_HXX #include "dbtreelistbox.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/control/listviewitems.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/listviewitems.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/listviewitems.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/listviewitems.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_LISTVIEWITEMS_HXX_ #include "listviewitems.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/control/marktree.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/marktree.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/marktree.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/marktree.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_MARKTREE_HXX_ #include "marktree.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/control/opendoccontrols.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/opendoccontrols.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/opendoccontrols.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/opendoccontrols.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX #include "opendoccontrols.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/control/sqledit.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/sqledit.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/sqledit.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/sqledit.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "sqledit.hxx" #include "QueryTextView.hxx" #include "querycontainerwindow.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/control/tabletree.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/tabletree.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/tabletree.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/tabletree.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_TABLETREE_HXX_ #include "tabletree.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/control/toolboxcontroller.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/toolboxcontroller.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/toolboxcontroller.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/toolboxcontroller.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBACCESS_TOOLBOXCONTROLLER_HXX #include "toolboxcontroller.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/control/undosqledit.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/control/undosqledit.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/control/undosqledit.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/control/undosqledit.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_GENERALUNDO_HXX #include "undosqledit.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/AdabasStat.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/AdabasStat.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/AdabasStat.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/AdabasStat.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc Sun Aug 7 19:24:03 2016 @@ -37,7 +37,7 @@ #ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" #endif - +#include "AutoControlsDef.hrc" #define CHECKBOX_HEIGHT 8 #define FIXEDTEXT_HEIGHT 8 @@ -46,60 +46,7 @@ #define EDIT_HEIGHT 12 #define EDIT_X 101 -#define FT_AUTOJDBCDRIVERCLASS 80 -#define FT_AUTOFIELDSEPARATOR 81 -#define FT_AUTOTEXTSEPARATOR 82 -#define FT_AUTODECIMALSEPARATOR 83 -#define FT_AUTOTHOUSANDSSEPARATOR 84 -#define FT_AUTOPORTNUMBER 85 -#define FT_AUTOPORTNUMBERDEFAULT 86 -#define FT_AUTOBASEDN 87 -#define FT_AUTOHOSTNAME 88 -#define FT_AUTOBROWSEURL 89 -#define FT_AUTODATABASENAME 90 -#define FT_AUTOWIZARDHELPTEXT 91 -#define FT_AUTOWIZARDHEADER 92 -#define FT_AUTOEXTENSIONHEADER 93 -#define FT_AUTOOWNEXTENSIONAPPENDIX 94 -#define FT_CHARSET 95 -#define FT_SOCKET 96 - -#define FL_AUTOSEPARATOR2 80 -#define FL_DATACONVERT 81 -#define FL_SEPARATOR1 82 - -#define CB_AUTOHEADER 80 - -#define PB_AUTOTESTDRIVERCLASS 80 -#define PB_AUTOBROWSEURL 81 - -#define CM_AUTOFIELDSEPARATOR 80 -#define CM_AUTOTEXTSEPARATOR 81 -#define CM_AUTODECIMALSEPARATOR 82 -#define CM_AUTOTHOUSANDSSEPARATOR 83 - -#define NF_AUTOPORTNUMBER 80 - -#define ET_AUTOBASEDN 80 -#define ET_AUTOHOSTNAME 81 -#define ET_AUTODATABASENAME 82 -#define ET_AUTOBROWSEURL 83 -#define ET_AUTOJDBCDRIVERCLASS 84 -#define ET_AUTOOWNEXTENSION 85 -#define ET_SOCKET 86 - -#define RB_AUTOACCESSCTEXTFILES 80 -#define RB_AUTOACCESSCCSVFILES 81 -#define RB_AUTOACCESSOTHERS 82 - -#define LB_CHARSET 80 -#define STR_AUTOFIELDSEPARATORLIST 100 -#define STR_AUTOTEXTSEPARATORLIST 101 -#define STR_AUTOTEXT_FIELD_SEP_NONE 102 -#define STR_AUTODELIMITER_MISSING 103 -#define STR_AUTODELIMITER_MUST_DIFFER 104 -#define STR_AUTONO_WILDCARDS 105 #define AUTO_WIZARDHELPTEXT( AUTO_LINECOUNT ) \ Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/CollectionView.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/CollectionView.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/CollectionView.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/CollectionView.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_COLLECTIONVIEW_HXX #include "CollectionView.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionHelper.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionHelper.cxx Sun Aug 7 19:24:03 2016 @@ -22,127 +22,49 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dsnItem.hxx" -#ifndef DBAUI_CONNECTIONHELPER_HXX #include "ConnectionHelper.hxx" -#endif -#ifndef _DBAUI_AUTOCONTROLS_HRC_ -#include "AutoControls.hrc" -#endif -#ifndef _DBU_DLG_HRC_ +#include "AutoControlsDef.hrc" #include "dbu_dlg.hrc" -#endif -#ifndef _DBU_MISC_HRC_ #include "dbu_misc.hrc" -#endif -#ifndef _SFXITEMSET_HXX #include <svl/itemset.hxx> -#endif -#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX #include <unotools/moduleoptions.hxx> -#endif -#ifndef _SFX_FCONTNR_HXX #include <sfx2/fcontnr.hxx> -#endif -#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <unotools/pathoptions.hxx> -#endif -#ifndef _SFXSTRITEM_HXX #include <svl/stritem.hxx> -#endif -#ifndef _SFXENUMITEM_HXX #include <svl/eitem.hxx> -#endif -#ifndef _SFXINTITEM_HXX #include <svl/intitem.hxx> -#endif -#ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBAUI_LOCALRESACCESS_HXX_ #include "localresaccess.hxx" -#endif -#ifndef _OSL_PROCESS_H_ #include <osl/process.h> -#endif -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif -#ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> -#endif -#ifndef _DBAUI_DBADMIN_HXX_ #include "dbadmin.hxx" -#endif -#ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> -#endif -#ifndef _VCL_STDTEXT_HXX #include <vcl/stdtext.hxx> -#endif -#ifndef _DBAUI_SQLMESSAGE_HXX_ #include "sqlmessage.hxx" -#endif -#ifndef _DBAUI_ODBC_CONFIG_HXX_ #include "odbcconfig.hxx" -#endif -#ifndef _DBAUI_DSSELECT_HXX_ #include "dsselect.hxx" -#endif -#ifndef SVTOOLS_FILENOTATION_HXX_ #include <svl/filenotation.hxx> -#endif -#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" -#endif -#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> -#endif // #106016# ------------------------------------ -#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_ #include <com/sun/star/task/XInteractionHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_TASK_XPROGRESSHANDLER_HPP_ #include <com/sun/star/ucb/XProgressHandler.hpp> -#endif -#ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> -#endif -#ifndef _UNOTOOLS_UCBHELPER_HXX #include <unotools/ucbhelper.hxx> -#endif -#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX #include <ucbhelper/commandenvironment.hxx> -#endif -#ifndef DBAUI_FILEPICKER_INTERACTION_HXX #include "finteraction.hxx" -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> -#endif -#ifndef _SFX_DOCFILT_HACK_HXX #include <sfx2/docfilt.hxx> -#endif #if !defined(WINDOWS_VISTA_PSDK) && defined(WNT) #define _ADO_DATALINK_BROWSE_ #endif Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionPage.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionPage.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionPage.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionPage.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_CONNECTIONPAGE_HXX #include "ConnectionPage.hxx" @@ -167,7 +167,7 @@ #endif #endif //_ADO_DATALINK_BROWSE_ -#include "AutoControls.hrc" +#include "AutoControlsDef.hrc" //......................................................................... namespace dbaui Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx Sun Aug 7 19:24:03 2016 @@ -22,126 +22,50 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_CONNECTIONPAGESETUP_HXX #include "ConnectionPageSetup.hxx" #endif -#ifndef _DBAUI_AUTOCONTROLS_HRC_ -#include "AutoControls.hrc" -#endif -#ifndef _DBAUI_DBADMINSETUP_HRC_ +#include "AutoControlsDef.hrc" #include "dbadminsetup.hrc" -#endif -#ifndef _DBU_DLG_HRC_ #include "dbu_dlg.hrc" -#endif -#ifndef _SFXITEMSET_HXX #include <svl/itemset.hxx> -#endif -#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <unotools/pathoptions.hxx> -#endif -#ifndef _SFXSTRITEM_HXX #include <svl/stritem.hxx> -#endif -#ifndef _SFXENUMITEM_HXX #include <svl/eitem.hxx> -#endif -#ifndef _SFXINTITEM_HXX #include <svl/intitem.hxx> -#endif -#ifndef _DBAUI_DATASOURCEITEMS_HXX_ #include "dsitems.hxx" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef _DBAUI_LOCALRESACCESS_HXX_ #include "localresaccess.hxx" -#endif -#ifndef _OSL_PROCESS_H_ #include <osl/process.h> -#endif -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif -#ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> -#endif -#ifndef _DBAUI_DBADMIN_HXX_ #include "dbadmin.hxx" -#endif -#ifndef _DBAUI_DBADMIN_HRC_ #include "dbadmin.hrc" -#endif -#ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> -#endif -#ifndef _VCL_STDTEXT_HXX #include <vcl/stdtext.hxx> -#endif -#ifndef _DBAUI_SQLMESSAGE_HXX_ #include "sqlmessage.hxx" -#endif -#ifndef _DBAUI_ODBC_CONFIG_HXX_ #include "odbcconfig.hxx" -#endif -#ifndef _DBAUI_DSSELECT_HXX_ #include "dsselect.hxx" -#endif -#ifndef SVTOOLS_FILENOTATION_HXX_ #include <svl/filenotation.hxx> -#endif -#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" -#endif -#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HPP_ #include <com/sun/star/ui/dialogs/XFolderPicker.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> -#endif -#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include <com/sun/star/awt/XWindow.hpp> -#endif // #106016# ------------------------------------ -#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_ #include <com/sun/star/task/XInteractionHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_TASK_XPROGRESSHANDLER_HPP_ #include <com/sun/star/ucb/XProgressHandler.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include <com/sun/star/sdbc/XConnection.hpp> -#endif -#ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> -#endif -#ifndef _UNOTOOLS_UCBHELPER_HXX #include <unotools/ucbhelper.hxx> -#endif -#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX #include <ucbhelper/commandenvironment.hxx> -#endif -#ifndef DBAUI_FILEPICKER_INTERACTION_HXX #include "finteraction.hxx" -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include <connectivity/CommonTools.hxx> -#endif -#ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> -#endif -#ifndef _SFX_DOCFILT_HACK_HXX #include <sfx2/docfilt.hxx> -#endif -#ifndef _SV_MNEMONIC_HXX #include <vcl/mnemonic.hxx> -#endif //......................................................................... namespace dbaui Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_DBSETUPCONNECTIONPAGES_HXX #include "DBSetupConnectionPages.hxx" #endif @@ -32,9 +32,7 @@ #ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" #endif -#ifndef _DBAUI_AUTOCONTROLS_HRC_ -#include "AutoControls.hrc" -#endif +#include "AutoControlsDef.hrc" #ifndef _DBAUI_DBADMINSETUP_HRC_ #include "dbadminsetup.hrc" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/DbAdminImpl.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/DbAdminImpl.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/DbAdminImpl.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/DbAdminImpl.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "DbAdminImpl.hxx" #include "dsmeta.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/DriverSettings.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/DriverSettings.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/DriverSettings.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/DriverSettings.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "DriverSettings.hxx" #include "dsmeta.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/RelationDlg.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/RelationDlg.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/RelationDlg.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/RelationDlg.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" //#ifndef _SVX_TABWIN_HXX //#include "tabwin.hxx" //#endif Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/TablesSingleDlg.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/TablesSingleDlg.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/TablesSingleDlg.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/TablesSingleDlg.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_TABLESSINGLEDLG_HXX_ #include "TablesSingleDlg.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/TextConnectionHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/TextConnectionHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/TextConnectionHelper.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/TextConnectionHelper.cxx Sun Aug 7 19:24:03 2016 @@ -21,7 +21,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" #endif @@ -39,9 +39,7 @@ #ifndef _DBU_RESOURCE_HRC_ #include "dbu_resource.hrc" #endif -#ifndef _DBAUI_AUTOCONTROLS_HRC_ -#include "AutoControls.hrc" -#endif +#include "AutoControlsDef.hrc" #ifndef _SFXITEMSET_HXX #include <svl/itemset.hxx> Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/UserAdmin.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/UserAdmin.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/UserAdmin.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/UserAdmin.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_USERADMIN_HXX #include "UserAdmin.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/UserAdminDlg.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/UserAdminDlg.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/UserAdminDlg.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/UserAdminDlg.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "adminpages.hxx" #include "DbAdminImpl.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/admincontrols.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/admincontrols.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/admincontrols.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/admincontrols.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "admincontrols.hxx" #include "admincontrols.hrc" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/adminpages.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/adminpages.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/adminpages.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/adminpages.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "adminpages.hxx" #include "dbadmin.hrc" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/adodatalinks.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/adodatalinks.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/adodatalinks.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/adodatalinks.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #if defined(WNT) Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/adtabdlg.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/adtabdlg.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/adtabdlg.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/adtabdlg.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "adtabdlg.hxx" #include "adtabdlg.hrc" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/advancedsettings.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/advancedsettings.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/advancedsettings.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/advancedsettings.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "advancedsettings.hxx" #include "advancedsettingsdlg.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/dbadmin.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/dbadmin.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/dbadmin.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/dbadmin.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "ConnectionPage.hxx" #include "DbAdminImpl.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/dbfindex.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/dbfindex.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/dbfindex.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/dbfindex.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_DBFINDEX_HXX_ #include "dbfindex.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/dbwiz.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/dbwiz.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/dbwiz.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/dbwiz.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_DBWIZ_HXX #include "dbwiz.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/dbwizsetup.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/dbwizsetup.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/dbwizsetup.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/dbwizsetup.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbwizsetup.hxx" #include "dsmeta.hxx" @@ -32,69 +32,27 @@ #include "dsitems.hxx" #include "dsnItem.hxx" -#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX #include <unotools/pathoptions.hxx> -#endif -#ifndef _SFXSTRITEM_HXX #include <svl/stritem.hxx> -#endif -#ifndef _SFXENUMITEM_HXX #include <svl/eitem.hxx> -#endif -#ifndef _SFXINTITEM_HXX #include <svl/intitem.hxx> -#endif -#ifndef _SV_MSGBOX_HXX #include <vcl/msgbox.hxx> -#endif -#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _SFX_DOCFILT_HACK_HXX #include <sfx2/docfilt.hxx> -#endif -#ifndef _UNOTOOLS_UCBHELPER_HXX #include <unotools/ucbhelper.hxx> -#endif -#ifndef _DBAUI_GENERALPAGE_HXX_ #include "generalpage.hxx" -#endif -#ifndef _DBAUI_LOCALRESACCESS_HXX_ #include "localresaccess.hxx" -#endif -#ifndef _DBAUI_STRINGLISTITEM_HXX_ #include "stringlistitem.hxx" -#endif -#ifndef _DBAUI_PROPERTYSETITEM_HXX_ #include "propertysetitem.hxx" -#endif -#ifndef _UNOTOOLS_CONFIGNODE_HXX_ #include <unotools/confignode.hxx> -#endif -#ifndef _DBAUI_DBADMINIMPL_HXX_ #include "DbAdminImpl.hxx" -#endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ #include "dbaccess_helpid.hrc" -#endif -#ifndef DBAUI_CONNECTIONPAGESETUP_HXX #include "ConnectionPageSetup.hxx" -#endif -#ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" -#endif -#ifndef _DBAUI_DBADMIN_HRC_ #include "dbadmin.hrc" -#endif -#ifndef DBAUI_ASYNCRONOUSLINK_HXX #include "AsyncronousLink.hxx" -#endif -#ifndef _FILEDLGHELPER_HXX #include <sfx2/filedlghelper.hxx> -#endif #include <cppuhelper/exc_hlp.hxx> /** === begin UNO includes === **/ @@ -1101,8 +1059,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveData void doLoadAsync(); // XTerminateListener - virtual void SAL_CALL queryTermination( const EventObject& Event ) throw (TerminationVetoException, RuntimeException); - virtual void SAL_CALL notifyTermination( const EventObject& Event ) throw (RuntimeException); + virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& Event ) throw (TerminationVetoException, RuntimeException); + virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& Event ) throw (RuntimeException); // XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); @@ -1186,17 +1144,17 @@ sal_Bool ODbTypeWizDialogSetup::SaveData } // ............................................................................. - void SAL_CALL AsyncLoader::queryTermination( const EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException) + void SAL_CALL AsyncLoader::queryTermination( const ::com::sun::star::lang::EventObject& /*Event*/ ) throw (TerminationVetoException, RuntimeException) { throw TerminationVetoException(); } // ............................................................................. - void SAL_CALL AsyncLoader::notifyTermination( const EventObject& /*Event*/ ) throw (RuntimeException) + void SAL_CALL AsyncLoader::notifyTermination( const ::com::sun::star::lang::EventObject& /*Event*/ ) throw (RuntimeException) { } // ............................................................................. - void SAL_CALL AsyncLoader::disposing( const EventObject& /*Source*/ ) throw (RuntimeException) + void SAL_CALL AsyncLoader::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (RuntimeException) { } } Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/detailpages.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/detailpages.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/detailpages.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/detailpages.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "detailpages.hxx" #include "sqlmessage.hxx" @@ -78,7 +78,7 @@ #ifndef _COMPHELPER_TYPES_HXX_ #include <comphelper/types.hxx> #endif -#include "AutoControls.hrc" +#include "AutoControlsDef.hrc" //......................................................................... namespace dbaui Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/directsql.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/directsql.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/directsql.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/directsql.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBACCESS_UI_DIRECTSQL_HXX_ #include "directsql.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/dlgattr.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/dlgattr.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/dlgattr.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/dlgattr.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_SBATTRDLG_HXX Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/dlgsave.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/dlgsave.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/dlgsave.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/dlgsave.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_DLGSAVE_HXX #include "dlgsave.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/dlgsize.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/dlgsize.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/dlgsize.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/dlgsize.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_DLGSIZE_HRC #include "dlgsize.hrc" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/dsselect.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/dsselect.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/dsselect.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/dsselect.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_DSSELECT_HXX_ #include "dsselect.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/finteraction.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/finteraction.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/finteraction.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/finteraction.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_FILEPICKER_INTERACTION_HXX #include "finteraction.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/generalpage.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/generalpage.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/generalpage.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/generalpage.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dsnItem.hxx" #include "generalpage.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/indexdialog.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/indexdialog.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/indexdialog.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/indexdialog.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_INDEXDIALOG_HXX_ #include "indexdialog.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/indexfieldscontrol.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/indexfieldscontrol.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/indexfieldscontrol.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/indexfieldscontrol.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_INDEXFIELDSCONTROL_HXX_ #include "indexfieldscontrol.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/odbcconfig.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/odbcconfig.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/odbcconfig.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/odbcconfig.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_ODBC_CONFIG_HXX_ #include "odbcconfig.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/optionalboolitem.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/optionalboolitem.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/optionalboolitem.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/optionalboolitem.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "optionalboolitem.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/paramdialog.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/paramdialog.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/paramdialog.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/paramdialog.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_PARAMDIALOG_HXX_ #include "paramdialog.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/queryfilter.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/queryfilter.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/queryfilter.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/queryfilter.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_QUERYFILTER_HXX #include "queryfilter.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/queryorder.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/queryorder.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/queryorder.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/queryorder.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_QUERYORDER_HRC #include "queryorder.hrc" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/sqlmessage.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/sqlmessage.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/sqlmessage.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/sqlmessage.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_SQLMESSAGE_HXX_ #include "sqlmessage.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/tablespage.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/tablespage.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/tablespage.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/tablespage.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_TABLESPAGE_HXX_ #include "tablespage.hxx" @@ -114,9 +114,7 @@ #ifndef _CPPUHELPER_EXC_HLP_HXX_ #include <cppuhelper/exc_hlp.hxx> #endif -#ifndef _DBAUI_AUTOCONTROLS_HRC_ -#include "AutoControls.hrc" -#endif +#include "AutoControlsDef.hrc" //......................................................................... namespace dbaui Modified: openoffice/trunk/main/dbaccess/source/ui/dlg/textconnectionsettings.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/dlg/textconnectionsettings.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/dlg/textconnectionsettings.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/dlg/textconnectionsettings.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "textconnectionsettings.hxx" #include "TextConnectionHelper.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/DExport.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/DExport.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/DExport.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/DExport.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "DExport.hxx" #include "moduledbu.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/HtmlReader.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/HtmlReader.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/HtmlReader.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/HtmlReader.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "HtmlReader.hxx" #include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> Modified: openoffice/trunk/main/dbaccess/source/ui/misc/RowSetDrop.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/RowSetDrop.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/RowSetDrop.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/RowSetDrop.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TokenWriter.hxx" #include <com/sun/star/sdbc/XColumnLocate.hpp> Modified: openoffice/trunk/main/dbaccess/source/ui/misc/RtfReader.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/RtfReader.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/RtfReader.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/RtfReader.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "RtfReader.hxx" #include <tools/debug.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> Modified: openoffice/trunk/main/dbaccess/source/ui/misc/TableCopyHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/TableCopyHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/TableCopyHelper.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/TableCopyHelper.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBUI_TABLECOPYHELPER_HXX #include "TableCopyHelper.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/misc/TokenWriter.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/TokenWriter.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/TokenWriter.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/TokenWriter.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "TokenWriter.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> Modified: openoffice/trunk/main/dbaccess/source/ui/misc/ToolBoxHelper.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/ToolBoxHelper.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/ToolBoxHelper.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/ToolBoxHelper.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_TOOLBOXHELPER_HXX #include "ToolBoxHelper.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/misc/UITools.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/UITools.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/UITools.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/UITools.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/WCPage.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/WCPage.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/WCPage.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/WCPage.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "WCPage.hxx" #include "WCopyTable.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/WColumnSelect.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/WColumnSelect.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/WColumnSelect.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/WColumnSelect.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_WIZ_COLUMNSELECT_HXX #include "WColumnSelect.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/WCopyTable.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/WCopyTable.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/WCopyTable.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/WCopyTable.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbu_misc.hrc" #include "dbustrings.hrc" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/WExtendPages.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/WExtendPages.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/WExtendPages.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/WExtendPages.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_WIZ_EXTENDPAGES_HXX #include "WExtendPages.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/misc/WNameMatch.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/WNameMatch.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/WNameMatch.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/WNameMatch.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_WIZ_NAMEMATCHING_HXX #include "WNameMatch.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/misc/WTypeSelect.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/WTypeSelect.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/WTypeSelect.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/WTypeSelect.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_WIZ_TYPESELECT_HXX #include "WTypeSelect.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/misc/asyncmodaldialog.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/asyncmodaldialog.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/asyncmodaldialog.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/asyncmodaldialog.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBACCESS_ASYNCMODALDIALOG_HXX #include "asyncmodaldialog.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/charsets.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/charsets.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/charsets.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/charsets.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_CHARSETS_HXX_ #include "charsets.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/controllerframe.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/controllerframe.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/controllerframe.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/controllerframe.cxx Sun Aug 7 19:24:03 2016 @@ -21,6 +21,9 @@ +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbui.hxx" + #include "controllerframe.hxx" #include "IController.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/databaseobjectview.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/databaseobjectview.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/databaseobjectview.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/databaseobjectview.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "databaseobjectview.hxx" #include "dbustrings.hrc" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/datasourceconnector.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/datasourceconnector.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/datasourceconnector.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/datasourceconnector.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_DATASOURCECONNECTOR_HXX_ #include "datasourceconnector.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/dbaundomanager.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/dbaundomanager.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/dbaundomanager.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/dbaundomanager.cxx Sun Aug 7 19:24:03 2016 @@ -21,7 +21,7 @@ -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbaundomanager.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "browserids.hxx" #include "commontypes.hxx" @@ -50,7 +50,7 @@ #include <connectivity/dbtools.hxx> #include <cppuhelper/typeprovider.hxx> #include <rtl/ustrbuf.hxx> -#include <toolkit/unohlp.hxx> +#include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> Modified: openoffice/trunk/main/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBACCESS_SOURCE_UI_MISC_DEFAULTOBJECTNAMECHECK_HXX #include "defaultobjectnamecheck.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/dsmeta.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/dsmeta.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/dsmeta.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/dsmeta.cxx Sun Aug 7 19:24:03 2016 @@ -20,7 +20,8 @@ *************************************************************/ - +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_dbui.hxx" #include "dsmeta.hxx" #include <connectivity/DriversConfig.hxx> #include "dsntypes.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/imageprovider.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/imageprovider.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/imageprovider.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/imageprovider.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "imageprovider.hxx" #include "dbu_resource.hrc" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/indexcollection.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/indexcollection.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/indexcollection.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/indexcollection.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_INDEXCOLLECTION_HXX_ #include "indexcollection.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/linkeddocuments.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/linkeddocuments.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/linkeddocuments.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/linkeddocuments.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_LINKEDDOCUMENTS_HXX_ #include "linkeddocuments.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/moduledbu.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/moduledbu.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/moduledbu.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/moduledbu.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/propertysetitem.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/propertysetitem.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/propertysetitem.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/propertysetitem.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_PROPERTYSETITEM_HXX_ #include "propertysetitem.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/propertystorage.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/propertystorage.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/propertystorage.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/propertystorage.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "propertystorage.hxx" @@ -64,7 +64,7 @@ namespace dbaui namespace { //---------------------------------------------------------------- - template < class ITEMTYPE, class UNOTYPE > + template < class ITEMTYPE, class UNOTYPE_Type > class ItemAdapter { public: @@ -75,7 +75,7 @@ namespace dbaui if ( !pTypedItem ) return false; - UNOTYPE aValue( pTypedItem->GetValue() ); + UNOTYPE_Type aValue( pTypedItem->GetValue() ); OSL_VERIFY( _rValue >>= aValue ); // TODO: one could throw an IllegalArgumentException here - finally, this method // is (to be) used from within an XPropertySet::setPropertyValue implementation, @@ -92,7 +92,7 @@ namespace dbaui if ( !pTypedItem ) return false; - _out_rValue <<= UNOTYPE( pTypedItem->GetValue() ); + _out_rValue <<= UNOTYPE_Type( pTypedItem->GetValue() ); return true; } }; Modified: openoffice/trunk/main/dbaccess/source/ui/misc/singledoccontroller.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/singledoccontroller.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/singledoccontroller.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/singledoccontroller.cxx Sun Aug 7 19:24:03 2016 @@ -21,7 +21,7 @@ -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #include "dbaundomanager.hxx" #include "singledoccontroller.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/stringlistitem.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/stringlistitem.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/stringlistitem.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/stringlistitem.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _DBAUI_STRINGLISTITEM_HXX_ #include "stringlistitem.hxx" Modified: openoffice/trunk/main/dbaccess/source/ui/misc/uiservices.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/misc/uiservices.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/misc/uiservices.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/misc/uiservices.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLine.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLine.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLine.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLine.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_CONNECTIONLINE_HXX #include "ConnectionLine.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBACCESS_CONNECTIONLINEACCESS_HXX #include "ConnectionLineAccess.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLineData.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLineData.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLineData.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/ConnectionLineData.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_CONNECTIONLINEDATA_HXX #include "ConnectionLineData.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/JAccess.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/JAccess.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/JAccess.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/JAccess.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBACCESS_JACCESS_HXX #include "JAccess.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinController.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinController.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinController.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinController.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef _SFXSIDS_HRC #include <sfx2/sfxsids.hrc> #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinDesignView.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinDesignView.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinDesignView.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinDesignView.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_JOINDESIGNVIEW_HXX #include "JoinDesignView.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinExchange.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinExchange.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinExchange.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinExchange.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_JOINEXCHANGE_HXX #include "JoinExchange.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinTableView.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinTableView.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinTableView.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/JoinTableView.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_QUERYTABLEVIEW_HXX #include "JoinTableView.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableConnection.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableConnection.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableConnection.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableConnection.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_QUERYTABLECONNECTION_HXX #include "QTableConnection.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableConnectionData.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableConnectionData.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableConnectionData.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableConnectionData.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_QTABLECONNECTIONDATA_HXX #include "QTableConnectionData.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableWindow.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableWindow.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableWindow.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableWindow.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_QUERY_TABLEWINDOWDATA_HXX #include "QTableWindow.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableWindowData.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableWindowData.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableWindowData.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/QTableWindowData.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_QUERY_TABLEWINDOWDATA_HXX #include "QTableWindowData.hxx" #endif Modified: openoffice/trunk/main/dbaccess/source/ui/querydesign/QueryDesignView.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/source/ui/querydesign/QueryDesignView.cxx?rev=1755455&r1=1755454&r2=1755455&view=diff ============================================================================== --- openoffice/trunk/main/dbaccess/source/ui/querydesign/QueryDesignView.cxx (original) +++ openoffice/trunk/main/dbaccess/source/ui/querydesign/QueryDesignView.cxx Sun Aug 7 19:24:03 2016 @@ -22,7 +22,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_dbaccess.hxx" +#include "precompiled_dbui.hxx" #ifndef DBAUI_QUERYDESIGNVIEW_HXX #include "QueryDesignView.hxx" #endif
