From dc8c15ae6267fe42ae1e9b69b30d2f5d9617e942 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Mon, 4 Oct 2010 16:58:09 +0200 Subject: remove include guards using fixguard.py --- .../source/ui/relationdesign/RTableConnection.cxx | 10 ------ .../ui/relationdesign/RelationDesignView.cxx | 40 ---------------------- 2 files changed, 50 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index da6495e91333..a958eeffb5b9 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -27,21 +27,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef DBAUI_RTABLECONNECTION_HXX #include "RTableConnection.hxx" -#endif -#ifndef _TOOLS_DEBUG_HXX #include -#endif -#ifndef DBAUI_RELATION_TABLEVIEW_HXX #include "RelationTableView.hxx" -#endif -#ifndef _SV_SVAPP_HXX #include -#endif -#ifndef DBAUI_CONNECTIONLINE_HXX #include "ConnectionLine.hxx" -#endif using namespace dbaui; //======================================================================== diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index b104790197c2..9d309fca8773 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -27,66 +27,26 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef DBAUI_RELATIONDESIGNVIEW_HXX #include "RelationDesignView.hxx" -#endif -#ifndef DBAUI_RELATION_TABLEVIEW_HXX #include "RelationTableView.hxx" -#endif -#ifndef DBAUI_RELATIONCONTROLLER_HXX #include "RelationController.hxx" -#endif -#ifndef _UNDO_HXX #include -#endif -#ifndef _SV_SVAPP_HXX #include -#endif -#ifndef _SV_MSGBOX_HXX #include -#endif -#ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" -#endif -#ifndef _DBU_REL_HRC_ #include "dbu_rel.hrc" -#endif -#ifndef _COMPHELPER_TYPES_HXX_ #include -#endif -#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef DBAUI_RTABLECONNECTION_HXX #include "RTableConnection.hxx" -#endif -#ifndef DBAUI_CONNECTIONLINE_HXX #include "ConnectionLine.hxx" -#endif -#ifndef DBAUI_CONNECTIONLINEDATA_HXX #include "ConnectionLineData.hxx" -#endif -#ifndef DBAUI_RTABLECONNECTIONDATA_HXX #include "RTableConnectionData.hxx" -#endif -#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC #include "dbustrings.hrc" -#endif -#ifndef _COMPHELPER_EXTRACT_HXX_ #include -#endif -#ifndef DBAUI_TOOLS_HXX #include "UITools.hxx" -#endif -#ifndef _TOOLS_DEBUG_HXX #include -#endif using namespace ::dbaui; using namespace ::com::sun::star::uno; -- cgit v1.2.3 From fbd40753f5378f8f8bc69ab8030101355845dfcc Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 5 Oct 2010 15:53:38 +0200 Subject: more removed include guards using fixguard.py --- dbaccess/inc/IController.hxx | 6 -- dbaccess/inc/ToolBoxHelper.hxx | 8 --- dbaccess/inc/dataview.hxx | 6 -- dbaccess/source/core/api/BookmarkSet.hxx | 4 -- dbaccess/source/core/api/CIndexColumn.hxx | 2 - dbaccess/source/core/api/CIndexes.hxx | 2 - dbaccess/source/core/api/CRowSetColumn.hxx | 8 --- dbaccess/source/core/api/CacheSet.hxx | 22 ------- dbaccess/source/core/api/HelperCollections.hxx | 10 --- dbaccess/source/core/api/KeySet.hxx | 8 --- dbaccess/source/core/api/RowSetBase.hxx | 42 ------------ dbaccess/source/core/api/RowSetCache.hxx | 48 -------------- dbaccess/source/core/api/RowSetCacheIterator.hxx | 4 -- dbaccess/source/core/api/RowSetRow.hxx | 8 --- dbaccess/source/core/api/StaticSet.hxx | 2 - dbaccess/source/core/api/WrappedResultSet.hxx | 2 - dbaccess/source/core/api/datacolumn.hxx | 12 ---- dbaccess/source/core/api/query.hxx | 14 ---- dbaccess/source/core/api/querydescriptor.hxx | 24 ------- dbaccess/source/core/api/resultcolumn.hxx | 4 -- dbaccess/source/core/api/resultset.hxx | 40 ------------ .../source/core/dataaccess/ComponentDefinition.hxx | 26 -------- .../source/core/dataaccess/SharedConnection.hxx | 28 -------- .../source/core/dataaccess/bookmarkcontainer.hxx | 26 -------- .../source/core/dataaccess/commandcontainer.hxx | 6 -- .../source/core/dataaccess/commanddefinition.hxx | 22 ------- dbaccess/source/core/dataaccess/datasource.hxx | 64 ------------------ .../source/core/dataaccess/documentcontainer.hxx | 20 ------ .../source/core/dataaccess/documentdefinition.hxx | 22 ------- dbaccess/source/core/dataaccess/intercept.hxx | 16 ----- .../source/core/dataaccess/myucp_datasupplier.hxx | 6 -- .../source/core/dataaccess/myucp_resultset.hxx | 6 -- dbaccess/source/core/inc/ContainerListener.hxx | 8 --- dbaccess/source/core/inc/ContainerMediator.hxx | 18 ----- dbaccess/source/core/inc/ContentHelper.hxx | 44 ------------- dbaccess/source/core/inc/PropertyForward.hxx | 12 ---- dbaccess/source/core/inc/RefreshListener.hxx | 2 - .../source/core/inc/SingleSelectQueryComposer.hxx | 30 --------- dbaccess/source/core/inc/TableDeco.hxx | 36 ---------- dbaccess/source/core/inc/callablestatement.hxx | 6 -- dbaccess/source/core/inc/commandbase.hxx | 4 -- dbaccess/source/core/inc/composertools.hxx | 2 - dbaccess/source/core/inc/containerapprove.hxx | 2 - dbaccess/source/core/inc/core_resource.hxx | 2 - dbaccess/source/core/inc/datasettings.hxx | 12 ---- dbaccess/source/core/inc/definitioncontainer.hxx | 38 ----------- dbaccess/source/core/inc/objectnameapproval.hxx | 4 -- dbaccess/source/core/inc/preparedstatement.hxx | 16 ----- dbaccess/source/core/inc/querycomposer.hxx | 26 -------- dbaccess/source/core/inc/querycontainer.hxx | 44 ------------- dbaccess/source/core/inc/statement.hxx | 28 -------- dbaccess/source/core/inc/tablecontainer.hxx | 32 --------- dbaccess/source/core/inc/userinformation.hxx | 4 -- dbaccess/source/core/inc/veto.hxx | 4 -- dbaccess/source/core/inc/viewcontainer.hxx | 26 -------- dbaccess/source/ext/adabas/ANewDb.hxx | 6 -- dbaccess/source/ext/adabas/ASQLNameEdit.hxx | 4 -- dbaccess/source/ext/adabas/Acomponentmodule.hxx | 16 ----- dbaccess/source/ext/adabas/AdabasNewDb.hxx | 16 ----- dbaccess/source/filter/migration/cfgimport.hxx | 24 ------- dbaccess/source/filter/xml/xmlAutoStyle.hxx | 8 --- dbaccess/source/filter/xml/xmlComponent.hxx | 4 -- dbaccess/source/filter/xml/xmlConnectionData.hxx | 4 -- .../source/filter/xml/xmlConnectionResource.hxx | 4 -- dbaccess/source/filter/xml/xmlDataSource.hxx | 4 -- dbaccess/source/filter/xml/xmlDataSourceInfo.hxx | 2 - .../source/filter/xml/xmlDataSourceSetting.hxx | 6 -- .../source/filter/xml/xmlDataSourceSettings.hxx | 2 - dbaccess/source/filter/xml/xmlDatabase.hxx | 2 - .../source/filter/xml/xmlDatabaseDescription.hxx | 4 -- dbaccess/source/filter/xml/xmlDocuments.hxx | 6 -- dbaccess/source/filter/xml/xmlExport.hxx | 42 ------------ .../source/filter/xml/xmlFileBasedDatabase.hxx | 4 -- dbaccess/source/filter/xml/xmlHelper.hxx | 6 -- dbaccess/source/filter/xml/xmlLogin.hxx | 2 - dbaccess/source/filter/xml/xmlQuery.hxx | 4 -- dbaccess/source/filter/xml/xmlServerDatabase.hxx | 4 -- dbaccess/source/filter/xml/xmlStyleImport.hxx | 20 ------ dbaccess/source/filter/xml/xmlTable.hxx | 6 -- dbaccess/source/filter/xml/xmlTableFilterList.hxx | 2 - .../source/filter/xml/xmlTableFilterPattern.hxx | 2 - dbaccess/source/filter/xml/xmlfilter.hxx | 38 ----------- .../source/inc/OAuthenticationContinuation.hxx | 0 dbaccess/source/inc/apitools.hxx | 14 ---- dbaccess/source/inc/cfg_reghelper.hxx | 12 ---- dbaccess/source/inc/dbu_reghelper.hxx | 12 ---- dbaccess/source/inc/flt_reghelper.hxx | 12 ---- .../source/sdbtools/connection/connectiontools.hxx | 16 ----- .../sdbtools/connection/datasourcemetadata.hxx | 6 -- dbaccess/source/sdbtools/connection/tablename.hxx | 6 -- dbaccess/source/sdbtools/inc/module_sdbt.hxx | 2 - dbaccess/source/ui/app/AppDetailPageHelper.hxx | 24 ------- dbaccess/source/ui/app/AppDetailView.hxx | 26 -------- dbaccess/source/ui/app/AppIconControl.hxx | 4 -- dbaccess/source/ui/app/AppSwapWindow.hxx | 8 --- dbaccess/source/ui/app/AppTitleWindow.hxx | 2 - dbaccess/source/ui/app/AppView.hxx | 18 ----- dbaccess/source/ui/browser/dbtreemodel.hxx | 10 --- dbaccess/source/ui/browser/dbtreeview.hxx | 4 -- dbaccess/source/ui/control/dbtreelistbox.cxx | 2 - dbaccess/source/ui/dlg/AdabasStat.hxx | 14 ---- dbaccess/source/ui/dlg/ConnectionHelper.hxx | 8 --- dbaccess/source/ui/dlg/ConnectionPage.hxx | 8 --- dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 10 --- dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 2 - dbaccess/source/ui/dlg/DbAdminImpl.hxx | 22 ------- dbaccess/source/ui/dlg/DriverSettings.hxx | 2 - dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 18 ----- dbaccess/source/ui/dlg/UserAdmin.hxx | 18 ----- dbaccess/source/ui/dlg/admincontrols.hxx | 0 dbaccess/source/ui/dlg/adminpages.hxx | 12 ---- dbaccess/source/ui/dlg/adodatalinks.hxx | 4 -- dbaccess/source/ui/dlg/dbfindex.hxx | 12 ---- dbaccess/source/ui/dlg/detailpages.hxx | 18 ----- dbaccess/source/ui/dlg/finteraction.hxx | 4 -- dbaccess/source/ui/dlg/generalpage.hxx | 10 --- dbaccess/source/ui/dlg/tablespage.hxx | 14 ---- dbaccess/source/ui/inc/AccessibleBaseIFace.hxx | 2 - dbaccess/source/ui/inc/CollectionView.hxx | 12 ---- dbaccess/source/ui/inc/ColumnControlWindow.hxx | 8 --- dbaccess/source/ui/inc/ConnectionLine.hxx | 6 -- dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 6 -- dbaccess/source/ui/inc/ConnectionLineData.hxx | 10 --- dbaccess/source/ui/inc/ExtensionNotPresent.hxx | 14 ---- dbaccess/source/ui/inc/FieldControls.hxx | 10 --- dbaccess/source/ui/inc/FieldDescControl.hxx | 10 --- dbaccess/source/ui/inc/FieldDescriptions.hxx | 12 ---- dbaccess/source/ui/inc/GeneralUndo.hxx | 4 -- dbaccess/source/ui/inc/HtmlReader.hxx | 10 --- dbaccess/source/ui/inc/IClipBoardTest.hxx | 2 - dbaccess/source/ui/inc/IItemSetHelper.hxx | 6 -- dbaccess/source/ui/inc/JAccess.hxx | 4 -- dbaccess/source/ui/inc/JoinController.hxx | 10 --- dbaccess/source/ui/inc/JoinDesignView.hxx | 6 -- dbaccess/source/ui/inc/JoinExchange.hxx | 10 --- dbaccess/source/ui/inc/JoinTableView.hxx | 14 ---- dbaccess/source/ui/inc/QueryDesignView.hxx | 14 ---- dbaccess/source/ui/inc/QueryTableView.hxx | 6 -- dbaccess/source/ui/inc/QueryTextView.hxx | 4 -- dbaccess/source/ui/inc/RTableConnectionData.hxx | 8 --- dbaccess/source/ui/inc/RefFunctor.hxx | 2 - dbaccess/source/ui/inc/RelControliFace.hxx | 2 - dbaccess/source/ui/inc/RelationControl.hxx | 6 -- dbaccess/source/ui/inc/RelationController.hxx | 4 -- dbaccess/source/ui/inc/RelationDesignView.hxx | 8 --- dbaccess/source/ui/inc/RelationDlg.hxx | 14 ---- dbaccess/source/ui/inc/RtfReader.hxx | 6 -- dbaccess/source/ui/inc/ScrollHelper.hxx | 6 -- dbaccess/source/ui/inc/SqlNameEdit.hxx | 4 -- dbaccess/source/ui/inc/TableConnection.hxx | 8 --- dbaccess/source/ui/inc/TableConnectionData.hxx | 6 -- dbaccess/source/ui/inc/TableController.hxx | 20 ------ dbaccess/source/ui/inc/TableCopyHelper.hxx | 14 ---- dbaccess/source/ui/inc/TableDesignControl.hxx | 8 --- dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 8 --- dbaccess/source/ui/inc/TableDesignView.hxx | 10 --- dbaccess/source/ui/inc/TableFieldDescription.hxx | 8 --- dbaccess/source/ui/inc/TableGrantCtrl.hxx | 12 ---- dbaccess/source/ui/inc/TableRow.hxx | 10 --- dbaccess/source/ui/inc/TableRowExchange.hxx | 6 -- dbaccess/source/ui/inc/TableWindowAccess.hxx | 6 -- dbaccess/source/ui/inc/TableWindowData.hxx | 2 - dbaccess/source/ui/inc/TableWindowTitle.hxx | 2 - dbaccess/source/ui/inc/TablesSingleDlg.hxx | 8 --- dbaccess/source/ui/inc/TypeInfo.hxx | 8 --- dbaccess/source/ui/inc/UITools.hxx | 12 ---- dbaccess/source/ui/inc/UserAdminDlg.hxx | 10 --- dbaccess/source/ui/inc/VertSplitView.hxx | 2 - dbaccess/source/ui/inc/WCPage.hxx | 12 ---- dbaccess/source/ui/inc/WColumnSelect.hxx | 6 -- dbaccess/source/ui/inc/WExtendPages.hxx | 2 - dbaccess/source/ui/inc/WNameMatch.hxx | 12 ---- dbaccess/source/ui/inc/WTabPage.hxx | 2 - dbaccess/source/ui/inc/adtabdlg.hxx | 16 ----- dbaccess/source/ui/inc/asyncmodaldialog.hxx | 2 - dbaccess/source/ui/inc/browserids.hxx | 4 -- dbaccess/source/ui/inc/brwview.hxx | 10 --- dbaccess/source/ui/inc/callbacks.hxx | 6 -- dbaccess/source/ui/inc/charsets.hxx | 8 --- dbaccess/source/ui/inc/commontypes.hxx | 4 -- dbaccess/source/ui/inc/curledit.hxx | 6 -- dbaccess/source/ui/inc/databaseobjectview.hxx | 24 ------- dbaccess/source/ui/inc/datasourceconnector.hxx | 8 --- dbaccess/source/ui/inc/datasourcemap.hxx | 10 --- dbaccess/source/ui/inc/dbadmin.hxx | 8 --- dbaccess/source/ui/inc/dbexchange.hxx | 16 ----- dbaccess/source/ui/inc/dbwiz.hxx | 12 ---- dbaccess/source/ui/inc/dbwizsetup.hxx | 16 ----- dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 8 --- dbaccess/source/ui/inc/directsql.hxx | 20 ------ dbaccess/source/ui/inc/dlgattr.hxx | 6 -- dbaccess/source/ui/inc/dlgsave.hxx | 8 --- dbaccess/source/ui/inc/dlgsize.hxx | 8 --- dbaccess/source/ui/inc/formadapter.hxx | 76 ---------------------- dbaccess/source/ui/inc/imageprovider.hxx | 6 -- dbaccess/source/ui/inc/indexcollection.hxx | 8 --- dbaccess/source/ui/inc/indexdialog.hxx | 26 -------- dbaccess/source/ui/inc/indexes.hxx | 4 -- dbaccess/source/ui/inc/indexfieldscontrol.hxx | 8 --- dbaccess/source/ui/inc/linkeddocuments.hxx | 20 ------ dbaccess/source/ui/inc/listviewitems.hxx | 2 - dbaccess/source/ui/inc/localresaccess.hxx | 4 -- dbaccess/source/ui/inc/marktree.hxx | 2 - dbaccess/source/ui/inc/moduledbu.hxx | 4 -- dbaccess/source/ui/inc/opendoccontrols.hxx | 6 -- dbaccess/source/ui/inc/paramdialog.hxx | 28 -------- dbaccess/source/ui/inc/propertysetitem.hxx | 4 -- dbaccess/source/ui/inc/querycontainerwindow.hxx | 12 ---- dbaccess/source/ui/inc/queryfilter.hxx | 16 ----- dbaccess/source/ui/inc/queryorder.hxx | 10 --- dbaccess/source/ui/inc/queryview.hxx | 2 - dbaccess/source/ui/inc/sbagrid.hxx | 18 ----- dbaccess/source/ui/inc/sbamultiplex.hxx | 48 -------------- dbaccess/source/ui/inc/sqlmessage.hxx | 8 --- dbaccess/source/ui/inc/statusbarontroller.hxx | 10 --- dbaccess/source/ui/inc/stringlistitem.hxx | 6 -- dbaccess/source/ui/inc/tabletree.hxx | 14 ---- dbaccess/source/ui/inc/toolboxcontroller.hxx | 12 ---- dbaccess/source/ui/inc/undosqledit.hxx | 4 -- dbaccess/source/ui/inc/unoadmin.hxx | 8 --- dbaccess/source/ui/inc/unodatbr.hxx | 44 ------------- dbaccess/source/ui/inc/unosqlmessage.hxx | 4 -- .../source/ui/querydesign/QTableConnection.hxx | 6 -- .../source/ui/querydesign/QTableConnectionData.hxx | 8 --- dbaccess/source/ui/querydesign/QTableWindow.hxx | 8 --- .../source/ui/querydesign/QTableWindowData.hxx | 6 -- .../ui/querydesign/QueryAddTabConnUndoAction.hxx | 2 - .../ui/querydesign/QueryDesignFieldUndoAct.hxx | 6 -- .../ui/querydesign/QueryDesignUndoAction.hxx | 2 - .../ui/querydesign/QueryMoveTabWinUndoAct.hxx | 6 -- .../ui/querydesign/QuerySizeTabWinUndoAct.hxx | 4 -- .../ui/querydesign/QueryTabConnUndoAction.hxx | 2 - .../ui/querydesign/QueryTabWinShowUndoAct.hxx | 2 - .../source/ui/querydesign/QueryTabWinUndoAct.hxx | 2 - .../source/ui/querydesign/SelectionBrowseBox.hxx | 14 ---- dbaccess/source/ui/querydesign/TableFieldInfo.hxx | 4 -- dbaccess/source/ui/querydesign/querydlg.hxx | 14 ---- .../source/ui/relationdesign/RTableConnection.hxx | 4 -- dbaccess/source/ui/relationdesign/RTableWindow.hxx | 2 - dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 4 -- dbaccess/source/ui/tabledesign/TEditControl.hxx | 12 ---- .../source/ui/tabledesign/TableFieldControl.hxx | 2 - .../source/ui/tabledesign/TableFieldDescWin.hxx | 6 -- dbaccess/source/ui/tabledesign/TableUndo.hxx | 8 --- dbaccess/source/ui/uno/ColumnControl.hxx | 4 -- dbaccess/source/ui/uno/ColumnModel.hxx | 22 ------- dbaccess/source/ui/uno/ColumnPeer.hxx | 8 --- dbaccess/source/ui/uno/composerdialogs.hxx | 16 ----- dbaccess/source/ui/uno/dbinteraction.hxx | 2 - dbaccess/source/ui/uno/unoDirectSql.hxx | 14 ---- reportdesign/source/core/inc/Function.hxx | 2 - reportdesign/source/filter/xml/xmlImage.hxx | 2 - reportdesign/source/filter/xml/xmlStyleImport.hxx | 4 -- reportdesign/source/ui/inc/DateTime.hxx | 6 -- reportdesign/source/ui/inc/GroupsSorting.hxx | 2 - reportdesign/source/ui/inc/InsertFunctions.hxx | 2 - reportdesign/source/ui/inc/PageNumber.hxx | 6 -- 257 files changed, 2776 deletions(-) mode change 100755 => 100644 dbaccess/source/inc/OAuthenticationContinuation.hxx mode change 100755 => 100644 dbaccess/source/ui/dlg/admincontrols.hxx (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index 46d5a78922f3..91dfb4aa0f11 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.hxx @@ -28,15 +28,9 @@ #ifndef DBAUI_ICONTROLLER_HXX #define DBAUI_ICONTROLLER_HXX -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef DBAUI_IREFERENCE_HXX #include "IReference.hxx" -#endif #include "dbaccessdllapi.h" namespace com { namespace sun { namespace star { diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx index 0bb93681d8c6..6ab9446fc7f8 100644 --- a/dbaccess/inc/ToolBoxHelper.hxx +++ b/dbaccess/inc/ToolBoxHelper.hxx @@ -28,18 +28,10 @@ #ifndef DBAUI_TOOLBOXHELPER_HXX #define DBAUI_TOOLBOXHELPER_HXX -#ifndef _SAL_TYPES_H_ #include -#endif -#ifndef _LINK_HXX #include -#endif -#ifndef _SV_GEN_HXX #include -#endif -#ifndef _SV_IMAGE_HXX #include -#endif #include "dbaccessdllapi.h" class SvtMiscOptions; diff --git a/dbaccess/inc/dataview.hxx b/dbaccess/inc/dataview.hxx index ae93fa1d3284..135866bec980 100644 --- a/dbaccess/inc/dataview.hxx +++ b/dbaccess/inc/dataview.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_DATAVIEW_HXX #define DBAUI_DATAVIEW_HXX -#ifndef _SV_WINDOW_HXX #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef INCLUDED_SVTOOLS_ACCELERATOREXECUTE_HXX #include -#endif #include #include "dbaccessdllapi.h" diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index 36d3c90c7969..b3e21a4731e1 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -28,12 +28,8 @@ #ifndef DBACCESS_CORE_API_BOOKMARKSET_HXX #define DBACCESS_CORE_API_BOOKMARKSET_HXX -#ifndef DBACCESS_CORE_API_CACHESET_HXX #include "CacheSet.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/CIndexColumn.hxx b/dbaccess/source/core/api/CIndexColumn.hxx index 948d472ef88c..352de2c21bb0 100644 --- a/dbaccess/source/core/api/CIndexColumn.hxx +++ b/dbaccess/source/core/api/CIndexColumn.hxx @@ -28,9 +28,7 @@ #ifndef DBACCESS_INDEXCOLUMN_HXX_ #define DBACCESS_INDEXCOLUMN_HXX_ -#ifndef _CONNECTIVITY_ADABAS_COLUMN_HXX_ #include "adabas/BColumn.hxx" -#endif namespace connectivity { diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx index c461204754be..33e87a02fad9 100644 --- a/dbaccess/source/core/api/CIndexes.hxx +++ b/dbaccess/source/core/api/CIndexes.hxx @@ -28,9 +28,7 @@ #ifndef DBACCESS_INDEXES_HXX_ #define DBACCESS_INDEXES_HXX_ -#ifndef CONNECTIVITY_INDEXESHELPER_HXX #include "connectivity/TIndexes.hxx" -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx index 043837f44589..c2df0b8b4831 100644 --- a/dbaccess/source/core/api/CRowSetColumn.hxx +++ b/dbaccess/source/core/api/CRowSetColumn.hxx @@ -27,18 +27,10 @@ #ifndef DBACCESS_CORE_API_CROWSETCOLUMN_HXX #define DBACCESS_CORE_API_CROWSETCOLUMN_HXX -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef DBACCESS_CORE_API_CROWSETDATACOLUMN_HXX #include "CRowSetDataColumn.hxx" -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index ef3503fa5e4e..1cacc1af95da 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -27,39 +27,17 @@ #ifndef DBACCESS_CORE_API_CACHESET_HXX #define DBACCESS_CORE_API_CACHESET_HXX -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDELETEROWS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_COMPAREBOOKMARK_HPP_ #include -#endif -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif #include namespace rtl diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index 1169a20b0750..c49d940c6820 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -27,21 +27,11 @@ #ifndef DBA_HELPERCOLLECTIONS_HXX #define DBA_HELPERCOLLECTIONS_HXX -#ifndef _CONNECTIVITY_SDBCX_COLLECTION_HXX_ #include "connectivity/sdbcx/VCollection.hxx" -#endif -#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include -#endif -#ifndef _DBHELPER_DBCONVERSION_HXX_ #include -#endif -#ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_ #include -#endif -#ifndef _VOS_REF_HXX_ #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 212ec237699e..53c05940f6fa 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -28,24 +28,16 @@ #ifndef DBACCESS_CORE_API_KEYSET_HXX #define DBACCESS_CORE_API_KEYSET_HXX -#ifndef DBACCESS_CORE_API_CACHESET_HXX #include "CacheSet.hxx" -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif #include #include -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include -#endif #include #include -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index dd61f997dd7d..39ae908cb4b2 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -27,69 +27,27 @@ #ifndef DBACCESS_CORE_API_ROWSETBASE_HXX #define DBACCESS_CORE_API_ROWSETBASE_HXX -#ifndef _CPPUHELPER_IMPLBASE10_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_H_ #include -#endif -#ifndef CONNECTIVITY_SQLERROR_HXX #include -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include -#endif -#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTYPES_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef DBACCESS_ROWSETCACHEITERATOR_HXX #include "RowSetCacheIterator.hxx" -#endif #include "core_resource.hxx" #include diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 76e1d7145752..519070ee6baa 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -27,78 +27,30 @@ #ifndef DBACCESS_CORE_API_ROWSETCACHE_HXX #define DBACCESS_CORE_API_ROWSETCACHE_HXX -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XPREPAREDSTATEMENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYANALYZER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYANALYZER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XRESULTSETACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XROWSETAPPROVEBROADCASTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_RESULTSETTYPE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDELETEROWS_HPP_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE11_HXX_ #include -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include -#endif -#ifndef COMPHELPER_COMPONENTCONTEXT_HXX #include -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef DBACCESS_ROWSETCACHEITERATOR_HXX #include "RowSetCacheIterator.hxx" -#endif namespace connectivity { diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index 6c4c1a8576ce..572e8b20abda 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -27,12 +27,8 @@ #ifndef DBACCESS_ROWSETCACHEITERATOR_HXX #define DBACCESS_ROWSETCACHEITERATOR_HXX -#ifndef DBACCESS_CORE_API_ROWSETROW_HXX #include "RowSetRow.hxx" -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index 1178c2990b83..ee603f597eff 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -27,18 +27,10 @@ #ifndef DBACCESS_CORE_API_ROWSETROW_HXX #define DBACCESS_CORE_API_ROWSETROW_HXX -#ifndef _VOS_REF_HXX_ #include -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include -#endif -#ifndef _CONNECTIVITY_FILE_VALUE_HXX_ #include "connectivity/FValue.hxx" -#endif -#ifndef _COMPHELPER_TYPES_HXX_ #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx index 676044cb61f9..12590e108468 100644 --- a/dbaccess/source/core/api/StaticSet.hxx +++ b/dbaccess/source/core/api/StaticSet.hxx @@ -28,9 +28,7 @@ #ifndef DBACCESS_CORE_API_STATICSET_HXX #define DBACCESS_CORE_API_STATICSET_HXX -#ifndef DBACCESS_CORE_API_CACHESET_HXX #include "CacheSet.hxx" -#endif namespace dbaccess { diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index 082811748e6a..1bba37764475 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -31,9 +31,7 @@ #ifndef DBACCESS_CORE_API_WRAPPEDRESULTSET_HXX #define DBACCESS_CORE_API_WRAPPEDRESULTSET_HXX -#ifndef DBACCESS_CORE_API_CACHESET_HXX #include "CacheSet.hxx" -#endif #include #include diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index 3c18fd4d830d..4b8017557b78 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -28,24 +28,12 @@ #ifndef _DBACORE_DATACOLUMN_HXX_ #define _DBACORE_DATACOLUMN_HXX_ -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HDL_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XCOLUMN_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XCOLUMNUPDATE_HPP_ #include -#endif -#ifndef _DBA_COREAPI_RESULTCOLUMN_HXX_ #include -#endif namespace dbaccess { //************************************************************ diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index 81e3a38c7862..ddc8bae41c3e 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -28,27 +28,13 @@ #ifndef _DBA_COREAPI_QUERY_HXX_ #define _DBA_COREAPI_QUERY_HXX_ -#ifndef _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ #include "querydescriptor.hxx" -#endif -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif #include diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index 2f27b4b9c628..67f226b08986 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -28,44 +28,20 @@ #ifndef _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ #define _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _OSL_MUTEX_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include "column.hxx" -#endif -#ifndef _DBA_CORE_DATASETTINGS_HXX_ #include "datasettings.hxx" -#endif -#ifndef _DBA_CORE_COMMANDBASE_HXX_ #include "commandbase.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 7e1842241cf6..58b34452e2be 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -28,12 +28,8 @@ #ifndef _DBACORE_RESULTCOLUMN_HXX_ #define _DBACORE_RESULTCOLUMN_HXX_ -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HDL_ #include -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include -#endif #include namespace dbaccess { diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index cc765919c313..66bcfb4965d6 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -27,68 +27,28 @@ #ifndef _DBA_COREAPI_RESULTSET_HXX_ #define _DBA_COREAPI_RESULTSET_HXX_ -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include "column.hxx" -#endif -#ifndef DBTOOLS_WARNINGSCONTAINER_HXX #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XSTATEMENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_RESULTSETCONCURRENCY_HPP_ #include -#endif -#ifndef _CPPUHELPER_PROPSHLP_HXX #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _OSL_DIAGNOSE_H_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE11_HXX_ #include -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 834e7a9979fa..fc773324018d 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -28,45 +28,19 @@ #ifndef DBA_COREDATAACESS_COMPONENTDEFINITION_HXX #define DBA_COREDATAACESS_COMPONENTDEFINITION_HXX -#ifndef _DBA_CORE_COMMANDBASE_HXX_ #include "commandbase.hxx" -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _DBA_CORE_DATASETTINGS_HXX_ #include "datasettings.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include -#endif #include #include diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index 7691411cd08b..5044c55414c7 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -27,48 +27,20 @@ #ifndef DBA_CORE_SHARED_CONNECTION_HXX #define DBA_CORE_SHARED_CONNECTION_HXX -#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_ #include "connectivity/ConnectionWrapper.hxx" -#endif -#ifndef _CPPUHELPER_COMPONENT_HXX_ #include -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE1_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSERFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XCOMMANDPREPARATION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_ #include -#endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include -#endif namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index 0a43371c51e5..4c66ba968971 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -28,45 +28,19 @@ #ifndef _DBA_CORE_BOOKMARKCONTAINER_HXX_ #define _DBA_CORE_BOOKMARKCONTAINER_HXX_ -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE6_HXX_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _OSL_MUTEX_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index 4528224ce24d..c85e549fb72c 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -28,17 +28,11 @@ #ifndef _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_ #define _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_ -#ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #include "definitioncontainer.hxx" -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 6d245324c831..796c386dc29e 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -28,39 +28,17 @@ #ifndef _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_ #define _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_ -#ifndef _DBA_CORE_COMMANDBASE_HXX_ #include "commandbase.hxx" -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _DBA_CORE_DATASETTINGS_HXX_ #include "datasettings.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef DBA_COREDATAACESS_COMPONENTDEFINITION_HXX #include "ComponentDefinition.hxx" -#endif //........................................................................ diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index b84b3d74c727..9699660d863f 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -28,102 +28,38 @@ #ifndef _DBA_COREDATAACCESS_DATASOURCE_HXX_ #define _DBA_COREDATAACCESS_DATASOURCE_HXX_ -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XBOOKMARKSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XQUERYDEFINITIONSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XISOLATEDCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XFLUSHABLE_HPP_ #include -#endif -#ifndef _CPPUHELPER_PROPSHLP_HXX #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _CPPUHELPER_WEAKREF_HXX_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE11_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_XTRANSACTIONLISTENER_HPP_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBA_CORE_BOOKMARKCONTAINER_HXX_ #include "bookmarkcontainer.hxx" -#endif -#ifndef _VOS_REF_HXX_ #include -#endif -#ifndef _STRING_HXX #include -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XCOMPLETEDCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XSTORAGEBASEDDOCUMENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XDOCUMENTDATASOURCE_HPP_ #include -#endif -#ifndef _DBA_COREDATAACCESS_MODELIMPL_HXX_ #include "ModelImpl.hxx" -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index c1a9c424d7d3..2ec37d18ed56 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -28,36 +28,16 @@ #ifndef _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ #define _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ -#ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #include "definitioncontainer.hxx" -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMECONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAME_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_ #include -#endif -#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index 76427ea78baf..f4cf9a9a57b8 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -28,39 +28,17 @@ #ifndef _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ #define _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ -#ifndef _CPPUHELPER_PROPSHLP_HXX #include -#endif -#ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_XSTATECHANGELISTENER_HPP_ #include -#endif #include #include #include diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 9c69ee0d59d7..fb61ecfd971a 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -28,30 +28,14 @@ #ifndef DBA_INTERCEPT_HXX #define DBA_INTERCEPT_HXX -#ifndef _OSL_MUTEX_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDERINTERCEPTOR_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XINTERCEPTORINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEVENTLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include -#endif -#ifndef _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ #include "documentdefinition.hxx" -#endif #include namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index 7b1e5bd814df..cf9c90383e54 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -28,15 +28,9 @@ #ifndef DBA_DATASUPPLIER_HXX #define DBA_DATASUPPLIER_HXX -#ifndef _RTL_REF_HXX_ #include -#endif -#ifndef _UCBHELPER_RESULTSET_HXX #include -#endif -#ifndef _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ #include "documentcontainer.hxx" -#endif #include namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.hxx b/dbaccess/source/core/dataaccess/myucp_resultset.hxx index a81658587003..f1457793a182 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.hxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.hxx @@ -28,15 +28,9 @@ #ifndef DBA_UCPRESULTSET_HXX #define DBA_UCPRESULTSET_HXX -#ifndef _RTL_REF_HXX_ #include -#endif -#ifndef _UCBHELPER_RESULTSETHELPER_HXX #include -#endif -#ifndef _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ #include "documentcontainer.hxx" -#endif // @@@ Adjust namespace name. diff --git a/dbaccess/source/core/inc/ContainerListener.hxx b/dbaccess/source/core/inc/ContainerListener.hxx index 2a6b976504e5..72111fcabf88 100644 --- a/dbaccess/source/core/inc/ContainerListener.hxx +++ b/dbaccess/source/core/inc/ContainerListener.hxx @@ -27,19 +27,11 @@ #ifndef DBA_CONTAINERLISTENER_HXX #define DBA_CONTAINERLISTENER_HXX -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERAPPROVELISTENER_HPP_ #include -#endif -#ifndef _CPPUHELPER_WEAK_HXX_ #include -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index f35a0bfca58b..2e4d6a58b863 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -27,34 +27,16 @@ #ifndef DBA_CONTAINERMEDIATOR_HXX #define DBA_CONTAINERMEDIATOR_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _RTL_REF_HXX_ #include -#endif #include diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 10c5df0cd5f3..3c83254513d0 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -27,72 +27,28 @@ #ifndef DBA_CONTENTHELPER_HXX #define DBA_CONTENTHELPER_HXX -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UCB_XCOMMANDPROCESSOR_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTIESCHANGENOTIFIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_XSTORAGE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_EMBED_XEMBEDDEDOBJECT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE9_HXX_ #include -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef COMPHELPER_COMPONENTCONTEXT_HXX #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include -#endif -#ifndef CONNECTIVITY_SQLERROR_HXX #include -#endif -#ifndef BOOST_SHARED_PTR_HPP_INCLUDED #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index b0e5696387b4..02027547eb3a 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -27,24 +27,12 @@ #ifndef DBA_PROPERTYSETFORWARD_HXX #define DBA_PROPERTYSETFORWARD_HXX -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif #include diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx index 2b4bdda0f5a0..51d7ee5e1249 100644 --- a/dbaccess/source/core/inc/RefreshListener.hxx +++ b/dbaccess/source/core/inc/RefreshListener.hxx @@ -28,9 +28,7 @@ #ifndef DBA_CORE_REFRESHLISTENER_HXX #define DBA_CORE_REFRESHLISTENER_HXX -#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include -#endif namespace com { namespace sun { namespace star { namespace container { diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 7c0d2ba4cea3..412fbb1c5231 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -27,51 +27,21 @@ #ifndef DBACCESS_CORE_API_SINGLESELECTQUERYCOMPOSER_HXX #define DBACCESS_CORE_API_SINGLESELECTQUERYCOMPOSER_HXX -#ifndef _COM_SUN_STAR_SDB_XPARAMETERSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SCRIPT_XTYPECONVERTER_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include -#endif -#ifndef _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ #include -#endif -#ifndef _CONNECTIVITY_SQLPARSE_HXX #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include -#endif -#ifndef COMPHELPER_COMPONENTCONTEXT_HXX #include -#endif #include diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 8f8ec5bf9652..8372859c2f6b 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -28,61 +28,25 @@ #ifndef _DBA_CORE_TABLEDECORATOR_HXX_ #define _DBA_CORE_TABLEDECORATOR_HXX_ -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XINDEXESSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XKEYSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XRENAME_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XALTERTABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE9_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBA_CORE_DATASETTINGS_HXX_ #include "datasettings.hxx" -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include "column.hxx" -#endif -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include -#endif -#ifndef _CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_ #include -#endif -#ifndef COMPHELPER_IDPROPERTYARRAYUSAGEHELPER_HXX #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx index 64f281e7b6aa..e772732b331f 100644 --- a/dbaccess/source/core/inc/callablestatement.hxx +++ b/dbaccess/source/core/inc/callablestatement.hxx @@ -27,15 +27,9 @@ #ifndef _DBA_COREAPI_CALLABLESTATEMENT_HXX_ #define _DBA_COREAPI_CALLABLESTATEMENT_HXX_ -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XOUTPARAMETERS_HPP_ #include -#endif -#ifndef _DBA_COREAPI_PREPAREDSTATEMENT_HXX_ #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index ea0e9644c714..bc589c428c26 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -28,12 +28,8 @@ #ifndef _DBA_CORE_COMMANDBASE_HXX_ #define _DBA_CORE_COMMANDBASE_HXX_ -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx index 4f7c4b7f66ef..06144a79c5f7 100644 --- a/dbaccess/source/core/inc/composertools.hxx +++ b/dbaccess/source/core/inc/composertools.hxx @@ -31,9 +31,7 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#ifndef _RTL_USTRBUF_HXX_ #include -#endif #include diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx index 0f27559201d7..6d64555fccbf 100644 --- a/dbaccess/source/core/inc/containerapprove.hxx +++ b/dbaccess/source/core/inc/containerapprove.hxx @@ -29,9 +29,7 @@ #define DBACCESS_CONTAINERAPPROVE_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_UNO_XINTERFACE_HPP_ #include -#endif /** === end UNO includes === **/ #include diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx index fd8023e15322..3730134a58e9 100644 --- a/dbaccess/source/core/inc/core_resource.hxx +++ b/dbaccess/source/core/inc/core_resource.hxx @@ -28,9 +28,7 @@ #ifndef _DBA_CORE_RESOURCE_HXX_ #define _DBA_CORE_RESOURCE_HXX_ -#ifndef _RTL_USTRING_HXX_ #include -#endif #include class ResMgr; diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index 9b42c7d57cf9..0e348de05849 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -28,24 +28,12 @@ #ifndef _DBA_CORE_DATASETTINGS_HXX_ #define _DBA_CORE_DATASETTINGS_HXX_ -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_ILLEGALARGUMENTEXCEPTION_HPP_ #include -#endif -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX #include -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index d70a0813e18c..96d0988361e7 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -28,63 +28,25 @@ #ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #define _DBA_CORE_DEFINITIONCONTAINER_HXX_ -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE7_HXX_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _OSL_MUTEX_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XVETOABLECHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERAPPROVEBROADCASTER_HPP_ #include -#endif -#ifndef DBA_CONTENTHELPER_HXX #include "ContentHelper.hxx" -#endif -#ifndef DBACCESS_CONTAINERAPPROVE_HXX #include "containerapprove.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _RTL_REF_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif //........................................................................ namespace dbaccess { diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx index bea104c77443..a1982a740d02 100644 --- a/dbaccess/source/core/inc/objectnameapproval.hxx +++ b/dbaccess/source/core/inc/objectnameapproval.hxx @@ -28,14 +28,10 @@ #ifndef DBACCESS_OBJECTNAMEAPPROVAL_HXX #define DBACCESS_OBJECTNAMEAPPROVAL_HXX -#ifndef DBACCESS_CONTAINERAPPROVE_HXX #include "containerapprove.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif /** === end UNO includes === **/ //........................................................................ diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index e0df114b22af..229c25414786 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -27,30 +27,14 @@ #ifndef _DBA_COREAPI_PREPAREDSTATEMENT_HXX_ #define _DBA_COREAPI_PREPAREDSTATEMENT_HXX_ -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XPREPAREDSTATEMENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_ #include -#endif -#ifndef _DBA_COREAPI_STATEMENT_HXX_ #include -#endif -#ifndef _DBA_COREAPI_COLUMN_HXX_ #include -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 839e5e39a772..0ae3cbb534f6 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -27,45 +27,19 @@ #ifndef DBACCESS_CORE_API_QUERYCOMPOSER_HXX #define DBACCESS_CORE_API_QUERYCOMPOSER_HXX -#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XPARAMETERSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SCRIPT_XTYPECONVERTER_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include -#endif -#ifndef _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ #include -#endif -#ifndef _CONNECTIVITY_SQLPARSE_HXX #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include -#endif diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index 9502a7002aa7..87579a033435 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -28,76 +28,32 @@ #ifndef _DBA_CORE_QUERYCONTAINER_HXX_ #define _DBA_CORE_QUERYCONTAINER_HXX_ -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include -#endif /** === begin UNO includes == **/ -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XAPPEND_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDROP_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERAPPROVELISTENER_HPP_ #include -#endif /** === end UNO includes === **/ -#ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_ #include "definitioncontainer.hxx" -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif namespace dbtools { diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index ae821c7a516b..ab88663037ae 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -27,49 +27,21 @@ #ifndef _DBA_COREAPI_STATEMENT_HXX_ #define _DBA_COREAPI_STATEMENT_HXX_ -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XSTATEMENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XCANCELLABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XMULTIPLERESULTS_HDL_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XPREPAREDBATCHEXECUTION_HDL_ #include -#endif #include -#ifndef _COM_SUN_STAR_SDBC_XGENERATEDRESULTSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include -#endif -#ifndef _CPPUHELPER_PROPSHLP_HXX #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif #include diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index 5e64e8896d55..8a7cf6367c33 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -28,54 +28,22 @@ #ifndef _DBA_CORE_TABLECONTAINER_HXX_ #define _DBA_CORE_TABLECONTAINER_HXX_ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef DBACCESS_CORE_FILTERED_CONTAINER_HXX #include "FilteredContainer.hxx" -#endif -#ifndef DBTOOLS_WARNINGSCONTAINER_HXX #include -#endif -#ifndef DBA_CORE_REFRESHLISTENER_HXX #include "RefreshListener.hxx" -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif namespace dbaccess { diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx index 24dbbb206f2c..0b944b321130 100644 --- a/dbaccess/source/core/inc/userinformation.hxx +++ b/dbaccess/source/core/inc/userinformation.hxx @@ -28,13 +28,9 @@ #ifndef _DBA_CORE_USERINFORMATION_HXX_ #define _DBA_CORE_USERINFORMATION_HXX_ -#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif class UserInformation { diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx index 00de76c7b73e..cec88e5e9cd7 100644 --- a/dbaccess/source/core/inc/veto.hxx +++ b/dbaccess/source/core/inc/veto.hxx @@ -29,14 +29,10 @@ #define DBACCESS_VETO_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_UTIL_XVETO_HPP_ #include -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif //........................................................................ namespace dbaccess diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index beb5c08e6350..f3afd8cc1114 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -28,47 +28,21 @@ #ifndef _DBA_CORE_VIEWCONTAINER_HXX_ #define _DBA_CORE_VIEWCONTAINER_HXX_ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_SQLWARNING_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef DBACCESS_CORE_FILTERED_CONTAINER_HXX #include "FilteredContainer.hxx" -#endif namespace dbtools { diff --git a/dbaccess/source/ext/adabas/ANewDb.hxx b/dbaccess/source/ext/adabas/ANewDb.hxx index 46de53c1fcaf..512488d24bb8 100644 --- a/dbaccess/source/ext/adabas/ANewDb.hxx +++ b/dbaccess/source/ext/adabas/ANewDb.hxx @@ -29,15 +29,9 @@ #ifndef ADABASUI_NEWDB_HXX #define ADABASUI_NEWDB_HXX -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include -#endif -#ifndef _EXTENSIONS_COMPONENT_MODULE_HXX_ #include "Acomponentmodule.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCREATECATALOG_HPP_ #include -#endif diff --git a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx index e434eff9ee64..56370c73ce1e 100644 --- a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx +++ b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx @@ -28,12 +28,8 @@ #ifndef ADABASUI_SQLNAMEEDIT_HXX #define ADABASUI_SQLNAMEEDIT_HXX -#ifndef _SV_EDIT_HXX #include -#endif -#ifndef _SV_COMBOBOX_HXX #include -#endif namespace adabasui { diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx index 7b5f1466a092..09fd0807639f 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx @@ -36,30 +36,14 @@ which should be used as namespace for the classes defined herein.

*/ -#ifndef _OSL_MUTEX_HXX_ #include -#endif -#ifndef _TOOLS_RESID_HXX #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include -#endif -#ifndef _RTL_STRING_HXX_ #include -#endif class ResMgr; diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx index 4a29f7c68e7e..c7485e17b5e2 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx @@ -29,31 +29,15 @@ #define ADABASUI_ADABAS_CREATEDB_HXX -#ifndef _SV_DIALOG_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif -#ifndef _SV_FIELD_HXX #include -#endif -#ifndef _SV_EDIT_HXX #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCREATECATALOG_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _FILEDLGHELPER_HXX #include -#endif #include #include "ASQLNameEdit.hxx" diff --git a/dbaccess/source/filter/migration/cfgimport.hxx b/dbaccess/source/filter/migration/cfgimport.hxx index ff2926944dca..34bca221347c 100644 --- a/dbaccess/source/filter/migration/cfgimport.hxx +++ b/dbaccess/source/filter/migration/cfgimport.hxx @@ -28,42 +28,18 @@ #ifndef CFG_CFGIMPORT_HXX #define CFG_CFGIMPORT_HXX -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_TASK_XJOB_HPP_ #include -#endif -#ifndef _OSL_DIAGNOSE_H_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE4_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYERHANDLER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONFIGURATION_BACKEND_XLAYER_HPP_ #include -#endif #include #include diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx index b966d68908d5..a45a7aac5e4b 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx @@ -26,18 +26,10 @@ ************************************************************************/ #ifndef DBA_XMLAUTOSTYLE_HXX #define DBA_XMLAUTOSTYLE_HXX -#ifndef _XMLOFF_PROPMAPPINGTYPES_HXX #include -#endif -#ifndef _XMLOFF_XMLASTPLP_HXX #include -#endif -#ifndef _XMLOFF_XMLTYPES_HXX #include -#endif -#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX #include -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 2523bad6d112..613322c60196 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLCOMPONENT_HXX #define DBA_XMLCOMPONENT_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 6dac18107c30..69ff3df6c4e1 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLCONNECTIONDATA_HXX_INCLUDED #define DBA_XMLCONNECTIONDATA_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index 2645dba69bb2..ecf7c2c47271 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED #define DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index 2b6a640f6576..d1127ad06419 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLDATASOURCE_HXX #define DBA_XMLDATASOURCE_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index 86832af5de77..6a94b0a80ea9 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLDATASOURCEINFO_HXX #define DBA_XMLDATASOURCEINFO_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index e1e0891069a8..4d31dc0834ed 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -27,15 +27,9 @@ #ifndef DBA_XMLDATASOURCESETTING_HXX #define DBA_XMLDATASOURCESETTING_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx index df9690dafd0f..ef91c7fcc6fd 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLDATASOURCESETTINGS_HXX #define DBA_XMLDATASOURCESETTINGS_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx index 3a41f3d01c7f..206ebcc8d18e 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlDatabase.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLDATABASE_HXX #define DBA_XMLDATABASE_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index 03c4cd94a8ec..b4fc79ec12dd 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED #define DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 26444e9e5454..777be178c367 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -27,15 +27,9 @@ #ifndef DBA_XMLDOCUMENTS_HXX #define DBA_XMLDOCUMENTS_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef DBA_XMLENUMS_HXX #include "xmlEnums.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 15681aa62525..ffb516cc84b9 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -28,70 +28,28 @@ #ifndef DBA_XMLEXPORT_HXX #define DBA_XMLEXPORT_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include -#endif -#ifndef _OSL_DIAGNOSE_H_ #include -#endif -#ifndef _UNOTOOLS_TEMPFILE_HXX #include -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include -#endif -#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX #include -#endif -#ifndef _XMLOFF_XMLEXP_HXX #include -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif #include "dsntypes.hxx" -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif #include diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index 2e5a957ebad9..29bcfcbffdd1 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED #define DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index 58853f4b1b17..0c31b5ddff9b 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -27,15 +27,9 @@ #ifndef DBA_XMLHELPER_HXX #define DBA_XMLHELPER_HXX -#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX #include -#endif -#ifndef _XMLOFF_CONTEXTID_HXX_ #include -#endif -#ifndef _XMLOFF_FORMS_CONTROLPROPERTYHDL_HXX_ #include -#endif #include diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index a41920d76562..8be3ae6ddd60 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLLOGIN_HXX #define DBA_XMLLOGIN_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index f751d9b7af50..874417853251 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLQUERY_HXX #define DBA_XMLQUERY_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef DBA_XMLTABLE_HXX #include "xmlTable.hxx" -#endif namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index 4eb2b8de402f..c3923ef43e11 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -27,12 +27,8 @@ #ifndef DBA_XMLSERVERDATABASE_HXX_INCLUDED #define DBA_XMLSERVERDATABASE_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index b9210e49e0e9..c85962c1d74c 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -28,36 +28,16 @@ #ifndef DBA_XMLSTYLEIMPORT_HXX #define DBA_XMLSTYLEIMPORT_HXX -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include -#endif -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _XMLOFF_PROPMAPPINGTYPES_HXX #include -#endif -#ifndef _XMLOFF_PRSTYLEI_HXX_ #include -#endif -#ifndef _XMLOFF_XMLIMPPR_HXX #include -#endif -#ifndef _XMLTEXTMASTERPAGECONTEXT_HXX #include -#endif -#ifndef _XMLTEXTMASTERSTYLESCONTEXT_HXX #include -#endif -#ifndef _XMLOFF_CONTEXTID_HXX_ #include -#endif -#ifndef _XMLOFF_FORMS_CONTROLPROPERTYHDL_HXX_ #include -#endif #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index 0fab2577c32d..9607a1d1637c 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -27,15 +27,9 @@ #ifndef DBA_XMLTABLE_HXX #define DBA_XMLTABLE_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index fe22ac40bb52..d5519c3ce72b 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLTABLEFILTERLIST_HXX #define DBA_XMLTABLEFILTERLIST_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif #include namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx index c33136849e0e..965fc99fa69f 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx @@ -27,9 +27,7 @@ #ifndef DBA_XMLTABLEFILTERPATTERN_HXX #define DBA_XMLTABLEFILTERPATTERN_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include -#endif namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index a14e5cd90984..2241fcf5deb0 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -28,63 +28,25 @@ #ifndef DBA_XMLFILTER_HXX #define DBA_XMLFILTER_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include -#endif -#ifndef _OSL_DIAGNOSE_H_ #include -#endif -#ifndef _UNOTOOLS_TEMPFILE_HXX #include -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include -#endif -#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX #include -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif #include diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx old mode 100755 new mode 100644 diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index d16d085f3750..8c2b332b2b64 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -28,27 +28,13 @@ #ifndef _DBASHARED_APITOOLS_HXX_ #define _DBASHARED_APITOOLS_HXX_ -#ifndef _CPPUHELPER_COMPONENT_HXX_ #include -#endif -#ifndef _OSL_MUTEX_HXX_ #include -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include -#endif -#ifndef _OSL_DIAGNOSE_H_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include -#endif -#ifndef _COMPHELPER_SEQUENCE_HXX_ #include -#endif //================================================================================== //= various typedefs diff --git a/dbaccess/source/inc/cfg_reghelper.hxx b/dbaccess/source/inc/cfg_reghelper.hxx index 157b6eaa72de..75ba5aafc0b1 100644 --- a/dbaccess/source/inc/cfg_reghelper.hxx +++ b/dbaccess/source/inc/cfg_reghelper.hxx @@ -28,24 +28,12 @@ #ifndef CFG_REGHELPER_HXX #define CFG_REGHELPER_HXX -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include -#endif namespace dbacfg { diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx index 644216dbb8c4..2db1c3e7714a 100644 --- a/dbaccess/source/inc/dbu_reghelper.hxx +++ b/dbaccess/source/inc/dbu_reghelper.hxx @@ -28,24 +28,12 @@ #ifndef _DBU_REGHELPER_HXX_ #define _DBU_REGHELPER_HXX_ -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx index 6ed767c00b86..9b16b07bc303 100644 --- a/dbaccess/source/inc/flt_reghelper.hxx +++ b/dbaccess/source/inc/flt_reghelper.hxx @@ -28,24 +28,12 @@ #ifndef _FLT_REGHELPER_HXX_ #define _FLT_REGHELPER_HXX_ -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef _CPPUHELPER_FACTORY_HXX_ #include -#endif namespace dbaxml { diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx index c2235e54c526..19b238a00249 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx @@ -28,36 +28,20 @@ #ifndef DBACCESS_CONNECTIONTOOLS_HXX #define DBACCESS_CONNECTIONTOOLS_HXX -#ifndef DBACCESS_MODULE_SDBT_HXX #include "module_sdbt.hxx" -#endif -#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX #include "connectiondependent.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDB_TOOLS_XCONNECTIONTOOLS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include -#endif -#ifndef COMPHELPER_COMPONENTCONTEXT_HXX #include -#endif //........................................................................ namespace sdbtools diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx index de4a82df1340..b7af11bb5c6d 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx @@ -28,19 +28,13 @@ #ifndef DBACCESS_DATASOURCEMETADATA_HXX #define DBACCESS_DATASOURCEMETADATA_HXX -#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX #include "connectiondependent.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDB_TOOLS_XDATASOURCEMETADATA_HPP_ #include -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif #include diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index fae1b8fae0be..6c6127962f0e 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.hxx @@ -28,19 +28,13 @@ #ifndef DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX #define DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX -#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX #include "connectiondependent.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDB_TOOLS_XTABLENAME_HPP_ #include -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif #include diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx index 5b17ff86b4f0..c40aca485a9e 100644 --- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx +++ b/dbaccess/source/sdbtools/inc/module_sdbt.hxx @@ -28,9 +28,7 @@ #ifndef DBACCESS_MODULE_SDBT_HXX #define DBACCESS_MODULE_SDBT_HXX -#ifndef UNOTOOLS_INC_UNOTOOLS_COMPONENTRESMODULE_HXX #include -#endif //........................................................................ namespace sdbtools diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 5ade6b687949..ec9fb8b92d00 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -29,42 +29,18 @@ #include -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include -#endif -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif -#ifndef _SVTREEBOX_HXX #include -#endif -#ifndef SVTOOLS_DOCUMENTINFOPREVIEW_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_TOOLBOX_HXX #include -#endif -#ifndef _SV_CVTGRF_HXX #include -#endif -#ifndef _SV_GRAPH_HXX #include -#endif -#ifndef _GRFMGR_HXX #include -#endif #include "callbacks.hxx" #include diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index 5626db6dc157..dea106083c79 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -27,45 +27,19 @@ #ifndef DBAUI_APPDETAILVIEW_HXX #define DBAUI_APPDETAILVIEW_HXX -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_ #include -#endif -#ifndef _SV_SPLIT_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_MNEMONIC_HXX #include -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif -#ifndef DBAUI_TITLE_WINDOW_HXX #include "AppTitleWindow.hxx" -#endif -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif -#ifndef _SVTREEBOX_HXX #include -#endif -#ifndef DBAUI_VERTSPLITVIEW_HXX #include "VertSplitView.hxx" -#endif #include diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index 0cd6bfdbbf76..3cdfe71f2844 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_APPICONCONTROL_HXX #define DBAUI_APPICONCONTROL_HXX -#ifndef _ICNVW_HXX #include -#endif -#ifndef _TRANSFER_HXX #include -#endif namespace dbaui diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index 9ce25817993f..b3a6f91c3a18 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_APPSWAPWINDOW_HXX #define DBAUI_APPSWAPWINDOW_HXX -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef DBAUI_APPICONCONTROL_HXX #include "AppIconControl.hxx" -#endif -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 8efe8cd5dd9d..755b566a4f4e 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_TITLE_WINDOW_HXX #define DBAUI_TITLE_WINDOW_HXX -#ifndef _SV_FIXED_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index 7de14399f8ed..be4159daa065 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -27,33 +27,15 @@ #ifndef DBAUI_APPVIEW_HXX #define DBAUI_APPVIEW_HXX -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_ #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_ #include -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif namespace com{ namespace sun { namespace star { namespace beans { class XPropertySet; } } } } diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx index 8894f85ce430..acddc5aeb57c 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.hxx +++ b/dbaccess/source/ui/browser/dbtreemodel.hxx @@ -28,21 +28,11 @@ #ifndef DBAUI_DBTREEMODEL_HXX #define DBAUI_DBTREEMODEL_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _SVLBOX_HXX #include -#endif -#ifndef _SVLBOXITM_HXX #include -#endif -#ifndef _SBA_UNODATBR_HXX_ #include "unodatbr.hxx" -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif // syntax of the tree userdata // datasource holds the connection diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx index b008a79a4195..82d3e90490a6 100644 --- a/dbaccess/source/ui/browser/dbtreeview.hxx +++ b/dbaccess/source/ui/browser/dbtreeview.hxx @@ -28,13 +28,9 @@ #ifndef DBACCESS_UI_DBTREEVIEW_HXX #define DBACCESS_UI_DBTREEVIEW_HXX -#ifndef _SV_WINDOW_HXX //autogen #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif class SvTreeListBox; class SvLBoxTreeList; diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index ff219255d8f4..973586718805 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -34,9 +34,7 @@ #include "listviewitems.hxx" #include "callbacks.hxx" -#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGGESTURELISTENER_HDL_ #include -#endif #include #include #include diff --git a/dbaccess/source/ui/dlg/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx index 2f222462d4df..9dd235fb6ea1 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hxx +++ b/dbaccess/source/ui/dlg/AdabasStat.hxx @@ -27,27 +27,13 @@ #ifndef _DBAUI_ADASTAT_HXX_ #define _DBAUI_ADASTAT_HXX_ -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif -#ifndef _SV_DIALOG_HXX #include -#endif -#ifndef DBAUI_FIELDCONTROLS_HXX #include "FieldControls.hxx" -#endif -#ifndef _PRGSBAR_HXX #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif namespace dbaui diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 94c2678f9714..8685236d0956 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -28,18 +28,10 @@ #ifndef DBAUI_CONNECTIONHELPER_HXX #define DBAUI_CONNECTIONHELPER_HXX -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include -#endif -#ifndef _DBAUI_CURLEDIT_HXX_ #include "curledit.hxx" -#endif -#ifndef _SFX_FILEDLGHELPER_HXX #include -#endif #define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 2d6fef74c598..d3b8f305afe5 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -28,18 +28,10 @@ #ifndef DBAUI_CONNECTIONPAGE_HXX #define DBAUI_CONNECTIONPAGE_HXX -#ifndef DBAUI_CONNECTIONHELPER_HXX #include "ConnectionHelper.hxx" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include -#endif -#ifndef _DBAUI_CURLEDIT_HXX_ #include "curledit.hxx" -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 79a16c880c54..2f6e15cc4d38 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -28,23 +28,13 @@ #ifndef DBAUI_CONNECTIONPAGESETUP_HXX #define DBAUI_CONNECTIONPAGESETUP_HXX -#ifndef DBAUI_CONNECTIONHELPER_HXX #include "ConnectionHelper.hxx" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include -#endif -#ifndef _DBAUI_CURLEDIT_HXX_ #include "curledit.hxx" -#endif -#ifndef _SV_FIELD_HXX #include -#endif //......................................................................... diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 1ba67e19b9e2..0c124e474341 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -28,9 +28,7 @@ #ifndef DBAUI_DBSETUPCONNECTIONPAGES_HXX #define DBAUI_DBSETUPCONNECTIONPAGES_HXX -#ifndef DBAUI_CONNECTIONPAGESETUP_HXX #include "ConnectionPageSetup.hxx" -#endif #include "adminpages.hxx" #include "admincontrols.hxx" diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 4ed86867618e..04fb1adfbcfe 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -28,39 +28,17 @@ #ifndef _DBAUI_DBADMINIMPL_HXX_ #define _DBAUI_DBADMINIMPL_HXX_ -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_XNAMINGSERVICE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XDRIVER_HPP_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef _SFXITEMSET_HXX #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XMODEL_HPP_ #include -#endif #include class Window; diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index c09977f276a7..37f23e4d8e10 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_DRIVERSETTINGS_HXX #define DBAUI_DRIVERSETTINGS_HXX -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif #include #include diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 911994553a4c..2a9add1d5bbc 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -28,33 +28,15 @@ #ifndef DBAUI_TEXTCONNECTIONHELPER_HXX #define DBAUI_TEXTCONNECTIONHELPER_HXX -#ifndef DBAUI_CONNECTIONPAGESETUP_HXX #include "ConnectionPageSetup.hxx" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef CHARSETLISTBOX_HXX #include "charsetlistbox.hxx" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include -#endif -#ifndef _DBAUI_CURLEDIT_HXX_ #include "curledit.hxx" -#endif -#ifndef SVTOOLS_INC_ROADMAPWIZARD_HXX #include -#endif -#ifndef _SV_FIELD_HXX #include -#endif -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif //......................................................................... diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 13700201a5c1..f73e93e6d3f1 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -27,33 +27,15 @@ #ifndef DBAUI_USERADMIN_HXX #define DBAUI_USERADMIN_HXX -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_FIELD_HXX #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif -#ifndef _SV_DIALOG_HXX #include -#endif -#ifndef _SV_GROUP_HXX #include -#endif -#ifndef DBAUI_TABLEGRANTCONTROL_HXX #include "TableGrantCtrl.hxx" -#endif -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif FORWARD_DECLARE_INTERFACE(beans,XPropertySet) FORWARD_DECLARE_INTERFACE(sdbc,XConnection) diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx old mode 100755 new mode 100644 diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 32ba0064a824..b918e0ceff62 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -28,24 +28,12 @@ #ifndef _DBAUI_ADMINPAGES_HXX_ #define _DBAUI_ADMINPAGES_HXX_ -#ifndef _SFXTABDLG_HXX #include -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif -#ifndef _SVTOOLS_WIZARDMACHINE_HXX_ #include -#endif -#ifndef _SV_FIELD_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif class NumericField; diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index 7daf5cda61e0..a8bb8c00c4a9 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_ADO_DATALINK_HXX_ #define _DBAUI_ADO_DATALINK_HXX_ -#ifndef _OSL_MODULE_H_ #include -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif ::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink); #endif \ No newline at end of file diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 5189bb34810d..f3ab30096e32 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -28,27 +28,15 @@ #ifndef _DBAUI_DBFINDEX_HXX_ #define _DBAUI_DBFINDEX_HXX_ -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _COMBOBOX_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif #ifndef __SGI_STL_LIST #include #endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index e93fa9b201c4..e54a85771e21 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -28,33 +28,15 @@ #ifndef _DBAUI_DETAILPAGES_HXX_ #define _DBAUI_DETAILPAGES_HXX_ -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _DBAUI_CHARSETS_HXX_ #include "charsets.hxx" -#endif -#ifndef CHARSETLISTBOX_HXX #include "charsetlistbox.hxx" -#endif -#ifndef _SV_FIELD_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _SV_EDIT_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif -#ifndef DBAUI_TEXTCONNECTIONHELPER_HXX #include "TextConnectionHelper.hxx" -#endif #include "admincontrols.hxx" #include diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index b11e960a144e..8858aeb9f3f2 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -28,12 +28,8 @@ #ifndef DBAUI_FILEPICKER_INTERACTION_HXX #define DBAUI_FILEPICKER_INTERACTION_HXX -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_ #include -#endif //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index efd1e326d5cf..5fc2a8b21447 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -28,21 +28,11 @@ #ifndef _DBAUI_GENERALPAGE_HXX_ #define _DBAUI_GENERALPAGE_HXX_ -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX #include "opendoccontrols.hxx" -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _SV_EDIT_HXX #include -#endif #include #include diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 0e7f72bd5c93..823decbb71bd 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -28,27 +28,13 @@ #ifndef _DBAUI_TABLESPAGE_HXX_ #define _DBAUI_TABLESPAGE_HXX_ -#ifndef _DBAUI_ADMINPAGES_HXX_ #include "adminpages.hxx" -#endif -#ifndef _COM_SUN_STAR_I18N_XCOLLATOR_HPP_ #include -#endif -#ifndef _OSL_MUTEX_HXX_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _DBAUI_TABLETREE_HXX_ #include "tabletree.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif //......................................................................... diff --git a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx index eb2bb5dcd031..61a9e0a1ec5a 100644 --- a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx +++ b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_ACCESSIBLE_HELPER_IFACE_HXX #define DBAUI_ACCESSIBLE_HELPER_IFACE_HXX -#ifndef _SAL_TYPES_H_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 1790f5dc1f4a..d7daac68fd2e 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -28,24 +28,12 @@ #ifndef DBAUI_COLLECTIONVIEW_HXX #define DBAUI_COLLECTIONVIEW_HXX -#ifndef _SVT_FILEVIEW_HXX #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _SV_EDIT_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 0035c1480d1c..876129c513eb 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_COLUMNCONTROLWINDOW_HXX #define DBAUI_COLUMNCONTROLWINDOW_HXX -#ifndef DBAUI_FIELDDESCRIPTIONCONTROL_HXX #include "FieldDescControl.hxx" -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index 9e348297d13c..117ed25b5bcd 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_CONNECTIONLINE_HXX #define DBAUI_CONNECTIONLINE_HXX -#ifndef _SV_GEN_HXX #include -#endif -#ifndef _STRING_HXX #include -#endif -#ifndef DBAUI_CONNECTIONLINEDATA_HXX #include "ConnectionLineData.hxx" -#endif #include class OutputDevice; diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 14fdbfa6d325..07d1b2e355ef 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -27,15 +27,9 @@ #ifndef DBACCESS_CONNECTIONLINEACCESS_HXX #define DBACCESS_CONNECTIONLINEACCESS_HXX -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLERELATIONSET_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include -#endif -#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index 0a8d145bd92b..7fb7c51e84ce 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -27,24 +27,14 @@ #ifndef DBAUI_CONNECTIONLINEDATA_HXX #define DBAUI_CONNECTIONLINEDATA_HXX -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _VOS_REFERNCE_HXX_ #include -#endif #include -#ifndef _VOS_REF_HXX_ #include -#endif -#ifndef DBAUI_REFFUNCTOR_HXX #include "RefFunctor.hxx" -#endif -#ifndef _RTL_USTRING_HXX_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx index 0c64214d4c37..9506dfee38b3 100644 --- a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx +++ b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx @@ -27,27 +27,13 @@ #ifndef DBU_EXTENSIONNOTPRESENT_HXX #define DBU_EXTENSIONNOTPRESENT_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _SV_FIELD_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif -#ifndef _COM_SUN_STAR_REPORT_XREPORTDEFINITION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_LOCALE_HPP_ #include -#endif #include #include diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 620810024713..d19307a54912 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_FIELDCONTROLS_HXX #define DBAUI_FIELDCONTROLS_HXX -#ifndef _SV_FIELD_HXX #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _SV_SVAPP_HXX #include -#endif -#ifndef DBAUI_SQLNAMEEDIT_HXX #include "SqlNameEdit.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index f71d33792c99..1d603709be87 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_FIELDDESCRIPTIONCONTROL_HXX #define DBAUI_FIELDDESCRIPTIONCONTROL_HXX -#ifndef _SV_TABPAGE_HXX #include -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif //------------------------------------------------------------------ // die Spalten einer Feld-Beschreibung einer Tabelle diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index ef98ef61492b..47d10f27cb8f 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_FIELDDESCRIPTIONS_HXX #define DBAUI_FIELDDESCRIPTIONS_HXX -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _SVX_SVXENUM_HXX #include -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif -#ifndef _OSL_DIAGNOSE_H_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HPP_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 1745b9e84f54..7d1ec542b1f7 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_GENERALUNDO_HXX #define DBAUI_GENERALUNDO_HXX -#ifndef _UNDO_HXX #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index 18af2d2d9e4f..b40f795748f2 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_HTMLREADER_HXX #define DBAUI_HTMLREADER_HXX -#ifndef DBAUI_DATABASEEXPORT_HXX #include "DExport.hxx" -#endif -#ifndef _PARHTML_HXX //autogen #include -#endif -#ifndef _SVX_SVXENUM_HXX #include -#endif -#ifndef _STREAM_HXX #include -#endif -#ifndef _COM_SUN_STAR_AWT_FONTDESCRIPTOR_HPP_ #include -#endif namespace dbaui diff --git a/dbaccess/source/ui/inc/IClipBoardTest.hxx b/dbaccess/source/ui/inc/IClipBoardTest.hxx index e41112fc95fe..45c32df39336 100644 --- a/dbaccess/source/ui/inc/IClipBoardTest.hxx +++ b/dbaccess/source/ui/inc/IClipBoardTest.hxx @@ -26,9 +26,7 @@ ************************************************************************/ #ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #define DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX -#ifndef _SAL_TYPES_H_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index 764a6dde6c17..8d769dcb4c3e 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -28,15 +28,9 @@ #ifndef DBAUI_ITEMSETHELPER_HXX #define DBAUI_ITEMSETHELPER_HXX -#ifndef _SAL_TYPES_H_ #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif FORWARD_DECLARE_INTERFACE(beans,XPropertySet) FORWARD_DECLARE_INTERFACE(sdbc,XConnection) diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index 15ebbc9aa1ee..d06266c84fcc 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -27,12 +27,8 @@ #ifndef DBACCESS_JACCESS_HXX #define DBACCESS_JACCESS_HXX -#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 41ee2458fa2f..6133550dd9b9 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_JOINCONTROLLER_HXX #define DBAUI_JOINCONTROLLER_HXX -#ifndef DBAUI_SINGLEDOCCONTROLLER_HXX #include "singledoccontroller.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif -#ifndef DBAUI_JOINDESIGNVIEW_HXX #include "JoinDesignView.hxx" -#endif #include "TableConnectionData.hxx" #include "TableWindowData.hxx" #ifndef _MEMORY_ diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index 60d820a42a11..238d1cbbceb5 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -28,18 +28,12 @@ #ifndef DBAUI_JOINDESIGNVIEW_HXX #define DBAUI_JOINDESIGNVIEW_HXX -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif #ifndef _VECTOR_ #include #endif -#ifndef _STRING_HXX #include -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif #include diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 48205effafb5..683840368ba3 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -27,22 +27,12 @@ #ifndef DBAUI_JOINEXCHANGE_HXX #define DBAUI_JOINEXCHANGE_HXX -#ifndef DBAUI_DBEXCHANGE_HXX #include "dbexchange.hxx" -#endif -#ifndef DBAUI_TABLEWINDOWLISTBOX_HXX #include "TableWindowListBox.hxx" -#endif -#ifndef _TRANSFER_HXX #include -#endif -#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index a3a8453da8f9..98973c06b5dd 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -27,28 +27,14 @@ #ifndef DBAUI_JOINTABLEVIEW_HXX #define DBAUI_JOINTABLEVIEW_HXX -#ifndef _SV_WINDOW_HXX #include -#endif -#ifndef _SV_TIMER_HXX #include -#endif -#ifndef _SV_SCRBAR_HXX #include -#endif -#ifndef _RTTI_HXX #include -#endif -#ifndef _TRANSFER_HXX #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _DBACCESS_UI_CALLBACKS_HXX_ #include "callbacks.hxx" -#endif #include "TableConnectionData.hxx" #include "TableWindowData.hxx" #include diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 5f117815ce5f..f9072f4b8b09 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -27,27 +27,13 @@ #ifndef DBAUI_QUERYDESIGNVIEW_HXX #define DBAUI_QUERYDESIGNVIEW_HXX -#ifndef DBAUI_QUERYVIEW_HXX #include "queryview.hxx" -#endif -#ifndef _SV_SPLIT_HXX #include -#endif -#ifndef _STRING_HXX #include -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef DBAUI_QUERYCONTROLLER_HXX #include "querycontroller.hxx" -#endif -#ifndef DBAUI_CONNECTIONLINEDATA_HXX #include "ConnectionLineData.hxx" -#endif namespace connectivity { diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index ac122501f4fb..bced89dad19e 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_QUERYTABLEVIEW_HXX #define DBAUI_QUERYTABLEVIEW_HXX -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef DBAUI_QUERYCONTROLLER_HXX #include "querycontroller.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index f2dbf833c56b..87942784b482 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_QUERYVIEW_TEXT_HXX #define DBAUI_QUERYVIEW_TEXT_HXX -#ifndef DBAUI_QUERYVIEW_HXX #include "queryview.hxx" -#endif -#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX #include "querycontainerwindow.hxx" -#endif class Splitter; namespace dbaui diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 866472ab50a0..068a848faa42 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_RTABLECONNECTIONDATA_HXX #define DBAUI_RTABLECONNECTIONDATA_HXX -#ifndef DBAUI_TABLECONNECTIONDATA_HXX #include "TableConnectionData.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx index 0cd287d18448..29268f70bf10 100644 --- a/dbaccess/source/ui/inc/RefFunctor.hxx +++ b/dbaccess/source/ui/inc/RefFunctor.hxx @@ -28,9 +28,7 @@ #ifndef DBAUI_REFFUNCTOR_HXX #define DBAUI_REFFUNCTOR_HXX -#ifndef _VOS_REF_HXX_ #include -#endif #ifndef INCLUDED_FUNCTIONAL #define INCLUDED_FUNCTIONAL #include diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index 0780bfaa2244..2fe868a975c6 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_RELCONTROLIFACE_HXX #define DBAUI_RELCONTROLIFACE_HXX -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif #include "TableConnectionData.hxx" namespace dbaui diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index 373e26fc5297..7537cbe3bf6f 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_RELATIONCONTROL_HXX #define DBAUI_RELATIONCONTROL_HXX -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _SV_LSTBOX_HXX //autogen #include -#endif -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index 8837a4216042..ff8f8080e273 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_RELATIONCONTROLLER_HXX #define DBAUI_RELATIONCONTROLLER_HXX -#ifndef DBAUI_JOINCONTROLLER_HXX #include "JoinController.hxx" -#endif -#ifndef DBAUI_RELATIONDESIGNVIEW_HXX #include "RelationDesignView.hxx" -#endif class VCLXWindow; class WaitObject; diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index 346e3a4ea065..10f1fa0248b9 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -28,21 +28,13 @@ #ifndef DBAUI_RELATIONDESIGNVIEW_HXX #define DBAUI_RELATIONDESIGNVIEW_HXX -#ifndef DBAUI_JOINDESIGNVIEW_HXX #include "JoinDesignView.hxx" -#endif #ifndef _VECTOR_ #include #endif -#ifndef _STRING_HXX #include -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef DBAUI_RELATION_TABLEVIEW_HXX #include "RelationTableView.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 53096d531454..53af1dac45f5 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -27,28 +27,14 @@ #ifndef DBAUI_RELATIONDIALOG_HXX #define DBAUI_RELATIONDIALOG_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _SV_MSGBOX_HXX #include -#endif -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif -#ifndef DBAUI_RELCONTROLIFACE_HXX #include "RelControliFace.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 3f73e947389a..522aea42ff7c 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -30,15 +30,9 @@ #ifndef _VECTOR_ #include #endif -#ifndef _PARRTF_HXX //autogen #include -#endif -#ifndef DBAUI_DATABASEEXPORT_HXX #include "DExport.hxx" -#endif -#ifndef _STREAM_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx index f9666e7d651c..5ecbbaf3a865 100644 --- a/dbaccess/source/ui/inc/ScrollHelper.hxx +++ b/dbaccess/source/ui/inc/ScrollHelper.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_SCROLLHELPER_HXX #define DBAUI_SCROLLHELPER_HXX -#ifndef _LINK_HXX #include -#endif -#ifndef _SV_GEN_HXX #include -#endif -#ifndef _SV_TIMER_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index c7f82806c742..182bc3ffd1e0 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_SQLNAMEEDIT_HXX #define DBAUI_SQLNAMEEDIT_HXX -#ifndef _SV_EDIT_HXX #include -#endif -#ifndef _SV_COMBOBOX_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index e2cd1d534999..68ac03da0d91 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -28,18 +28,10 @@ #define DBAUI_TABLECONNECTION_HXX #include -#ifndef _TOOLS_DEBUG_HXX #include -#endif -#ifndef _SV_WINDOW_HXX #include -#endif -#ifndef _RTTI_HXX #include -#endif -#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_ #include -#endif #include "TableConnectionData.hxx" class Point; diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index f6bf83e60161..7ca37f9e1d64 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -27,17 +27,11 @@ #ifndef DBAUI_TABLECONNECTIONDATA_HXX #define DBAUI_TABLECONNECTIONDATA_HXX -#ifndef DBAUI_CONNECTIONLINEDATA_HXX #include "ConnectionLineData.hxx" -#endif #include "TableWindowData.hxx" #include -#ifndef _RTTI_HXX #include -#endif -#ifndef _STRING_HXX #include -#endif #include namespace dbaui diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 3651c5632504..5925ae8c6f62 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -27,36 +27,16 @@ #ifndef DBUI_TABLECONTROLLER_HXX #define DBUI_TABLECONTROLLER_HXX -#ifndef DBAUI_SINGLEDOCCONTROLLER_HXX #include "singledoccontroller.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XOBJECTOUTPUTSTREAM_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XOBJECTINPUTSTREAM_HPP_ #include -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XKEYSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif class FixedText; namespace dbaui diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 9b56d0729fa4..8b59d3c5f6a3 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -27,27 +27,13 @@ #ifndef DBUI_TABLECOPYHELPER_HXX #define DBUI_TABLECOPYHELPER_HXX -#ifndef DBAUI_APPELEMENTTYPE_HXX #include "AppElementType.hxx" -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif -#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ #include -#endif -#ifndef _SOT_STORAGE_HXX #include -#endif -#ifndef _TRANSFER_HXX #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HPP_ #include -#endif #include class SvLBoxEntry; diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index b10b9340aafb..5d6ff3a117dd 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -27,19 +27,11 @@ #ifndef DBAUI_TABLEDESIGNCONTROL_HXX #define DBAUI_TABLEDESIGNCONTROL_HXX -#ifndef _TABBAR_HXX //autogen #include -#endif -#ifndef _SVTOOLS_EDITBROWSEBOX_HXX_ #include -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif #define TABPAGESIZE 70 namespace dbaui diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index c39a44320fb6..7bea7f8f5e76 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_TABLEDESIGNHELPBAR_HXX #define DBAUI_TABLEDESIGNHELPBAR_HXX -#ifndef _STRING_HXX #include -#endif -#ifndef _SV_TABCTRL_HXX #include -#endif -#ifndef _SV_TABPAGE_HXX #include -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif class MultiLineEdit; namespace dbaui diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 6be89d0d7b93..3350a2517baf 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_TABLEDESIGNVIEW_HXX #define DBAUI_TABLEDESIGNVIEW_HXX -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_ #include -#endif -#ifndef _SV_SPLIT_HXX #include -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 7160edbbfbfb..6943b97d59cc 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -31,18 +31,10 @@ #define INCLUDED_VECTOR #include #endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _VOS_REF_HXX_ #include -#endif namespace comphelper { diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 5dae0103f442..123dc1b29c77 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_TABLEGRANTCONTROL_HXX #define DBAUI_TABLEGRANTCONTROL_HXX -#ifndef _SVTOOLS_EDITBROWSEBOX_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XAUTHORIZABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif class Edit; namespace dbaui diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index d17ccfeefce4..1e224504cd2f 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_TABLEROW_HXX #define DBAUI_TABLEROW_HXX -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _STRING_HXX #include -#endif -#ifndef _STREAM_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 55f662fb1d79..eab96a8eba5d 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_TABLEROW_EXCHANGE_HXX #define DBAUI_TABLEROW_EXCHANGE_HXX -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include -#endif -#ifndef _TRANSFER_HXX #include -#endif #include namespace dbaui diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index 78828a30cfbc..f030f82f766d 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -27,15 +27,9 @@ #ifndef DBACCESS_TABLEWINDOWACCESS_HXX #define DBACCESS_TABLEWINDOWACCESS_HXX -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLERELATIONSET_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include -#endif -#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index 6e84f48a4ef0..c9c2f16612a2 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_TABLEWINDOWDATA_HXX #define DBAUI_TABLEWINDOWDATA_HXX -#ifndef _SV_GEN_HXX #include -#endif #include #include #include diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx index 4291f11fecb9..61fc124f7b6a 100644 --- a/dbaccess/source/ui/inc/TableWindowTitle.hxx +++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_TABLEWINDOWTITLE_HXX #define DBAUI_TABLEWINDOWTITLE_HXX -#ifndef _SV_FIXED_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 0c686921f30f..4dbdca7b2f39 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_TABLESSINGLEDLG_HXX_ #define _DBAUI_TABLESSINGLEDLG_HXX_ -#ifndef _BASEDLGS_HXX #include -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif #include diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 89f9863855c2..5770f6b1c0dd 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -28,18 +28,10 @@ #define DBAUI_TYPEINFO_HXX -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_COLUMNSEARCH_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_COLUMNVALUE_HPP_ #include -#endif #include #include diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index df7208aba9b7..29664f3b9627 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_TOOLS_HXX #define DBAUI_TOOLS_HXX -#ifndef _DBHELPER_DBEXCEPTION_HXX_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif -#ifndef _SVX_SVXENUM_HXX #include -#endif -#ifndef _SV_TASKPANELIST_HXX #include -#endif -#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include -#endif #define RET_ALL 10 diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index 4d42561a06f0..c9f94930eece 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -28,21 +28,11 @@ #ifndef DBAUI_USERADMINDLG_HXX #define DBAUI_USERADMINDLG_HXX -#ifndef _SFXTABDLG_HXX #include -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif #include FORWARD_DECLARE_INTERFACE(beans,XPropertySet) diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index 52ef4dc381a0..a430694cdfd8 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_VERTSPLITVIEW_HXX #define DBAUI_VERTSPLITVIEW_HXX -#ifndef _SV_SPLIT_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index a1b6118b7d08..1135e9ec3f00 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -29,24 +29,12 @@ #include "WTabPage.hxx" -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_GROUP_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_EDIT_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index e9e6e71f6999..14372d0d8f72 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -30,15 +30,9 @@ #include "WTabPage.hxx" #include "WCopyTable.hxx" -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif #include namespace dbaui diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index 0045bb859328..d450fa1e0e86 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_WIZ_EXTENDPAGES_HXX #define DBAUI_WIZ_EXTENDPAGES_HXX -#ifndef DBAUI_WIZ_TYPESELECT_HXX #include "WTypeSelect.hxx" -#endif class SvStream; namespace dbaui diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index ba11df243717..9c1e17af3ee2 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_WIZ_NAMEMATCHING_HXX #define DBAUI_WIZ_NAMEMATCHING_HXX -#ifndef DBAUI_WIZ_TABBPAGE_HXX #include "WTabPage.hxx" -#endif -#ifndef _DBAUI_MARKTREE_HXX_ #include "marktree.hxx" -#endif -#ifndef DBAUI_DATABASEEXPORT_HXX #include "DExport.hxx" -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif -#ifndef DBAUI_WIZ_COPYTABLEDIALOG_HXX #include "WCopyTable.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index 51746e1e6aae..690c68f2c0fd 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -28,9 +28,7 @@ #ifndef DBAUI_WIZ_TABBPAGE_HXX #define DBAUI_WIZ_TABBPAGE_HXX -#ifndef _SV_TABPAGE_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index c98c6879db2b..15baef92f6aa 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -27,35 +27,19 @@ #ifndef DBAUI_QYDLGTAB_HXX #define DBAUI_QYDLGTAB_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _SV_DIALOG_HXX #include -#endif -#ifndef _STRING_HXX //autogen #include -#endif -#ifndef _DBAUI_TABLETREE_HXX_ #include "tabletree.hxx" -#endif #include diff --git a/dbaccess/source/ui/inc/asyncmodaldialog.hxx b/dbaccess/source/ui/inc/asyncmodaldialog.hxx index 376512912da6..17d3187401fb 100644 --- a/dbaccess/source/ui/inc/asyncmodaldialog.hxx +++ b/dbaccess/source/ui/inc/asyncmodaldialog.hxx @@ -29,9 +29,7 @@ #define DBACCESS_ASYNCMODALDIALOG_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_UI_DIALOGS_XEXECUTABLEDIALOG_HPP_ #include -#endif /** === end UNO includes === **/ //........................................................................ diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx index 94fea5a5c067..1334cf3d4c28 100644 --- a/dbaccess/source/ui/inc/browserids.hxx +++ b/dbaccess/source/ui/inc/browserids.hxx @@ -27,12 +27,8 @@ #ifndef DBACCESS_UI_BROWSER_ID_HXX #define DBACCESS_UI_BROWSER_ID_HXX -#ifndef _SBASLTID_HRC #include -#endif -#ifndef _DBACCESS_SLOTID_HRC_ #include "dbaccess_slotid.hrc" -#endif #define ID_BROWSER_COPY SID_COPY #define ID_BROWSER_CUT SID_CUT diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index 519c9792019c..f16aab919ae3 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -28,23 +28,13 @@ #ifndef _SBX_BRWVIEW_HXX #define _SBX_BRWVIEW_HXX -#ifndef _SV_WINDOW_HXX //autogen #include -#endif -#ifndef _TOOLS_RESID_HXX //autogen wg. ResId #include -#endif -#ifndef _COM_SUN_STAR_AWT_POSSIZE_HPP_ #include -#endif -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif -#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_ #include -#endif namespace com { namespace sun { namespace star { namespace awt { diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx index 2d9fdd95d60a..0d4eea6c8c6e 100644 --- a/dbaccess/source/ui/inc/callbacks.hxx +++ b/dbaccess/source/ui/inc/callbacks.hxx @@ -28,15 +28,9 @@ #ifndef _DBACCESS_UI_CALLBACKS_HXX_ #define _DBACCESS_UI_CALLBACKS_HXX_ -#ifndef _SOT_EXCHANGE_HXX #include -#endif -#ifndef _SOT_FORMATS_HXX #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include -#endif class CommandEvent; class SvLBoxEntry; diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index bded889bcb2a..e7504c7522c0 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_CHARSETS_HXX_ #define _DBAUI_CHARSETS_HXX_ -#ifndef _STRING_HXX #include -#endif -#ifndef _TOOLS_RC_HXX #include -#endif -#ifndef _DBHELPER_DBCHARSET_HXX_ #include -#endif -#ifndef _SVX_TXENCTAB_HXX #include -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index 1bf15631ba95..6a2633cc6dea 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_COMMON_TYPES_HXX_ #define _DBAUI_COMMON_TYPES_HXX_ -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef UNOTOOLS_INC_SHAREDUNOCOMPONENT_HXX #include -#endif namespace com { namespace sun { namespace star { namespace sdbc { diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index 68687ab8eb43..f58742891ca2 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -28,15 +28,9 @@ #ifndef _DBAUI_CURLEDIT_HXX_ #define _DBAUI_CURLEDIT_HXX_ -#ifndef _SV_EDIT_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif #include //......................................................................... diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index 782555b106af..445e379da75d 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -28,42 +28,18 @@ #ifndef DBACCESS_DATABASE_OBJECT_VIEW_HXX #define DBACCESS_DATABASE_OBJECT_VIEW_HXX -#ifndef _RTL_USTRING_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UI_DIALOGS_XEXECUTABLEDIALOG_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_XDATABASEDOCUMENTUI_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif #include #include diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index c74ede36d0af..32b3dee93aec 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_DATASOURCECONNECTOR_HXX_ #define _DBAUI_DATASOURCECONNECTOR_HXX_ -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATASOURCE_HPP_ #include -#endif namespace dbtools { diff --git a/dbaccess/source/ui/inc/datasourcemap.hxx b/dbaccess/source/ui/inc/datasourcemap.hxx index e39515d35b75..2cc08819cf93 100644 --- a/dbaccess/source/ui/inc/datasourcemap.hxx +++ b/dbaccess/source/ui/inc/datasourcemap.hxx @@ -28,21 +28,11 @@ #ifndef DBAUI_DATASOURCEMAP_HXX #define DBAUI_DATASOURCEMAP_HXX -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _STRING_HXX #include -#endif class SfxItemPool; class SfxItemSet; diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 005af27ffdfe..fe8c886529d7 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_DBADMIN_HXX_ #define _DBAUI_DBADMIN_HXX_ -#ifndef _SFXTABDLG_HXX #include -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif #include FORWARD_DECLARE_INTERFACE(beans,XPropertySet) diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 7d7d0bf8cab0..a26271db3f21 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -27,30 +27,14 @@ #ifndef DBAUI_DBEXCHANGE_HXX #define DBAUI_DBEXCHANGE_HXX -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XEVENTLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _SVX_DBAEXCHANGE_HXX_ #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif #include #include diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 94b3fd683336..6919aac7ea0e 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -28,24 +28,12 @@ #ifndef DBAUI_DBWIZ_HXX #define DBAUI_DBWIZ_HXX -#ifndef _SFXTABDLG_HXX #include -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _SVTOOLS_WIZARDMACHINE_HXX_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif #include FORWARD_DECLARE_INTERFACE(beans,XPropertySet) diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 039fc64392de..318012d2d5da 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -28,31 +28,15 @@ #ifndef DBAUI_DBWIZ2_HXX #define DBAUI_DBWIZ2_HXX -#ifndef _SFXTABDLG_HXX #include -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef DBAUI_ITEMSETHELPER_HXX #include "IItemSetHelper.hxx" -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _URLOBJ_HXX #include -#endif #include -#ifndef SVTOOLS_INC_ROADMAPWIZARD_HXX #include -#endif -#ifndef _CONNECTIVITY_DBTOOLS_HXX_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif FORWARD_DECLARE_INTERFACE(beans,XPropertySet) FORWARD_DECLARE_INTERFACE(sdbc,XConnection) diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index 41bee7ef3bfb..9111cbb265b0 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -28,20 +28,12 @@ #ifndef DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX #define DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX -#ifndef DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX #include "objectnamecheck.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif /** === end UNO includes === **/ #include diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 2299d8a4656e..f139705d5e68 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -28,38 +28,18 @@ #ifndef _DBACCESS_UI_DIRECTSQL_HXX_ #define _DBACCESS_UI_DIRECTSQL_HXX_ -#ifndef _SV_DIALOG_HXX #include -#endif -#ifndef _SVEDIT_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif #include -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _OSL_MUTEX_HXX_ #include -#endif //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index 63d11bdd8ab4..a23cabb2e195 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -28,16 +28,10 @@ #define DBAUI_SBATTRDLG_HXX -#ifndef DBAUI_SBATTRDLG_HRC #include "dlgattr.hrc" -#endif -#ifndef _SFXTABDLG_HXX //autogen #include -#endif -#ifndef _SOLAR_H #include -#endif diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 080ced79a0d9..06a505c32eea 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -28,18 +28,10 @@ #ifndef DBAUI_DLGSAVE_HXX #define DBAUI_DLGSAVE_HXX -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _SV_MSGBOX_HXX #include -#endif namespace com { namespace sun { namespace star { namespace container { diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index c442bd4fb90c..b0a768811b9d 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -27,21 +27,13 @@ #ifndef _DBAUI_DLGSIZE_HXX #define _DBAUI_DLGSIZE_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _FIELD_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index f4d91540a1b3..fce0f65f84c9 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -28,121 +28,45 @@ #ifndef _SBA_FORMADAPTER_HXX #define _SBA_FORMADAPTER_HXX -#ifndef _SBA_MULTIPLEX_HXX #include "sbamultiplex.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XPARAMETERS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCOLUMNLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCLOSEABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XROWLOCATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWUPDATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETUPDATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDELETEROWS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XWARNINGSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XSQLERRORBROADCASTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XROWSETAPPROVEBROADCASTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XLOADABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XRESULTSETACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XFORM_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XMULTIPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XFASTPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXCONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XRESET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XSUBMIT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XDATABASEPARAMETERBROADCASTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_AWT_XTABCONTROLLERMODEL_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XPERSISTOBJECT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XCANCELLABLE_HPP_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE12_HXX_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE10_HXX_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index b384e9e3d0db..cac2a92ca286 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -28,17 +28,11 @@ #ifndef DBACCESS_IMAGEPROVIDER_HXX #define DBACCESS_IMAGEPROVIDER_HXX -#ifndef _SV_IMAGE_HXX #include -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECT_HPP_ #include -#endif /** === end UNO includes === **/ #include diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index ac7ea0f6c2a6..da4c4d540b66 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_INDEXCOLLECTION_HXX_ #define _DBAUI_INDEXCOLLECTION_HXX_ -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_SQLEXCEPTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _DBAUI_INDEXES_HXX_ #include "indexes.hxx" -#endif //...................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 7faad262ddd3..45a0420b7469 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -28,45 +28,19 @@ #ifndef _DBAUI_INDEXDIALOG_HXX_ #define _DBAUI_INDEXDIALOG_HXX_ -#ifndef _SV_DIALOG_HXX #include -#endif -#ifndef _SV_FIXED_HXX #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _SV_BUTTON_HXX #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _SV_TOOLBOX_HXX #include -#endif -#ifndef _SVTREEBOX_HXX #include -#endif -#ifndef INCLUDED_SVTOOLS_VIEWOPTIONS_HXX #include -#endif -#ifndef _DBAUI_INDEXES_HXX_ #include "indexes.hxx" -#endif -#ifndef DBAUI_TOOLBOXHELPER_HXX #include "ToolBoxHelper.hxx" -#endif //...................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index a1eda99c4f7f..ee7261a8c22d 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_INDEXES_HXX_ #define _DBAUI_INDEXES_HXX_ -#ifndef _STRING_HXX #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif //...................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 634a19cc0f42..40190bf81ac4 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_INDEXFIELDSCONTROL_HXX_ #define _DBAUI_INDEXFIELDSCONTROL_HXX_ -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _SVTOOLS_EDITBROWSEBOX_HXX_ #include -#endif -#ifndef _DBAUI_INDEXCOLLECTION_HXX_ #include "indexcollection.hxx" -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif //...................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index 3c1b574d3300..7c93b1869dab 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -30,38 +30,18 @@ #include "AppElementType.hxx" -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif #include -#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UCB_XCONTENT_HPP_ #include -#endif #include -#ifndef _LINK_HXX #include -#endif -#ifndef _STRING_HXX #include -#endif -#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX #include -#endif class Window; //...................................................................... diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index 893ea1eb4472..aaf43b3fab11 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -28,9 +28,7 @@ #ifndef _DBAUI_LISTVIEWITEMS_HXX_ #define _DBAUI_LISTVIEWITEMS_HXX_ -#ifndef _SVLBOXITM_HXX #include -#endif //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/inc/localresaccess.hxx b/dbaccess/source/ui/inc/localresaccess.hxx index 718ae8cdadde..c33e9470d790 100644 --- a/dbaccess/source/ui/inc/localresaccess.hxx +++ b/dbaccess/source/ui/inc/localresaccess.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_LOCALRESACCESS_HXX_ #define _DBAUI_LOCALRESACCESS_HXX_ -#ifndef _SVTOOLS_LOCALRESACCESS_HXX_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index 70574312c3c1..d98db6f0bdce 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -28,9 +28,7 @@ #ifndef _DBAUI_MARKTREE_HXX_ #define _DBAUI_MARKTREE_HXX_ -#ifndef DBAUI_DBTREELISTBOX_HXX #include "dbtreelistbox.hxx" -#endif diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx index eeb6a9747524..143acf31631d 100644 --- a/dbaccess/source/ui/inc/moduledbu.hxx +++ b/dbaccess/source/ui/inc/moduledbu.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_MODULE_DBU_HXX_ #define _DBAUI_MODULE_DBU_HXX_ -#ifndef _OSL_MUTEX_HXX_ #include -#endif -#ifndef _TOOLS_RESID_HXX #include -#endif class ResMgr; diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index 87c403a45be3..a7c8c0bc8cb6 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -28,15 +28,9 @@ #ifndef DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX #define DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX -#ifndef _SV_BUTTON_HXX #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _RTL_USTRING_HXX_ #include -#endif #include //........................................................................ diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index 8cb8c2c093aa..baa703018dc5 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -28,50 +28,22 @@ #ifndef _DBAUI_PARAMDIALOG_HXX_ #define _DBAUI_PARAMDIALOG_HXX_ -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif -#ifndef _DIALOG_HXX #include -#endif -#ifndef _BUTTON_HXX #include -#endif -#ifndef _FIXED_HXX #include -#endif -#ifndef _EDIT_HXX #include -#endif -#ifndef _SV_GROUP_HXX #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XINDEXACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef CONNECTIVITY_PREDICATEINPUT_HXX #include -#endif -#ifndef SVX_QUERYDESIGNCONTEXT_HXX #include "svx/ParseContext.hxx" -#endif namespace connectivity { diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index 9e1cd676a545..ac1cd0e2bd1a 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_PROPERTYSETITEM_HXX_ #define _DBAUI_PROPERTYSETITEM_HXX_ -#ifndef _SFXPOOLITEM_HXX #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index f2ecf7728a69..eaf798cc693a 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -28,24 +28,12 @@ #ifndef DBAUI_QUERYCONTAINERWINDOW_HXX #define DBAUI_QUERYCONTAINERWINDOW_HXX -#ifndef _SV_WINDOW_HXX #include -#endif -#ifndef _SV_SPLIT_HXX #include -#endif -#ifndef DBAUI_DATAVIEW_HXX #include "dataview.hxx" -#endif -#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_ #include -#endif -#ifndef DBAUI_QUERYVIEWSWITCH_HXX #include "QueryViewSwitch.hxx" -#endif -#ifndef _SV_DOCKWIN_HXX #include -#endif class FixedLine; //......................................................................... diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 20fecdfa30f2..133df3eba3c2 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -28,35 +28,19 @@ #ifndef DBAUI_QUERYFILTER_HXX #define DBAUI_QUERYFILTER_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _EDIT_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif -#ifndef _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ #include -#endif -#ifndef CONNECTIVITY_PREDICATEINPUT_HXX #include -#endif -#ifndef SVX_QUERYDESIGNCONTEXT_HXX #include "svx/ParseContext.hxx" -#endif namespace rtl { diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 7bdd4733ebc6..da489299ac41 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -27,25 +27,15 @@ #ifndef DBAUI_QUERYORDER_HXX #define DBAUI_QUERYORDER_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _LSTBOX_HXX //autogen #include -#endif -#ifndef _EDIT_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif -#ifndef _BUTTON_HXX //autogen #include -#endif #define DOG_ROWS 3 diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 94ee49befe91..9281039b7cab 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYVIEW_HXX #define DBAUI_QUERYVIEW_HXX -#ifndef DBAUI_JOINDESIGNVIEW_HXX #include "JoinDesignView.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index eac973230d20..e3ff542d81a0 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -30,35 +30,17 @@ // #include -#ifndef _SVX_FMGRIDCL_HXX #include -#endif -#ifndef _SVX_FMGRIDIF_HXX #include -#endif -#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_URL_HPP_ #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _SBA_MULTIPLEX_HXX #include "sbamultiplex.hxx" -#endif -#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ #include -#endif #include class SvNumberFormatter; diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index e451b8153f1d..7d73aee9bf81 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -28,78 +28,30 @@ #ifndef _SBA_MULTIPLEX_HXX #define _SBA_MULTIPLEX_HXX -#ifndef _COM_SUN_STAR_BEANS_XVETOABLECHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XUPDATELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XERRORLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XRESTORELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XINSERTLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XDELETELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XPOSITIONINGLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XDATABASEPARAMETERLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XLOADLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATECHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTIESCHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYCHANGELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XSUBMITLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FORM_XRESETLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XREFRESHLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XSQLERRORLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XROWSETAPPROVELISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSETLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _CPPUHELPER_INTERFACECONTAINER_HXX_ #include -#endif -#ifndef _CPPUHELPER_QUERYINTERFACE_HXX_ #include -#endif -#ifndef _CPPUHELPER_WEAK_HXX_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 2c8565191544..910a75883939 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -28,19 +28,11 @@ #ifndef _DBAUI_SQLMESSAGE_HXX_ #define _DBAUI_SQLMESSAGE_HXX_ -#ifndef _BUTTON_HXX #include -#endif -#ifndef _FIXED_HXX #include -#endif -#ifndef _SV_BTNDLG_HXX #include -#endif -#ifndef _DBHELPER_DBEXCEPTION_HXX_ #include -#endif #include diff --git a/dbaccess/source/ui/inc/statusbarontroller.hxx b/dbaccess/source/ui/inc/statusbarontroller.hxx index 7ae4212ad821..400dbebe5719 100644 --- a/dbaccess/source/ui/inc/statusbarontroller.hxx +++ b/dbaccess/source/ui/inc/statusbarontroller.hxx @@ -27,21 +27,11 @@ #ifndef DBAUI_STATUSBARCONTROLLER_HXX #define DBAUI_STATUSBARCONTROLLER_HXX -#ifndef _SVTOOLS_STATUSBARCONTROLLER_HXX #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 5bdb2f78da5d..214af158e485 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -28,16 +28,10 @@ #ifndef _DBAUI_STRINGLISTITEM_HXX_ #define _DBAUI_STRINGLISTITEM_HXX_ -#ifndef _SFXPOOLITEM_HXX #include -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include -#endif -#ifndef _RTL_USTRING_HXX_ #include -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index c23a128ddfdd..5fcbc437d4f5 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -28,28 +28,14 @@ #ifndef _DBAUI_TABLETREE_HXX_ #define _DBAUI_TABLETREE_HXX_ -#ifndef _DBAUI_MARKTREE_HXX_ #include "marktree.hxx" -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XDRIVER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_ #include -#endif #include diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index d2bd25dc49fa..0832612f3cc4 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -27,24 +27,12 @@ #ifndef DBACCESS_TOOLBOXCONTROLLER_HXX #define DBACCESS_TOOLBOXCONTROLLER_HXX -#ifndef _SVTOOLS_TOOLBOXCONTROLLER_HXX #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif #include class PopupMenu; diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index b81ff997ae8d..e944504d7755 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_UNDOSQLEDIT_HXX #define DBAUI_UNDOSQLEDIT_HXX -#ifndef DBAUI_GENERALUNDO_HXX #include "GeneralUndo.hxx" -#endif -#ifndef _DBU_CONTROL_HRC_ #include "dbu_control.hrc" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index 2cedaa577d34..a64c2f2e9370 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -28,18 +28,10 @@ #ifndef _DBAUI_UNOADMIN_ #define _DBAUI_UNOADMIN_ -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _DBAUI_DSNTYPES_HXX_ #include "dsntypes.hxx" -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif class SfxItemSet; class SfxItemPool; diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index 0448cef602e6..a5aee9f6850b 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -28,72 +28,28 @@ #ifndef _SBA_UNODATBR_HXX_ #define _SBA_UNODATBR_HXX_ -#ifndef _SBA_BWRCTRLR_HXX #include "brwctrlr.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XSTATUSLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_FRAME_XDISPATCH_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XCONTAINERLISTENER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_I18N_XCOLLATOR_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_VIEW_XSELECTIONSUPPLIER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XSCRIPTINVOCATIONCONTEXT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UI_XCONTEXTMENUINTERCEPTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_APPLICATION_DATABASEOBJECTCONTAINER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_DATABASEOBJECTCONTAINER_HPP_ #include -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include -#endif -#ifndef _DBACCESS_UI_CALLBACKS_HXX_ #include "callbacks.hxx" -#endif -#ifndef _SV_TIMER_HXX #include -#endif -#ifndef _TRANSFER_HXX #include -#endif -#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_ #include -#endif -#ifndef _SOT_STORAGE_HXX #include -#endif -#ifndef DBUI_TABLECOPYHELPER_HXX #include "TableCopyHelper.hxx" -#endif -#ifndef _DBAUI_COMMON_TYPES_HXX_ #include "commontypes.hxx" -#endif // ========================================================================= class SvLBoxEntry; diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 49c1174f9cc9..6ac787f83dc2 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -28,12 +28,8 @@ #ifndef _DBAUI_UNOSQLMESSAGE_HXX_ #define _DBAUI_UNOSQLMESSAGE_HXX_ -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif //......................................................................... namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx index bfab4fe88c10..eaef2fef1457 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_QUERYTABLECONNECTION_HXX #define DBAUI_QUERYTABLECONNECTION_HXX -#ifndef DBAUI_TABLECONNECTION_HXX #include "TableConnection.hxx" -#endif -#ifndef DBAUI_QTABLECONNECTIONDATA_HXX #include "QTableConnectionData.hxx" -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index 13e375967389..6e3bed10173b 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_QTABLECONNECTIONDATA_HXX #define DBAUI_QTABLECONNECTIONDATA_HXX -#ifndef DBAUI_TABLECONNECTIONDATA_HXX #include "TableConnectionData.hxx" -#endif -#ifndef DBAUI_TABLEFIELDDESC_HXX #include "TableFieldDescription.hxx" -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _RTTI_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index f9f336b13410..0f8fcfd943e5 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_QUERY_TABLEWINDOW_HXX #define DBAUI_QUERY_TABLEWINDOW_HXX -#ifndef DBAUI_TABLEWINDOW_HXX #include "TableWindow.hxx" -#endif -#ifndef DBAUI_QUERY_TABLEWINDOWDATA_HXX #include "QTableWindowData.hxx" -#endif -#ifndef DBAUI_TABLEFIELDDESC_HXX #include "TableFieldDescription.hxx" -#endif -#ifndef _RTTI_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index 21f69b37fd9c..4d867fa2097d 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -27,19 +27,13 @@ #ifndef DBAUI_QUERY_TABLEWINDOWDATA_HXX #define DBAUI_QUERY_TABLEWINDOWDATA_HXX -#ifndef DBAUI_TABLEWINDOWDATA_HXX #include "TableWindowData.hxx" -#endif #ifndef INCLUDED_VECTOR #define INCLUDED_VECTOR #include #endif -#ifndef _COM_SUN_STAR_IO_XOBJECTOUTPUTSTREAM_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XOBJECTINPUTSTREAM_HPP_ #include -#endif namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx index 17f02964be73..39c54ad24f09 100644 --- a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYADDTABCONNUNDOACTION_HXX #define DBAUI_QUERYADDTABCONNUNDOACTION_HXX -#ifndef DBAUI_QUERYTABCONNUNDOACTION_HXX #include "QueryTabConnUndoAction.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index cf2bd36ebc33..eed462b00a1b 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_QUERYDESIGNFIELDUNDOACT_HXX #define DBAUI_QUERYDESIGNFIELDUNDOACT_HXX -#ifndef DBAUI_GENERALUNDO_HXX #include "GeneralUndo.hxx" -#endif -#ifndef _DBU_QRY_HRC_ #include "dbu_qry.hrc" -#endif -#ifndef DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX #include "SelectionBrowseBox.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx index 73f29f9c54ae..e8d11256cfcb 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #define DBAUI_QUERYDESIGNUNDOACTION_HXX -#ifndef DBAUI_GENERALUNDO_HXX #include "GeneralUndo.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx index 4e52665a6dd9..b8defd0d0227 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_OQUERYMOVETABWINUNDOACT_HXX #define DBAUI_OQUERYMOVETABWINUNDOACT_HXX -#ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #include "QueryDesignUndoAction.hxx" -#endif -#ifndef _DBU_QRY_HRC_ #include "dbu_qry.hrc" -#endif -#ifndef _SV_GEN_HXX #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx index 5b790c0506d0..5e42e04fa764 100644 --- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_QUERYSIZETABWINUNDOACT_HXX #define DBAUI_QUERYSIZETABWINUNDOACT_HXX -#ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #include "QueryDesignUndoAction.hxx" -#endif -#ifndef _DBU_QRY_HRC_ #include "dbu_qry.hrc" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx index 414b2e40b756..5f6b6fd56944 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYTABCONNUNDOACTION_HXX #define DBAUI_QUERYTABCONNUNDOACTION_HXX -#ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #include "QueryDesignUndoAction.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx index 897d86e028a6..323d67284e50 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx @@ -28,9 +28,7 @@ #ifndef DBAUI_QUERYTABWINSHOWUNDOACT_HXX #define DBAUI_QUERYTABWINSHOWUNDOACT_HXX -#ifndef DBAUI_QUERYTABWINUNDOACT_HXX #include "QueryTabWinUndoAct.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index a588ad8eb5b8..0caf794d9eaf 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_QUERYTABWINUNDOACT_HXX #define DBAUI_QUERYTABWINUNDOACT_HXX -#ifndef DBAUI_QUERYDESIGNUNDOACTION_HXX #include "QueryDesignUndoAction.hxx" -#endif #ifndef INCLUDED_VECTOR #define INCLUDED_VECTOR #include diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index aa365e55d00f..ecd809edeccf 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -27,27 +27,13 @@ #ifndef DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX #define DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX -#ifndef _SVTOOLS_EDITBROWSEBOX_HXX_ #include -#endif -#ifndef DBAUI_TABLEFIELDDESC_HXX #include "TableFieldDescription.hxx" -#endif -#ifndef DBAUI_JOINEXCHANGE_HXX #include "JoinExchange.hxx" -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_ #include -#endif -#ifndef _STRING_HXX #include -#endif -#ifndef _TRANSFER_HXX #include -#endif namespace connectivity { diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx index d8cced2f0005..559bf0867396 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_TABLEFIELDINFO_HXX #define DBAUI_TABLEFIELDINFO_HXX -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef _SAL_TYPES_H_ #include -#endif namespace dbaui { diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index e885f216b804..bca050fe7fd4 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -26,31 +26,17 @@ ************************************************************************/ #ifndef DBAUI_QUERYDLG_HXX #define DBAUI_QUERYDLG_HXX -#ifndef _SV_DIALOG_HXX //autogen #include -#endif -#ifndef _SV_BUTTON_HXX //autogen #include -#endif -#ifndef _SV_FIXED_HXX //autogen #include -#endif -#ifndef _SV_LSTBOX_HXX #include -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef DBAUI_RELCONTROLIFACE_HXX #include "RelControliFace.hxx" -#endif -#ifndef DBAUI_JOINTABLEVIEW_HXX #include "JoinTableView.hxx" -#endif namespace dbaui diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx index a96b559596be..cfc13849f083 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_RTABLECONNECTION_HXX #define DBAUI_RTABLECONNECTION_HXX -#ifndef DBAUI_TABLECONNECTION_HXX #include "TableConnection.hxx" -#endif -#ifndef DBAUI_RTABLECONNECTIONDATA_HXX #include "RTableConnectionData.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index 2300fa346892..39d8363d02b7 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_RELTABLEWINDOW_HXX #define DBAUI_RELTABLEWINDOW_HXX -#ifndef DBAUI_TABLEWINDOW_HXX #include "TableWindow.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index de6ea4b0ff49..b5e9c31c6752 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_TABLEFIELDDESCGENPAGE_HXX #define DBAUI_TABLEFIELDDESCGENPAGE_HXX -#ifndef _SV_TABPAGE_HXX #include -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 2a7a36f3a051..e2da6dfa19bf 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -27,24 +27,12 @@ #ifndef DBAUI_TABLEEDITORCONTROL_HXX #define DBAUI_TABLEEDITORCONTROL_HXX -#ifndef DBAUI_TABLEDESIGNCONTROL_HXX #include "TableDesignControl.hxx" -#endif -#ifndef DBAUI_TABLEDESIGNVIEW_HXX #include "TableDesignView.hxx" -#endif -#ifndef DBAUI_TABLEFIELDDESCRIPTION_HXX #include "TableFieldDescWin.hxx" -#endif -#ifndef DBAUI_TABLEROW_HXX #include "TableRow.hxx" -#endif -#ifndef DBAUI_ENUMTYPES_HXX #include "QEnumTypes.hxx" -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif class Edit; class SfxUndoManager; diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index cc18065bc03d..825b5f4d682e 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -27,9 +27,7 @@ #ifndef DBAUI_TABLEFIELDCONTROL_HXX #define DBAUI_TABLEFIELDCONTROL_HXX -#ifndef DBAUI_FIELDDESCRIPTIONCONTROL_HXX #include "FieldDescControl.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index b2d5f09c99c4..27857826a732 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -27,15 +27,9 @@ #ifndef DBAUI_TABLEFIELDDESCRIPTION_HXX #define DBAUI_TABLEFIELDDESCRIPTION_HXX -#ifndef _SV_TABPAGE_HXX #include -#endif -#ifndef DBAUI_TABLEFIELDDESCGENPAGE_HXX #include "FieldDescGenWin.hxx" -#endif -#ifndef DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX #include "IClipBoardTest.hxx" -#endif class FixedText; namespace dbaui diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index a5e4af28b447..16a840b4977d 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -27,21 +27,13 @@ #ifndef DBAUI_TABLEUNDO_HXX #define DBAUI_TABLEUNDO_HXX -#ifndef DBAUI_GENERALUNDO_HXX #include "GeneralUndo.hxx" -#endif -#ifndef _SV_MULTISEL_HXX #include -#endif #include -#ifndef _COM_SUN_STAR_UNO_ANY_H_ #include -#endif -#ifndef DBAUI_TYPEINFO_HXX #include "TypeInfo.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 866eba99b18c..a5832a9f51be 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -27,12 +27,8 @@ #ifndef DBAUI_COLUMNCONTROL_HXX #define DBAUI_COLUMNCONTROL_HXX -#ifndef _TOOLKIT_CONTROLS_UNOCONTROL_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif namespace dbaui { diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index 363898c89111..eec1ca89fc9a 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -27,39 +27,17 @@ #ifndef DBAUI_COLUMNMODEL_HXX #define DBAUI_COLUMNMODEL_HXX -#ifndef _COM_SUN_STAR_AWT_XCONTROLMODEL_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_UTIL_XCLONEABLE_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_IO_XPERSISTOBJECT_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COMPHELPER_PROPERTY_ARRAY_HELPER_HXX_ #include -#endif -#ifndef _COMPHELPER_PROPERTYCONTAINER_HXX_ #include -#endif -#ifndef _COMPHELPER_BROADCASTHELPER_HXX_ #include -#endif -#ifndef _COMPHELPER_UNO3_HXX_ #include -#endif -#ifndef _CPPUHELPER_COMPBASE4_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index e00459a67c10..7c59cfa496f9 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -27,18 +27,10 @@ #ifndef DBAUI_COLUMNPEER_HXX #define DBAUI_COLUMNPEER_HXX -#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 3a38880819b4..063cff286c57 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -29,32 +29,16 @@ #define DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDB_XSINGLESELECTQUERYCOMPOSER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ #include -#endif /** === end UNO includes === **/ -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif //......................................................................... namespace dbaui diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index f9a84ef935bc..fb04c512a3f1 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -28,9 +28,7 @@ #ifndef _DBAUI_INTERACTION_HXX_ #define _DBAUI_INTERACTION_HXX_ -#ifndef _CPPUHELPER_IMPLBASE2_HXX_ #include -#endif #include "moduledbu.hxx" #include "apitools.hxx" diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index e8837de3aca8..ce936a406366 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -28,27 +28,13 @@ #ifndef DBAUI_UNODIRECTSQL_HXX #define DBAUI_UNODIRECTSQL_HXX -#ifndef _SVT_GENERICUNODIALOG_HXX_ #include -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COM_SUN_STAR_SDB_XSQLQUERYCOMPOSER_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include -#endif -#ifndef _COM_SUN_STAR_SDBC_XROWSET_HPP_ #include -#endif -#ifndef _DBAUI_MODULE_DBU_HXX_ #include "moduledbu.hxx" -#endif -#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_ #include -#endif //......................................................................... namespace dbaui diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index cd4364ef2659..2b39d73decd6 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -28,9 +28,7 @@ #define RPT_FUNCTION_HXX #include -#ifndef _COM_SUN_STAR_REPORT_XFunction_HPP_ #include -#endif #include #include "ReportControlModel.hxx" #include diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx index 1c4cc9a193dd..6a0c284eeb1a 100644 --- a/reportdesign/source/filter/xml/xmlImage.hxx +++ b/reportdesign/source/filter/xml/xmlImage.hxx @@ -28,9 +28,7 @@ #define RPT_XMLIMAGE_HXX #include "xmlReportElementBase.hxx" -#ifndef _COM_SUN_STAR_REPORT_XImageControl_HPP_ #include -#endif namespace rptxml { diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 125168aa9447..10a7a842108a 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -34,12 +34,8 @@ #include #include #include -#ifndef _XMLTEXTMASTERPAGECONTEXT_HXX #include -#endif -#ifndef _XMLTEXTMASTERSTYLESCONTEXT_HXX #include -#endif #include #include #include diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 1526e5978331..f1eded66cd37 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -27,17 +27,11 @@ #ifndef RPTUI_DATETIME_HXX #define RPTUI_DATETIME_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif #include #include -#ifndef _SV_BUTTON_HXX #include -#endif #include #include #include diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 6c2838b4ac08..173db7fbb9d3 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -28,9 +28,7 @@ #define RPTUI_GROUPS_SORTING_HXX #include -#ifndef _FIXED_HXX //autogen #include -#endif #include #include #include diff --git a/reportdesign/source/ui/inc/InsertFunctions.hxx b/reportdesign/source/ui/inc/InsertFunctions.hxx index b177377fd5fd..de3a2577be4e 100644 --- a/reportdesign/source/ui/inc/InsertFunctions.hxx +++ b/reportdesign/source/ui/inc/InsertFunctions.hxx @@ -27,9 +27,7 @@ #ifndef RPT_INSERTFUNCTIONS_HXX_INCLUDED #define RPT_INSERTFUNCTIONS_HXX_INCLUDED -#ifndef _EVENT_HXX //autogen #include -#endif #include class SdrView; diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index fd574ff5fa8b..5c1d88ced606 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -27,17 +27,11 @@ #ifndef RPTUI_PAGENUMBER_HXX #define RPTUI_PAGENUMBER_HXX -#ifndef _DIALOG_HXX //autogen #include -#endif -#ifndef _FIXED_HXX //autogen #include -#endif #include #include -#ifndef _SV_BUTTON_HXX #include -#endif #include -- cgit v1.2.3 From 6450d1a7f5a6cab445a1b53c93f3c010d771c3a5 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 12 Oct 2010 15:59:03 +0200 Subject: Add vim/emacs modelines to all source files Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth --- dbaccess/inc/pch/precompiled_dbaccess.cxx | 2 ++ dbaccess/source/core/api/BookmarkSet.cxx | 2 ++ dbaccess/source/core/api/CIndexes.cxx | 2 ++ dbaccess/source/core/api/CRowSetColumn.cxx | 3 +++ dbaccess/source/core/api/CRowSetDataColumn.cxx | 2 ++ dbaccess/source/core/api/CacheSet.cxx | 2 ++ dbaccess/source/core/api/FilteredContainer.cxx | 2 ++ dbaccess/source/core/api/HelperCollections.cxx | 3 +++ dbaccess/source/core/api/KeySet.cxx | 2 ++ dbaccess/source/core/api/OptimisticSet.cxx | 2 ++ dbaccess/source/core/api/PrivateRow.cxx | 2 ++ dbaccess/source/core/api/RowSet.cxx | 3 +++ dbaccess/source/core/api/RowSetBase.cxx | 3 +++ dbaccess/source/core/api/RowSetCache.cxx | 3 +++ dbaccess/source/core/api/RowSetCacheIterator.cxx | 3 +++ dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 3 +++ dbaccess/source/core/api/StaticSet.cxx | 2 ++ dbaccess/source/core/api/TableDeco.cxx | 2 ++ dbaccess/source/core/api/View.cxx | 3 +++ dbaccess/source/core/api/WrappedResultSet.cxx | 2 ++ dbaccess/source/core/api/callablestatement.cxx | 2 ++ dbaccess/source/core/api/column.cxx | 3 +++ dbaccess/source/core/api/columnsettings.cxx | 3 +++ dbaccess/source/core/api/datacolumn.cxx | 2 ++ dbaccess/source/core/api/datasettings.cxx | 2 ++ dbaccess/source/core/api/definitioncolumn.cxx | 2 ++ dbaccess/source/core/api/preparedstatement.cxx | 2 ++ dbaccess/source/core/api/query.cxx | 2 ++ dbaccess/source/core/api/querycomposer.cxx | 2 ++ dbaccess/source/core/api/querycontainer.cxx | 2 ++ dbaccess/source/core/api/querydescriptor.cxx | 2 ++ dbaccess/source/core/api/resultcolumn.cxx | 2 ++ dbaccess/source/core/api/resultset.cxx | 2 ++ dbaccess/source/core/api/statement.cxx | 3 +++ dbaccess/source/core/api/table.cxx | 3 +++ dbaccess/source/core/api/tablecontainer.cxx | 2 ++ dbaccess/source/core/api/viewcontainer.cxx | 3 +++ dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 2 ++ dbaccess/source/core/dataaccess/ContentHelper.cxx | 2 ++ dbaccess/source/core/dataaccess/ModelImpl.cxx | 2 ++ dbaccess/source/core/dataaccess/SharedConnection.cxx | 2 ++ dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 3 +++ dbaccess/source/core/dataaccess/commandcontainer.cxx | 2 ++ dbaccess/source/core/dataaccess/commanddefinition.cxx | 2 ++ dbaccess/source/core/dataaccess/connection.cxx | 2 ++ dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 3 +++ dbaccess/source/core/dataaccess/databasecontext.cxx | 3 +++ dbaccess/source/core/dataaccess/databasedocument.cxx | 2 ++ dbaccess/source/core/dataaccess/databaseregistrations.cxx | 3 +++ dbaccess/source/core/dataaccess/datasource.cxx | 2 ++ dbaccess/source/core/dataaccess/definitioncontainer.cxx | 3 +++ dbaccess/source/core/dataaccess/documentcontainer.cxx | 2 ++ dbaccess/source/core/dataaccess/documentdefinition.cxx | 2 ++ dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 3 +++ dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 3 +++ dbaccess/source/core/dataaccess/documentevents.cxx | 3 +++ dbaccess/source/core/dataaccess/intercept.cxx | 2 ++ dbaccess/source/core/dataaccess/myucp_datasupplier.cxx | 2 ++ dbaccess/source/core/dataaccess/myucp_resultset.cxx | 2 ++ dbaccess/source/core/misc/ContainerListener.cxx | 3 +++ dbaccess/source/core/misc/ContainerMediator.cxx | 3 +++ dbaccess/source/core/misc/DatabaseDataProvider.cxx | 3 +++ dbaccess/source/core/misc/PropertyForward.cxx | 2 ++ dbaccess/source/core/misc/apitools.cxx | 2 ++ dbaccess/source/core/misc/dbastrings.cxx | 3 +++ dbaccess/source/core/misc/dsntypes.cxx | 2 ++ dbaccess/source/core/misc/module_dba.cxx | 2 ++ dbaccess/source/core/misc/objectnameapproval.cxx | 2 ++ dbaccess/source/core/misc/sdbcoretools.cxx | 2 ++ dbaccess/source/core/misc/services.cxx | 3 +++ dbaccess/source/core/misc/userinformation.cxx | 2 ++ dbaccess/source/core/misc/veto.cxx | 2 ++ dbaccess/source/core/recovery/dbdocrecovery.cxx | 3 +++ dbaccess/source/core/recovery/settingsimport.cxx | 3 +++ dbaccess/source/core/recovery/storagestream.cxx | 3 +++ dbaccess/source/core/recovery/storagetextstream.cxx | 3 +++ dbaccess/source/core/recovery/storagexmlstream.cxx | 3 +++ dbaccess/source/core/recovery/subcomponentloader.cxx | 3 +++ dbaccess/source/core/recovery/subcomponentrecovery.cxx | 3 +++ dbaccess/source/core/resource/core_resource.cxx | 2 ++ dbaccess/source/ext/adabas/ANewDb.cxx | 2 ++ dbaccess/source/ext/adabas/ASqlNameEdit.cxx | 2 ++ dbaccess/source/ext/adabas/Acomponentmodule.cxx | 2 ++ dbaccess/source/ext/adabas/AdabasNewDb.cxx | 3 +++ dbaccess/source/ext/adabas/Aservices.cxx | 3 +++ dbaccess/source/ext/adabas/Astringconstants.cxx | 2 ++ dbaccess/source/ext/adabas/adabasuistrings.cxx | 2 ++ dbaccess/source/ext/macromigration/dbmm_module.cxx | 2 ++ dbaccess/source/ext/macromigration/dbmm_services.cxx | 3 +++ dbaccess/source/ext/macromigration/dbmm_types.cxx | 3 +++ dbaccess/source/ext/macromigration/docinteraction.cxx | 3 +++ dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 3 +++ dbaccess/source/ext/macromigration/macromigrationpages.cxx | 3 +++ dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 3 +++ dbaccess/source/ext/macromigration/migrationengine.cxx | 3 +++ dbaccess/source/ext/macromigration/migrationlog.cxx | 3 +++ dbaccess/source/ext/macromigration/progresscapture.cxx | 3 +++ dbaccess/source/ext/macromigration/progressmixer.cxx | 3 +++ dbaccess/source/filter/migration/cfgimport.cxx | 3 +++ dbaccess/source/filter/migration/cfgservices.cxx | 2 ++ dbaccess/source/filter/xml/dbloader2.cxx | 2 ++ dbaccess/source/filter/xml/xmlAutoStyle.cxx | 3 +++ dbaccess/source/filter/xml/xmlColumn.cxx | 3 +++ dbaccess/source/filter/xml/xmlComponent.cxx | 3 +++ dbaccess/source/filter/xml/xmlConnectionData.cxx | 3 +++ dbaccess/source/filter/xml/xmlConnectionResource.cxx | 3 +++ dbaccess/source/filter/xml/xmlDataSource.cxx | 3 +++ dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 3 +++ dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 3 +++ dbaccess/source/filter/xml/xmlDataSourceSettings.cxx | 3 +++ dbaccess/source/filter/xml/xmlDatabase.cxx | 3 +++ dbaccess/source/filter/xml/xmlDatabaseDescription.cxx | 3 +++ dbaccess/source/filter/xml/xmlDocuments.cxx | 3 +++ dbaccess/source/filter/xml/xmlExport.cxx | 3 +++ dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 3 +++ dbaccess/source/filter/xml/xmlHelper.cxx | 2 ++ dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 3 +++ dbaccess/source/filter/xml/xmlLogin.cxx | 3 +++ dbaccess/source/filter/xml/xmlQuery.cxx | 3 +++ dbaccess/source/filter/xml/xmlServerDatabase.cxx | 3 +++ dbaccess/source/filter/xml/xmlStyleImport.cxx | 3 +++ dbaccess/source/filter/xml/xmlTable.cxx | 3 +++ dbaccess/source/filter/xml/xmlTableFilterList.cxx | 3 +++ dbaccess/source/filter/xml/xmlTableFilterPattern.cxx | 3 +++ dbaccess/source/filter/xml/xmlfilter.cxx | 3 +++ dbaccess/source/filter/xml/xmlservices.cxx | 2 ++ dbaccess/source/sdbtools/connection/connectiontools.cxx | 2 ++ dbaccess/source/sdbtools/connection/datasourcemetadata.cxx | 2 ++ dbaccess/source/sdbtools/connection/objectnames.cxx | 2 ++ dbaccess/source/sdbtools/connection/tablename.cxx | 2 ++ dbaccess/source/sdbtools/misc/module_sdbt.cxx | 2 ++ dbaccess/source/sdbtools/misc/sdbt_services.cxx | 2 ++ dbaccess/source/shared/cfg_reghelper.cxx | 3 +++ dbaccess/source/shared/cfgstrings.cxx | 2 ++ dbaccess/source/shared/dbu_reghelper.cxx | 2 ++ dbaccess/source/shared/dbustrings.cxx | 3 +++ dbaccess/source/shared/flt_reghelper.cxx | 3 +++ dbaccess/source/shared/registrationhelper.cxx | 2 ++ dbaccess/source/shared/sdbtstrings.cxx | 3 +++ dbaccess/source/shared/xmlstrings.cxx | 2 ++ dbaccess/source/ui/app/AppController.cxx | 2 ++ dbaccess/source/ui/app/AppControllerDnD.cxx | 2 ++ dbaccess/source/ui/app/AppControllerGen.cxx | 3 +++ dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 ++ dbaccess/source/ui/app/AppDetailView.cxx | 2 ++ dbaccess/source/ui/app/AppIconControl.cxx | 3 +++ dbaccess/source/ui/app/AppSwapWindow.cxx | 3 +++ dbaccess/source/ui/app/AppTitleWindow.cxx | 3 +++ dbaccess/source/ui/app/AppView.cxx | 3 +++ dbaccess/source/ui/app/subcomponentmanager.cxx | 3 +++ dbaccess/source/ui/browser/AsyncronousLink.cxx | 3 +++ dbaccess/source/ui/browser/brwctrlr.cxx | 3 +++ dbaccess/source/ui/browser/brwview.cxx | 3 +++ dbaccess/source/ui/browser/dataview.cxx | 3 +++ dbaccess/source/ui/browser/dbexchange.cxx | 2 ++ dbaccess/source/ui/browser/dbloader.cxx | 2 ++ dbaccess/source/ui/browser/dbtreemodel.cxx | 3 +++ dbaccess/source/ui/browser/dbtreeview.cxx | 2 ++ dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 2 ++ dbaccess/source/ui/browser/dsbrowserDnD.cxx | 2 ++ dbaccess/source/ui/browser/exsrcbrw.cxx | 3 +++ dbaccess/source/ui/browser/formadapter.cxx | 2 ++ dbaccess/source/ui/browser/genericcontroller.cxx | 2 ++ dbaccess/source/ui/browser/sbagrid.cxx | 2 ++ dbaccess/source/ui/browser/sbamultiplex.cxx | 2 ++ dbaccess/source/ui/browser/unodatbr.cxx | 2 ++ dbaccess/source/ui/control/ColumnControlWindow.cxx | 3 +++ dbaccess/source/ui/control/FieldDescControl.cxx | 3 +++ dbaccess/source/ui/control/RelationControl.cxx | 2 ++ dbaccess/source/ui/control/ScrollHelper.cxx | 2 ++ dbaccess/source/ui/control/SqlNameEdit.cxx | 2 ++ dbaccess/source/ui/control/TableGrantCtrl.cxx | 2 ++ dbaccess/source/ui/control/VertSplitView.cxx | 3 +++ dbaccess/source/ui/control/charsetlistbox.cxx | 3 +++ dbaccess/source/ui/control/curledit.cxx | 2 ++ dbaccess/source/ui/control/dbtreelistbox.cxx | 3 +++ dbaccess/source/ui/control/listviewitems.cxx | 2 ++ dbaccess/source/ui/control/marktree.cxx | 2 ++ dbaccess/source/ui/control/opendoccontrols.cxx | 3 +++ dbaccess/source/ui/control/sqledit.cxx | 3 +++ dbaccess/source/ui/control/statusbarontroller.cxx | 3 +++ dbaccess/source/ui/control/tabletree.cxx | 2 ++ dbaccess/source/ui/control/toolboxcontroller.cxx | 2 ++ dbaccess/source/ui/control/undosqledit.cxx | 2 ++ dbaccess/source/ui/dlg/AdabasStat.cxx | 2 ++ dbaccess/source/ui/dlg/CollectionView.cxx | 2 ++ dbaccess/source/ui/dlg/ConnectionHelper.cxx | 3 +++ dbaccess/source/ui/dlg/ConnectionPage.cxx | 2 ++ dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 2 ++ dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 3 +++ dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2 ++ dbaccess/source/ui/dlg/DriverSettings.cxx | 3 +++ dbaccess/source/ui/dlg/ExtensionNotPresent.cxx | 2 ++ dbaccess/source/ui/dlg/RelationDlg.cxx | 2 ++ dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 2 ++ dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 3 +++ dbaccess/source/ui/dlg/UserAdmin.cxx | 3 +++ dbaccess/source/ui/dlg/UserAdminDlg.cxx | 3 +++ dbaccess/source/ui/dlg/admincontrols.cxx | 3 +++ dbaccess/source/ui/dlg/adminpages.cxx | 2 ++ dbaccess/source/ui/dlg/adodatalinks.cxx | 3 +++ dbaccess/source/ui/dlg/adtabdlg.cxx | 2 ++ dbaccess/source/ui/dlg/advancedsettings.cxx | 3 +++ dbaccess/source/ui/dlg/dbadmin.cxx | 2 ++ dbaccess/source/ui/dlg/dbfindex.cxx | 2 ++ dbaccess/source/ui/dlg/dbwiz.cxx | 3 +++ dbaccess/source/ui/dlg/dbwizsetup.cxx | 2 ++ dbaccess/source/ui/dlg/detailpages.cxx | 3 +++ dbaccess/source/ui/dlg/directsql.cxx | 2 ++ dbaccess/source/ui/dlg/dlgattr.cxx | 2 ++ dbaccess/source/ui/dlg/dlgsave.cxx | 2 ++ dbaccess/source/ui/dlg/dlgsize.cxx | 2 ++ dbaccess/source/ui/dlg/dsselect.cxx | 2 ++ dbaccess/source/ui/dlg/finteraction.cxx | 2 ++ dbaccess/source/ui/dlg/generalpage.cxx | 2 ++ dbaccess/source/ui/dlg/indexdialog.cxx | 2 ++ dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 2 ++ dbaccess/source/ui/dlg/odbcconfig.cxx | 3 +++ dbaccess/source/ui/dlg/optionalboolitem.cxx | 3 +++ dbaccess/source/ui/dlg/paramdialog.cxx | 3 +++ dbaccess/source/ui/dlg/queryfilter.cxx | 2 ++ dbaccess/source/ui/dlg/queryorder.cxx | 2 ++ dbaccess/source/ui/dlg/sqlmessage.cxx | 2 ++ dbaccess/source/ui/dlg/tablespage.cxx | 2 ++ dbaccess/source/ui/dlg/textconnectionsettings.cxx | 3 +++ dbaccess/source/ui/misc/DExport.cxx | 2 ++ dbaccess/source/ui/misc/HtmlReader.cxx | 2 ++ dbaccess/source/ui/misc/ModuleHelper.cxx | 2 ++ dbaccess/source/ui/misc/RowSetDrop.cxx | 2 ++ dbaccess/source/ui/misc/RtfReader.cxx | 2 ++ dbaccess/source/ui/misc/TableCopyHelper.cxx | 2 ++ dbaccess/source/ui/misc/TokenWriter.cxx | 3 +++ dbaccess/source/ui/misc/ToolBoxHelper.cxx | 2 ++ dbaccess/source/ui/misc/UITools.cxx | 3 +++ dbaccess/source/ui/misc/WCPage.cxx | 3 +++ dbaccess/source/ui/misc/WColumnSelect.cxx | 2 ++ dbaccess/source/ui/misc/WCopyTable.cxx | 2 ++ dbaccess/source/ui/misc/WExtendPages.cxx | 2 ++ dbaccess/source/ui/misc/WNameMatch.cxx | 2 ++ dbaccess/source/ui/misc/WTypeSelect.cxx | 2 ++ dbaccess/source/ui/misc/asyncmodaldialog.cxx | 2 ++ dbaccess/source/ui/misc/charsets.cxx | 2 ++ dbaccess/source/ui/misc/controllerframe.cxx | 3 +++ dbaccess/source/ui/misc/databaseobjectview.cxx | 2 ++ dbaccess/source/ui/misc/datasourceconnector.cxx | 2 ++ dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2 ++ dbaccess/source/ui/misc/dsmeta.cxx | 3 +++ dbaccess/source/ui/misc/imageprovider.cxx | 2 ++ dbaccess/source/ui/misc/indexcollection.cxx | 2 ++ dbaccess/source/ui/misc/linkeddocuments.cxx | 2 ++ dbaccess/source/ui/misc/moduledbu.cxx | 2 ++ dbaccess/source/ui/misc/propertysetitem.cxx | 2 ++ dbaccess/source/ui/misc/propertystorage.cxx | 3 +++ dbaccess/source/ui/misc/singledoccontroller.cxx | 2 ++ dbaccess/source/ui/misc/stringlistitem.cxx | 2 ++ dbaccess/source/ui/misc/uiservices.cxx | 3 +++ dbaccess/source/ui/querydesign/ConnectionLine.cxx | 2 ++ dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 2 ++ dbaccess/source/ui/querydesign/ConnectionLineData.cxx | 2 ++ dbaccess/source/ui/querydesign/JAccess.cxx | 2 ++ dbaccess/source/ui/querydesign/JoinController.cxx | 3 +++ dbaccess/source/ui/querydesign/JoinDesignView.cxx | 2 ++ dbaccess/source/ui/querydesign/JoinExchange.cxx | 3 +++ dbaccess/source/ui/querydesign/JoinTableView.cxx | 3 +++ dbaccess/source/ui/querydesign/QTableConnection.cxx | 2 ++ dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 2 ++ dbaccess/source/ui/querydesign/QTableWindow.cxx | 2 ++ dbaccess/source/ui/querydesign/QTableWindowData.cxx | 2 ++ dbaccess/source/ui/querydesign/QueryDesignView.cxx | 3 +++ dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx | 2 ++ dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx | 3 +++ dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx | 2 ++ dbaccess/source/ui/querydesign/QueryTableView.cxx | 3 +++ dbaccess/source/ui/querydesign/QueryTextView.cxx | 3 +++ dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 3 +++ dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 ++ dbaccess/source/ui/querydesign/TableConnection.cxx | 2 ++ dbaccess/source/ui/querydesign/TableConnectionData.cxx | 2 ++ dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 2 ++ dbaccess/source/ui/querydesign/TableFieldInfo.cxx | 2 ++ dbaccess/source/ui/querydesign/TableWindow.cxx | 2 ++ dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 2 ++ dbaccess/source/ui/querydesign/TableWindowData.cxx | 3 +++ dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 3 +++ dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 2 ++ dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 2 ++ dbaccess/source/ui/querydesign/querycontroller.cxx | 2 ++ dbaccess/source/ui/querydesign/querydlg.cxx | 2 ++ dbaccess/source/ui/querydesign/queryview.cxx | 2 ++ dbaccess/source/ui/relationdesign/RTableConnection.cxx | 3 +++ dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 2 ++ dbaccess/source/ui/relationdesign/RelationController.cxx | 2 ++ dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 2 ++ dbaccess/source/ui/relationdesign/RelationTableView.cxx | 2 ++ dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 2 ++ dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 3 +++ dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 ++ dbaccess/source/ui/tabledesign/TableController.cxx | 3 +++ dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 2 ++ dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 3 +++ dbaccess/source/ui/tabledesign/TableDesignView.cxx | 2 ++ dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 2 ++ dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 2 ++ dbaccess/source/ui/tabledesign/TableRow.cxx | 2 ++ dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2 ++ dbaccess/source/ui/tabledesign/TableUndo.cxx | 2 ++ dbaccess/source/ui/uno/AdabasSettingsDlg.cxx | 2 ++ dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 3 +++ dbaccess/source/ui/uno/ColumnControl.cxx | 3 +++ dbaccess/source/ui/uno/ColumnModel.cxx | 2 ++ dbaccess/source/ui/uno/ColumnPeer.cxx | 3 +++ dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 2 ++ dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 2 ++ dbaccess/source/ui/uno/TableFilterDlg.cxx | 2 ++ dbaccess/source/ui/uno/UserSettingsDlg.cxx | 2 ++ dbaccess/source/ui/uno/admindlg.cxx | 2 ++ dbaccess/source/ui/uno/composerdialogs.cxx | 2 ++ dbaccess/source/ui/uno/copytablewizard.cxx | 3 +++ dbaccess/source/ui/uno/dbinteraction.cxx | 2 ++ dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 2 ++ dbaccess/source/ui/uno/unoDirectSql.cxx | 2 ++ dbaccess/source/ui/uno/unoadmin.cxx | 2 ++ dbaccess/source/ui/uno/unosqlmessage.cxx | 2 ++ dbaccess/win32/source/odbcconfig/odbcconfig.cxx | 2 ++ reportdesign/inc/pch/precompiled_reportdesign.cxx | 2 ++ reportdesign/source/core/api/FixedLine.cxx | 2 ++ reportdesign/source/core/api/FixedText.cxx | 2 ++ reportdesign/source/core/api/FormatCondition.cxx | 3 +++ reportdesign/source/core/api/FormattedField.cxx | 3 +++ reportdesign/source/core/api/Function.cxx | 3 +++ reportdesign/source/core/api/Functions.cxx | 3 +++ reportdesign/source/core/api/Group.cxx | 2 ++ reportdesign/source/core/api/Groups.cxx | 3 +++ reportdesign/source/core/api/ImageControl.cxx | 2 ++ reportdesign/source/core/api/ReportComponent.cxx | 2 ++ reportdesign/source/core/api/ReportControlModel.cxx | 2 ++ reportdesign/source/core/api/ReportDefinition.cxx | 2 ++ reportdesign/source/core/api/ReportEngineJFree.cxx | 3 +++ reportdesign/source/core/api/ReportVisitor.cxx | 3 +++ reportdesign/source/core/api/Section.cxx | 3 +++ reportdesign/source/core/api/Shape.cxx | 3 +++ reportdesign/source/core/api/Tools.cxx | 3 +++ reportdesign/source/core/api/services.cxx | 3 +++ reportdesign/source/core/misc/conditionalexpression.cxx | 3 +++ reportdesign/source/core/misc/conditionupdater.cxx | 3 +++ reportdesign/source/core/misc/reportformula.cxx | 2 ++ reportdesign/source/core/resource/core_resource.cxx | 2 ++ reportdesign/source/core/sdr/ModuleHelper.cxx | 3 +++ reportdesign/source/core/sdr/PropertyForward.cxx | 2 ++ reportdesign/source/core/sdr/ReportDrawPage.cxx | 3 +++ reportdesign/source/core/sdr/ReportUndoFactory.cxx | 2 ++ reportdesign/source/core/sdr/RptModel.cxx | 3 +++ reportdesign/source/core/sdr/RptObject.cxx | 3 +++ reportdesign/source/core/sdr/RptObjectListener.cxx | 3 +++ reportdesign/source/core/sdr/RptPage.cxx | 3 +++ reportdesign/source/core/sdr/UndoActions.cxx | 2 ++ reportdesign/source/core/sdr/UndoEnv.cxx | 3 +++ reportdesign/source/core/sdr/formatnormalizer.cxx | 3 +++ reportdesign/source/filter/xml/dbloader2.cxx | 2 ++ reportdesign/source/filter/xml/xmlAutoStyle.cxx | 3 +++ reportdesign/source/filter/xml/xmlCell.cxx | 2 ++ reportdesign/source/filter/xml/xmlColumn.cxx | 3 +++ reportdesign/source/filter/xml/xmlComponent.cxx | 3 +++ reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 3 +++ reportdesign/source/filter/xml/xmlControlProperty.cxx | 3 +++ reportdesign/source/filter/xml/xmlExport.cxx | 2 ++ reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx | 3 +++ reportdesign/source/filter/xml/xmlFixedContent.cxx | 3 +++ reportdesign/source/filter/xml/xmlFormatCondition.cxx | 3 +++ reportdesign/source/filter/xml/xmlFormattedField.cxx | 3 +++ reportdesign/source/filter/xml/xmlFunction.cxx | 3 +++ reportdesign/source/filter/xml/xmlGroup.cxx | 3 +++ reportdesign/source/filter/xml/xmlHelper.cxx | 3 +++ reportdesign/source/filter/xml/xmlImage.cxx | 3 +++ reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 2 ++ reportdesign/source/filter/xml/xmlMasterFields.cxx | 3 +++ reportdesign/source/filter/xml/xmlPropertyHandler.cxx | 2 ++ reportdesign/source/filter/xml/xmlReport.cxx | 3 +++ reportdesign/source/filter/xml/xmlReportElement.cxx | 3 +++ reportdesign/source/filter/xml/xmlReportElementBase.cxx | 3 +++ reportdesign/source/filter/xml/xmlRow.cxx | 3 +++ reportdesign/source/filter/xml/xmlSection.cxx | 3 +++ reportdesign/source/filter/xml/xmlStyleImport.cxx | 3 +++ reportdesign/source/filter/xml/xmlSubDocument.cxx | 3 +++ reportdesign/source/filter/xml/xmlTable.cxx | 3 +++ reportdesign/source/filter/xml/xmlfilter.cxx | 3 +++ reportdesign/source/filter/xml/xmlservices.cxx | 3 +++ reportdesign/source/shared/corestrings.cxx | 2 ++ reportdesign/source/shared/stringconstants.cxx | 3 +++ reportdesign/source/shared/uistrings.cxx | 3 +++ reportdesign/source/shared/xmlstrings.cxx | 2 ++ reportdesign/source/ui/dlg/AddField.cxx | 2 ++ reportdesign/source/ui/dlg/CondFormat.cxx | 3 +++ reportdesign/source/ui/dlg/Condition.cxx | 2 ++ reportdesign/source/ui/dlg/DateTime.cxx | 3 +++ reportdesign/source/ui/dlg/Formula.cxx | 3 +++ reportdesign/source/ui/dlg/GroupExchange.cxx | 3 +++ reportdesign/source/ui/dlg/GroupsSorting.cxx | 3 +++ reportdesign/source/ui/dlg/Navigator.cxx | 2 ++ reportdesign/source/ui/dlg/PageNumber.cxx | 3 +++ reportdesign/source/ui/dlg/dlgpage.cxx | 3 +++ reportdesign/source/ui/inspection/DataProviderHandler.cxx | 2 ++ reportdesign/source/ui/inspection/DefaultInspection.cxx | 2 ++ reportdesign/source/ui/inspection/GeometryHandler.cxx | 2 ++ reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 2 ++ reportdesign/source/ui/inspection/metadata.cxx | 2 ++ reportdesign/source/ui/misc/ColorListener.cxx | 3 +++ reportdesign/source/ui/misc/FunctionHelper.cxx | 3 +++ reportdesign/source/ui/misc/UITools.cxx | 3 +++ reportdesign/source/ui/misc/Undo.cxx | 2 ++ reportdesign/source/ui/misc/rptuiservices.cxx | 3 +++ reportdesign/source/ui/misc/statusbarcontroller.cxx | 3 +++ reportdesign/source/ui/misc/toolboxcontroller.cxx | 2 ++ reportdesign/source/ui/report/DesignView.cxx | 3 +++ reportdesign/source/ui/report/EndMarker.cxx | 3 +++ reportdesign/source/ui/report/FixedTextColor.cxx | 3 +++ reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 3 +++ reportdesign/source/ui/report/ReportController.cxx | 3 +++ reportdesign/source/ui/report/ReportControllerObserver.cxx | 2 ++ reportdesign/source/ui/report/ReportRuler.cxx | 3 +++ reportdesign/source/ui/report/ReportSection.cxx | 3 +++ reportdesign/source/ui/report/ReportWindow.cxx | 2 ++ reportdesign/source/ui/report/ScrollHelper.cxx | 3 +++ reportdesign/source/ui/report/SectionView.cxx | 3 +++ reportdesign/source/ui/report/SectionWindow.cxx | 2 ++ reportdesign/source/ui/report/StartMarker.cxx | 3 +++ reportdesign/source/ui/report/ViewsWindow.cxx | 3 +++ reportdesign/source/ui/report/dlgedclip.cxx | 3 +++ reportdesign/source/ui/report/dlgedfac.cxx | 3 +++ reportdesign/source/ui/report/dlgedfunc.cxx | 3 +++ reportdesign/source/ui/report/propbrw.cxx | 3 +++ 431 files changed, 1069 insertions(+) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/inc/pch/precompiled_dbaccess.cxx b/dbaccess/inc/pch/precompiled_dbaccess.cxx index 1ef5d4b9c7a5..0fe2c43d1189 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.cxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_dbaccess.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index c28363ad0cf1..ec64042b835d 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -266,3 +267,4 @@ void OBookmarkSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParamet } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx index e495a5dd06cd..0c3e62323dc0 100644 --- a/dbaccess/source/core/api/CIndexes.cxx +++ b/dbaccess/source/core/api/CIndexes.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,4 @@ void SAL_CALL OIndexes::disposing(void) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 12a7d16e8716..3be05a873360 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ void SAL_CALL ORowSetColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, //.............................................................................. } // namespace dbaccess //.............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index d33039a7becd..1c30bb48a7b6 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,4 @@ void ORowSetDataColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeExce // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 0c48fc7a6768..f246e8ac03e1 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -715,3 +716,4 @@ void OCacheSet::fillMissingValues(ORowSetValueVector::Vector& /*io_aRow*/) const } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index aa20bf080e4d..25273df28ced 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -496,3 +497,4 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // .............................................................................. +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index 517ddc11b3f9..ec431855dde3 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ namespace dbaccess } // ----------------------------------------------------------------------------- } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 97755ff79e36..c0867b31844c 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1639,3 +1640,4 @@ void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const Select } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 2a9ac96ce82b..f4afefd7bca9 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -762,3 +763,4 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx index 939e335b4cb3..05eed3b2b687 100644 --- a/dbaccess/source/core/api/PrivateRow.cxx +++ b/dbaccess/source/core/api/PrivateRow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,4 @@ using namespace ::com::sun::star; return Reference< XArray >(m_aRow[m_nPos].makeAny(),UNO_QUERY); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index f8d666103bdc..9dd7aa54aed9 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3031,3 +3032,5 @@ void SAL_CALL ORowSetClone::removeRowSetListener( const Reference< XRowSetListen } } // dbaccess + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index cd43437e1332..c58f679b231b 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1584,3 +1585,5 @@ void ORowSetNotifier::firePropertyChange() } } } // namespace dbaccess + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 011676335d5d..cc8fac4d118e 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1670,3 +1671,5 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_ } } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx index 3b52909aab38..69ea1bd22263 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.cxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -144,3 +145,5 @@ sal_Bool ORowSetCacheIterator::isNull() const RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::getMutex" ); return m_pRowSet ? m_pRowSet->getMutex() : NULL; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 2f9a58c975b7..5b1685d42e1f 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1873,3 +1874,5 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC return sRet; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index 241a7721f542..140ba91e2390 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -372,3 +373,4 @@ void SAL_CALL OStaticSet::moveToCurrentRow( ) throw(SQLException, RuntimeExcept } // ------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index f7b369e473b4..ea8870f19ebf 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -712,3 +713,4 @@ void SAL_CALL ODBTableDecorator::setName( const ::rtl::OUString& /*aName*/ ) thr // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index fa528d203466..f8cd30f8b7fb 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -159,3 +160,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index 22e8f61383ac..4c240c2e940e 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -253,3 +254,4 @@ void WrappedResultSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xPar } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index 90afbc8a8bdc..ebaa81e57b15 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -330,3 +331,4 @@ Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 columnIndex } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 292bf5694793..33c5c407cb6c 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -479,3 +480,5 @@ void SAL_CALL OColumns::setParent( const Reference< XInterface >& _xParent ) thr m_xParent = _xParent; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index ab91b7183d44..b9f87b14fe71 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -181,3 +182,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index ca6ca2a4db85..6b1a12eec52c 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -465,3 +466,4 @@ void ODataColumn::updateObject(const Any& x) throw( SQLException, RuntimeExcepti m_xRowUpdate->updateObject(m_nPos, x); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index 6b88a8389d49..920ba97db4b1 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -228,3 +229,4 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index 53886c346389..1c0f67eb2534 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -672,3 +673,4 @@ Sequence< ::rtl::OUString > OTableColumnWrapper::getSupportedServiceNames( ) th return OTableColumnDescriptorWrapper::createArrayHelper( nId ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 98c7c1c74b65..e48e372f1437 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -471,3 +472,4 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim m_xAggregateAsParameters->clearParameters(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index c8941b8b222e..dc6ca41a3354 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -396,3 +397,4 @@ void OQuery::registerProperties() } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index ed8df40eb78c..19850a4c790d 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -358,3 +359,4 @@ void SAL_CALL OQueryComposer::release() throw() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index eb694bf64ff8..79928b548c9f 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -437,3 +438,4 @@ Sequence< ::rtl::OUString > SAL_CALL OQueryContainer::getElementNames( ) throw( } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index e7e606925ec6..56c087e10ce1 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -303,3 +304,4 @@ OColumn* OQueryDescriptor_Base::createColumn( const ::rtl::OUString& /*_rName*/ //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index dd6c6c42a349..f5ae834d5407 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -329,3 +330,4 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 8acc5a119b56..254252217f29 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1172,3 +1173,4 @@ void OResultSet::checkBookmarkable() const } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index 9a0c78a51bb6..ffba9a513dfb 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -670,3 +671,5 @@ bool OStatement::impl_ensureComposer_nothrow() const return m_xComposer.is(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index ec6530b07f2d..7431d3162d9e 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -414,3 +415,5 @@ sdbcx::OCollection* ODBTable::createIndexes(const TStringVector& _rNames) return new OIndexes(this,m_aMutex,_rNames,NULL); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 86b15eb1b721..b7d9369843bd 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -509,3 +510,4 @@ void OTableContainer::addMasterContainerListener() } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 0fc2542bfa4a..f9baf1a6047d 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -272,3 +273,5 @@ void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ ) // no restriction at all (other than the ones provided externally) return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VIEW" ) ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index f0a33f941b08..00b89711137d 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -308,3 +309,4 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index c78a712a6323..90ed1a528081 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -728,3 +729,4 @@ void OContentHelper::notifyDataSourceModified() } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index ee50bea00dd0..7b732ee4caec 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1500,3 +1501,4 @@ ModelDependentComponent::~ModelDependentComponent() } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index d148da41ab32..ef92928a77a6 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -180,3 +181,4 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 94277f366d93..29668a607c6e 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -397,3 +398,5 @@ void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Pa //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index 62cdc0f121cb..59849c09b793 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,4 @@ Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exc } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index b3b41ff903b8..be7977e73bbc 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -177,3 +178,4 @@ void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index f543e2665a7e..de11ad8930b7 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -944,3 +945,4 @@ Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< X } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index ad5078825a16..20ac1670afb7 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -346,3 +347,5 @@ extern "C" void SAL_CALL createRegistryInfo_DataAccessDescriptorFactory() { static ::dba::OSingletonRegistration< ::dbaccess::DataAccessDescriptorFactory > aAutoRegistration; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 315cbcca3b7e..69240acd1d5b 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -807,3 +808,5 @@ void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForD //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 125c54121628..f4e4aaac8460 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -2189,3 +2190,4 @@ void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index 6a8e7db21236..913522441a46 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -397,3 +398,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 82f4a2aa6e2b..0cb9f9135a4c 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1473,3 +1474,4 @@ Reference< XInterface > ODatabaseSource::getThis() const //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index c1268fa69239..aa2bb1312850 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -714,3 +715,5 @@ sal_Bool ODefinitionContainer::checkExistence(const ::rtl::OUString& _rName) } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 48ce42141a8e..76e27a3cf885 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -797,3 +798,4 @@ void SAL_CALL ODocumentContainer::rename( const ::rtl::OUString& newName ) throw } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 6fa5cf86f77b..51e49c8e56b9 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -2260,3 +2261,4 @@ void NameChangeNotifier::impl_fireEvent_throw( const sal_Bool i_bVetoable ) } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index c25d052a396c..09fd42d1f73d 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -229,3 +230,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx index cfbf96433971..47752a30b6a3 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -317,3 +318,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index 8d191c1d3503..384939cccbb5 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -263,3 +264,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 8a24bbcdf4a3..7e83fd811752 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -445,3 +446,4 @@ void SAL_CALL OInterceptor::disposing( const ::com::sun::star::lang::EventObject } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index c7c2200a8809..f10f8cd93b70 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -416,3 +417,4 @@ void DataSupplier::validate() { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.cxx b/dbaccess/source/core/dataaccess/myucp_resultset.cxx index 325e04460d88..d33e8d2d52da 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.cxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,4 @@ void DynamicResultSet::initDynamic() m_xResultSet2 = m_xResultSet1; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/ContainerListener.cxx b/dbaccess/source/core/misc/ContainerListener.cxx index c12ffb8e6f70..79772386d185 100644 --- a/dbaccess/source/core/misc/ContainerListener.cxx +++ b/dbaccess/source/core/misc/ContainerListener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index d65f9e88677f..cd1dd3c2907c 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -259,3 +260,5 @@ void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, co //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index b07c86cfe39c..37f99be93a36 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1089,3 +1090,5 @@ void DatabaseDataProvider::impl_invalidateParameter_nothrow() } // ----------------------------------------------------------------------------- } // namespace dbaccess + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 4f9aa81ab28c..9940b3990562 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,3 +172,4 @@ namespace dbaccess } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index c2d9f306f99a..281fb4902a6b 100644 --- a/dbaccess/source/core/misc/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -143,3 +144,4 @@ Any OSubComponent::queryInterface( const Type & rType ) throw(RuntimeException) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/dbastrings.cxx b/dbaccess/source/core/misc/dbastrings.cxx index 35d0025f8fb7..f8f53df0e866 100644 --- a/dbaccess/source/core/misc/dbastrings.cxx +++ b/dbaccess/source/core/misc/dbastrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,5 @@ namespace dbaccess IMPLEMENT_CONSTASCII_USTRING( PROPERTY_IS_FORM, "IsForm" ); IMPLEMENT_CONSTASCII_USTRING( PROPERTY_PERSISTENT_PATH, "PersistentPath" ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index fc12f1a9d889..39c29c4f4925 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -629,3 +630,4 @@ bool operator==(const ODsnTypeCollection::TypeIterator& lhs, const ODsnTypeColle } // namespace dbaccess //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/module_dba.cxx b/dbaccess/source/core/misc/module_dba.cxx index 0010927f733c..c5653e6c02b0 100644 --- a/dbaccess/source/core/misc/module_dba.cxx +++ b/dbaccess/source/core/misc/module_dba.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,4 @@ namespace dba } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx index 0a10a58e6d16..3773680fe891 100644 --- a/dbaccess/source/core/misc/objectnameapproval.cxx +++ b/dbaccess/source/core/misc/objectnameapproval.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,4 @@ namespace dbaccess } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index dea2328dc907..a7f21ee4a3cf 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,4 @@ namespace dbaccess } // namespace dbaccess //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 5c427d1eb57e..189e4f1e36e4 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,5 @@ extern "C" OOO_DLLPUBLIC_DBA void* SAL_CALL component_getFactory( pImplementationName, pServiceManager, pRegistryKey, dba::entries); return xRet.get(); }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/userinformation.cxx b/dbaccess/source/core/misc/userinformation.cxx index 0bae88a2949d..27ea6bb51f8b 100644 --- a/dbaccess/source/core/misc/userinformation.cxx +++ b/dbaccess/source/core/misc/userinformation.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,4 @@ UserInformation::UserInformation() m_aUserLocale = MsLangId::convertLanguageToLocale(eLanguage); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx index 3f555ebebc7a..ead0b705b3d6 100644 --- a/dbaccess/source/core/misc/veto.cxx +++ b/dbaccess/source/core/misc/veto.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ namespace dbaccess } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 8ac25ac01f10..f1e897764457 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -435,3 +436,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 73bece9f584c..8ef984f585ee 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -292,3 +293,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx index ec6ff49a6098..7c5589f864f6 100644 --- a/dbaccess/source/core/recovery/storagestream.cxx +++ b/dbaccess/source/core/recovery/storagestream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -124,3 +125,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx index af1b832b67b3..b034b95b60a3 100644 --- a/dbaccess/source/core/recovery/storagetextstream.cxx +++ b/dbaccess/source/core/recovery/storagetextstream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -128,3 +129,5 @@ namespace dbaccess //...................................................................................................................... } // namespace dbaccess //...................................................................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index 8405cce75903..3e65d79387e7 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -195,3 +196,5 @@ namespace dbaccess //...................................................................................................................... } // namespace dbaccess //...................................................................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx index 5fd120a5009b..48debe206c73 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.cxx +++ b/dbaccess/source/core/recovery/subcomponentloader.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -198,3 +199,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index 0ae69402faeb..c579e014e657 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -700,3 +701,5 @@ namespace dbaccess //........................................................................ } // namespace dbaccess //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index 0c2e167f1a83..d197fe66eb20 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,3 +114,4 @@ namespace dbaccess } //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx index 58d946d0d601..3fc0d952cf40 100644 --- a/dbaccess/source/ext/adabas/ANewDb.cxx +++ b/dbaccess/source/ext/adabas/ANewDb.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,4 @@ void OAdabasCreateDialog::executedDialog(sal_Int16 _nExecutionResult) } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx index 2c50b7d82b97..4745568c69e8 100644 --- a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx +++ b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ namespace adabasui } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx index 5599132d7da1..cab3b7170bc2 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -339,3 +340,4 @@ namespace COMPMOD_NAMESPACE } // namespace COMPMOD_NAMESPACE //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx index 0b80de30ed8f..8bb6ff11dfab 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -747,3 +748,5 @@ sal_Bool OAdabasNewDbDlg::fillEnvironmentVariable(const ::rtl::OUString& _sVaria return bError; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx index 018fc304b656..62f7f87d183d 100644 --- a/dbaccess/source/ext/adabas/Aservices.cxx +++ b/dbaccess/source/ext/adabas/Aservices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( xRet->acquire(); return xRet.get(); }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/Astringconstants.cxx b/dbaccess/source/ext/adabas/Astringconstants.cxx index bede25514524..6fe34c212a00 100644 --- a/dbaccess/source/ext/adabas/Astringconstants.cxx +++ b/dbaccess/source/ext/adabas/Astringconstants.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ IMPLEMENT_CONSTASCII_USTRING(SQLSTATE_GENERAL, "01000"); +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/adabasuistrings.cxx b/dbaccess/source/ext/adabas/adabasuistrings.cxx index 2e5b215b46eb..cf1edccedc07 100644 --- a/dbaccess/source/ext/adabas/adabasuistrings.cxx +++ b/dbaccess/source/ext/adabas/adabasuistrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,3 +34,4 @@ namespace adabasui } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_module.cxx b/dbaccess/source/ext/macromigration/dbmm_module.cxx index e4863ed8f2c3..d133dc0fcae2 100644 --- a/dbaccess/source/ext/macromigration/dbmm_module.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_module.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ namespace dbmm } // namespace dbmm //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index 7776631dd449..f1dd54aa312f 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ namespace dbmm //........................................................................ IMPLEMENT_COMPONENT_LIBRARY_API( ::dbmm::MacroMigrationModule, ::dbmm::initializeModule ) + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx index 6e2369498137..ee0c32b7eef7 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -61,3 +62,5 @@ namespace dbmm //........................................................................ } // namespace dbmm //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index ef42fc881c2a..63670e88b323 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,5 @@ namespace dbmm //........................................................................ } // namespace dbmm //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 5ee29ff5d35f..4054f67189c0 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -626,3 +627,5 @@ namespace dbmm //........................................................................ } // namespace dbmm //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index c2bd3986e27a..54051841b9f5 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -359,3 +360,5 @@ namespace dbmm //........................................................................ } // namespace dbmm //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 2f60d848ffb5..9a03a8e4f63e 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -261,3 +262,5 @@ namespace dbmm //........................................................................ } // namespace dbmm //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 7f5b7ab4241f..702b722aaf5c 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1988,3 +1989,5 @@ namespace dbmm //........................................................................ } // namespace dbmm //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index 79cd4f02c8d1..d5b391532863 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -510,3 +511,5 @@ namespace dbmm //........................................................................ } // namespace dbmm //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx index 723a6335261a..b0e31f4ec35c 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.cxx +++ b/dbaccess/source/ext/macromigration/progresscapture.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ namespace dbmm //........................................................................ } // namespace dbmm //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index cf1031e1a506..bed5f7f33b8f 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.cxx +++ b/dbaccess/source/ext/macromigration/progressmixer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -214,3 +215,5 @@ namespace dbmm //........................................................................ } // namespace dbmm //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx index 4cd102fd9ad6..a6eb5b7b073b 100644 --- a/dbaccess/source/filter/migration/cfgimport.cxx +++ b/dbaccess/source/filter/migration/cfgimport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1178,3 +1179,5 @@ void SAL_CALL OCfgImport::addPropertyWithValue( // ----------------------------------------------------------------------------- // }// dbacfg // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/migration/cfgservices.cxx b/dbaccess/source/filter/migration/cfgservices.cxx index ed83678b04cb..a5c256488ebc 100644 --- a/dbaccess/source/filter/migration/cfgservices.cxx +++ b/dbaccess/source/filter/migration/cfgservices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,4 @@ extern "C" void* SAL_CALL component_getFactory( return xRet.get(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 126a043145ab..0dd47a8ff3a5 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -656,3 +657,4 @@ extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey) } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index d37e486a550b..a84b69dfa43b 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ OXMLAutoStylePoolP::~OXMLAutoStylePoolP() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index 9a2717bb4fec..ba826ebdc721 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -191,3 +192,5 @@ ODBFilter& OXMLColumn::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index 2f4c08455eb3..2af3b4d9c102 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,5 @@ OXMLComponent::~OXMLComponent() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index e77ac0a8ce28..25ec65a48c7b 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,5 @@ ODBFilter& OXMLConnectionData::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx index c0e898d8602c..5b0b6aeee3de 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ OXMLConnectionResource::~OXMLConnectionResource() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index 6e674a65d8c9..b2e87883a62b 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -279,3 +280,5 @@ ODBFilter& OXMLDataSource::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index 7feea1f3f024..5aac0f307824 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ OXMLDataSourceInfo::~OXMLDataSourceInfo() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index 2e084b1b427d..8e5f2652244f 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -249,3 +250,5 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index 24f9b527aeb1..284971fd8a07 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ ODBFilter& OXMLDataSourceSettings::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index 7fff786ca518..6bb928b2b541 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,3 +157,5 @@ void OXMLDatabase::EndElement() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 97a0649b0ecf..73faf3a5a64a 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ ODBFilter& OXMLDatabaseDescription::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 7c5ed57a3ed1..99e981a581d7 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,5 @@ ODBFilter& OXMLDocuments::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 94969325dcbe..40e2341cdecc 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1454,3 +1455,5 @@ void ODBExport::collectComponentStyles() // ----------------------------------------------------------------------------- }// dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index dc5ca692a76a..c4a9893f8493 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ OXMLFileBasedDatabase::~OXMLFileBasedDatabase() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index e6bef02737f6..99807b88a5b6 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -194,3 +195,4 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper( // ----------------------------------------------------------------------------- } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 48d49c3e638b..d132f7666151 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -175,3 +176,5 @@ ODBFilter& OXMLHierarchyCollection::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx index fb30f3678c60..21d30473872b 100644 --- a/dbaccess/source/filter/xml/xmlLogin.cxx +++ b/dbaccess/source/filter/xml/xmlLogin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,5 @@ OXMLLogin::~OXMLLogin() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index fa00c8543792..6c35f416b5c2 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -150,3 +151,5 @@ void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp ) //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx index fd7e0aefff36..112524ddbe98 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,5 @@ OXMLServerDatabase::~OXMLServerDatabase() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index e58e3ec14369..67ea8c5bc77e 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -327,3 +328,5 @@ ODBFilter& OTableStylesContext::GetOwnImport() // ----------------------------------------------------------------------------- } // dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 231ca9d77569..a64a3ac40360 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -265,3 +266,5 @@ void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/ //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 007a51e479b9..4291c244a341 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,5 @@ void OXMLTableFilterList::EndElement() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx index cf88ace07100..12ce89a823f1 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ void OXMLTableFilterPattern::Characters( const ::rtl::OUString& rChars ) //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index b2c46a98d78d..fe07ce1e7f59 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -917,3 +918,5 @@ void ODBFilter::setPropertyInfo() // ----------------------------------------------------------------------------- }// dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index d98b935ddfb4..95464c7d6896 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,3 +119,4 @@ extern "C" void* SAL_CALL component_getFactory( return xRet.get(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index f873e6b6e34b..5f1e8153f278 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -185,3 +186,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx index db0eed7dc91c..ef76d96eed95 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 838917b3571d..0b64bca252ef 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -490,3 +491,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index a9d1106777e3..4d6357a88d1b 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -274,3 +275,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx index b09e1c0dc920..f84822c1d25a 100644 --- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx +++ b/dbaccess/source/sdbtools/misc/module_sdbt.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index a198fe006cb7..dcea32927e21 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ extern "C" void* SAL_CALL component_getFactory( return xRet.get(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/cfg_reghelper.cxx b/dbaccess/source/shared/cfg_reghelper.cxx index 34649535d0ce..e4565b27e9f3 100644 --- a/dbaccess/source/shared/cfg_reghelper.cxx +++ b/dbaccess/source/shared/cfg_reghelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ namespace dbacfg #undef _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_ } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/cfgstrings.cxx b/dbaccess/source/shared/cfgstrings.cxx index ee0bc9ff403e..a08cb3227a28 100644 --- a/dbaccess/source/shared/cfgstrings.cxx +++ b/dbaccess/source/shared/cfgstrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ namespace dbacfg IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_COLUMN_CONTROLDEFAULT, "ControlDefault"); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx index c67148227aa6..3acbee9d2d91 100644 --- a/dbaccess/source/shared/dbu_reghelper.cxx +++ b/dbaccess/source/shared/dbu_reghelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ namespace dbaui } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx index c6d8aa99e6ea..6352e15fb72c 100644 --- a/dbaccess/source/shared/dbustrings.cxx +++ b/dbaccess/source/shared/dbustrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ namespace dbaui IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLED, "Enabled"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MOUSE_WHEEL_BEHAVIOR, "MouseWheelBehavior"); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/flt_reghelper.cxx b/dbaccess/source/shared/flt_reghelper.cxx index 1c0aad312005..bf98c4ddd82d 100644 --- a/dbaccess/source/shared/flt_reghelper.cxx +++ b/dbaccess/source/shared/flt_reghelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,5 @@ namespace dbaxml #undef _REGISTRATIONHELPER_CXX_INCLUDED_INDIRECTLY_ } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx index b606c6bcf9b6..56246cee507a 100644 --- a/dbaccess/source/shared/registrationhelper.cxx +++ b/dbaccess/source/shared/registrationhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -213,3 +214,4 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/sdbtstrings.cxx b/dbaccess/source/shared/sdbtstrings.cxx index b972df52bfec..aa531d01f59d 100644 --- a/dbaccess/source/shared/sdbtstrings.cxx +++ b/dbaccess/source/shared/sdbtstrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,3 +34,5 @@ namespace sdbtools { #include "stringconstants.inc" } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx index 569d7216cd97..4ae1bf472495 100644 --- a/dbaccess/source/shared/xmlstrings.cxx +++ b/dbaccess/source/shared/xmlstrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,3 +35,4 @@ namespace dbaxml #include "stringconstants.inc" } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 9d659c26e707..af2da4acb59d 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3005,3 +3006,4 @@ void OApplicationController::impl_migrateScripts_nothrow() } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index d81bae69a3a3..ac88783d524a 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -814,3 +815,4 @@ IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index a36ac074be52..1a6fb8a6e5fc 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -839,3 +840,5 @@ ElementType OApplicationController::getElementType(const Reference< XContainer > //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index b7a70151c269..d89c495e5106 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1435,3 +1436,4 @@ void OPreviewWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index a83e611cedec..4003c14e854c 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -959,3 +960,4 @@ Window* OApplicationDetailView::getTreeWindow() const return m_pControlHelper->getCurrentView(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 5902f1f8da65..939d174b23e9 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -117,3 +118,5 @@ sal_Int8 OApplicationIconControl::ExecuteDrop( const ExecuteDropEvent& _rEvt ) return DND_ACTION_NONE; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 21e546bdcd0e..e8b0393dec54 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -212,3 +213,5 @@ void OApplicationSwapWindow::selectContainer(ElementType _eType) else onContainerSelected( _eType ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index 2e2f07f7a1ed..f0166e49d69a 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -178,3 +179,5 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B // ............................................................. } // namespace dbaui // ............................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 9824bb257d6a..17a16c5ea2b4 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -605,3 +606,5 @@ void OApplicationView::ImplInitSettings() SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/ } //----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 9b56120c3ea0..4b62d2997092 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -610,3 +611,5 @@ namespace dbaui //...................................................................................................................... } // namespace dbaui //...................................................................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/AsyncronousLink.cxx b/dbaccess/source/ui/browser/AsyncronousLink.cxx index 8dfaf8e296ea..7cc0ac71d23b 100644 --- a/dbaccess/source/ui/browser/AsyncronousLink.cxx +++ b/dbaccess/source/ui/browser/AsyncronousLink.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ IMPL_LINK(OAsyncronousLink, OnAsyncCall, void*, _pArg) return 0L; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 6a2161b1c291..1e815c74b28e 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3079,3 +3080,5 @@ sal_Bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com:: //.................................................................. } // namespace dbaui //.................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 46e3065ea5fb..6929a9ee162b 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -369,3 +370,5 @@ BrowserViewStatusDisplay::~BrowserViewStatusDisplay( ) DBG_DTOR(BrowserViewStatusDisplay,NULL); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 8df3d3d75bdd..c0e3157bfb75 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -246,3 +247,5 @@ namespace dbaui } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index 972f9be83934..21b4fc2d2172 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -261,3 +262,4 @@ namespace dbaui } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 81d9f82b5f04..9335ed582e42 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -357,3 +358,4 @@ void DBContentLoader::cancel(void) throw() { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx index 80a2848a005a..c2975b9d8314 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.cxx +++ b/dbaccess/source/ui/browser/dbtreemodel.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,5 @@ namespace dbaui DBG_DTOR(DBTreeListUserData,NULL); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 67c8cb35beec..b69c67bc4bee 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,4 @@ void DBTreeView::GetFocus() // ......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx index 52cf25a38031..26c7860a474e 100644 --- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx +++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -271,3 +272,4 @@ void SbaTableQueryBrowser::notifyHiContrastChanged() } // namespace dbaui // ......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 093bd2f35854..5794465ebf8d 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -293,3 +294,4 @@ namespace dbaui } // namespace dbaui // ......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 8d059bade09d..6526592112fc 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -476,3 +477,5 @@ void SbaExternalSourceBrowser::stopListening() //================================================================== //================================================================== + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx index 20ac39e7583d..2a02d3827f56 100644 --- a/dbaccess/source/ui/browser/formadapter.cxx +++ b/dbaccess/source/ui/browser/formadapter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1772,3 +1773,4 @@ void SAL_CALL SbaXFormAdapter::disposing(const ::com::sun::star::lang::EventObje // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 0cd38e5609d7..85fa45c0b959 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1617,3 +1618,4 @@ void SAL_CALL OGenericUnoController::dispose() throw(::com::sun::star::uno::Runt } } // namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index c532c0330b96..16d27cd4a85f 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1665,3 +1666,4 @@ void SbaGridControl::DeleteSelectedRows() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx index 716c7c17b644..65733d7ae563 100644 --- a/dbaccess/source/ui/browser/sbamultiplex.cxx +++ b/dbaccess/source/ui/browser/sbamultiplex.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,4 @@ void SbaXPropertiesChangeMultiplexer::propertiesChange(const ::com::sun::star::u ((::com::sun::star::beans::XPropertiesChangeListener*)aIt.next())->propertiesChange(aMulti); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 9c746e2edf6b..0db947efe612 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3782,3 +3783,4 @@ void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegis // ......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index eee9f08b8bc7..094b1c6f4271 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,3 +185,5 @@ TOTypeInfoSP OColumnControlWindow::getDefaultTyp() const return m_pTypeInfo; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 51145c36a097..353fba74e3e1 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1938,3 +1939,5 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes return sDefault; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 5c0d9015e09f..0687b61d7b8e 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -715,3 +716,4 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx index 3693e1f67778..47cac018ffc5 100644 --- a/dbaccess/source/ui/control/ScrollHelper.cxx +++ b/dbaccess/source/ui/control/ScrollHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,4 @@ DBG_NAME(OScrollHelper) // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx index 9513061ecf61..5acc67d433a6 100644 --- a/dbaccess/source/ui/control/SqlNameEdit.cxx +++ b/dbaccess/source/ui/control/SqlNameEdit.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,4 @@ namespace dbaui } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 1bdf8267b99b..991dca50d804 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -496,3 +497,4 @@ Reference< XAccessible > OTableGrantControl::CreateAccessibleCell( sal_Int32 _nR } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx index 40474c428d07..929b5c050743 100644 --- a/dbaccess/source/ui/control/VertSplitView.cxx +++ b/dbaccess/source/ui/control/VertSplitView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -214,3 +215,5 @@ void OSplitterView::setSplitter(Splitter* _pSplitter) LINK( this, OSplitterView, SplitHdl ).Call(m_pSplitter); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx index 89ce1e82e9dd..bd72946958ca 100644 --- a/dbaccess/source/ui/control/charsetlistbox.cxx +++ b/dbaccess/source/ui/control/charsetlistbox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ namespace dbaui //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx index 90c2add8af0f..43f8ae2e6a57 100644 --- a/dbaccess/source/ui/control/curledit.cxx +++ b/dbaccess/source/ui/control/curledit.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -152,3 +153,4 @@ void OConnectionURLEdit::ShowPrefix(BOOL _bShowPrefix) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 973586718805..381c7036677f 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -722,3 +723,5 @@ void DBTreeListBox::StateChanged( StateChangedType nStateChange ) // ......................................................................... } // namespace dbaui // ......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx index 8c97b30ebde3..2f2c7afd2a60 100644 --- a/dbaccess/source/ui/control/listviewitems.cxx +++ b/dbaccess/source/ui/control/listviewitems.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,4 @@ namespace dbaui } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index 8bd1918b1a20..1ecb15575ca9 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -239,3 +240,4 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx index 1fb91a3a6fd1..78fd8f4fdd1c 100644 --- a/dbaccess/source/ui/control/opendoccontrols.cxx +++ b/dbaccess/source/ui/control/opendoccontrols.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -329,3 +330,5 @@ namespace dbaui //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 89cdc855a0cd..3eee26f30959 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -222,3 +223,5 @@ void OSqlEdit::ImplSetFont() SetSettings(aSettings); } //============================================================================== + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/statusbarontroller.cxx b/dbaccess/source/ui/control/statusbarontroller.cxx index f210044240f9..37cb9c85f990 100644 --- a/dbaccess/source/ui/control/statusbarontroller.cxx +++ b/dbaccess/source/ui/control/statusbarontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,5 @@ namespace dbaui IMPLEMENT_SERVICE_INFO1_STATIC(OStatusbarController,"com.sun.star.sdb.ApplicationStatusbarController","com.sun.star.frame.StatusbarController") IMPLEMENT_FORWARD_XINTERFACE2(OStatusbarController,StatusbarController,OStatusbarController_BASE) } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 74e28941ef93..832459021f1e 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -692,3 +693,4 @@ void OTableTreeListBox::removedTable( const ::rtl::OUString& _rName ) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 87e0a4c02a60..48c2d9e4e87d 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -279,3 +280,4 @@ namespace dbaui //.......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/control/undosqledit.cxx b/dbaccess/source/ui/control/undosqledit.cxx index b92345711f8b..39e44be96f3f 100644 --- a/dbaccess/source/ui/control/undosqledit.cxx +++ b/dbaccess/source/ui/control/undosqledit.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,4 @@ void OSqlEditUndoAct::ToggleText() } // namespace // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx index ba2ce51c3d4b..6f4af6e9aae8 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.cxx +++ b/dbaccess/source/ui/dlg/AdabasStat.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -301,3 +302,4 @@ void OAdabasStatistics::showError() // ----------------------------------------------------------------------------- } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx index be85a6c1498b..c3308fd53f9a 100644 --- a/dbaccess/source/ui/dlg/CollectionView.cxx +++ b/dbaccess/source/ui/dlg/CollectionView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -339,3 +340,4 @@ void OCollectionView::initCurrentPath() //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 74322de10bf0..7e6ac39f658f 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -908,3 +909,5 @@ DBG_NAME(OConnectionHelper) //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index a413590d8ce3..03f2b5f057df 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -378,3 +379,4 @@ namespace dbaui } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index 6169b95d5523..fcc5af853afd 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -241,3 +242,4 @@ namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 52a20a787551..66a1c3b44787 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -981,3 +982,5 @@ DBG_NAME(OFinalDBPageSetup) } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 797cb73eb021..3dff5f9904c7 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1217,3 +1218,4 @@ SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx index cecdc49aff8e..23390d34bba2 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.cxx +++ b/dbaccess/source/ui/dlg/DriverSettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,5 @@ void ODriversSettings::getSupportedIndirectSettings( const ::rtl::OUString& _sUR _out_rDetailsIds.push_back(pProps->first); } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx index 56c69c1011e1..425976d61de4 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -218,3 +219,4 @@ IMPL_LINK( OExtensionNotPresentDialog, Download_Click, PushButton*, EMPTYARG ) } // rptui // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index d5117de784a1..947bec14a021 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -266,3 +267,4 @@ void ORelationDialog::notifyConnectionChange() // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index cab8245e7226..fe392d82cbe0 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,4 @@ SfxItemSet* OTableSubscriptionDialog::getWriteOutputSet() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index 0f8cf63aba08..4e2864aaaa52 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -545,3 +546,5 @@ DBG_NAME(OTextConnectionHelper) //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 5c218de78e7b..d22e8c4839a7 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -349,3 +350,5 @@ void OUserAdmin::implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue) OGenericAdministrationPage::implInitControls(_rSet, _bSaveValue); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 37f28bcaa828..5e7e28158777 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -204,3 +205,5 @@ DBG_NAME(OUserAdminDlg) //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 463358e179d5..cfdc2dd3842f 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -309,3 +310,5 @@ namespace dbaui //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 8e5b61dc9076..e87ca6a93d45 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -335,3 +336,4 @@ namespace dbaui } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx index 0b7d26ed30f9..a0f0365fb22b 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.cxx +++ b/dbaccess/source/ui/dlg/adodatalinks.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -207,3 +208,5 @@ BSTR PromptEdit(long hWnd,BSTR connstr) return _result; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index a4914cd45cc5..68b7d64abd8c 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -531,3 +532,4 @@ String OAddTableDlg::getDialogTitleForContext( IAddTableDialogContext& _rContext // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index a2e82e50757d..66df4a24c74c 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -563,3 +564,5 @@ namespace dbaui //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index ec98bbf09176..028705d806ea 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -513,3 +514,4 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool, } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index 925353b484b1..809ccddc27eb 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -557,3 +558,4 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index e9356eeb4ce0..cac6a8499601 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -381,3 +382,5 @@ sal_Bool ODbTypeWizDialog::onFinish() //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 157ed2c6dd58..aea15cf0fb8a 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1137,3 +1138,4 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 735a8f13c167..fb3a27decc66 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1123,3 +1124,5 @@ namespace dbaui //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 8ae49fa4167a..5ad7e8781be7 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -347,3 +348,4 @@ DBG_NAME(DirectSQLDialog) } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx index f8db9e27ec83..20537fce089d 100644 --- a/dbaccess/source/ui/dlg/dlgattr.cxx +++ b/dbaccess/source/ui/dlg/dlgattr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,4 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index ac4702e9c77e..d9466a39663e 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -444,3 +445,4 @@ String OSaveAsDlg::getName() const { return m_pImpl->m_aName; } String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); } String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 69804b5f0cf9..a42122657c23 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,4 @@ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton ) //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 4acbf1fe7cfd..dc7e5426c1d8 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -275,3 +276,4 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx index 7499b81e1b59..aee6876e8ebc 100644 --- a/dbaccess/source/ui/dlg/finteraction.cxx +++ b/dbaccess/source/ui/dlg/finteraction.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,4 @@ namespace dbaui } // namespace svt //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index b65619916742..1103a375b636 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -634,3 +635,4 @@ namespace dbaui } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 73344ef96a08..780fe621157f 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -936,3 +937,4 @@ DBG_NAME(DbaIndexDialog) } // namespace dbaui //...................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 521ddb6f7d40..a617abd6baa6 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -506,3 +507,4 @@ DBG_NAME(IndexFieldsControl) } // namespace dbaui //...................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 99e8aa763054..1f27f2408f17 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -383,3 +384,5 @@ bool OOdbcManagement::isRunning() const //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index cdc3ff03ee5b..5a271ab4be45 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -74,3 +75,5 @@ namespace dbaui //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 85cf8d2bd82b..21023208a4d7 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -422,3 +423,5 @@ DBG_NAME(OParameterDialog) //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 4a3a77fbdcc8..6c3a6124f5b4 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -873,3 +874,4 @@ void DlgFilterCrit::fillLines(const Sequence >& _aValue } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index d94304d0255e..d237978ce1ce 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -306,3 +307,4 @@ void DlgOrderCrit::BuildOrderPart() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 70631460528a..0220c2691ade 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -783,3 +784,4 @@ OSQLWarningBox::OSQLWarningBox( Window* _pParent, const UniString& _rMessage, Wi } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 1f097c6c6fb8..62f676e10a25 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -630,3 +631,4 @@ DBG_NAME(OTableSubscriptionPage) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx index d0276d7cd20d..2ceefab64a35 100644 --- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx +++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ namespace dbaui //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index e8789f25468b..4473031808fe 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -902,3 +903,4 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index 9e3517ffb3af..2764d2fc6116 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -596,3 +597,4 @@ TypeSelectionPageFactory OHTMLReader::getTypeSelectionPageFactory() } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/ModuleHelper.cxx b/dbaccess/source/ui/misc/ModuleHelper.cxx index e105ddc7c894..7a38e3df08eb 100644 --- a/dbaccess/source/ui/misc/ModuleHelper.cxx +++ b/dbaccess/source/ui/misc/ModuleHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -40,3 +41,4 @@ namespace dbaui } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 145262376288..386c17312221 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -271,3 +272,4 @@ sal_Bool ORowSetImportExport::insertNewRow() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 5df3a10b15b6..f4f1ae4013cb 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -375,3 +376,4 @@ TypeSelectionPageFactory ORTFReader::getTypeSelectionPageFactory() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 832b04974fd0..8cca42ddf1b4 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -341,3 +342,4 @@ void OTableCopyHelper::asyncCopyTagTable( DropDescriptor& _rDesc } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index b66778138d57..e165df1c7b1b 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1159,3 +1160,5 @@ void OHTMLImportExport::IncIndent( sal_Int16 nVal ) sIndent[m_nIndent] = 0; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index dcdae383f001..43e5883b86db 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,4 @@ namespace dbaui } // namespace // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index cae934fc0935..d8573b5aea5e 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1717,3 +1718,5 @@ Reference< XNumberFormatter > getNumberFormatter(const Reference< XConnection >& // ......................................................................... } // dbaui // ......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 94a0010edc1f..905846ba9892 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -382,3 +383,5 @@ void OCopyTable::setCreateStyleAction() } } //---add end + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 3ee39f711b17..11095d00f660 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -424,3 +425,4 @@ void OWizColumnSelect::enableButtons() } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 267e8ba88bf1..4ab963777312 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1690,3 +1691,4 @@ void OCopyTableWizard::showError(const Any& _aError) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx index ad6aa9c1f5e5..3b00f2289359 100644 --- a/dbaccess/source/ui/misc/WExtendPages.cxx +++ b/dbaccess/source/ui/misc/WExtendPages.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ SvParser* OWizNormalExtend::createReader(sal_Int32 /*_nRows*/) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 189e77d6a7f1..20a4177e3e3a 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -428,3 +429,4 @@ void OColumnTreeBox::FillListBox( const ODatabaseExport::TColumnVector& _rList) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 1e611cdc1c21..efc94d56524b 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -478,3 +479,4 @@ void OWizTypeSelect::fillColumnList(sal_uInt32 nRows) // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/asyncmodaldialog.cxx b/dbaccess/source/ui/misc/asyncmodaldialog.cxx index cb7343e456ac..5d866839748e 100644 --- a/dbaccess/source/ui/misc/asyncmodaldialog.cxx +++ b/dbaccess/source/ui/misc/asyncmodaldialog.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,4 @@ namespace dbaui } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/charsets.cxx b/dbaccess/source/ui/misc/charsets.cxx index 6b38a0dd4524..2ce044be43c9 100644 --- a/dbaccess/source/ui/misc/charsets.cxx +++ b/dbaccess/source/ui/misc/charsets.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,4 @@ namespace dbaui } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 7bba70667b8c..23a336d76266 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -441,3 +442,5 @@ namespace dbaui //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 68f702b11d75..9e0e5d352cc4 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -342,3 +343,4 @@ namespace dbaui } // namespace dbaui // ......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/datasourceconnector.cxx b/dbaccess/source/ui/misc/datasourceconnector.cxx index abafe11babad..abd0aceb9433 100644 --- a/dbaccess/source/ui/misc/datasourceconnector.cxx +++ b/dbaccess/source/ui/misc/datasourceconnector.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -231,3 +232,4 @@ namespace dbaui } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index d8342a4e13ab..bac5dfbaa5f6 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -202,3 +203,4 @@ namespace dbaui } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx index 08b5ea49f2bd..8bb505e5332f 100644 --- a/dbaccess/source/ui/misc/dsmeta.cxx +++ b/dbaccess/source/ui/misc/dsmeta.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -211,3 +212,5 @@ namespace dbaui //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/imageprovider.cxx b/dbaccess/source/ui/misc/imageprovider.cxx index fb35bdcc9e73..8147e2bd242a 100644 --- a/dbaccess/source/ui/misc/imageprovider.cxx +++ b/dbaccess/source/ui/misc/imageprovider.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -259,3 +260,4 @@ namespace dbaui } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/indexcollection.cxx b/dbaccess/source/ui/misc/indexcollection.cxx index b2b03bcf94d9..137f9eeb696e 100644 --- a/dbaccess/source/ui/misc/indexcollection.cxx +++ b/dbaccess/source/ui/misc/indexcollection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -404,3 +405,4 @@ namespace dbaui } // namespace dbaui //...................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index 7525347ca2f6..8d470332158e 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -411,3 +412,4 @@ namespace dbaui } // namespace dbaui //...................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/moduledbu.cxx b/dbaccess/source/ui/misc/moduledbu.cxx index 4ec1408e0bfc..3e8457361222 100644 --- a/dbaccess/source/ui/misc/moduledbu.cxx +++ b/dbaccess/source/ui/misc/moduledbu.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,4 @@ void OModule::ensureImpl() } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx index 2d763f6da391..817b4a68aee8 100644 --- a/dbaccess/source/ui/misc/propertysetitem.cxx +++ b/dbaccess/source/ui/misc/propertysetitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ namespace dbaui } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/propertystorage.cxx b/dbaccess/source/ui/misc/propertystorage.cxx index 83ac5d36bd30..fc65cb18d670 100644 --- a/dbaccess/source/ui/misc/propertystorage.cxx +++ b/dbaccess/source/ui/misc/propertystorage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,5 @@ namespace dbaui //........................................................................ } // namespace dbaui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx index 87ddfa1f197b..d6cc403765bf 100644 --- a/dbaccess/source/ui/misc/singledoccontroller.cxx +++ b/dbaccess/source/ui/misc/singledoccontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -747,3 +748,4 @@ namespace dbaui } // namespace dbaui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index c4fa2e693d62..655dce15c4e8 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ SfxPoolItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/uiservices.cxx b/dbaccess/source/ui/misc/uiservices.cxx index 18e4e35ff5bf..8ea14059692c 100644 --- a/dbaccess/source/ui/misc/uiservices.cxx +++ b/dbaccess/source/ui/misc/uiservices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,3 +157,5 @@ extern "C" DBACCESS_DLLPUBLIC void* SAL_CALL component_getFactory( xRet->acquire(); return xRet.get(); }; + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx index c47162bad7e7..8ea7147fd153 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -381,3 +382,4 @@ Point OConnectionLine::getMidPoint() const // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 4a9cf46e94dd..8f532687e72c 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -248,3 +249,4 @@ namespace dbaui } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx index b29f2d69bbf1..9dd794087ed4 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,4 @@ bool operator==(const OConnectionLineData& lhs, const OConnectionLineData& rhs) } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 4bc863fa894c..155aac4c27da 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,4 @@ namespace dbaui // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index d798fb708fda..333d584292a1 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -469,3 +470,5 @@ TTableWindowData::value_type OJoinController::createTableWindowData(const ::rtl: // ............................................................................. } // namespace dbaui // ............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index c327f34e8bdc..85c5a9eb9120 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,4 @@ void OJoinDesignView::KeyInput( const KeyEvent& rEvt ) } // namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 895da23f2daf..75d69afa5b09 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -174,3 +175,5 @@ namespace dbaui } // namespace dbaui + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index 3639c0915edb..60099ed9999d 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1724,3 +1725,5 @@ bool OJoinTableView::supressCrossNaturalJoin(const TTableConnectionData::value_t { return false; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx index 375258abff9d..4bba1b75eaaa 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ sal_Bool OQueryTableConnection::operator==(const OQueryTableConnection& rCompare +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx index 01a0107ef72c..a15714a299cc 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,4 @@ BOOL OQueryTableConnectionData::Update() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index 27d95e273a67..405bd8870fab 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -240,3 +241,4 @@ void OQueryTableWindow::KeyInput( const KeyEvent& rEvt ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.cxx b/dbaccess/source/ui/querydesign/QTableWindowData.cxx index 87b37e62eb1a..5fc047a9fbcf 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ OQueryTableWindowData::~OQueryTableWindowData() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 60d22e8bd0eb..2014e4fc0b9c 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -3228,3 +3229,5 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p aInfo->SetTabWindow(NULL); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx index abe0e79b8c78..fb662a8b7438 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,4 @@ void OJoinMoveTabWinUndoAct::TogglePosition() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx index 31e4e11b83c6..93775a1be43e 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,5 @@ void OQueryTabWinDelUndoAct::Redo() SetOwnership(TRUE); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx index f00eb7ad3cfd..953cab5fa552 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,4 @@ void OTabFieldMovedUndoAct::Undo() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index eee8dead6b5e..b4b0506950ca 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1036,3 +1037,5 @@ bool OQueryTableView::supressCrossNaturalJoin(const TTableConnectionData::value_ return pQueryData && (pQueryData->GetJoinType() == CROSS_JOIN); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index 5df16c8b09e2..cd2e92a4d2cd 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -149,3 +150,5 @@ void OQueryTextView::paste() getContainerWindow()->getDesignView()->getController().setModified(sal_True); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx index d7b9693fb876..792d283ee8a3 100644 --- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx +++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -339,3 +340,5 @@ void OQueryViewSwitch::setNoneVisbleRow(sal_Int32 _nRows) m_pDesignView->setNoneVisbleRow(_nRows); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 442fd556b320..2d99babb00e5 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -2837,3 +2838,4 @@ bool OSelectionBrowseBox::HasFieldByAliasName(const ::rtl::OUString& rFieldName, } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index eed4151e9ef3..964b54d00f25 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -242,3 +243,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx index c31c5a80992f..2e79cc372f67 100644 --- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx +++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -194,3 +195,4 @@ void OTableConnectionData::normalizeLines() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx index 07708a65f17e..5bc807619188 100644 --- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -238,3 +239,4 @@ void OTableFieldDesc::Save( ::comphelper::NamedValueCollection& o_rSettings, con +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx index ed0ef9ec8db8..7ef432c32bd8 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.cxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ OTableFieldInfo::~OTableFieldInfo() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 9a8fcd35812d..1c0dd80e93f8 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -800,3 +801,4 @@ void OTableWindow::_elementReplaced( const container::ContainerEvent& /*_rEvent* } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 1fb675c976f6..aad8a07fa4cc 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -291,3 +292,4 @@ namespace dbaui } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx index 79baeb069ebd..6a9d63372a88 100644 --- a/dbaccess/source/ui/querydesign/TableWindowData.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ void OTableWindowData::listen() } } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index c51d0c760a72..936148c5ed93 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -401,3 +402,5 @@ void OTableWindowListBox::Command(const CommandEvent& rEvt) } } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx index 4fdc551c93b0..48e9865dd1ce 100644 --- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -218,3 +219,4 @@ void OTableWindowTitle::StateChanged( StateChangedType nType ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index e93459e03506..56343b778e0a 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -262,3 +263,4 @@ namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 06b6804fa9be..fe938ac6b004 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1866,3 +1867,4 @@ void SAL_CALL OQueryController::restoreViewData(const Any& /*Data*/) throw( Runt } // namespace dbaui // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 8fb3ecbb423a..f7348dd25294 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -373,3 +374,4 @@ void DlgQryJoin::setJoinType(EJoinType _eNewJoinType) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx index eda976b73208..dea455795484 100644 --- a/dbaccess/source/ui/querydesign/queryview.cxx +++ b/dbaccess/source/ui/querydesign/queryview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,4 @@ OQueryView::~OQueryView() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.cxx b/dbaccess/source/ui/relationdesign/RTableConnection.cxx index a958eeffb5b9..9cc6a42b4fe8 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -145,3 +146,5 @@ void ORelationTableConnection::Draw( const Rectangle& rRect ) GetParent()->DrawText( aDestPos, aDestText, TEXT_DRAW_CLIP | TEXT_DRAW_CENTER | TEXT_DRAW_BOTTOM); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index a8e34493e320..db145f75664f 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -464,3 +465,4 @@ xKey.clear(); } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 99fe03a7004d..b9e3d8b12b33 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -613,3 +614,4 @@ bool ORelationController::allowQueries() const // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index 9d309fca8773..4030abfb46a2 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,4 @@ void ORelationDesignView::GetFocus() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 0c9d0cc1a456..d608ee531d25 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -484,3 +485,4 @@ void ORelationTableView::_elementReplaced( const container::ContainerEvent& /*_r { } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 036255ed0d7c..22756f48a909 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,4 @@ void OFieldDescGenWin::paste() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 077d8e7b797e..0f7ef63d5d94 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -677,3 +678,5 @@ void OFieldDescription::copyColumnSettingsTo(const Reference< XPropertySet >& _r } } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 5569f8a05c62..06bd03125f51 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1961,3 +1962,4 @@ long OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt ) +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index a848eb8de18c..70aa026cb78f 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1611,3 +1612,5 @@ bool OTableController::isAutoIncrementPrimaryKey() const return getSdbMetaData().isAutoIncrementPrimaryKey(); } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 7edc830c691b..97de4f457d62 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -223,3 +224,4 @@ EditBrowseBox::RowStatus OTableRowView::GetRowStatus(long nRow) const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 7ba15bc35e46..7279c1ec1fca 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,5 @@ void OTableDesignHelpBar::copy() void OTableDesignHelpBar::paste() { } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 71d90e5bab83..66b5d8c621f3 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -372,3 +373,4 @@ void OTableDesignView::GetFocus() } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index d69515af6ab2..14ef3955eebe 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,4 @@ sal_Bool OTableFieldControl::isAutoIncrementValueEnabled() const +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 8b67d7930315..c6e810353794 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -317,3 +318,4 @@ long OTableFieldDescWin::PreNotify( NotifyEvent& rNEvt ) } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableRow.cxx b/dbaccess/source/ui/tabledesign/TableRow.cxx index 52f0c2483414..84c5f293a125 100644 --- a/dbaccess/source/ui/tabledesign/TableRow.cxx +++ b/dbaccess/source/ui/tabledesign/TableRow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -227,3 +228,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index dc3d8454ac9a..516fcaf0fac4 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index c5ab6f34f1b6..5d7e1da08c81 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -475,3 +476,4 @@ void OPrimKeyUndoAct::Redo() +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx index 564a1ce188d6..d138782392da 100644 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdabasSettingsDlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,4 @@ Dialog* OAdabasSettingsDialog::createDialog(Window* _pParent) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 6fe26f228180..ce30b85d57cc 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,3 +158,5 @@ extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OAdvancedSettingsDialog > aAutoRegistration; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnControl.cxx b/dbaccess/source/ui/uno/ColumnControl.cxx index 2f1d493ec6e4..c98e3ffa6d21 100644 --- a/dbaccess/source/ui/uno/ColumnControl.cxx +++ b/dbaccess/source/ui/uno/ColumnControl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,5 @@ void SAL_CALL OColumnControl::createPeer(const Reference< XToolkit >& /*rToolkit //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index cdab45ffed1e..6957f4c8e300 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -166,3 +167,4 @@ void OColumnControlModel::read(const Reference& /*_rxInStrea } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index d1be719a34b4..bd3b697c9d77 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -160,3 +161,5 @@ Any OColumnPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( Run //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx index db736a9cee53..ef214bf1a8d0 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -124,3 +125,4 @@ Dialog* ODBTypeWizDialog::createDialog(Window* _pParent) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx index 994f5bcb5396..6d5a2fb5ecd9 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,4 @@ void ODBTypeWizDialogSetup::executedDialog(sal_Int16 _nExecutionResult) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/TableFilterDlg.cxx b/dbaccess/source/ui/uno/TableFilterDlg.cxx index a840aa5ae755..4f0cc4d0196d 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.cxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,4 @@ Dialog* OTableFilterDialog::createDialog(Window* _pParent) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.cxx b/dbaccess/source/ui/uno/UserSettingsDlg.cxx index f351efcd964b..e30a06037b50 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,4 @@ Dialog* OUserSettingsDialog::createDialog(Window* _pParent) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/admindlg.cxx b/dbaccess/source/ui/uno/admindlg.cxx index 7c3eb813c31e..fd751e807c40 100644 --- a/dbaccess/source/ui/uno/admindlg.cxx +++ b/dbaccess/source/ui/uno/admindlg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,4 @@ Dialog* ODataSourcePropertyDialog::createDialog(Window* _pParent) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx b/dbaccess/source/ui/uno/composerdialogs.cxx index 1afc938685a3..f816faf95777 100644 --- a/dbaccess/source/ui/uno/composerdialogs.cxx +++ b/dbaccess/source/ui/uno/composerdialogs.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -207,3 +208,4 @@ namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index b7d5577ff6b6..65315cd0e738 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1625,3 +1626,5 @@ extern "C" void SAL_CALL createRegistryInfo_CopyTableWizard() { static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::CopyTableWizard > aAutoRegistration; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 728d43a04dfb..562cb1043243 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -385,3 +386,4 @@ namespace dbaui } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index af0e020d069b..23658530be71 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -261,3 +262,4 @@ extern "C" void SAL_CALL createRegistryInfo_OTextConnectionSettingsDialog() static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OTextConnectionSettingsDialog > aAutoRegistration; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 07914ea8f593..998b79a136ad 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -134,3 +135,4 @@ DBG_NAME(ODirectSQLDialog) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 71b42133bbdd..ef3c6c8f6542 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,4 @@ void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index b034cfea293f..1396cbcf6495 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,4 @@ Dialog* OSQLMessageDialog::createDialog(Window* _pParent) } // namespace dbaui //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx index 6cfabce13a7d..64360c2a72b0 100644 --- a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx +++ b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,3 +158,4 @@ extern "C" int APIENTRY _tWinMain( HINSTANCE _hAppInstance, HINSTANCE, LPTSTR, i return 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/pch/precompiled_reportdesign.cxx b/reportdesign/inc/pch/precompiled_reportdesign.cxx index d22a705b51a9..e01779afdfba 100644 --- a/reportdesign/inc/pch/precompiled_reportdesign.cxx +++ b/reportdesign/inc/pch/precompiled_reportdesign.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,3 +28,4 @@ #include "precompiled_reportdesign.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index 70bf4b3f63e9..4b5f26f9cd96 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -579,3 +580,4 @@ void SAL_CALL OFixedLine::setPrintRepeatedValues( ::sal_Bool /*_printrepeatedval } // namespace reportdesign // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/FixedText.cxx b/reportdesign/source/core/api/FixedText.cxx index 1cae023b03f5..4414508dcd04 100644 --- a/reportdesign/source/core/api/FixedText.cxx +++ b/reportdesign/source/core/api/FixedText.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -341,3 +342,4 @@ void SAL_CALL OFixedText::setSize( const awt::Size& aSize ) throw (beans::Proper } // namespace reportdesign // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/FormatCondition.cxx b/reportdesign/source/core/api/FormatCondition.cxx index 0ef4db6bc7a4..73315be74314 100644 --- a/reportdesign/source/core/api/FormatCondition.cxx +++ b/reportdesign/source/core/api/FormatCondition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,5 @@ REPORTCONTROLFORMAT_IMPL(OFormatCondition,m_aFormatProperties) // ============================================================================= } // namespace reportdesign // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/FormattedField.cxx b/reportdesign/source/core/api/FormattedField.cxx index 27e04574eb5a..100ded84e8ab 100644 --- a/reportdesign/source/core/api/FormattedField.cxx +++ b/reportdesign/source/core/api/FormattedField.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -381,3 +382,5 @@ void SAL_CALL OFormattedField::setSize( const awt::Size& aSize ) throw (beans::P // ============================================================================= } // namespace reportdesign // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/Function.cxx b/reportdesign/source/core/api/Function.cxx index 6e8b658d0d1f..05e52ae6f93c 100644 --- a/reportdesign/source/core/api/Function.cxx +++ b/reportdesign/source/core/api/Function.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -218,3 +219,5 @@ void SAL_CALL OFunction::setParent( const uno::Reference< uno::XInterface >& Par // ============================================================================= } // namespace reportdesign // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/Functions.cxx b/reportdesign/source/core/api/Functions.cxx index cbbbcb6d6cf9..80a06c85ef61 100644 --- a/reportdesign/source/core/api/Functions.cxx +++ b/reportdesign/source/core/api/Functions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -200,3 +201,5 @@ void OFunctions::checkIndex(sal_Int32 _nIndex) // ============================================================================= } // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/Group.cxx b/reportdesign/source/core/api/Group.cxx index b23242dd05ed..d7c208c98634 100644 --- a/reportdesign/source/core/api/Group.cxx +++ b/reportdesign/source/core/api/Group.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -351,3 +352,4 @@ uno::Reference< report::XFunctions > SAL_CALL OGroup::getFunctions() throw (uno: } // namespace reportdesign // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/Groups.cxx b/reportdesign/source/core/api/Groups.cxx index dc9ce9f7f332..b65d8faf75fe 100644 --- a/reportdesign/source/core/api/Groups.cxx +++ b/reportdesign/source/core/api/Groups.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -213,3 +214,5 @@ void OGroups::checkIndex(sal_Int32 _nIndex) // ============================================================================= } // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/ImageControl.cxx b/reportdesign/source/core/api/ImageControl.cxx index 6a25cc486cb6..60498b766b12 100644 --- a/reportdesign/source/core/api/ImageControl.cxx +++ b/reportdesign/source/core/api/ImageControl.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -499,3 +500,4 @@ void SAL_CALL OImageControl::setPreserveIRI( ::sal_Bool _preserveiri ) throw (un } // namespace reportdesign // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/ReportComponent.cxx b/reportdesign/source/core/api/ReportComponent.cxx index e8da0b656f28..78361152a82d 100644 --- a/reportdesign/source/core/api/ReportComponent.cxx +++ b/reportdesign/source/core/api/ReportComponent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -149,3 +150,4 @@ OReportComponentProperties::~OReportComponentProperties() // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/ReportControlModel.cxx b/reportdesign/source/core/api/ReportControlModel.cxx index 8d97f7abada0..c247742d9870 100644 --- a/reportdesign/source/core/api/ReportControlModel.cxx +++ b/reportdesign/source/core/api/ReportControlModel.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,3 +157,4 @@ bool OReportControlModel::isInterfaceForbidden(const uno::Type& _rType) // ----------------------------------------------------------------------------- } // reportdesign +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 855751166595..56643dd67056 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -2937,3 +2938,4 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL OReportDefinition::getTransfe }// namespace reportdesign // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 0a39b12455a5..feb94419f337 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -424,3 +425,5 @@ void SAL_CALL OReportEngineJFree::setMaxRows( ::sal_Int32 _MaxRows ) throw (uno: // ============================================================================= } // namespace reportdesign // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/ReportVisitor.cxx b/reportdesign/source/core/api/ReportVisitor.cxx index ea1ef11b239f..8ee97e2369c9 100644 --- a/reportdesign/source/core/api/ReportVisitor.cxx +++ b/reportdesign/source/core/api/ReportVisitor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ void OReportVisitor::start(const uno::Reference< report::XGroup>& _xGroup) // ============================================================================= } // namespace reportdesign // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/Section.cxx b/reportdesign/source/core/api/Section.cxx index 2f8bf443bc02..54e5cd8847ca 100644 --- a/reportdesign/source/core/api/Section.cxx +++ b/reportdesign/source/core/api/Section.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -717,3 +718,5 @@ void OSection::notifyElementRemoved(const uno::Reference< drawing::XShape >& xSh // ============================================================================= } // namespace reportdesign // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 60e63d16538a..4ed2b8aabb9d 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -520,3 +521,5 @@ void SAL_CALL OShape::setCustomShapeGeometry( const uno::Sequence< beans::Proper // ============================================================================= }// namespace reportdesign // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/Tools.cxx b/reportdesign/source/core/api/Tools.cxx index ef8af4ccad65..99028d9c7e4f 100644 --- a/reportdesign/source/core/api/Tools.cxx +++ b/reportdesign/source/core/api/Tools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ uno::Reference< util::XCloneable > cloneObject(const uno::Reference< report::XRe // ============================================================================= } // namespace reportdesign // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/api/services.cxx b/reportdesign/source/core/api/services.cxx index c8251800afad..32fa29152634 100644 --- a/reportdesign/source/core/api/services.cxx +++ b/reportdesign/source/core/api/services.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( serviceManager, registryKey, entries); } } // extern "C" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 8537f6b81d50..0804c1814487 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -202,3 +203,5 @@ namespace rptui //........................................................................ } // namespace rptui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/misc/conditionupdater.cxx b/reportdesign/source/core/misc/conditionupdater.cxx index a3408e9d7d01..69246f36e654 100644 --- a/reportdesign/source/core/misc/conditionupdater.cxx +++ b/reportdesign/source/core/misc/conditionupdater.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ namespace rptui //........................................................................ } // namespace rptui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/misc/reportformula.cxx b/reportdesign/source/core/misc/reportformula.cxx index 2ceef3340ef0..cd101b0a3be0 100644 --- a/reportdesign/source/core/misc/reportformula.cxx +++ b/reportdesign/source/core/misc/reportformula.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -181,3 +182,4 @@ namespace rptui } // namespace rptui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/resource/core_resource.cxx b/reportdesign/source/core/resource/core_resource.cxx index 3fdcd8dde895..90db1ef61e91 100644 --- a/reportdesign/source/core/resource/core_resource.cxx +++ b/reportdesign/source/core/resource/core_resource.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ namespace reportdesign } //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx b/reportdesign/source/core/sdr/ModuleHelper.cxx index 2c8288f49d47..d132304be477 100644 --- a/reportdesign/source/core/sdr/ModuleHelper.cxx +++ b/reportdesign/source/core/sdr/ModuleHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,5 @@ void OModule::ensureImpl() //......................................................................... } // namespace dbaui //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index dbd6d4da65a2..307b6f26c390 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -203,3 +204,4 @@ void OPropertyMediator::startListening() } // namespace dbaccess //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index 6ef0f970078f..2aa9cca9d187 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -154,3 +155,5 @@ uno::Reference< drawing::XShape > OReportDrawPage::_CreateShape( SdrObject *pOb } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/ReportUndoFactory.cxx b/reportdesign/source/core/sdr/ReportUndoFactory.cxx index e0e089e651b2..a16963c95573 100644 --- a/reportdesign/source/core/sdr/ReportUndoFactory.cxx +++ b/reportdesign/source/core/sdr/ReportUndoFactory.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,4 @@ SdrUndoAction* OReportUndoFactory::CreateUndoPageChangeMasterPage(SdrPage& rChan } //rptui //================================================================== +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 32244fd44f39..7b98042f9aeb 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -231,3 +232,5 @@ uno::Reference< uno::XInterface > OReportModel::createShape(const ::rtl::OUStrin //================================================================== } //rptui //================================================================== + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index f9e19c08a27f..4449cfd6144e 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1262,3 +1263,5 @@ uno::Reference< style::XStyle> getUsedStyle(const uno::Reference< report::XRepor //============================================================================ } // rptui //============================================================================ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptObjectListener.cxx b/reportdesign/source/core/sdr/RptObjectListener.cxx index 64cd9d3dc8a3..01ba228ffb96 100644 --- a/reportdesign/source/core/sdr/RptObjectListener.cxx +++ b/reportdesign/source/core/sdr/RptObjectListener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ DlgEdHint::~DlgEdHint() } //---------------------------------------------------------------------------- } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index da676ccf4f56..fe9ae18cdb52 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -249,3 +250,5 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRe //============================================================================ } // rptui //============================================================================ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index d58fe62e974d..43cdd2c8f120 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -447,3 +448,4 @@ Reference< XPropertySet> OUndoPropertyReportSectionAction::getObject() } // rptui //============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 911279ed6f71..95fbb051bc63 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -627,3 +628,5 @@ sal_Bool OXUndoEnvironment::IsUndoMode() const //============================================================================ } // rptui //============================================================================ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index e4817bbe9f44..3620f29bf554 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -277,3 +278,5 @@ namespace rptui //........................................................................ } // namespace rptui //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/dbloader2.cxx b/reportdesign/source/filter/xml/dbloader2.cxx index cd709789ca2c..fae4e234bdb3 100644 --- a/reportdesign/source/filter/xml/dbloader2.cxx +++ b/reportdesign/source/filter/xml/dbloader2.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -123,3 +124,4 @@ Sequence< ::rtl::OUString > ORptTypeDetection::getSupportedServiceNames_Static(v }//rptxml // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.cxx b/reportdesign/source/filter/xml/xmlAutoStyle.cxx index f802b3460684..e5fec78cda69 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.cxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ OXMLAutoStylePoolP::~OXMLAutoStylePoolP() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index a89b9402bf4e..f47f360c4687 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -287,3 +288,4 @@ void OXMLCell::setContainsShape(bool _bContainsShape) } // namespace rptxml // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index 170a2e96951c..a6599cce79ff 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,5 @@ void OXMLRowColumn::EndElement() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index 615d1f756ff4..dd1387db40da 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ OXMLComponent::~OXMLComponent() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 700ec0549332..16135095268a 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ void OXMLCondPrtExpr::Characters( const ::rtl::OUString& rChars ) //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index cce9d6b450ea..6e717557aca8 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -358,3 +359,5 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 7b797f644b47..5596bcb67b02 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1671,3 +1672,4 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG }// rptxml // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index d3a557c3ff6b..1e81fd20e426 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -453,3 +454,5 @@ void ExportDocumentHandler::exportTableRows() // ----------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 5c19db5c44d7..c30c3344b9e0 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -239,3 +240,5 @@ void OXMLFixedContent::Characters( const ::rtl::OUString& rChars ) //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index c6d9d2d16a95..6d70a78ec147 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ void OXMLFormatCondition::EndElement() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 210d4bd7409b..65fdbe1ee81f 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ OXMLFormattedField::~OXMLFormattedField() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index 02771159f0db..fd0ede7b2244 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -139,3 +140,5 @@ void OXMLFunction::EndElement() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 26d1b7f61252..c5fad4d165cd 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -277,3 +278,5 @@ void OXMLGroup::EndElement() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 0409ca67a067..9e4569704d9c 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -416,3 +417,5 @@ const SvXMLEnumMapEntry* OXMLHelper::GetImageScaleOptions() // ----------------------------------------------------------------------------- } // rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index 1f489bc947fd..ab7567214fdf 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -128,3 +129,5 @@ OXMLImage::~OXMLImage() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index c92eecc1084d..ac068df47975 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -403,3 +404,4 @@ uno::Sequence< uno::Type > SAL_CALL ImportDocumentHandler::getTypes( ) throw (u } // namespace rptxml // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 2067aec4ee7e..745203f25c51 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,5 @@ SvXMLImportContext* OXMLMasterFields::CreateChildContext( //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx index 0310edf0830a..358aeba8e0f4 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.cxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ OXMLRptPropHdlFactory::~OXMLRptPropHdlFactory() }// rptxml // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index e2bfa0deee8c..6990c9144b20 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -234,3 +235,5 @@ void OXMLReport::addMasterDetailPair(const ::std::pair< ::rtl::OUString,::rtl::O //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 5cd4e3800047..2ef2ad192423 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ ORptFilter& OXMLReportElement::GetOwnImport() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index cbc9c6d7f739..01de1e714bf9 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,3 +114,5 @@ void OXMLReportElementBase::EndElement() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlRow.cxx b/reportdesign/source/filter/xml/xmlRow.cxx index 2be9143e3137..fbff64b2a617 100644 --- a/reportdesign/source/filter/xml/xmlRow.cxx +++ b/reportdesign/source/filter/xml/xmlRow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -176,3 +177,5 @@ ORptFilter& OXMLRow::GetOwnImport() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index ea2fbccc6804..098858190d28 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -150,3 +151,5 @@ ORptFilter& OXMLSection::GetOwnImport() // ----------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index 05d6dfadb254..afb2ceff5431 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -457,3 +458,5 @@ sal_uInt16 OReportStylesContext::GetFamily( const ::rtl::OUString& rFamily ) con // ----------------------------------------------------------------------------- } // rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index a999a0376cbb..623eceaa849f 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,5 @@ void OXMLSubDocument::addMasterDetailPair(const ::std::pair< ::rtl::OUString,::r //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index 828243ec55e3..f70a65d98bcc 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -317,3 +318,5 @@ void OXMLTable::incrementRowIndex() //---------------------------------------------------------------------------- } // namespace rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 74e6e1dd9341..cd902158ab39 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1135,3 +1136,5 @@ sal_Bool ORptFilter::isOldFormat() const // ----------------------------------------------------------------------------- }// rptxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlservices.cxx b/reportdesign/source/filter/xml/xmlservices.cxx index bebf5f69a05b..3e4a09d3993a 100644 --- a/reportdesign/source/filter/xml/xmlservices.cxx +++ b/reportdesign/source/filter/xml/xmlservices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -99,3 +100,5 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( return cppu::component_writeInfoHelper( serviceManager, registryKey, entries); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/shared/corestrings.cxx b/reportdesign/source/shared/corestrings.cxx index fec7a3695047..de78ede60197 100644 --- a/reportdesign/source/shared/corestrings.cxx +++ b/reportdesign/source/shared/corestrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,3 +34,4 @@ namespace reportdesign #include "stringconstants.cxx" } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/shared/stringconstants.cxx b/reportdesign/source/shared/stringconstants.cxx index edfa0fab7083..f9e28fd87bd1 100644 --- a/reportdesign/source/shared/stringconstants.cxx +++ b/reportdesign/source/shared/stringconstants.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -274,3 +275,5 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UNVISITEDCHARSTYLENAME, "UnvisitedCharStyl IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORDER, "Order"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_APPLYFILTER, "ApplyFilter"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MAXROWS, "MaxRows"); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/shared/uistrings.cxx b/reportdesign/source/shared/uistrings.cxx index 4a8cdf37ab1a..a9dc08d1a491 100644 --- a/reportdesign/source/shared/uistrings.cxx +++ b/reportdesign/source/shared/uistrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ namespace rptui IMPLEMENT_CONSTASCII_USTRING(DBTEXTBOXBOUNDCONTENT , "TextBoxBoundContent"); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/shared/xmlstrings.cxx b/reportdesign/source/shared/xmlstrings.cxx index 9c6ef829b95a..6933a01a4d2c 100644 --- a/reportdesign/source/shared/xmlstrings.cxx +++ b/reportdesign/source/shared/xmlstrings.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERTOP , "BorderTop"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDERBOTTOM , "BorderBottom"); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 11de48113cee..43ad175d827d 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -572,3 +573,4 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) } // namespace rptui // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index c470a1da7bbd..898779094953 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -623,3 +624,5 @@ namespace rptui // ............................................................................. } // rptui // ............................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index e3591ae03534..a61b2fdb08cb 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -738,3 +739,4 @@ bool Condition::isEmpty() const } // rptui // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 7ec347076ab5..b70e49140d2e 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -253,3 +254,5 @@ sal_Int32 ODateTimeDialog::getFormatKey(sal_Bool _bDate) const // ============================================================================= } // rptui // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index c54380cb7d2a..c199f8c3f7c3 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -271,3 +272,5 @@ table::CellAddress FormulaDialog::getReferencePosition() const // ============================================================================= } // rptui // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index cbce03c629fd..efa70b6b7e61 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace rptui } // ----------------------------------------------------------------------------- } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 04d954c78834..2539fd7ab8ea 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1561,3 +1562,5 @@ ImageList OGroupsSortingDialog::getImageList(vcl::ImageListType _eType) SAL_THRO // ============================================================================= } // rptui // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index af61f3b6d514..cca1a5a2fbdb 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -984,3 +985,4 @@ void ONavigator::GetFocus() } // rptui // ============================================================================= +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/PageNumber.cxx b/reportdesign/source/ui/dlg/PageNumber.cxx index 2661759f7279..10e9f64b852c 100644 --- a/reportdesign/source/ui/dlg/PageNumber.cxx +++ b/reportdesign/source/ui/dlg/PageNumber.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -142,3 +143,5 @@ short OPageNumberDialog::Execute() // ============================================================================= } // rptui // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index 0f6d328de729..383078a377f5 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,5 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ), // ============================================================================= } // namespace rptui // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 08f80796ff34..232f18c285ed 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -570,3 +571,4 @@ bool DataProviderHandler::impl_dialogChartType_nothrow( ::osl::ClearableMutexGua } // namespace rptui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 861c978bcbe9..368aa7cac239 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -275,3 +276,4 @@ namespace rptui } // namespace rptui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 9b34b32f0059..a90a80a26f65 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -2244,3 +2245,4 @@ void SAL_CALL GeometryHandler::propertyChange(const beans::PropertyChangeEvent& } // namespace rptui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx index 77899f5e497a..d42be56e7656 100644 --- a/reportdesign/source/ui/inspection/ReportComponentHandler.cxx +++ b/reportdesign/source/ui/inspection/ReportComponentHandler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -228,3 +229,4 @@ void SAL_CALL ReportComponentHandler::actuatingPropertyChanged(const ::rtl::OUSt } // namespace rptui //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 4618f5993e37..92ca6d62b44b 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -331,3 +332,4 @@ namespace rptui } // namespace pcr //............................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/ColorListener.cxx b/reportdesign/source/ui/misc/ColorListener.cxx index e7e737ecdf9e..4c37cfa888f1 100644 --- a/reportdesign/source/ui/misc/ColorListener.cxx +++ b/reportdesign/source/ui/misc/ColorListener.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ void OColorListener::setMarked(sal_Bool _bMark) // ======================================================================= } // ======================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 4e15218c2af8..1de40751f9c1 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -255,3 +256,5 @@ bool FunctionDescription::isParameterOptional(sal_uInt32 _nPos) const // ============================================================================= } // rptui // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 48faa3cd55cb..6e1ed17c4e2e 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1084,3 +1085,5 @@ bool openDialogFormula_nothrow( ::rtl::OUString& _in_out_rFormula // ----------------------------------------------------------------------------- } // namespace rptui // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/Undo.cxx index 9944aa1304db..3a434d179985 100644 --- a/reportdesign/source/ui/misc/Undo.cxx +++ b/reportdesign/source/ui/misc/Undo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -408,3 +409,4 @@ void OGroupUndo::Redo() //============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/rptuiservices.cxx b/reportdesign/source/ui/misc/rptuiservices.cxx index efa58dc3ebae..ee0fc6512c32 100644 --- a/reportdesign/source/ui/misc/rptuiservices.cxx +++ b/reportdesign/source/ui/misc/rptuiservices.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( return cppu::component_writeInfoHelper( serviceManager, registryKey, entries); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index ce34ebadf775..8426c03e0b52 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -228,3 +229,5 @@ void SAL_CALL OStatusbarController::dispose() throw (::com::sun::star::uno::Runt // ============================================================================= } // rptui // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index cf5561ba4758..132d58dd531b 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -358,3 +359,4 @@ throw (uno::RuntimeException) //.......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 37a67f99eb63..1c0d323b75de 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -785,3 +786,5 @@ sal_uInt16 ODesignView::getZoomFactor(SvxZoomType _eType) const //============================================================================ } // rptui //============================================================================ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index c32a07d5fc76..92b6b716860f 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ void OEndMarker::MouseButtonDown( const MouseEvent& rMEvt ) // ======================================================================= } // ======================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/FixedTextColor.cxx b/reportdesign/source/ui/report/FixedTextColor.cxx index 9952d706a4b4..67c6829b75ec 100644 --- a/reportdesign/source/ui/report/FixedTextColor.cxx +++ b/reportdesign/source/ui/report/FixedTextColor.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -281,3 +282,5 @@ namespace rptui } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx index fdfdad6cb55f..4cb76497d7f8 100644 --- a/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx +++ b/reportdesign/source/ui/report/FormattedFieldBeautifier.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -201,3 +202,5 @@ namespace rptui return xVclWindowPeer; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 44a26fda3e0f..002540395593 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -4400,3 +4401,5 @@ uno::Reference< container::XNameAccess > OReportController::getColumns() const return sLabel; } // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 7c0f3a572be8..b5a23bf2dab2 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -460,3 +461,4 @@ void SAL_CALL OXReportControllerObserver::elementRemoved(const container::Contai +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportRuler.cxx b/reportdesign/source/ui/report/ReportRuler.cxx index c2480f23b3e5..2867f9fee662 100644 --- a/reportdesign/source/ui/report/ReportRuler.cxx +++ b/reportdesign/source/ui/report/ReportRuler.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ void OReportRuler::SetGridVisible(BOOL _bVisible) //============================================================================== } // rptui //============================================================================== + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 04222d6e2f1e..875adf1118e3 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -876,3 +877,5 @@ bool OReportSection::isUiActive() const // ============================================================================= } // ============================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 3a2f4559b43a..cd9363e05d57 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -442,3 +443,4 @@ sal_uInt16 OReportWindow::getZoomFactor(SvxZoomType _eType) const } //rptui //================================================================== +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx index b6ab83e24a64..82988a764f99 100644 --- a/reportdesign/source/ui/report/ScrollHelper.cxx +++ b/reportdesign/source/ui/report/ScrollHelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -414,3 +415,5 @@ sal_uInt16 OScrollWindowHelper::getZoomFactor(SvxZoomType _eType) const //============================================================================== } // rptui //============================================================================== + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/SectionView.cxx b/reportdesign/source/ui/report/SectionView.cxx index e0d836a3d8c5..b0c9a080ea3a 100644 --- a/reportdesign/source/ui/report/SectionView.cxx +++ b/reportdesign/source/ui/report/SectionView.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -272,3 +273,5 @@ short OSectionView::GetLayerIdOfMarkedObjects() const //============================================================================ } // rptui //============================================================================ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index 26ce8c13c2a6..0a829c73f01e 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -416,3 +417,4 @@ void OSectionWindow::scrollChildren(long _nX) } // rptui //============================================================================== +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index c3fed866e534..da2e56a178e8 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -322,3 +323,5 @@ void OStartMarker::zoom(const Fraction& _aZoom) // ======================================================================= } // ======================================================================= + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 5740f0f80caa..87349dd3e2be 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1867,3 +1868,5 @@ void OViewsWindow::fillControlModelSelection(::std::vector< uno::Reference< uno: //============================================================================== } // rptui //============================================================================== + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index d0c1b03bda11..b18c645aa18e 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ OReportExchange::TSectionElements OReportExchange::extractCopies(const Transfera //============================================================================ } // rptui //============================================================================ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index c39cfbea6dd4..1ca2e5cadbee 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,5 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) } //---------------------------------------------------------------------------- } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx b/reportdesign/source/ui/report/dlgedfunc.cxx index 1535ce7d6ee1..10fdbce9a06e 100644 --- a/reportdesign/source/ui/report/dlgedfunc.cxx +++ b/reportdesign/source/ui/report/dlgedfunc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1117,3 +1118,5 @@ BOOL DlgEdFuncSelect::MouseMove( const MouseEvent& rMEvt ) //---------------------------------------------------------------------------- } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index a67ad6cc4809..ac36078ff3cf 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -607,3 +608,5 @@ void PropBrw::LoseFocus() } //---------------------------------------------------------------------------- } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3 From 921136c6933f9142a9371eccf98799d72ee1e6cd Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Wed, 13 Oct 2010 01:38:41 -0500 Subject: use SolarMutexGuard to guard the SolarMutex --- .../source/core/dataaccess/documentcontainer.cxx | 2 +- .../source/core/dataaccess/documentdefinition.cxx | 6 ++--- .../core/dataaccess/documenteventexecutor.cxx | 2 +- .../source/ext/macromigration/progresscapture.cxx | 10 ++++----- dbaccess/source/filter/xml/dbloader2.cxx | 2 +- dbaccess/source/filter/xml/xmlfilter.cxx | 4 ++-- dbaccess/source/ui/app/AppController.cxx | 16 ++++++------- dbaccess/source/ui/app/AppControllerDnD.cxx | 10 ++++----- dbaccess/source/ui/app/AppControllerGen.cxx | 14 ++++++------ dbaccess/source/ui/app/subcomponentmanager.cxx | 2 +- dbaccess/source/ui/browser/brwctrlr.cxx | 6 ++--- dbaccess/source/ui/browser/dbloader.cxx | 2 +- dbaccess/source/ui/browser/dsbrowserDnD.cxx | 2 +- dbaccess/source/ui/browser/genericcontroller.cxx | 12 +++++----- dbaccess/source/ui/browser/sbagrid.cxx | 10 ++++----- dbaccess/source/ui/browser/unodatbr.cxx | 24 ++++++++++---------- dbaccess/source/ui/control/toolboxcontroller.cxx | 6 ++--- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2 +- dbaccess/source/ui/dlg/directsql.cxx | 2 +- dbaccess/source/ui/misc/UITools.cxx | 2 +- dbaccess/source/ui/querydesign/JoinController.cxx | 2 +- dbaccess/source/ui/querydesign/querycontroller.cxx | 6 ++--- .../ui/relationdesign/RelationController.cxx | 2 +- dbaccess/source/ui/tabledesign/TableController.cxx | 2 +- dbaccess/source/ui/uno/ColumnPeer.cxx | 8 +++---- dbaccess/source/ui/uno/dbinteraction.cxx | 6 ++--- reportdesign/source/core/api/ReportDefinition.cxx | 26 +++++++++++----------- reportdesign/source/filter/xml/xmlExport.cxx | 2 +- reportdesign/source/filter/xml/xmlfilter.cxx | 2 +- .../source/ui/misc/statusbarcontroller.cxx | 4 ++-- reportdesign/source/ui/misc/toolboxcontroller.cxx | 10 ++++----- reportdesign/source/ui/report/ReportController.cxx | 14 ++++++------ 32 files changed, 110 insertions(+), 110 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 325e12aa37fb..bb7560d49640 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -533,7 +533,7 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const , sal_Int32 /*SearchFlags*/ , const Sequence< PropertyValue >& Arguments ) throw (IOException, IllegalArgumentException, RuntimeException) { - vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; MutexGuard aGuard(m_aMutex); Reference< XComponent > xComp; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index a4c078989e16..8fac5c8edc9d 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -1016,7 +1016,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co // However, we do /not/ have control over the EmbeddedObject implementation, and from a first look, it seems as // making it release the own mutex before calling SolarMutex-code is ... difficult, at least. // So, to be on the same side, we lock the SolarMutex here. Yes, it sucks. - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::ClearableMutexGuard aGuard(m_aMutex); if ( m_bInExecute ) return aRet; @@ -1271,7 +1271,7 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove) { { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; // the request Reference xName(m_xParentContainer,UNO_QUERY); @@ -1367,7 +1367,7 @@ sal_Bool ODocumentDefinition::saveAs() try { { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; // the request Reference xName(m_xParentContainer,UNO_QUERY); diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index e044ba1b4988..e6b894178dc8 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -113,7 +113,7 @@ namespace dbaccess // unfortunately, executing a script can trigger all kind of complex stuff, and unfortunately, not // every component involved into this properly cares for thread safety. To be on the safe side, // we lock the solar mutex here. - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aScriptURL, ::rtl::OUString(), 0 ) ); if ( !xDispatch.is() ) diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx index b0e31f4ec35c..6045515264fc 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.cxx +++ b/dbaccess/source/ext/macromigration/progresscapture.cxx @@ -89,14 +89,14 @@ namespace dbmm //-------------------------------------------------------------------- void ProgressCapture::dispose() { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; m_pData->bDisposed = true; } //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::start( const ::rtl::OUString& _rText, ::sal_Int32 _nRange ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !m_pData->bDisposed ) m_pData->rMasterProgress.startObject( m_pData->sObjectName, _rText, _nRange ); } @@ -104,7 +104,7 @@ namespace dbmm //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::end( ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !m_pData->bDisposed ) m_pData->rMasterProgress.endObject(); } @@ -112,7 +112,7 @@ namespace dbmm //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::setText( const ::rtl::OUString& _rText ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !m_pData->bDisposed ) m_pData->rMasterProgress.setObjectProgressText( _rText ); } @@ -120,7 +120,7 @@ namespace dbmm //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::setValue( ::sal_Int32 _nValue ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !m_pData->bDisposed ) m_pData->rMasterProgress.setObjectProgressValue( _nValue ); } diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 0dd47a8ff3a5..715e58000ec2 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -619,7 +619,7 @@ IMPL_LINK( DBContentLoader, OnStartTableWizard, void*, /*NOTINTERESTEDIN*/ ) aValue.Value <<= m_sCurrentURL; aWizArgs[0] <<= aValue; - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XJobExecutor > xTableWizard; if ( m_aContext.createComponentWithArguments( "com.sun.star.wizards.table.CallTableWizard", aWizArgs, xTableWizard ) ) xTableWizard->trigger(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("start"))); diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index fe07ce1e7f59..2d56c70ea8f2 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -409,7 +409,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto { uno::Reference< ::com::sun::star::awt::XWindow > xWindow; { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window* pFocusWindow = Application::GetFocusWindow(); xWindow = VCLUnoHelper::GetInterface( pFocusWindow ); if( pFocusWindow ) @@ -422,7 +422,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto if ( xWindow.is() ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pFocusWindow ) pFocusWindow->LeaveWait(); diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index a2af939dbed0..62c358f9a098 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -553,7 +553,7 @@ sal_Bool SAL_CALL OApplicationController::suspend(sal_Bool bSuspend) throw( Runt ); } - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) @@ -1022,7 +1022,7 @@ namespace // ----------------------------------------------------------------------------- void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& aArgs) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( isUserDefinedFeature( _nId ) ) @@ -1559,7 +1559,7 @@ OApplicationView* OApplicationController::getContainer() const // ::com::sun::star::container::XContainerListener void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); Reference< XContainer > xContainer(_rEvent.Source, UNO_QUERY); @@ -1595,7 +1595,7 @@ void SAL_CALL OApplicationController::elementInserted( const ContainerEvent& _rE // ----------------------------------------------------------------------------- void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); Reference< XContainer > xContainer(_rEvent.Source, UNO_QUERY); @@ -1629,7 +1629,7 @@ void SAL_CALL OApplicationController::elementRemoved( const ContainerEvent& _rEv // ----------------------------------------------------------------------------- void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); Reference< XContainer > xContainer(_rEvent.Source, UNO_QUERY); @@ -2074,7 +2074,7 @@ void OApplicationController::addContainerListener(const Reference& // ----------------------------------------------------------------------------- void OApplicationController::renameEntry() { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); OSL_ENSURE(getContainer(),"View is NULL! -> GPF"); @@ -2834,7 +2834,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer // ----------------------------------------------------------------------------- ::sal_Bool SAL_CALL OApplicationController::select( const Any& _aSelection ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); Sequence< ::rtl::OUString> aSelection; if ( !_aSelection.hasValue() || !getView() ) @@ -2957,7 +2957,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer // ----------------------------------------------------------------------------- Any SAL_CALL OApplicationController::getSelection( ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); Sequence< NamedDatabaseObject > aCurrentSelection; diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index ac88783d524a..46c3f5f5e66e 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -315,7 +315,7 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec // ----------------------------------------------------------------------------- void OApplicationController::deleteEntries() { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getContainer() ) @@ -345,7 +345,7 @@ void OApplicationController::deleteEntries() // ----------------------------------------------------------------------------- const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQLExceptionInfo* _pErrorInfo ) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( !m_xDataSourceConnection.is() ) @@ -461,7 +461,7 @@ Reference< XNameAccess > OApplicationController::getElements( ElementType _eType // ----------------------------------------------------------------------------- void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames) const { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); OSL_ENSURE(getContainer(),"View isn't valid! -> GPF"); @@ -494,7 +494,7 @@ TransferableHelper* OApplicationController::copyObject() { try { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); ElementType eType = getContainer()->getElementType(); @@ -777,7 +777,7 @@ sal_Bool OApplicationController::isTableFormat() const IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) { m_nAsyncDrop = 0; - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 26a645b43ae1..6d30c639b0df 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -216,7 +216,7 @@ void OApplicationController::openDialog( const ::rtl::OUString& _sServiceName ) { try { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); WaitObject aWO(getView()); @@ -306,7 +306,7 @@ void OApplicationController::openDirectSQLDialog() // ----------------------------------------------------------------------------- void SAL_CALL OApplicationController::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( evt.PropertyName == PROPERTY_USER ) { @@ -393,7 +393,7 @@ Reference< XConnection > SAL_CALL OApplicationController::getActiveConnection() // ----------------------------------------------------------------------------- void SAL_CALL OApplicationController::connect( ) throw (SQLException, RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); SQLExceptionInfo aError; @@ -432,7 +432,7 @@ beans::Pair< ::sal_Int32, ::rtl::OUString > SAL_CALL OApplicationController::ide // ----------------------------------------------------------------------------- ::sal_Bool SAL_CALL OApplicationController::closeSubComponents( ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); return m_pSubComponentManager->closeSubComponents(); } @@ -517,7 +517,7 @@ Reference< XComponent > SAL_CALL OApplicationController::loadComponent( ::sal_In Reference< XComponent > SAL_CALL OApplicationController::loadComponentWithArguments( ::sal_Int32 _ObjectType, const ::rtl::OUString& _ObjectName, ::sal_Bool _ForEditing, const Sequence< PropertyValue >& _Arguments ) throw (IllegalArgumentException, NoSuchElementException, SQLException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); impl_validateObjectTypeAndName_throw( _ObjectType, _ObjectName ); @@ -542,7 +542,7 @@ Reference< XComponent > SAL_CALL OApplicationController::createComponent( ::sal_ // ----------------------------------------------------------------------------- Reference< XComponent > SAL_CALL OApplicationController::createComponentWithArguments( ::sal_Int32 i_nObjectType, const Sequence< PropertyValue >& i_rArguments, Reference< XComponent >& o_DocumentDefinition ) throw (IllegalArgumentException, SQLException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); impl_validateObjectTypeAndName_throw( i_nObjectType, ::boost::optional< ::rtl::OUString >() ); @@ -572,7 +572,7 @@ void SAL_CALL OApplicationController::releaseContextMenuInterceptor( const Refer // ----------------------------------------------------------------------------- void OApplicationController::previewChanged( sal_Int32 _nMode ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( m_xDataSource.is() && !isDataSourceReadOnly() ) diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 4b62d2997092..16287ac0078e 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -464,7 +464,7 @@ namespace dbaui //------------------------------------------------------------------------------------------------------------------ sal_Bool SubComponentManager::closeSubComponents() { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_pData->getMutex() ); try diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 1e815c74b28e..66e774b22a53 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1185,7 +1185,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t if (!xSource.is()) return; - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // the IsModified changed to sal_False ? if ( (evt.PropertyName.equals(PROPERTY_ISMODIFIED)) && (::comphelper::getBOOL(evt.NewValue) == sal_False) @@ -1455,7 +1455,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for } Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters; - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; // this may be executed in a non-main thread and we want to use vcl ... Window* pParent = Application::GetDefDialogParent(); // don't use the content as parent if it isn't visible @@ -2468,7 +2468,7 @@ void SbaXDataBrowserController::CellDeactivated() //------------------------------------------------------------------------------ IMPL_LINK( SbaXDataBrowserController, OnClipboardChanged, void*, EMPTYARG ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return OnInvalidateClipboard( NULL ); } diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 9335ed582e42..bb4ae9b35b28 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -303,7 +303,7 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const :: } // init controller - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; try { Reference xIni(xController,UNO_QUERY); diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 5794465ebf8d..9497d08f5076 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -242,7 +242,7 @@ namespace dbaui IMPL_LINK( SbaTableQueryBrowser, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) { m_nAsyncDrop = 0; - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( m_aAsyncDrop.nType == E_TABLE ) diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 85fa45c0b959..6bac728cad62 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -292,7 +292,7 @@ void OGenericUnoController::impl_initialize() // ------------------------------------------------------------------------- void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArguments ) throw(Exception, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); Reference< XWindow > xParent; @@ -425,7 +425,7 @@ Sequence< PropertyValue > SAL_CALL OGenericUnoController::getCreationArguments() // ----------------------------------------------------------------------- void OGenericUnoController::attachFrame( const Reference< XFrame >& _rxFrame ) throw( RuntimeException ) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); stopFrameListening( m_aCurrentFrame.getFrame() ); @@ -767,7 +767,7 @@ void OGenericUnoController::setMasterDispatchProvider(const Reference< XDispatch // ----------------------------------------------------------------------- void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyValue >& aArgs) throw(RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // Since the fix for #123967#, the SolarMutex is not locked anymore when the framework calls into // here. So, lock it ourself. The real solution would be to lock it only in the places // where it's needed, but a) this might turn out difficult, since we then also need to care @@ -1377,7 +1377,7 @@ Reference< awt::XWindow> OGenericUnoController::getTopMostContainerWindow() cons // ----------------------------------------------------------------------------- Reference< XTitle > OGenericUnoController::impl_getTitleHelper_throw() { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( ! m_xTitleHelper.is ()) @@ -1411,7 +1411,7 @@ Reference< XTitle > OGenericUnoController::impl_getTitleHelper_throw() void SAL_CALL OGenericUnoController::setTitle(const ::rtl::OUString& sTitle) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); m_bExternalTitle = sal_True; impl_getTitleHelper_throw()->setTitle (sTitle); @@ -1613,7 +1613,7 @@ void OGenericUnoController::fillSupportedFeatures() void SAL_CALL OGenericUnoController::dispose() throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; OGenericUnoController_Base::dispose(); } } // namespace dbaui diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 16d27cd4a85f..1652ed46b094 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -329,7 +329,7 @@ void SAL_CALL SbaXGridControl::removeStatusListener(const Reference< ::com::sun: //--------------------------------------------------------------------------------------- void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; EventObject aEvt; aEvt.Source = *this; @@ -504,7 +504,7 @@ void SAL_CALL SbaXGridPeer::dispatch(const URL& aURL, const Sequence< PropertyVa return; } - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nColId = -1; const PropertyValue* pArgs = aArgs.getConstArray(); for (sal_uInt16 i=0; i & xSet, const :: //------------------------------------------------------------------------- Reference< XInterface > SAL_CALL SbaTableQueryBrowser::Create(const Reference& _rxFactory) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return *(new SbaTableQueryBrowser(_rxFactory)); } @@ -316,7 +316,7 @@ Sequence< sal_Int8 > SAL_CALL SbaTableQueryBrowser::getImplementationId( ) thro //------------------------------------------------------------------------------ void SAL_CALL SbaTableQueryBrowser::disposing() { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // doin' a lot of VCL stuff here -> lock the SolarMutex // kiss our listeners goodbye @@ -870,7 +870,7 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw( // ----------------------------------------------------------------------- sal_Bool SbaTableQueryBrowser::suspend(sal_Bool bSuspend) throw( RuntimeException ) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) return sal_False; @@ -1350,7 +1350,7 @@ void SbaTableQueryBrowser::implRemoveStatusListeners() // ------------------------------------------------------------------------- sal_Bool SAL_CALL SbaTableQueryBrowser::select( const Any& _rSelection ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // doin' a lot of VCL stuff here -> lock the SolarMutex Sequence< PropertyValue > aDescriptorSequence; @@ -1971,7 +1971,7 @@ void SbaTableQueryBrowser::implAddDatasource(const String& _rDbName, Image& _rDb String& _rQueryName, Image& _rQueryImage, String& _rTableName, Image& _rTableImage, const SharedConnection& _rxConnection) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // initialize the names/images if necessary if (!_rQueryName.Len()) _rQueryName = String(ModuleRes(RID_STR_QUERIES_CONTAINER)); @@ -2671,7 +2671,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference xNames(_rEvent.Source, UNO_QUERY); // first search for a definition container where we can insert this element @@ -2716,7 +2716,7 @@ sal_Bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const String& _sName, // ------------------------------------------------------------------------- void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; Reference< XNameAccess > xNames(_rEvent.Source, UNO_QUERY); // get the top-level representing the removed data source @@ -2769,7 +2769,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven // ------------------------------------------------------------------------- void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; Reference< XNameAccess > xNames(_rEvent.Source, UNO_QUERY); SvLBoxEntry* pContainer = getEntryFromContainer(xNames); @@ -3006,7 +3006,7 @@ namespace // ------------------------------------------------------------------------- void SbaTableQueryBrowser::impl_initialize() { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // doin' a lot of VCL stuff here -> lock the SolarMutex // first initialize the parent @@ -3701,7 +3701,7 @@ void SAL_CALL SbaTableQueryBrowser::releaseContextMenuInterceptor( const Referen //------------------------------------------------------------------------------ void SAL_CALL SbaTableQueryBrowser::registeredDatabaseLocation( const DatabaseRegistrationEvent& _Event ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; implAddDatasource( _Event.Name, SharedConnection() ); } @@ -3758,7 +3758,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour //------------------------------------------------------------------------------ void SAL_CALL SbaTableQueryBrowser::revokedDatabaseLocation( const DatabaseRegistrationEvent& _Event ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; impl_cleanupDataSourceEntry( _Event.Name ); @@ -3769,7 +3769,7 @@ void SAL_CALL SbaTableQueryBrowser::revokedDatabaseLocation( const DatabaseRegis //------------------------------------------------------------------------------ void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegistrationEvent& _Event ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // in case the data source was expanded, and connected, we need to clean it up // for simplicity, just do as if the data source were completely removed and re-added diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 48c2d9e4e87d..0e652020bdd5 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -112,7 +112,7 @@ namespace dbaui void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { ToolboxController::initialize(_rArguments); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); if ( m_aCommandURL.equalsAscii(".uno:DBNewForm") ) @@ -158,7 +158,7 @@ namespace dbaui // ----------------------------------------------------------------------------- void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event ) throw ( RuntimeException ) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); TCommandState::iterator aFind = m_aStates.find( Event.FeatureURL.Complete ); if ( aFind != m_aStates.end() ) @@ -240,7 +240,7 @@ namespace dbaui Reference< ::com::sun::star::awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException) { // execute the menu - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); ToolBox* pToolBox = static_cast(VCLUnoHelper::GetWindow(getParent())); diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 3dff5f9904c7..71cb668216e6 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -323,7 +323,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert // handle the request try { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; // release the mutex when calling the handler, it may need to lock the SolarMutex xHandler->handle(xRequest); } diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index 5ad7e8781be7..a4ae710d7f73 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -134,7 +134,7 @@ DBG_NAME(DirectSQLDialog) //-------------------------------------------------------------------- void DirectSQLDialog::_disposing( const EventObject& _rSource ) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); OSL_ENSURE(Reference< XConnection >(_rSource.Source, UNO_QUERY).get() == m_xConnection.get(), diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index d8573b5aea5e..089025b511f7 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1477,7 +1477,7 @@ TOTypeInfoSP queryTypeInfoByType(sal_Int32 _nDataType,const OTypeInfoMap& _rType // ----------------------------------------------------------------------------- sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Bool _bAll,const ::rtl::OUString& _sName) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; String aMsg = String(ModuleRes(_nText)); aMsg.SearchAndReplace(String::CreateFromAscii("%1"),String(_sName)); OSQLMessageBox aAsk(_pParent,String(ModuleRes(_nTitle )),aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query); diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 333d584292a1..b820d80acbae 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -363,7 +363,7 @@ sal_Bool SAL_CALL OJoinController::suspend(sal_Bool _bSuspend) throw( RuntimeExc if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) return sal_True; - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) return sal_False; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index fe938ac6b004..fa48701f6768 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1079,7 +1079,7 @@ void OQueryController::onLoadedMenu(const Reference< ::com::sun::star::frame::XL { if ( !editingCommand() ) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); String aDefaultName = String( ModuleRes( editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE ) ); sName = aDefaultName.GetToken(0,' '); @@ -1160,7 +1160,7 @@ void OQueryController::impl_onModifyChanged() // ----------------------------------------------------------------------------- void SAL_CALL OQueryController::disposing( const EventObject& Source ) throw(RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( getContainer() && Source.Source.is() ) { @@ -1636,7 +1636,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs) // ----------------------------------------------------------------------------- short OQueryController::saveModified() { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); short nRet = RET_YES; if ( !isConnected() || !isModified() ) diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index b9e3d8b12b33..48cb50dedf24 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -489,7 +489,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData // ----------------------------------------------------------------------------- IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ ) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); try { diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 70aa026cb78f..3336906c21aa 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -592,7 +592,7 @@ sal_Bool SAL_CALL OTableController::suspend(sal_Bool /*_bSuspend*/) throw( Runti if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) return sal_True; - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) return sal_False; diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx index bd3b697c9d77..faf090402297 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.cxx +++ b/dbaccess/source/ui/uno/ColumnPeer.cxx @@ -59,7 +59,7 @@ OColumnPeer::OColumnPeer(Window* _pParent,const Reference& // ----------------------------------------------------------------------------- void OColumnPeer::setEditWidth(sal_Int32 _nWidth) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; OColumnControlWindow* pFieldControl = static_cast( GetWindow() ); if ( pFieldControl ) @@ -70,7 +70,7 @@ void OColumnPeer::setEditWidth(sal_Int32 _nWidth) // ----------------------------------------------------------------------------- void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; OColumnControlWindow* pFieldControl = static_cast( GetWindow() ); if ( pFieldControl ) @@ -118,7 +118,7 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn) // ----------------------------------------------------------------------------- void OColumnPeer::setConnection(const Reference< XConnection>& _xCon) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; OColumnControlWindow* pFieldControl = static_cast( GetWindow() ); if ( pFieldControl ) pFieldControl->setConnection(_xCon); @@ -126,7 +126,7 @@ void OColumnPeer::setConnection(const Reference< XConnection>& _xCon) //------------------------------------------------------------------------------ void OColumnPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& Value) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( 0 == _rPropertyName.compareToAscii( PROPERTY_COLUMN ) ) { diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 562cb1043243..651e7926861a 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -137,7 +137,7 @@ namespace dbaui //------------------------------------------------------------------------- void BasicInteractionHandler::implHandle(const ParametersRequest& _rParamRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // want to open a dialog .... sal_Int32 nAbortPos = getContinuation(ABORT, _rContinuations); @@ -181,7 +181,7 @@ namespace dbaui //------------------------------------------------------------------------- void BasicInteractionHandler::implHandle(const SQLExceptionInfo& _rSqlInfo, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // want to open a dialog .... sal_Int32 nApprovePos = getContinuation(APPROVE, _rContinuations); @@ -255,7 +255,7 @@ namespace dbaui //------------------------------------------------------------------------- void BasicInteractionHandler::implHandle(const DocumentSaveRequest& _rDocuRequest, const Sequence< Reference< XInteractionContinuation > >& _rContinuations) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // want to open a dialog .... sal_Int32 nApprovePos = getContinuation(APPROVE, _rContinuations); diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 56643dd67056..621775db10c1 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -815,7 +815,7 @@ void SAL_CALL OReportDefinition::disposing() m_pImpl->m_aStorageChangeListeners.disposeAndClear( aDisposeEvent ); // SYNCHRONIZED ---> - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::ResettableMutexGuard aGuard(m_aMutex); m_pImpl->m_aControllers.clear(); @@ -1250,7 +1250,7 @@ void SAL_CALL OReportDefinition::removeCloseListener( const uno::Reference< util // XCloseable void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (util::CloseVetoException, uno::RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::ResettableMutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -1469,7 +1469,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS if ( !_xStorageToSaveTo.is() ) throw lang::IllegalArgumentException(RPT_RESSTRING(RID_STR_ARGUMENT_IS_NULL,m_aProps->m_xContext->getServiceManager()),*this,1); - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); // create XStatusIndicator @@ -2727,7 +2727,7 @@ bool OReportDefinition::isEnableSetModified() const } uno::Reference< frame::XTitle > OReportDefinition::impl_getTitleHelper_throw() { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2749,7 +2749,7 @@ uno::Reference< frame::XTitle > OReportDefinition::impl_getTitleHelper_throw() // ----------------------------------------------------------------------------- uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHelper_throw() { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2772,7 +2772,7 @@ uno::Reference< frame::XUntitledNumbers > OReportDefinition::impl_getUntitledHel throw (uno::RuntimeException) { // SYNCHRONIZED -> - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2785,7 +2785,7 @@ void SAL_CALL OReportDefinition::setTitle( const ::rtl::OUString& sTitle ) throw (uno::RuntimeException) { // SYNCHRONIZED -> - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2798,7 +2798,7 @@ void SAL_CALL OReportDefinition::addTitleChangeListener( const uno::Reference< f throw (uno::RuntimeException) { // SYNCHRONIZED -> - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2813,7 +2813,7 @@ void SAL_CALL OReportDefinition::removeTitleChangeListener( const uno::Reference throw (uno::RuntimeException) { // SYNCHRONIZED -> - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2829,7 +2829,7 @@ void SAL_CALL OReportDefinition::removeTitleChangeListener( const uno::Reference uno::RuntimeException ) { // object already disposed? - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2842,7 +2842,7 @@ void SAL_CALL OReportDefinition::releaseNumber( ::sal_Int32 nNumber ) uno::RuntimeException ) { // object already disposed? - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2855,7 +2855,7 @@ void SAL_CALL OReportDefinition::releaseNumberForComponent( const uno::Reference uno::RuntimeException ) { // object already disposed? - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); @@ -2867,7 +2867,7 @@ void SAL_CALL OReportDefinition::releaseNumberForComponent( const uno::Reference throw (uno::RuntimeException) { // object already disposed? - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 5596bcb67b02..591f0a74489c 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -702,7 +702,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference& _xPr { UniReference< XMLShapeExport > xShapeExport = GetShapeExport(); xShapeExport->seekShapes(_xProp.get()); - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; xShapeExport->collectShapeAutoStyles(xShape.get()); } else diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index cd902158ab39..2843fafc4773 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -1081,7 +1081,7 @@ void ORptFilter::endDocument( void ) return; // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // Clear the shape import to sort the shapes (and not in the // destructor that might be called after the import has finished // for Java filters. diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index 8426c03e0b52..df462f9ee450 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -94,7 +94,7 @@ OStatusbarController::OStatusbarController(const Reference< XMultiServiceFactory void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { StatusbarController::initialize(_rArguments); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); StatusBar* pStatusBar = static_cast(VCLUnoHelper::GetWindow(m_xParentWindow)); @@ -132,7 +132,7 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen // XStatusListener void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEvent)throw ( RuntimeException ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard(m_aMutex); if ( m_pController.is() ) diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 132d58dd531b..5f7c59b8c9d8 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -143,7 +143,7 @@ void SAL_CALL OToolboxController::release() throw () void SAL_CALL OToolboxController::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { ToolboxController::initialize(_rArguments); - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); ToolBox* pToolBox = static_cast(VCLUnoHelper::GetWindow(getParent())); @@ -289,7 +289,7 @@ void SAL_CALL OToolboxController::statusChanged( const FeatureStateEvent& Event Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw (RuntimeException) { // execute the menu - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); Reference< awt::XWindow > xRet; @@ -306,7 +306,7 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OToolboxController::getSubToolbarName() throw (uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY); if ( xSub.is() ) @@ -316,7 +316,7 @@ Reference< awt::XWindow > SAL_CALL OToolboxController::createPopupWindow() throw // ----------------------------------------------------------------------------- void SAL_CALL OToolboxController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY); @@ -328,7 +328,7 @@ void SAL_CALL OToolboxController::functionSelected( const ::rtl::OUString& rComm // ----------------------------------------------------------------------------- void SAL_CALL OToolboxController::updateImage( ) throw (uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; ::osl::MutexGuard aGuard(m_aMutex); uno::Reference< frame::XSubToolbarController> xSub(m_pToolbarController.getRef(),uno::UNO_QUERY); diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 002540395593..a028dfaf52c6 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -983,7 +983,7 @@ namespace // ----------------------------------------------------------------------------- void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& aArgs) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( !getView() ) { @@ -1847,7 +1847,7 @@ sal_Bool SAL_CALL OReportController::suspend(sal_Bool /*_bSuspend*/) throw( Runt if ( getBroadcastHelper().bInDispose || getBroadcastHelper().bDisposed ) return sal_True; - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); if ( getView() && getView()->IsInModalMode() ) @@ -2176,7 +2176,7 @@ void OReportController::notifyGroupSections(const ContainerEvent& _rEvent,bool _ uno::Reference< report::XGroup> xGroup(_rEvent.Element,uno::UNO_QUERY); if ( xGroup.is() ) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); sal_Int32 nGroupPos = 0; _rEvent.Accessor >>= nGroupPos; @@ -2232,14 +2232,14 @@ void SAL_CALL OReportController::elementRemoved( const ContainerEvent& _rEvent ) // ----------------------------------------------------------------------------- void SAL_CALL OReportController::elementReplaced( const ContainerEvent& /*_rEvent*/ ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard(Application::GetSolarMutex()); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); OSL_ENSURE(0,"Not yet implemented!"); } // ----------------------------------------------------------------------------- void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); try { @@ -4064,7 +4064,7 @@ void OReportController::checkChartEnabled() ::rtl::OUString SAL_CALL OReportController::getTitle() throw (uno::RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); uno::Reference< frame::XTitle> xTitle(m_xReportDefinition,uno::UNO_QUERY_THROW); @@ -4336,7 +4336,7 @@ awt::Size SAL_CALL OReportController::getVisualAreaSize( ::sal_Int64 /*nAspect*/ // ----------------------------------------------------------------------------- embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepresentation( ::sal_Int64 _nAspect ) throw (lang::IllegalArgumentException, embed::WrongStateException, uno::Exception, uno::RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); embed::VisualRepresentation aResult; if ( !m_bInGeneratePreview ) -- cgit v1.2.3 From 84869b63b49405bede76a152f9c8d3d1e35db3b8 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 16 Oct 2010 03:13:32 -0500 Subject: merge vosremoval-mutex.diff In practice the changeset is 'inspired' by vosremoval-mutex.diff but was essentially redone manually --- dbaccess/inc/pch/precompiled_dbaccess.hxx | 2 +- dbaccess/source/core/dataaccess/ModelImpl.cxx | 2 +- dbaccess/source/core/dataaccess/ModelImpl.hxx | 4 ++-- dbaccess/source/core/dataaccess/documentcontainer.cxx | 4 ++-- dbaccess/source/core/dataaccess/documentdefinition.cxx | 8 ++++---- dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 2 +- dbaccess/source/ext/macromigration/progresscapture.cxx | 2 +- dbaccess/source/filter/xml/xmlfilter.cxx | 2 +- dbaccess/source/ui/app/AppController.cxx | 2 +- dbaccess/source/ui/app/AppControllerDnD.cxx | 2 +- dbaccess/source/ui/app/AppControllerGen.cxx | 2 +- dbaccess/source/ui/app/subcomponentmanager.cxx | 2 +- dbaccess/source/ui/control/toolboxcontroller.cxx | 2 +- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2 +- dbaccess/source/ui/dlg/directsql.cxx | 2 +- dbaccess/source/ui/dlg/tablespage.cxx | 2 +- dbaccess/source/ui/querydesign/JoinController.cxx | 2 +- dbaccess/source/ui/querydesign/querycontroller.cxx | 2 +- dbaccess/source/ui/relationdesign/RelationController.cxx | 4 ++-- dbaccess/source/ui/uno/dbinteraction.cxx | 2 +- dbaccess/source/ui/uno/unoadmin.cxx | 2 +- reportdesign/source/core/api/ReportDefinition.cxx | 2 +- reportdesign/source/core/sdr/UndoActions.cxx | 2 +- reportdesign/source/core/sdr/UndoEnv.cxx | 2 +- reportdesign/source/filter/xml/xmlExport.cxx | 2 +- reportdesign/source/filter/xml/xmlfilter.cxx | 2 +- reportdesign/source/ui/inspection/DataProviderHandler.cxx | 2 +- reportdesign/source/ui/misc/statusbarcontroller.cxx | 2 +- reportdesign/source/ui/misc/toolboxcontroller.cxx | 2 +- reportdesign/source/ui/report/ReportController.cxx | 2 +- reportdesign/source/ui/report/ReportControllerObserver.cxx | 2 +- 31 files changed, 37 insertions(+), 37 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index 0f1b004cde6c..993722d9814e 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -500,7 +500,7 @@ #include "unotools/processfactory.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "xmloff/ProgressBarHelper.hxx" #include "xmloff/XMLConstantsPropertyHandler.hxx" diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 41925b2a8b2f..5d31055d2cc2 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -1227,7 +1227,7 @@ namespace { void lcl_modifyListening( ::sfx2::IModifiableDocument& _rDocument, const Reference< XStorage >& _rxStorage, ::rtl::Reference< ::sfx2::DocumentStorageModifyListener >& _inout_rListener, - ::vos::IMutex& _rMutex, bool _bListen ) + ::osl::SolarMutex& _rMutex, bool _bListen ) { Reference< XModifiable > xModify( _rxStorage, UNO_QUERY ); OSL_ENSURE( xModify.is() || !_rxStorage.is(), "lcl_modifyListening: storage can't notify us!" ); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index a2d0f32e600c..9973af429c08 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -80,7 +80,7 @@ #include #include #include -#include +#include #include #include @@ -140,7 +140,7 @@ class OSharedConnectionManager; //============================================================ /** a class which provides an IMutex interface to an OSL-based mutex */ -class VosMutexFacade : public ::vos::IMutex +class VosMutexFacade : public ::osl::SolarMutex { public: /** beware of life time: the mutex you pass here must live as least as long diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index bb7560d49640..498882f5885e 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -52,7 +52,7 @@ #include #include -#include +#include #include using namespace ::com::sun::star::uno; @@ -533,7 +533,7 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const , sal_Int32 /*SearchFlags*/ , const Sequence< PropertyValue >& Arguments ) throw (IOException, IllegalArgumentException, RuntimeException) { - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; MutexGuard aGuard(m_aMutex); Reference< XComponent > xComp; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 8fac5c8edc9d..305a01363177 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -89,7 +89,7 @@ #include #include #include -#include +#include #include #include #include "core_resource.hxx" @@ -1016,7 +1016,7 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co // However, we do /not/ have control over the EmbeddedObject implementation, and from a first look, it seems as // making it release the own mutex before calling SolarMutex-code is ... difficult, at least. // So, to be on the same side, we lock the SolarMutex here. Yes, it sucks. - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; ::osl::ClearableMutexGuard aGuard(m_aMutex); if ( m_bInExecute ) return aRet; @@ -1271,7 +1271,7 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove) { { - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; // the request Reference xName(m_xParentContainer,UNO_QUERY); @@ -1367,7 +1367,7 @@ sal_Bool ODocumentDefinition::saveAs() try { { - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; // the request Reference xName(m_xParentContainer,UNO_QUERY); diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index e6b894178dc8..35262dd70038 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -42,7 +42,7 @@ #include #include #include -#include +#include namespace dbaccess { diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx index 6045515264fc..a151edee2a58 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.cxx +++ b/dbaccess/source/ext/macromigration/progresscapture.cxx @@ -36,7 +36,7 @@ /** === end UNO includes === **/ #include -#include +#include //........................................................................ namespace dbmm diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 2d56c70ea8f2..25c48491af22 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -61,7 +61,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 62c358f9a098..68d5aac5fa33 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -124,7 +124,7 @@ #include #include -#include +#include #include "AppView.hxx" #include "browserids.hxx" #include "dbu_reghelper.hxx" diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index 46c3f5f5e66e..b89f72956344 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -92,7 +92,7 @@ #include #include #include "defaultobjectnamecheck.hxx" -#include +#include #include "subcomponentmanager.hxx" //........................................................................ diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 6d30c639b0df..906607406e3a 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -80,7 +80,7 @@ #include #include #include -#include +#include //........................................................................ namespace dbaui diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 16287ac0078e..641051f20d49 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -43,7 +43,7 @@ #include #include -#include +#include #include #include diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 0e652020bdd5..57618dea47b1 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include "dbu_reghelper.hxx" #include "UITools.hxx" diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 71cb668216e6..8be379b9aa89 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -81,7 +81,7 @@ #include #include #include -#include +#include #include #include diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx index a4ae710d7f73..d964da262c30 100644 --- a/dbaccess/source/ui/dlg/directsql.cxx +++ b/dbaccess/source/ui/dlg/directsql.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include //........................................................................ diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 62f676e10a25..441aa6c6f846 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -54,7 +54,7 @@ #include #include "dbaccess_helpid.hrc" #include "UITools.hxx" -#include +#include #include #include "TablesSingleDlg.hxx" #include diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index b820d80acbae..3f3059967447 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -64,7 +64,7 @@ #include "adtabdlg.hxx" #include #include -#include +#include #include "UITools.hxx" #include diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index fa48701f6768..82122c97aed1 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -92,7 +92,7 @@ #include #include #include -#include +#include extern "C" void SAL_CALL createRegistryInfo_OQueryControl() { diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 48cb50dedf24..43400cb2c6a9 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -73,7 +73,7 @@ #include #include #include -#include +#include #define MAX_THREADS 10 @@ -489,7 +489,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData // ----------------------------------------------------------------------------- IMPL_LINK( ORelationController, OnThreadFinished, void*, /*NOTINTERESTEDIN*/ ) { - SolarMutexGuard aSolarGuard; + ::SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); try { diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx b/dbaccess/source/ui/uno/dbinteraction.cxx index 651e7926861a..390f339384f7 100644 --- a/dbaccess/source/ui/uno/dbinteraction.cxx +++ b/dbaccess/source/ui/uno/dbinteraction.cxx @@ -46,7 +46,7 @@ #include "dbu_uno.hrc" #include "paramdialog.hxx" #include -#include +#include #include "CollectionView.hxx" #include "UITools.hxx" diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index ef3c6c8f6542..c48a2e54a250 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -43,7 +43,7 @@ #include // --- needed because of the solar mutex -#include +#include #include // --- diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 4ecd1a38c563..fd9360e30b3c 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 43cdd2c8f120..737e43af74be 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include namespace rptui { diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index 556563b56908..780113958495 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -54,7 +54,7 @@ #include #include #include -#include +#include namespace rptui { diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 591f0a74489c..a8fdacf51e9e 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -64,7 +64,7 @@ #include "RptDef.hxx" // for locking SolarMutex: svapp + mutex #include -#include +#include #include #include diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 2843fafc4773..1e1f2ba71305 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -59,7 +59,7 @@ #include #include #include -#include +#include #include #include "xmlEnums.hxx" #include "xmlStyleImport.hxx" diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 42c1b5a13e0f..f2a87ea06bde 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -55,7 +55,7 @@ #include #include "metadata.hxx" #include -#include +#include #include "helpids.hrc" #include "uistrings.hrc" #include "RptResId.hrc" diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index df462f9ee450..a169c8279026 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -38,7 +38,7 @@ #include #include -#include +#include #include namespace rptui diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx b/reportdesign/source/ui/misc/toolboxcontroller.cxx index 5f7c59b8c9d8..a009e4393de0 100644 --- a/reportdesign/source/ui/misc/toolboxcontroller.cxx +++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #define ITEMID_COLOR 1 #define ITEMID_BRUSH 2 diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index a028dfaf52c6..2f7fc8997d16 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -143,7 +143,7 @@ #include #include -#include +#include #include "PropertyForward.hxx" #include "SectionWindow.hxx" diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 115d03de8e5b..45c389f94bef 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include -- cgit v1.2.3 From e9470b00509155fc27598b59acfca26a7b85ae6d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 27 Oct 2010 12:33:13 +0100 Subject: add modelines to .hxx files as well --- dbaccess/inc/AsyncronousLink.hxx | 2 ++ dbaccess/inc/IController.hxx | 3 +++ dbaccess/inc/IEnvironment.hxx | 3 +++ dbaccess/inc/IReference.hxx | 2 ++ dbaccess/inc/ToolBoxHelper.hxx | 2 ++ dbaccess/inc/controllerframe.hxx | 3 +++ dbaccess/inc/dataview.hxx | 2 ++ dbaccess/inc/dbaccessdllapi.h | 2 ++ dbaccess/inc/genericcontroller.hxx | 2 ++ dbaccess/inc/pch/precompiled_dbaccess.hxx | 2 ++ dbaccess/inc/singledoccontroller.hxx | 2 ++ dbaccess/source/core/api/BookmarkSet.hxx | 2 ++ dbaccess/source/core/api/CIndexColumn.hxx | 3 +++ dbaccess/source/core/api/CIndexes.hxx | 3 +++ dbaccess/source/core/api/CRowSetColumn.hxx | 3 +++ dbaccess/source/core/api/CRowSetDataColumn.hxx | 3 +++ dbaccess/source/core/api/CacheSet.hxx | 2 ++ dbaccess/source/core/api/HelperCollections.hxx | 3 +++ dbaccess/source/core/api/KeySet.hxx | 3 +++ dbaccess/source/core/api/OptimisticSet.hxx | 3 +++ dbaccess/source/core/api/PrivateRow.hxx | 3 +++ dbaccess/source/core/api/RowSet.hxx | 2 ++ dbaccess/source/core/api/RowSetBase.hxx | 3 +++ dbaccess/source/core/api/RowSetCache.hxx | 2 ++ dbaccess/source/core/api/RowSetCacheIterator.hxx | 3 +++ dbaccess/source/core/api/RowSetRow.hxx | 3 +++ dbaccess/source/core/api/StaticSet.hxx | 3 +++ dbaccess/source/core/api/WrappedResultSet.hxx | 2 ++ dbaccess/source/core/api/datacolumn.hxx | 2 ++ dbaccess/source/core/api/query.hxx | 2 ++ dbaccess/source/core/api/querydescriptor.hxx | 2 ++ dbaccess/source/core/api/resultcolumn.hxx | 2 ++ dbaccess/source/core/api/resultset.hxx | 2 ++ dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 3 +++ dbaccess/source/core/dataaccess/ModelImpl.hxx | 2 ++ dbaccess/source/core/dataaccess/SharedConnection.hxx | 3 +++ dbaccess/source/core/dataaccess/bookmarkcontainer.hxx | 3 +++ dbaccess/source/core/dataaccess/commandcontainer.hxx | 3 +++ dbaccess/source/core/dataaccess/commanddefinition.hxx | 2 ++ dbaccess/source/core/dataaccess/connection.hxx | 2 ++ dbaccess/source/core/dataaccess/databasecontext.hxx | 2 ++ dbaccess/source/core/dataaccess/databasedocument.hxx | 3 +++ dbaccess/source/core/dataaccess/databaseregistrations.hxx | 3 +++ dbaccess/source/core/dataaccess/datasource.hxx | 2 ++ dbaccess/source/core/dataaccess/documentcontainer.hxx | 3 +++ dbaccess/source/core/dataaccess/documentdefinition.hxx | 3 +++ dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 3 +++ dbaccess/source/core/dataaccess/documenteventnotifier.hxx | 3 +++ dbaccess/source/core/dataaccess/documentevents.hxx | 3 +++ dbaccess/source/core/dataaccess/intercept.hxx | 3 +++ dbaccess/source/core/dataaccess/myucp_datasupplier.hxx | 3 +++ dbaccess/source/core/dataaccess/myucp_resultset.hxx | 3 +++ dbaccess/source/core/inc/ContainerListener.hxx | 3 +++ dbaccess/source/core/inc/ContainerMediator.hxx | 3 +++ dbaccess/source/core/inc/ContentHelper.hxx | 3 +++ dbaccess/source/core/inc/DatabaseDataProvider.hxx | 3 +++ dbaccess/source/core/inc/FilteredContainer.hxx | 3 +++ dbaccess/source/core/inc/PropertyForward.hxx | 3 +++ dbaccess/source/core/inc/RefreshListener.hxx | 3 +++ dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 3 +++ dbaccess/source/core/inc/TableDeco.hxx | 2 ++ dbaccess/source/core/inc/View.hxx | 3 +++ dbaccess/source/core/inc/callablestatement.hxx | 2 ++ dbaccess/source/core/inc/column.hxx | 3 +++ dbaccess/source/core/inc/columnsettings.hxx | 3 +++ dbaccess/source/core/inc/commandbase.hxx | 3 +++ dbaccess/source/core/inc/composertools.hxx | 3 +++ dbaccess/source/core/inc/containerapprove.hxx | 3 +++ dbaccess/source/core/inc/core_resource.hxx | 3 +++ dbaccess/source/core/inc/datasettings.hxx | 3 +++ dbaccess/source/core/inc/definitioncolumn.hxx | 2 ++ dbaccess/source/core/inc/definitioncontainer.hxx | 3 +++ dbaccess/source/core/inc/module_dba.hxx | 3 +++ dbaccess/source/core/inc/object.hxx | 2 ++ dbaccess/source/core/inc/objectnameapproval.hxx | 3 +++ dbaccess/source/core/inc/preparedstatement.hxx | 2 ++ dbaccess/source/core/inc/querycomposer.hxx | 3 +++ dbaccess/source/core/inc/querycontainer.hxx | 3 +++ dbaccess/source/core/inc/recovery/dbdocrecovery.hxx | 3 +++ dbaccess/source/core/inc/sdbcoretools.hxx | 3 +++ dbaccess/source/core/inc/statement.hxx | 2 ++ dbaccess/source/core/inc/table.hxx | 2 ++ dbaccess/source/core/inc/tablecontainer.hxx | 2 ++ dbaccess/source/core/inc/userinformation.hxx | 2 ++ dbaccess/source/core/inc/veto.hxx | 3 +++ dbaccess/source/core/inc/viewcontainer.hxx | 2 ++ dbaccess/source/core/recovery/settingsimport.hxx | 3 +++ dbaccess/source/core/recovery/storagestream.hxx | 3 +++ dbaccess/source/core/recovery/storagetextstream.hxx | 3 +++ dbaccess/source/core/recovery/storagexmlstream.hxx | 3 +++ dbaccess/source/core/recovery/subcomponentloader.hxx | 3 +++ dbaccess/source/core/recovery/subcomponentrecovery.hxx | 3 +++ dbaccess/source/core/recovery/subcomponents.hxx | 3 +++ dbaccess/source/ext/adabas/ANewDb.hxx | 3 +++ dbaccess/source/ext/adabas/ASQLNameEdit.hxx | 2 ++ dbaccess/source/ext/adabas/Acomponentmodule.hxx | 2 ++ dbaccess/source/ext/adabas/AdabasNewDb.hxx | 2 ++ dbaccess/source/ext/macromigration/dbmm_module.hxx | 2 ++ dbaccess/source/ext/macromigration/dbmm_types.hxx | 3 +++ dbaccess/source/ext/macromigration/docinteraction.hxx | 3 +++ dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 3 +++ dbaccess/source/ext/macromigration/macromigrationpages.hxx | 3 +++ dbaccess/source/ext/macromigration/migrationengine.hxx | 3 +++ dbaccess/source/ext/macromigration/migrationerror.hxx | 2 ++ dbaccess/source/ext/macromigration/migrationlog.hxx | 3 +++ dbaccess/source/ext/macromigration/migrationprogress.hxx | 3 +++ dbaccess/source/ext/macromigration/progresscapture.hxx | 3 +++ dbaccess/source/ext/macromigration/progressmixer.hxx | 3 +++ dbaccess/source/ext/macromigration/rangeprogressbar.hxx | 3 +++ dbaccess/source/filter/migration/cfgimport.hxx | 3 +++ dbaccess/source/filter/xml/xmlAutoStyle.hxx | 2 ++ dbaccess/source/filter/xml/xmlColumn.hxx | 3 +++ dbaccess/source/filter/xml/xmlComponent.hxx | 3 +++ dbaccess/source/filter/xml/xmlConnectionData.hxx | 3 +++ dbaccess/source/filter/xml/xmlConnectionResource.hxx | 2 ++ dbaccess/source/filter/xml/xmlDataSource.hxx | 3 +++ dbaccess/source/filter/xml/xmlDataSourceInfo.hxx | 3 +++ dbaccess/source/filter/xml/xmlDataSourceSetting.hxx | 3 +++ dbaccess/source/filter/xml/xmlDataSourceSettings.hxx | 3 +++ dbaccess/source/filter/xml/xmlDatabase.hxx | 3 +++ dbaccess/source/filter/xml/xmlDatabaseDescription.hxx | 3 +++ dbaccess/source/filter/xml/xmlDocuments.hxx | 3 +++ dbaccess/source/filter/xml/xmlEnums.hxx | 3 +++ dbaccess/source/filter/xml/xmlExport.hxx | 3 +++ dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx | 3 +++ dbaccess/source/filter/xml/xmlHelper.hxx | 2 ++ dbaccess/source/filter/xml/xmlHierarchyCollection.hxx | 3 +++ dbaccess/source/filter/xml/xmlLogin.hxx | 3 +++ dbaccess/source/filter/xml/xmlQuery.hxx | 3 +++ dbaccess/source/filter/xml/xmlServerDatabase.hxx | 2 ++ dbaccess/source/filter/xml/xmlStyleImport.hxx | 3 +++ dbaccess/source/filter/xml/xmlTable.hxx | 3 +++ dbaccess/source/filter/xml/xmlTableFilterList.hxx | 3 +++ dbaccess/source/filter/xml/xmlTableFilterPattern.hxx | 3 +++ dbaccess/source/filter/xml/xmlfilter.hxx | 3 +++ dbaccess/source/inc/OAuthenticationContinuation.hxx | 2 ++ dbaccess/source/inc/apitools.hxx | 2 ++ dbaccess/source/inc/cfg_reghelper.hxx | 2 ++ dbaccess/source/inc/constasciistring.hxx | 3 +++ dbaccess/source/inc/dbadllapi.hxx | 3 +++ dbaccess/source/inc/dbu_reghelper.hxx | 2 ++ dbaccess/source/inc/dsntypes.hxx | 2 ++ dbaccess/source/inc/flt_reghelper.hxx | 2 ++ dbaccess/source/inc/registrationhelper.hxx | 2 ++ dbaccess/source/sdbtools/connection/connectiondependent.hxx | 2 ++ dbaccess/source/sdbtools/connection/connectiontools.hxx | 2 ++ dbaccess/source/sdbtools/connection/datasourcemetadata.hxx | 3 +++ dbaccess/source/sdbtools/connection/objectnames.hxx | 2 ++ dbaccess/source/sdbtools/connection/tablename.hxx | 2 ++ dbaccess/source/sdbtools/inc/module_sdbt.hxx | 2 ++ dbaccess/source/ui/app/AppController.hxx | 2 ++ dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 ++ dbaccess/source/ui/app/AppDetailView.hxx | 2 ++ dbaccess/source/ui/app/AppIconControl.hxx | 2 ++ dbaccess/source/ui/app/AppSwapWindow.hxx | 2 ++ dbaccess/source/ui/app/AppTitleWindow.hxx | 2 ++ dbaccess/source/ui/app/AppView.hxx | 2 ++ dbaccess/source/ui/app/IApplicationController.hxx | 3 +++ dbaccess/source/ui/app/subcomponentmanager.hxx | 3 +++ dbaccess/source/ui/browser/dbtreemodel.hxx | 3 +++ dbaccess/source/ui/browser/dbtreeview.hxx | 2 ++ dbaccess/source/ui/dlg/AdabasStat.hxx | 2 ++ dbaccess/source/ui/dlg/ConnectionHelper.hxx | 3 +++ dbaccess/source/ui/dlg/ConnectionPage.hxx | 3 +++ dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 3 +++ dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 3 +++ dbaccess/source/ui/dlg/DbAdminImpl.hxx | 2 ++ dbaccess/source/ui/dlg/DriverSettings.hxx | 2 ++ dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 2 ++ dbaccess/source/ui/dlg/UserAdmin.hxx | 3 +++ dbaccess/source/ui/dlg/admincontrols.hxx | 3 +++ dbaccess/source/ui/dlg/adminpages.hxx | 2 ++ dbaccess/source/ui/dlg/adodatalinks.hxx | 4 +++- dbaccess/source/ui/dlg/advancedsettings.hxx | 3 +++ dbaccess/source/ui/dlg/dbfindex.hxx | 2 ++ dbaccess/source/ui/dlg/detailpages.hxx | 3 +++ dbaccess/source/ui/dlg/dsnItem.hxx | 2 ++ dbaccess/source/ui/dlg/dsselect.hxx | 2 ++ dbaccess/source/ui/dlg/finteraction.hxx | 2 ++ dbaccess/source/ui/dlg/generalpage.hxx | 3 +++ dbaccess/source/ui/dlg/odbcconfig.hxx | 2 ++ dbaccess/source/ui/dlg/optionalboolitem.hxx | 3 +++ dbaccess/source/ui/dlg/tablespage.hxx | 2 ++ dbaccess/source/ui/inc/AccessibleBaseIFace.hxx | 3 +++ dbaccess/source/ui/inc/AppElementType.hxx | 2 ++ dbaccess/source/ui/inc/CollectionView.hxx | 2 ++ dbaccess/source/ui/inc/ColumnControlWindow.hxx | 3 +++ dbaccess/source/ui/inc/ConnectionLine.hxx | 3 +++ dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 3 +++ dbaccess/source/ui/inc/ConnectionLineData.hxx | 2 ++ dbaccess/source/ui/inc/DExport.hxx | 2 ++ dbaccess/source/ui/inc/ExtensionNotPresent.hxx | 2 ++ dbaccess/source/ui/inc/FieldControls.hxx | 2 ++ dbaccess/source/ui/inc/FieldDescControl.hxx | 2 ++ dbaccess/source/ui/inc/FieldDescriptions.hxx | 2 ++ dbaccess/source/ui/inc/GeneralUndo.hxx | 2 ++ dbaccess/source/ui/inc/HtmlReader.hxx | 2 ++ dbaccess/source/ui/inc/IClipBoardTest.hxx | 3 +++ dbaccess/source/ui/inc/IItemSetHelper.hxx | 2 ++ dbaccess/source/ui/inc/IUpdateHelper.hxx | 2 ++ dbaccess/source/ui/inc/JAccess.hxx | 3 +++ dbaccess/source/ui/inc/JoinController.hxx | 2 ++ dbaccess/source/ui/inc/JoinDesignView.hxx | 2 ++ dbaccess/source/ui/inc/JoinExchange.hxx | 2 ++ dbaccess/source/ui/inc/JoinTableView.hxx | 3 +++ dbaccess/source/ui/inc/QEnumTypes.hxx | 2 ++ dbaccess/source/ui/inc/QueryDesignView.hxx | 2 ++ dbaccess/source/ui/inc/QueryTableView.hxx | 2 ++ dbaccess/source/ui/inc/QueryTextView.hxx | 2 ++ dbaccess/source/ui/inc/QueryViewSwitch.hxx | 2 ++ dbaccess/source/ui/inc/RTableConnectionData.hxx | 2 ++ dbaccess/source/ui/inc/RefFunctor.hxx | 2 ++ dbaccess/source/ui/inc/RelControliFace.hxx | 3 +++ dbaccess/source/ui/inc/RelationControl.hxx | 3 +++ dbaccess/source/ui/inc/RelationController.hxx | 2 ++ dbaccess/source/ui/inc/RelationDesignView.hxx | 2 ++ dbaccess/source/ui/inc/RelationDlg.hxx | 2 ++ dbaccess/source/ui/inc/RelationTableView.hxx | 2 ++ dbaccess/source/ui/inc/RtfReader.hxx | 2 ++ dbaccess/source/ui/inc/ScrollHelper.hxx | 2 ++ dbaccess/source/ui/inc/SqlNameEdit.hxx | 2 ++ dbaccess/source/ui/inc/TableConnection.hxx | 2 ++ dbaccess/source/ui/inc/TableConnectionData.hxx | 2 ++ dbaccess/source/ui/inc/TableController.hxx | 2 ++ dbaccess/source/ui/inc/TableCopyHelper.hxx | 2 ++ dbaccess/source/ui/inc/TableDesignControl.hxx | 2 ++ dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 2 ++ dbaccess/source/ui/inc/TableDesignView.hxx | 2 ++ dbaccess/source/ui/inc/TableFieldDescription.hxx | 2 ++ dbaccess/source/ui/inc/TableGrantCtrl.hxx | 3 +++ dbaccess/source/ui/inc/TableRow.hxx | 2 ++ dbaccess/source/ui/inc/TableRowExchange.hxx | 2 ++ dbaccess/source/ui/inc/TableWindow.hxx | 2 ++ dbaccess/source/ui/inc/TableWindowAccess.hxx | 3 +++ dbaccess/source/ui/inc/TableWindowData.hxx | 2 ++ dbaccess/source/ui/inc/TableWindowListBox.hxx | 2 ++ dbaccess/source/ui/inc/TableWindowTitle.hxx | 2 ++ dbaccess/source/ui/inc/TablesSingleDlg.hxx | 2 ++ dbaccess/source/ui/inc/TokenWriter.hxx | 2 ++ dbaccess/source/ui/inc/TypeInfo.hxx | 2 ++ dbaccess/source/ui/inc/UITools.hxx | 2 ++ dbaccess/source/ui/inc/UserAdminDlg.hxx | 3 +++ dbaccess/source/ui/inc/VertSplitView.hxx | 2 ++ dbaccess/source/ui/inc/WCPage.hxx | 2 ++ dbaccess/source/ui/inc/WColumnSelect.hxx | 2 ++ dbaccess/source/ui/inc/WCopyTable.hxx | 3 +++ dbaccess/source/ui/inc/WExtendPages.hxx | 2 ++ dbaccess/source/ui/inc/WNameMatch.hxx | 2 ++ dbaccess/source/ui/inc/WTabPage.hxx | 2 ++ dbaccess/source/ui/inc/WTypeSelect.hxx | 2 ++ dbaccess/source/ui/inc/adtabdlg.hxx | 3 +++ dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 3 +++ dbaccess/source/ui/inc/asyncmodaldialog.hxx | 2 ++ dbaccess/source/ui/inc/browserids.hxx | 3 +++ dbaccess/source/ui/inc/brwctrlr.hxx | 2 ++ dbaccess/source/ui/inc/brwview.hxx | 2 ++ dbaccess/source/ui/inc/callbacks.hxx | 2 ++ dbaccess/source/ui/inc/charsetlistbox.hxx | 3 +++ dbaccess/source/ui/inc/charsets.hxx | 2 ++ dbaccess/source/ui/inc/commontypes.hxx | 2 ++ dbaccess/source/ui/inc/curledit.hxx | 2 ++ dbaccess/source/ui/inc/databaseobjectview.hxx | 2 ++ dbaccess/source/ui/inc/datasourceconnector.hxx | 2 ++ dbaccess/source/ui/inc/datasourcemap.hxx | 2 ++ dbaccess/source/ui/inc/dbadmin.hxx | 2 ++ dbaccess/source/ui/inc/dbexchange.hxx | 2 ++ dbaccess/source/ui/inc/dbtreelistbox.hxx | 3 +++ dbaccess/source/ui/inc/dbwiz.hxx | 2 ++ dbaccess/source/ui/inc/dbwizsetup.hxx | 2 ++ dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 2 ++ dbaccess/source/ui/inc/directsql.hxx | 2 ++ dbaccess/source/ui/inc/dlgattr.hxx | 2 ++ dbaccess/source/ui/inc/dlgsave.hxx | 2 ++ dbaccess/source/ui/inc/dlgsize.hxx | 2 ++ dbaccess/source/ui/inc/dsitems.hxx | 2 ++ dbaccess/source/ui/inc/dsmeta.hxx | 3 +++ dbaccess/source/ui/inc/exsrcbrw.hxx | 3 +++ dbaccess/source/ui/inc/formadapter.hxx | 2 ++ dbaccess/source/ui/inc/imageprovider.hxx | 2 ++ dbaccess/source/ui/inc/indexcollection.hxx | 2 ++ dbaccess/source/ui/inc/indexdialog.hxx | 2 ++ dbaccess/source/ui/inc/indexes.hxx | 2 ++ dbaccess/source/ui/inc/indexfieldscontrol.hxx | 2 ++ dbaccess/source/ui/inc/linkeddocuments.hxx | 2 ++ dbaccess/source/ui/inc/listviewitems.hxx | 2 ++ dbaccess/source/ui/inc/localresaccess.hxx | 2 ++ dbaccess/source/ui/inc/marktree.hxx | 2 ++ dbaccess/source/ui/inc/moduledbu.hxx | 2 ++ dbaccess/source/ui/inc/objectnamecheck.hxx | 3 +++ dbaccess/source/ui/inc/opendoccontrols.hxx | 2 ++ dbaccess/source/ui/inc/paramdialog.hxx | 2 ++ dbaccess/source/ui/inc/propertysetitem.hxx | 2 ++ dbaccess/source/ui/inc/propertystorage.hxx | 3 +++ dbaccess/source/ui/inc/querycontainerwindow.hxx | 2 ++ dbaccess/source/ui/inc/querycontroller.hxx | 2 ++ dbaccess/source/ui/inc/queryfilter.hxx | 2 ++ dbaccess/source/ui/inc/queryorder.hxx | 2 ++ dbaccess/source/ui/inc/queryview.hxx | 3 +++ dbaccess/source/ui/inc/sbagrid.hxx | 2 ++ dbaccess/source/ui/inc/sbamultiplex.hxx | 2 ++ dbaccess/source/ui/inc/sqledit.hxx | 2 ++ dbaccess/source/ui/inc/sqlmessage.hxx | 2 ++ dbaccess/source/ui/inc/statusbarontroller.hxx | 2 ++ dbaccess/source/ui/inc/stringlistitem.hxx | 2 ++ dbaccess/source/ui/inc/tabletree.hxx | 2 ++ dbaccess/source/ui/inc/textconnectionsettings.hxx | 3 +++ dbaccess/source/ui/inc/toolboxcontroller.hxx | 2 ++ dbaccess/source/ui/inc/undosqledit.hxx | 2 ++ dbaccess/source/ui/inc/unoadmin.hxx | 2 ++ dbaccess/source/ui/inc/unodatbr.hxx | 2 ++ dbaccess/source/ui/inc/unosqlmessage.hxx | 2 ++ dbaccess/source/ui/misc/UpdateHelperImpl.hxx | 2 ++ dbaccess/source/ui/querydesign/ConnectionData.hxx | 3 +++ dbaccess/source/ui/querydesign/QTableConnection.hxx | 3 +++ dbaccess/source/ui/querydesign/QTableConnectionData.hxx | 3 +++ dbaccess/source/ui/querydesign/QTableWindow.hxx | 2 ++ dbaccess/source/ui/querydesign/QTableWindowData.hxx | 2 ++ dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx | 2 ++ dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx | 2 ++ dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx | 2 ++ dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx | 2 ++ dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx | 2 ++ dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx | 2 ++ dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx | 2 ++ dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx | 2 ++ dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2 ++ dbaccess/source/ui/querydesign/TableFieldInfo.hxx | 2 ++ dbaccess/source/ui/querydesign/querydlg.hxx | 2 ++ dbaccess/source/ui/relationdesign/RTableConnection.hxx | 2 ++ dbaccess/source/ui/relationdesign/RTableWindow.hxx | 2 ++ dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 2 ++ dbaccess/source/ui/tabledesign/TEditControl.hxx | 2 ++ dbaccess/source/ui/tabledesign/TableFieldControl.hxx | 2 ++ dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 2 ++ dbaccess/source/ui/tabledesign/TableUndo.hxx | 2 ++ dbaccess/source/ui/uno/AdabasSettingsDlg.hxx | 2 ++ dbaccess/source/ui/uno/ColumnControl.hxx | 3 +++ dbaccess/source/ui/uno/ColumnModel.hxx | 3 +++ dbaccess/source/ui/uno/ColumnPeer.hxx | 2 ++ dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 2 ++ dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 2 ++ dbaccess/source/ui/uno/TableFilterDlg.hxx | 2 ++ dbaccess/source/ui/uno/UserSettingsDlg.hxx | 2 ++ dbaccess/source/ui/uno/admindlg.hxx | 2 ++ dbaccess/source/ui/uno/composerdialogs.hxx | 2 ++ dbaccess/source/ui/uno/dbinteraction.hxx | 2 ++ dbaccess/source/ui/uno/unoDirectSql.hxx | 2 ++ reportdesign/inc/ModuleHelper.hxx | 2 ++ reportdesign/inc/PropertyForward.hxx | 2 ++ reportdesign/inc/ReportDefinition.hxx | 2 ++ reportdesign/inc/ReportHelperDefines.hxx | 2 ++ reportdesign/inc/ReportVisitor.hxx | 2 ++ reportdesign/inc/RptDef.hxx | 3 +++ reportdesign/inc/RptModel.hxx | 2 ++ reportdesign/inc/RptObject.hxx | 2 ++ reportdesign/inc/RptPage.hxx | 3 +++ reportdesign/inc/UndoActions.hxx | 2 ++ reportdesign/inc/UndoEnv.hxx | 2 ++ reportdesign/inc/conditionalexpression.hxx | 3 +++ reportdesign/inc/dllapi.h | 2 ++ reportdesign/inc/pch/precompiled_reportdesign.hxx | 3 +++ reportdesign/inc/reportformula.hxx | 3 +++ reportdesign/source/core/inc/FixedLine.hxx | 2 ++ reportdesign/source/core/inc/FixedText.hxx | 2 ++ reportdesign/source/core/inc/FormatCondition.hxx | 2 ++ reportdesign/source/core/inc/FormattedField.hxx | 2 ++ reportdesign/source/core/inc/Function.hxx | 2 ++ reportdesign/source/core/inc/Functions.hxx | 2 ++ reportdesign/source/core/inc/Group.hxx | 3 +++ reportdesign/source/core/inc/Groups.hxx | 2 ++ reportdesign/source/core/inc/ImageControl.hxx | 2 ++ reportdesign/source/core/inc/ReportComponent.hxx | 2 ++ reportdesign/source/core/inc/ReportControlModel.hxx | 2 ++ reportdesign/source/core/inc/ReportDrawPage.hxx | 2 ++ reportdesign/source/core/inc/ReportEngineJFree.hxx | 3 +++ reportdesign/source/core/inc/ReportHelperImpl.hxx | 2 ++ reportdesign/source/core/inc/ReportUndoFactory.hxx | 2 ++ reportdesign/source/core/inc/RptObjectListener.hxx | 3 +++ reportdesign/source/core/inc/Section.hxx | 3 +++ reportdesign/source/core/inc/Shape.hxx | 2 ++ reportdesign/source/core/inc/Tools.hxx | 2 ++ reportdesign/source/core/inc/conditionupdater.hxx | 3 +++ reportdesign/source/core/inc/core_resource.hxx | 2 ++ reportdesign/source/core/sdr/formatnormalizer.hxx | 3 +++ reportdesign/source/filter/xml/dbloader2.hxx | 3 +++ reportdesign/source/filter/xml/xmlAutoStyle.hxx | 2 ++ reportdesign/source/filter/xml/xmlCell.hxx | 3 +++ reportdesign/source/filter/xml/xmlColumn.hxx | 3 +++ reportdesign/source/filter/xml/xmlComponent.hxx | 3 +++ reportdesign/source/filter/xml/xmlCondPrtExpr.hxx | 3 +++ reportdesign/source/filter/xml/xmlControlProperty.hxx | 3 +++ reportdesign/source/filter/xml/xmlEnums.hxx | 3 +++ reportdesign/source/filter/xml/xmlExport.hxx | 3 +++ reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx | 3 +++ reportdesign/source/filter/xml/xmlFixedContent.hxx | 3 +++ reportdesign/source/filter/xml/xmlFormatCondition.hxx | 3 +++ reportdesign/source/filter/xml/xmlFormattedField.hxx | 3 +++ reportdesign/source/filter/xml/xmlFunction.hxx | 3 +++ reportdesign/source/filter/xml/xmlGroup.hxx | 3 +++ reportdesign/source/filter/xml/xmlHelper.hxx | 2 ++ reportdesign/source/filter/xml/xmlImage.hxx | 3 +++ reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx | 3 +++ reportdesign/source/filter/xml/xmlMasterFields.hxx | 3 +++ reportdesign/source/filter/xml/xmlPropertyHandler.hxx | 2 ++ reportdesign/source/filter/xml/xmlReport.hxx | 3 +++ reportdesign/source/filter/xml/xmlReportElement.hxx | 3 +++ reportdesign/source/filter/xml/xmlReportElementBase.hxx | 3 +++ reportdesign/source/filter/xml/xmlRow.hxx | 3 +++ reportdesign/source/filter/xml/xmlSection.hxx | 3 +++ reportdesign/source/filter/xml/xmlStyleImport.hxx | 3 +++ reportdesign/source/filter/xml/xmlSubDocument.hxx | 3 +++ reportdesign/source/filter/xml/xmlTable.hxx | 3 +++ reportdesign/source/filter/xml/xmlfilter.hxx | 3 +++ reportdesign/source/inc/GroupProperties.hxx | 3 +++ reportdesign/source/inc/constasciistring.hxx | 3 +++ reportdesign/source/ui/dlg/Condition.hxx | 2 ++ reportdesign/source/ui/dlg/GroupExchange.hxx | 2 ++ reportdesign/source/ui/inc/AddField.hxx | 2 ++ reportdesign/source/ui/inc/ColorChanger.hxx | 2 ++ reportdesign/source/ui/inc/ColorListener.hxx | 2 ++ reportdesign/source/ui/inc/ColumnInfo.hxx | 3 +++ reportdesign/source/ui/inc/CondFormat.hxx | 3 +++ reportdesign/source/ui/inc/DataProviderHandler.hxx | 3 +++ reportdesign/source/ui/inc/DateTime.hxx | 3 +++ reportdesign/source/ui/inc/DefaultInspection.hxx | 2 ++ reportdesign/source/ui/inc/DesignView.hxx | 2 ++ reportdesign/source/ui/inc/EndMarker.hxx | 2 ++ reportdesign/source/ui/inc/FixedTextColor.hxx | 3 +++ reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx | 3 +++ reportdesign/source/ui/inc/Formula.hxx | 2 ++ reportdesign/source/ui/inc/FunctionHelper.hxx | 3 +++ reportdesign/source/ui/inc/GeometryHandler.hxx | 3 +++ reportdesign/source/ui/inc/GroupsSorting.hxx | 3 +++ reportdesign/source/ui/inc/IReportControllerObserver.hxx | 2 ++ reportdesign/source/ui/inc/InsertFunctions.hxx | 2 ++ reportdesign/source/ui/inc/MarkedSection.hxx | 3 +++ reportdesign/source/ui/inc/Navigator.hxx | 3 +++ reportdesign/source/ui/inc/PageNumber.hxx | 3 +++ reportdesign/source/ui/inc/ReportComponentHandler.hxx | 3 +++ reportdesign/source/ui/inc/ReportController.hxx | 2 ++ reportdesign/source/ui/inc/ReportControllerObserver.hxx | 2 ++ reportdesign/source/ui/inc/ReportDefines.hxx | 3 +++ reportdesign/source/ui/inc/ReportRuler.hxx | 3 +++ reportdesign/source/ui/inc/ReportSection.hxx | 2 ++ reportdesign/source/ui/inc/ReportWindow.hxx | 2 ++ reportdesign/source/ui/inc/ScrollHelper.hxx | 3 +++ reportdesign/source/ui/inc/SectionView.hxx | 3 +++ reportdesign/source/ui/inc/SectionWindow.hxx | 2 ++ reportdesign/source/ui/inc/StartMarker.hxx | 2 ++ reportdesign/source/ui/inc/UITools.hxx | 2 ++ reportdesign/source/ui/inc/Undo.hxx | 3 +++ reportdesign/source/ui/inc/ViewsWindow.hxx | 2 ++ reportdesign/source/ui/inc/dlgedclip.hxx | 3 +++ reportdesign/source/ui/inc/dlgedfac.hxx | 2 ++ reportdesign/source/ui/inc/dlgedfunc.hxx | 3 +++ reportdesign/source/ui/inc/dlgpage.hxx | 3 +++ reportdesign/source/ui/inc/metadata.hxx | 2 ++ reportdesign/source/ui/inc/propbrw.hxx | 3 +++ reportdesign/source/ui/inc/statusbarcontroller.hxx | 2 ++ reportdesign/source/ui/inc/toolboxcontroller.hxx | 2 ++ 460 files changed, 1120 insertions(+), 1 deletion(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/inc/AsyncronousLink.hxx b/dbaccess/inc/AsyncronousLink.hxx index 2b2bbb597c7e..93faab850163 100644 --- a/dbaccess/inc/AsyncronousLink.hxx +++ b/dbaccess/inc/AsyncronousLink.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ namespace dbaui } #endif // DBAUI_ASYNCRONOUSLINK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index 91dfb4aa0f11..962782ea5e18 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -132,3 +133,5 @@ namespace dbaui }; } #endif // DBAUI_ICONTROLLER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/IEnvironment.hxx b/dbaccess/inc/IEnvironment.hxx index bc6766c91ebb..64ad54844912 100644 --- a/dbaccess/inc/IEnvironment.hxx +++ b/dbaccess/inc/IEnvironment.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ namespace dbaui }; } #endif // DBAUI_IENVIRONMENT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/IReference.hxx b/dbaccess/inc/IReference.hxx index ba78811e1e85..01534f6063e0 100644 --- a/dbaccess/inc/IReference.hxx +++ b/dbaccess/inc/IReference.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ namespace dbaui #endif // DBAUI_IREFERENCE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx index 6ab9446fc7f8..e95e40a0f4a1 100644 --- a/dbaccess/inc/ToolBoxHelper.hxx +++ b/dbaccess/inc/ToolBoxHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,4 @@ namespace dbaui } #endif // DBAUI_TOOLBOXHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/controllerframe.hxx b/dbaccess/inc/controllerframe.hxx index 942bdc42da64..19daaebb3d69 100644 --- a/dbaccess/inc/controllerframe.hxx +++ b/dbaccess/inc/controllerframe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_CONTROLLERFRAME_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/dataview.hxx b/dbaccess/inc/dataview.hxx index 1c3b1c2ac259..e3026f15ce56 100644 --- a/dbaccess/inc/dataview.hxx +++ b/dbaccess/inc/dataview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,4 @@ namespace dbaui } #endif // DBAUI_DATAVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/dbaccessdllapi.h b/dbaccess/inc/dbaccessdllapi.h index 7edac96cf07c..7365d0c4c84f 100644 --- a/dbaccess/inc/dbaccessdllapi.h +++ b/dbaccess/inc/dbaccessdllapi.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -41,3 +42,4 @@ #endif /* INCLUDED_DBACCESSDLLAPI_H */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index fefeec0125a1..510e554e93f6 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -540,3 +541,4 @@ namespace dbaui #endif //DBAUI_GENERICCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index 993722d9814e..daa7a324ab60 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -517,3 +518,4 @@ #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx index 5bda31fb4608..75e146ec2a05 100644 --- a/dbaccess/inc/singledoccontroller.hxx +++ b/dbaccess/inc/singledoccontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -232,3 +233,4 @@ namespace dbaui #endif // DBAUI_SINGLEDOCCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index b3e21a4731e1..7e9a199d6c79 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ namespace dbaccess } #endif // DBACCESS_CORE_API_BOOKMARKSET_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CIndexColumn.hxx b/dbaccess/source/core/api/CIndexColumn.hxx index 352de2c21bb0..2ac731919703 100644 --- a/dbaccess/source/core/api/CIndexColumn.hxx +++ b/dbaccess/source/core/api/CIndexColumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ namespace connectivity } } #endif // DBACCESS_INDEXCOLUMN_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx index 33e87a02fad9..ec58d93f9160 100644 --- a/dbaccess/source/core/api/CIndexes.hxx +++ b/dbaccess/source/core/api/CIndexes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ namespace dbaccess } #endif // DBACCESS_INDEXES_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx index c2df0b8b4831..2d6fe45a4006 100644 --- a/dbaccess/source/core/api/CRowSetColumn.hxx +++ b/dbaccess/source/core/api/CRowSetColumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ namespace dbaccess } #endif // DBACCESS_CORE_API_CROWSETCOLUMN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx index 0e329aba1ad5..8cf0aa5f2c95 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.hxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,5 @@ namespace dbaccess } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 1cacc1af95da..42f5d290edd5 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -155,3 +156,4 @@ namespace dbaccess } #endif //DBACCESS_CORE_API_CACHESET_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index d0a5ce74938b..f88024bc9b7a 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ namespace dbaccess }; } #endif // DBA_HELPERCOLLECTIONS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 27b99e08afaf..3ee20477f63a 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -220,3 +221,5 @@ namespace dbaccess }; } #endif // DBACCESS_CORE_API_KEYSET_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index 3a25c5d1bf80..3dc4ad4f0e73 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ namespace dbaccess }; } #endif // DBACCESS_CORE_API_OPTIMISTICSET_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx index 82dd97232c92..211ec7e9bea9 100644 --- a/dbaccess/source/core/api/PrivateRow.hxx +++ b/dbaccess/source/core/api/PrivateRow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ namespace dbaccess }; } // dbaccess #endif // PRIVATE_ROW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 13f42de75b2c..b686bc65a0e5 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -544,3 +545,4 @@ namespace dbaccess } #endif // DBACCESS_CORE_API_ROWSET_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 912fd8c314ca..58e2765d3aea 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -421,3 +422,5 @@ namespace dbaccess } // end of namespace #endif // DBACCESS_CORE_API_ROWSETBASE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 519070ee6baa..dedf04ead36b 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -223,3 +224,4 @@ namespace dbaccess } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index cafeb89aa440..e6be14baaeb8 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ namespace dbaccess }; } #endif // DBACCESS_ROWSETCACHEITERATOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index c69b2e6e6901..9dfb0eb6a80f 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ namespace dbaccess }; } #endif // DBACCESS_CORE_API_ROWSETROW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx index 098442c2c5f9..d69dfca465ec 100644 --- a/dbaccess/source/core/api/StaticSet.hxx +++ b/dbaccess/source/core/api/StaticSet.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ namespace dbaccess }; } #endif //DBACCESS_CORE_API_STATICSET_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index 1bba37764475..ae8332eee052 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,4 @@ namespace dbaccess } #endif // DBACCESS_CORE_API_WRAPPEDRESULTSET_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index 4b8017557b78..fce607807650 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,4 @@ namespace dbaccess } #endif // _DBACORE_RESULTCOLUMN_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index ddc8bae41c3e..c3fff9cc3cdd 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -170,3 +171,4 @@ private: #endif // _DBA_COREAPI_QUERY_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index 67f226b08986..391df07351bb 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,3 +158,4 @@ public: #endif // _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 58b34452e2be..a28854fcdf29 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,4 @@ namespace dbaccess } #endif // _DBACORE_RESULTCOLUMN_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index 66bcfb4965d6..dfc750bf51be 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -236,3 +237,4 @@ namespace dbaccess } #endif // _DBA_COREAPI_RESULTSET_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index fc773324018d..0eba07a61dd4 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,5 @@ private: //........................................................................ #endif // DBA_COREDATAACESS_COMPONENTDEFINITION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 9973af429c08..d18f820bff47 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -640,3 +641,4 @@ public: #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index 4b5aa7856ac5..5706d20ef5ae 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -139,3 +140,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBA_CORE_SHARED_CONNECTION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index 60f3157e8631..b41c70ae75e3 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -174,3 +175,5 @@ inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rNam } // namespace dbaccess #endif // _DBA_CORE_BOOKMARKCONTAINER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index b753b094b0f5..e1ff6b34357c 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ protected: #endif // _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 9ce1880f9c9d..30f22948cb62 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,4 @@ private: #endif // _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index eb80cc2fc7db..20488aa13e1c 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -250,3 +251,4 @@ private: #endif // _DBA_CORE_CONNECTION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx index d24ab5b6914e..e7dbf9417e7e 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.hxx +++ b/dbaccess/source/core/dataaccess/databasecontext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -210,3 +211,4 @@ private: #endif // _DBA_COREDATAACCESS_DATABASECONTEXT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index f25c39627253..a032251f8efa 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -704,3 +705,5 @@ private: } // namespace dbaccess #endif // _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.hxx b/dbaccess/source/core/dataaccess/databaseregistrations.hxx index cdfcc5141e36..f3213dba6823 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.hxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -45,3 +46,5 @@ namespace dbaccess } // namespace dbaccess #endif // OOO_DATASOURCEREGISTRATIONS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index b5282c3e34af..88cb631aac36 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -235,3 +236,4 @@ protected: #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index dd7c3f75a567..dafeef03fabf 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,5 @@ protected: } // namespace dbaccess #endif // _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index 134062adde7e..d7109efa2582 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -381,3 +382,5 @@ private: } // namespace dbaccess #endif // _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx index e48e13f91783..c83a3e2886fd 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -72,3 +73,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACCESS_DOCUMENTEVENTEXECUTOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx index 7cc3c2b1c8b0..c92064aabbc7 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACCESS_DOCUMENTEVENTNOTIFIER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx index b053a9790a6f..16cb0c86875e 100644 --- a/dbaccess/source/core/dataaccess/documentevents.hxx +++ b/dbaccess/source/core/dataaccess/documentevents.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -84,3 +85,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACCESS_DOCUMENTEVENTS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index ad3053e84487..d1d4ffc27dd3 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -164,3 +165,5 @@ private: } // namespace dbaccess #endif //DBA_INTERCEPT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index cf9c90383e54..77dcbf2e9659 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ public: } #endif // DBA_DATASUPPLIER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.hxx b/dbaccess/source/core/dataaccess/myucp_resultset.hxx index f1457793a182..b74be38df9d6 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.hxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ public: } #endif // DBA_UCPRESULTSET_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/ContainerListener.hxx b/dbaccess/source/core/inc/ContainerListener.hxx index 5d4b930aa6ed..878f13dae47b 100644 --- a/dbaccess/source/core/inc/ContainerListener.hxx +++ b/dbaccess/source/core/inc/ContainerListener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBA_CONTAINERLISTENER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 8e7a59693252..15b754e3607e 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBA_CONTAINERMEDIATOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index b1a671ac1ffd..2d659f066b90 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -202,3 +203,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBA_CONTENTHELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 5d7a4a4e368e..eb6dba6f54b8 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,5 @@ private: } // namespace dbaccess #endif // DBA_DATABASEDATAPROVIDER_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx index f02c3da87d19..561ef67778f9 100644 --- a/dbaccess/source/core/inc/FilteredContainer.hxx +++ b/dbaccess/source/core/inc/FilteredContainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -142,3 +143,5 @@ namespace dbaccess // .............................................................................. #endif // DBACCESS_CORE_FILTERED_CONTAINER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index 1c611b505918..4a685b037be0 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBA_PROPERTYSETFORWARD_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx index f6b7f5742fba..80e490c4a34c 100644 --- a/dbaccess/source/core/inc/RefreshListener.hxx +++ b/dbaccess/source/core/inc/RefreshListener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBA_CORE_REFRESHLISTENER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 6be48ba3fa43..305d3493d353 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -251,3 +252,5 @@ namespace dbaccess }; } #endif // DBACCESS_CORE_API_SINGLESELECTQUERYCOMPOSER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 8372859c2f6b..659f667e0544 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,4 @@ namespace dbaccess #endif // _DBA_CORE_TABLEDECORATOR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx index 2611b6ef8f82..44fac5088991 100644 --- a/dbaccess/source/core/inc/View.hxx +++ b/dbaccess/source/core/inc/View.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACCESS_VIEW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx index e772732b331f..26230ee9c9e6 100644 --- a/dbaccess/source/core/inc/callablestatement.hxx +++ b/dbaccess/source/core/inc/callablestatement.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ namespace dbaccess } #endif // _DBA_COREAPI_CALLABLESTATEMENT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index af3395c950fe..a65e967cc4c4 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -254,3 +255,5 @@ namespace dbaccess }; } #endif // _DBA_COREAPI_COLUMN_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx index 09fd8b8d93f1..c407b60820a8 100644 --- a/dbaccess/source/core/inc/columnsettings.hxx +++ b/dbaccess/source/core/inc/columnsettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -103,3 +104,5 @@ namespace dbaccess } // namespace dbaccess #endif // COLUMNSETTINGS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index 49d9c68f077d..05b9ca849276 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,5 @@ protected: } // namespace dbaccess #endif // _DBA_CORE_COMMANDBASE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx index 4febd4c931f5..eaaba4cdd26b 100644 --- a/dbaccess/source/core/inc/composertools.hxx +++ b/dbaccess/source/core/inc/composertools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx index e9bebd874b47..abedd666e0f3 100644 --- a/dbaccess/source/core/inc/containerapprove.hxx +++ b/dbaccess/source/core/inc/containerapprove.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACCESS_CONTAINERAPPROVE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx index 01324c35d396..42677cd5a72d 100644 --- a/dbaccess/source/core/inc/core_resource.hxx +++ b/dbaccess/source/core/inc/core_resource.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ namespace dbaccess } #endif // _DBA_CORE_RESOURCE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index 252135cdea44..cd2b4e715702 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,5 @@ protected: } // namespace dbaccess #endif // _DBA_CORE_DATASETTINGS_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index 185e7d1426d8..f98c633a5396 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -316,3 +317,4 @@ namespace dbaccess } #endif // _DBACORE_DEFINITIONCOLUMN_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index f996539d0135..72a5a9fbbfd7 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -331,3 +332,5 @@ private: } // namespace dbaccess #endif // _DBA_CORE_DEFINITIONCONTAINER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/module_dba.hxx b/dbaccess/source/core/inc/module_dba.hxx index df70bf25996a..8553348dbf00 100644 --- a/dbaccess/source/core/inc/module_dba.hxx +++ b/dbaccess/source/core/inc/module_dba.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,5 @@ namespace dba } // namespace sdbtools #endif // DBACCESS_MODULE_DBA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/object.hxx b/dbaccess/source/core/inc/object.hxx index 917cc9e05e42..7b32511f2521 100644 --- a/dbaccess/source/core/inc/object.hxx +++ b/dbaccess/source/core/inc/object.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,3 +39,4 @@ enum ObjectType #endif // _DBA_OBJECT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx index 3db920ac9cae..d641e6f1c6bd 100644 --- a/dbaccess/source/core/inc/objectnameapproval.hxx +++ b/dbaccess/source/core/inc/objectnameapproval.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACCESS_OBJECTNAMEAPPROVAL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index 229c25414786..ff2337944a69 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -114,3 +115,4 @@ namespace dbaccess } #endif // _DBA_COREAPI_PREPAREDSTATEMENT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 0ae3cbb534f6..e98ec650b632 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,5 @@ namespace dbaccess }; } #endif // DBACCESS_CORE_API_QUERYCOMPOSER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index 2c308f074e83..46fea061727f 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -181,3 +182,5 @@ namespace dbaccess } // namespace dbaccess #endif // _DBA_CORE_QUERYCONTAINER_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx index 14baf5357807..5808a134484e 100644 --- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx +++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -86,3 +87,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACCESS_DBDOCRECOVERY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx index 5cb8e4c794af..6c057018e325 100644 --- a/dbaccess/source/core/inc/sdbcoretools.hxx +++ b/dbaccess/source/core/inc/sdbcoretools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACORE_SDBCORETOOLS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index ab88663037ae..b609aaf71213 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -190,3 +191,4 @@ private: #endif // _DBA_COREAPI_STATEMENT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 95e984949619..8c2d1eda7c14 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,4 @@ namespace dbaccess #endif // _DBA_CORE_TABLE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index 8a7cf6367c33..ab2eb7bfe293 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,4 @@ namespace dbaccess #endif // _DBA_CORE_TABLECONTAINER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx index 0b944b321130..f3cbcc4fd643 100644 --- a/dbaccess/source/core/inc/userinformation.hxx +++ b/dbaccess/source/core/inc/userinformation.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -44,3 +45,4 @@ public: #endif // _DBA_CORE_USERINFORMATION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx index ffdbf70cdaa2..787d3d107f4a 100644 --- a/dbaccess/source/core/inc/veto.hxx +++ b/dbaccess/source/core/inc/veto.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace dbaccess } // namespace dbaccess #endif // DBACCESS_VETO_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index f3afd8cc1114..97e4f1393ca3 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,4 @@ namespace dbaccess #endif // _DBA_CORE_VIEWCONTAINER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx index 3415092ee93a..1101ce0cd0cc 100644 --- a/dbaccess/source/core/recovery/settingsimport.hxx +++ b/dbaccess/source/core/recovery/settingsimport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -188,3 +189,5 @@ namespace dbaccess //........................................................................ #endif // SETTINGSIMPORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index 2485cfac24cb..4f724a93e906 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -107,3 +108,5 @@ namespace dbaccess //........................................................................ #endif // STORAGESTREAM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index 08d02008f1a4..5283687ce163 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -64,3 +65,5 @@ namespace dbaccess //...................................................................................................................... #endif // STORAGETEXTSTREAM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index 10a8aaaed5de..d14d9b62bc12 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -111,3 +112,5 @@ namespace dbaccess //........................................................................ #endif // STORAGEXMLSTREAM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx index f3bec5b6b39e..30922c9d71d9 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.hxx +++ b/dbaccess/source/core/recovery/subcomponentloader.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -85,3 +86,5 @@ namespace dbaccess //........................................................................ #endif // SUBCOMPONENTLOADER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx index 2cec262937a8..cb5519cf5c77 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -124,3 +125,5 @@ namespace dbaccess //........................................................................ #endif // SUBCOMPONENTRECOVERY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index d1ba0ccb1966..75dd161c09a9 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -86,3 +87,5 @@ namespace dbaccess //........................................................................ #endif // SUBCOMPONENTS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/ANewDb.hxx b/dbaccess/source/ext/adabas/ANewDb.hxx index 512488d24bb8..cf725930dd0a 100644 --- a/dbaccess/source/ext/adabas/ANewDb.hxx +++ b/dbaccess/source/ext/adabas/ANewDb.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace adabasui //......................................................................... #endif // ADABASUI_NEWDB_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx index 56370c73ce1e..be2c27acf9d9 100644 --- a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx +++ b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ namespace adabasui #endif // DBAUI_SQLNAMEEDIT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx index 09fd0807639f..8ac75326a56e 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -276,3 +277,4 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService #endif // _EXTENSIONS_COMPONENT_MODULE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx index c7485e17b5e2..9ab36e88060c 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,4 @@ namespace adabasui } #endif // adabasui_ADABAS_CREATEDB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_module.hxx b/dbaccess/source/ext/macromigration/dbmm_module.hxx index 264550f4cba4..4e27f8c18401 100644 --- a/dbaccess/source/ext/macromigration/dbmm_module.hxx +++ b/dbaccess/source/ext/macromigration/dbmm_module.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ namespace dbmm #endif // DBACCESS_MACROMIGRATION_MODULE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/dbmm_types.hxx b/dbaccess/source/ext/macromigration/dbmm_types.hxx index 99639cd13417..13c02005b68c 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.hxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_DBMM_TYPES_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx index 51036eb90d54..524aa981aac4 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.hxx +++ b/dbaccess/source/ext/macromigration/docinteraction.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_DOCERRORHANDLING_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index d2af622316da..a4a6852909d0 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_MACROMIGRATIONDIALOG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index 8c269982999d..93cfd04bf864 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -179,3 +180,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_MACROMIGRATIONPAGES_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx index 2a203c9a82eb..8cecd2faac2b 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.hxx +++ b/dbaccess/source/ext/macromigration/migrationengine.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_MIGRATIONENGINE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx index 8e0a0fd29082..aee93d10bdc6 100644 --- a/dbaccess/source/ext/macromigration/migrationerror.hxx +++ b/dbaccess/source/ext/macromigration/migrationerror.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -171,3 +172,4 @@ namespace dbmm #endif // DBACCESS_MIGRATIONERROR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx index c8dd0910242e..554b95763e95 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.hxx +++ b/dbaccess/source/ext/macromigration/migrationlog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_MIGRATIONLOG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx index a38cc6365f7b..9c1598a43855 100644 --- a/dbaccess/source/ext/macromigration/migrationprogress.hxx +++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_MIGRATIONPROGRESS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx index 263ad9861475..eb507e6d63c1 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.hxx +++ b/dbaccess/source/ext/macromigration/progresscapture.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_PROGRESSCAPTURE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx index 784692da07a3..dd52a72d134d 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.hxx +++ b/dbaccess/source/ext/macromigration/progressmixer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -98,3 +99,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_PROGRESSMIXER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx index e94f15dbdfbe..6ecaabac6981 100644 --- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx +++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,5 @@ namespace dbmm //........................................................................ #endif // DBACCESS_RANGEPROGRESSBAR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/migration/cfgimport.hxx b/dbaccess/source/filter/migration/cfgimport.hxx index 34bca221347c..fcccadae42b0 100644 --- a/dbaccess/source/filter/migration/cfgimport.hxx +++ b/dbaccess/source/filter/migration/cfgimport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -197,3 +198,5 @@ public: } // dbacfg // ----------------------------------------------------------------------------- #endif // CFG_CFGIMPORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx index a45a7aac5e4b..6d3da1fa34aa 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLAUTOSTYLE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx index d4b9c9f5bc3b..e417e0398825 100644 --- a/dbaccess/source/filter/xml/xmlColumn.hxx +++ b/dbaccess/source/filter/xml/xmlColumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLCOLUMN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 613322c60196..1d950173b1b4 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLCOMPONENT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 69ff3df6c4e1..2cf32047c99c 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLCONNECTIONDATA_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index ecf7c2c47271..ea6be03655fb 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ namespace dbaxml #endif // DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index d1127ad06419..87038f05ef30 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATASOURCE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index 6a94b0a80ea9..89f9dde6a242 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATASOURCEINFO_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index 4d31dc0834ed..4740a7834306 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATASOURCESETTING_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx index ef91c7fcc6fd..67d3f02e432d 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATASOURCESETTINGS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx index 206ebcc8d18e..ed70500fdca3 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlDatabase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATABASE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index b4fc79ec12dd..6a056412e57a 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 777be178c367..1a84dfa4c94e 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDOCUMENTS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx index 2298b13c58e1..2248050d09b3 100644 --- a/dbaccess/source/filter/xml/xmlEnums.hxx +++ b/dbaccess/source/filter/xml/xmlEnums.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -170,3 +171,5 @@ namespace dbaxml } // namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLENUMS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index ffb516cc84b9..7e957cf554a0 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -199,3 +200,5 @@ public: } // dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLEXPORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index 29bcfcbffdd1..9f58f4b0f03f 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index 0c31b5ddff9b..fcc9ca8af74e 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index 5bd7f54730df..3d87826a928d 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLHIERARCHYCOLLECTION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index 8be3ae6ddd60..6f2751eb300b 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLLOGIN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index 874417853251..4e4bfde87be0 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLQUERY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index c3923ef43e11..c94d2184f793 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ namespace dbaxml #endif // DBA_XMLSERVERDATABASE_HXX_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index c85962c1d74c..16bea01cc12b 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,5 @@ namespace dbaxml } // dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLSTYLEIMPORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index 9607a1d1637c..925497ce92a8 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLTABLE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index d5519c3ce72b..d288b23ae7d1 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLTABLEFILTERLIST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx index 965fc99fa69f..460d896ecc89 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLTABLEFILTERPATTERN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 2241fcf5deb0..c4e2a16dc856 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -170,3 +171,5 @@ public: } // dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLFILTER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx index d025ff343462..743772cdc506 100644 --- a/dbaccess/source/inc/OAuthenticationContinuation.hxx +++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,4 @@ public: #endif // _DBACCESS_OAUTHENTICATIONCONTINUATION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 8c2b332b2b64..f5e85f426877 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -439,3 +440,4 @@ public: #endif // _DBASHARED_APITOOLS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/cfg_reghelper.hxx b/dbaccess/source/inc/cfg_reghelper.hxx index 75ba5aafc0b1..e7edf6004423 100644 --- a/dbaccess/source/inc/cfg_reghelper.hxx +++ b/dbaccess/source/inc/cfg_reghelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ namespace dbacfg #endif // CFG_REGHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/constasciistring.hxx b/dbaccess/source/inc/constasciistring.hxx index 07861a054a47..2179e2d7ffdd 100644 --- a/dbaccess/source/inc/constasciistring.hxx +++ b/dbaccess/source/inc/constasciistring.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _DBASHARED_CONSTASCIISTRING_HXX_ #define _DBASHARED_CONSTASCIISTRING_HXX_ @@ -59,3 +60,5 @@ inline ConstAsciiString::operator const ::rtl::OUString& () const #endif // _DBASHARED_CONSTASCIISTRING_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/dbadllapi.hxx b/dbaccess/source/inc/dbadllapi.hxx index 3edf80da5643..9dfd5c3269fc 100644 --- a/dbaccess/source/inc/dbadllapi.hxx +++ b/dbaccess/source/inc/dbadllapi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,5 @@ #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx index 2db1c3e7714a..fa2b70c1bde0 100644 --- a/dbaccess/source/inc/dbu_reghelper.hxx +++ b/dbaccess/source/inc/dbu_reghelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ namespace dbaui #endif // _DBU_REGHELPER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index 97e2b2ff6f31..b781c1b77316 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -239,3 +240,4 @@ protected: #endif // _DBACCESS_DSNTYPES_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx index 9b16b07bc303..a68555add95a 100644 --- a/dbaccess/source/inc/flt_reghelper.hxx +++ b/dbaccess/source/inc/flt_reghelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ namespace dbaxml #endif // _FLT_REGHELPER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx index b7861e89faf0..dd02ed5226a3 100644 --- a/dbaccess/source/inc/registrationhelper.hxx +++ b/dbaccess/source/inc/registrationhelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -166,3 +167,4 @@ OOneInstanceAutoRegistration::~OOneInstanceAutoRegistration() OModuleRegistration::revokeComponent(TYPE::getImplementationName_Static()); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx index 52a418105985..ed756b98a76c 100644 --- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx +++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -154,3 +155,4 @@ namespace sdbtools #endif // DBACCESS_CONNECTION_DEPENDENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx index 19b238a00249..ed1372e5eb89 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,4 @@ namespace sdbtools #endif // DBACCESS_CONNECTIONTOOLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx index b7af11bb5c6d..440b1f6c2c81 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,5 @@ namespace sdbtools //........................................................................ #endif // DBACCESS_DATASOURCEMETADATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index 0f72896aa118..de2b95951c62 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,4 @@ namespace sdbtools #endif // DBACCESS_SOURCE_SDBTOOLS_INC_OBJECTNAMES_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index 6c6127962f0e..d165fc8680fe 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ namespace sdbtools #endif // DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx index c40aca485a9e..938ec38c6aca 100644 --- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx +++ b/dbaccess/source/sdbtools/inc/module_sdbt.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,3 +44,4 @@ namespace sdbtools #endif // DBACCESS_MODULE_SDBT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index 1edda1d44758..fd484c686616 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -574,3 +575,4 @@ namespace dbaui #endif // DBAUI_APPCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index ec9fb8b92d00..cb4a79970fca 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -377,3 +378,4 @@ namespace dbaui } #endif // DBAUI_APPDETAILPAGEHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index dea106083c79..ef2001ab65fb 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -377,3 +378,4 @@ namespace dbaui } #endif // DBAUI_APPDETAILVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index 3cdfe71f2844..3bd27a99a56b 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ namespace dbaui } #endif // DBAUI_APPICONCONTROL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index b3a6f91c3a18..bc5cd2abb1df 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ namespace dbaui // ............................................................. #endif // DBAUI_APPSWAPWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 755b566a4f4e..8f230d9d9e1c 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -81,3 +82,4 @@ namespace dbaui // ............................................................. #endif // DBAUI_TITLE_WINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index be4159daa065..d4fa76c35849 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -312,3 +313,4 @@ namespace dbaui } #endif // DBAUI_APPVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/IApplicationController.hxx b/dbaccess/source/ui/app/IApplicationController.hxx index 2e495a93a77b..5e7123e4d3ed 100644 --- a/dbaccess/source/ui/app/IApplicationController.hxx +++ b/dbaccess/source/ui/app/IApplicationController.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -98,3 +99,5 @@ namespace dbaui //........................................................................ #endif // DBA30D_IAPPLICATIONCONTROLLER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index 72b0a548e533..c66732528471 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -134,3 +135,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_SUBCOMPONENTMANAGER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx index acddc5aeb57c..b0afe70a5fe1 100644 --- a/dbaccess/source/ui/browser/dbtreemodel.hxx +++ b/dbaccess/source/ui/browser/dbtreemodel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ namespace dbaui } #endif // DBAUI_DBTREEMODEL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx index 82d3e90490a6..2cba0dd10b08 100644 --- a/dbaccess/source/ui/browser/dbtreeview.hxx +++ b/dbaccess/source/ui/browser/dbtreeview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ namespace dbaui #endif // DBACCESS_UI_DBTREEVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx index 9dd235fb6ea1..7bba19f59724 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.hxx +++ b/dbaccess/source/ui/dlg/AdabasStat.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ namespace dbaui #endif //_DBAUI_ADASTAT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 8685236d0956..3e4c538d084c 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -130,3 +131,5 @@ namespace dbaui //......................................................................... #endif // DBAUI_CONNECTIONHELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index d3b8f305afe5..140ea6792efc 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,5 @@ namespace dbaui //......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx index 2f6e15cc4d38..c49fcc8d28ad 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ namespace dbaui //......................................................................... #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index 0c124e474341..da3735b18cc7 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -340,3 +341,5 @@ namespace dbaui //......................................................................... #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 04fb1adfbcfe..02ef746fcd7a 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -192,3 +193,4 @@ namespace dbaui #endif // _DBAUI_DBADMINIMPL_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 37f23e4d8e10..13b4b50e5943 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,4 @@ namespace dbaui #endif // DBAUI_DRIVERSETTINGS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 2a9add1d5bbc..8c1d0aa0c0fd 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -120,3 +121,4 @@ namespace dbaui #endif // DBAUI_DBWIZ2_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index f73e93e6d3f1..73458126dbb1 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,5 @@ public: }; } #endif // DBAUI_USERADMIN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index e4526dffb8d2..cd3246cdc332 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -80,3 +81,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_ADMINCONTROLS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index b918e0ceff62..eba739fec877 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -285,3 +286,4 @@ namespace dbaui #endif // _DBAUI_ADMINPAGES_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx index a8bb8c00c4a9..e5f299e7a7be 100644 --- a/dbaccess/source/ui/dlg/adodatalinks.hxx +++ b/dbaccess/source/ui/dlg/adodatalinks.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,4 +33,5 @@ #include "commontypes.hxx" ::rtl::OUString getAdoDatalink(long hWnd,::rtl::OUString& oldLink); -#endif \ No newline at end of file +#endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 7e58f260f4e6..f4c6e75e4f3f 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_ADVANCEDSETTINGS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index f3ab30096e32..59b1f0f66f1e 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -152,3 +153,4 @@ public: #endif // _DBAUI_DBFINDEX_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index e54a85771e21..2d304430e865 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -368,3 +369,5 @@ namespace dbaui //......................................................................... #endif // _DBAUI_DETAILPAGES_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx index ac66e4386bf9..a3b542a1d4f6 100644 --- a/dbaccess/source/ui/dlg/dsnItem.hxx +++ b/dbaccess/source/ui/dlg/dsnItem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,4 @@ namespace dbaui #endif // _DBAUI_DSNITEM_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index d2ac059827e9..555464635b84 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -93,3 +94,4 @@ protected: #endif // _DBAUI_DSSELECT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx index 8858aeb9f3f2..bbc837e0b074 100644 --- a/dbaccess/source/ui/dlg/finteraction.hxx +++ b/dbaccess/source/ui/dlg/finteraction.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,4 @@ namespace dbaui #endif // DBAUI_FILEPICKER_INTERACTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 5fc2a8b21447..ad28e2dc0692 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -165,3 +166,5 @@ namespace dbaui } // namespace dbaui //......................................................................... #endif // _DBAUI_GENERALPAGE_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx index b4a10625e49b..479c0743953b 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.hxx +++ b/dbaccess/source/ui/dlg/odbcconfig.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,4 @@ public: #endif // _DBAUI_ODBC_CONFIG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx index 89d7d0d5de3b..0fdb2dedf611 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.hxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * @@ -65,3 +66,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_OPTIONALBOOLITEM_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx index 823decbb71bd..a15e7e159e53 100644 --- a/dbaccess/source/ui/dlg/tablespage.hxx +++ b/dbaccess/source/ui/dlg/tablespage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,4 @@ namespace dbaui #endif // _DBAUI_TABLESPAGE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx index 61a9e0a1ec5a..adcd7bf75c4b 100644 --- a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx +++ b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,5 @@ namespace dbaui }; } #endif // DBAUI_ACCESSIBLE_HELPER_IFACE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/AppElementType.hxx b/dbaccess/source/ui/inc/AppElementType.hxx index d615fa034692..006f5ced1c73 100644 --- a/dbaccess/source/ui/inc/AppElementType.hxx +++ b/dbaccess/source/ui/inc/AppElementType.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ namespace dbaui //........................................................................ #endif // DBAUI_APPELEMENTTYPE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index d7daac68fd2e..395ad71f3e0c 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ namespace dbaui #endif //DBAUI_COLLECTIONVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 876129c513eb..d0376cbf76dc 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ namespace dbaui } // namespace dbaui //......................................................................... #endif // DBAUI_COLUMNCONTROLWINDOW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx index 117ed25b5bcd..a8070ecd183e 100644 --- a/dbaccess/source/ui/inc/ConnectionLine.hxx +++ b/dbaccess/source/ui/inc/ConnectionLine.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,5 @@ namespace dbaui } #endif // DBAUI_CONNECTIONLINE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx index 07d1b2e355ef..d36af945165f 100644 --- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -105,3 +106,5 @@ namespace dbaui }; } #endif // DBACCESS_CONNECTIONLINEACCESS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx index 42c1f8969daa..50898937894c 100644 --- a/dbaccess/source/ui/inc/ConnectionLineData.hxx +++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,4 @@ namespace dbaui } #endif // DBAUI_CONNECTIONLINEDATA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx index de320d363173..4a96c8176825 100644 --- a/dbaccess/source/ui/inc/DExport.hxx +++ b/dbaccess/source/ui/inc/DExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx index 9506dfee38b3..9252a6b3974c 100644 --- a/dbaccess/source/ui/inc/ExtensionNotPresent.hxx +++ b/dbaccess/source/ui/inc/ExtensionNotPresent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,4 @@ public: // ============================================================================= #endif // DBU_EXTENSIONNOTPRESENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index d19307a54912..5ccb33bb70dc 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 1d603709be87..38c270610a5f 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -230,3 +231,4 @@ namespace dbaui #endif // DBAUI_FIELDDESCRIPTIONCONTROL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx index 47d10f27cb8f..980b23050f3e 100644 --- a/dbaccess/source/ui/inc/FieldDescriptions.hxx +++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,4 @@ namespace dbaui #endif // DBAUI_FIELDDESCRIPTIONS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx index 7d1ec542b1f7..29e4d09e5670 100644 --- a/dbaccess/source/ui/inc/GeneralUndo.hxx +++ b/dbaccess/source/ui/inc/GeneralUndo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ namespace dbaui #endif // DBAUI_GENERALUNDO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx index b40f795748f2..83d1926f1b1c 100644 --- a/dbaccess/source/ui/inc/HtmlReader.hxx +++ b/dbaccess/source/ui/inc/HtmlReader.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/IClipBoardTest.hxx b/dbaccess/source/ui/inc/IClipBoardTest.hxx index 45c32df39336..2f64d667379d 100644 --- a/dbaccess/source/ui/inc/IClipBoardTest.hxx +++ b/dbaccess/source/ui/inc/IClipBoardTest.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -45,3 +46,5 @@ namespace dbaui }; } #endif // DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx index 8d769dcb4c3e..8d39925c33e0 100644 --- a/dbaccess/source/ui/inc/IItemSetHelper.hxx +++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ namespace dbaui } #endif // DBAUI_ITEMSETHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/IUpdateHelper.hxx b/dbaccess/source/ui/inc/IUpdateHelper.hxx index 8a08bd1e0229..b9976efe9935 100644 --- a/dbaccess/source/ui/inc/IUpdateHelper.hxx +++ b/dbaccess/source/ui/inc/IUpdateHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,4 @@ namespace dbaui #endif // DBAUI_IUPDATEHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx index d06266c84fcc..7ecb0dbf4aa4 100644 --- a/dbaccess/source/ui/inc/JAccess.hxx +++ b/dbaccess/source/ui/inc/JAccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ namespace dbaui }; } #endif // DBACCESS_JACCESS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 6133550dd9b9..7c27a499e783 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -176,3 +177,4 @@ namespace dbaui } #endif // DBAUI_JOINCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index 238d1cbbceb5..ce67cc1b8990 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 683840368ba3..44f19b89c528 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,4 @@ namespace dbaui #endif // DBAUI_JOINEXCHANGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index 98973c06b5dd..72f5d054345e 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -321,3 +322,5 @@ namespace dbaui }; } #endif // DBAUI_JOINTABLEVIEW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/QEnumTypes.hxx b/dbaccess/source/ui/inc/QEnumTypes.hxx index 687b40dcb4c6..13ea803c3866 100644 --- a/dbaccess/source/ui/inc/QEnumTypes.hxx +++ b/dbaccess/source/ui/inc/QEnumTypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,4 @@ namespace dbaui #endif // DBAUI_ENUMTYPES_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index f9072f4b8b09..4fa761fa3b64 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,4 @@ namespace dbaui } #endif // DBAUI_QUERYDESIGNVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index bced89dad19e..5bd45e30ccb9 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index 87942784b482..d541e972169c 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,3 +71,4 @@ namespace dbaui #endif // DBAUI_QUERYVIEW_TEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx index 57ff2b5b29ff..9ddc6ce20108 100644 --- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx +++ b/dbaccess/source/ui/inc/QueryViewSwitch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ namespace dbaui } #endif // DBAUI_QUERYVIEWSWITCH_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx index 068a848faa42..184e0e97cbdb 100644 --- a/dbaccess/source/ui/inc/RTableConnectionData.hxx +++ b/dbaccess/source/ui/inc/RTableConnectionData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx index 95c55e485c6b..20912af0af1c 100644 --- a/dbaccess/source/ui/inc/RefFunctor.hxx +++ b/dbaccess/source/ui/inc/RefFunctor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ namespace dbaui // ----------------------------------------------------------------------------- #endif //DBAUI_REFFUNCTOR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index 2fe868a975c6..ab0366263e50 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ namespace dbaui }; } #endif // DBAUI_RELCONTROLIFACE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index 7537cbe3bf6f..55983b1dff6e 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ namespace dbaui }; } #endif // DBAUI_RELATIONCONTROL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx index ff8f8080e273..3b0e375f8537 100644 --- a/dbaccess/source/ui/inc/RelationController.hxx +++ b/dbaccess/source/ui/inc/RelationController.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,4 @@ namespace dbaui } #endif // DBAUI_RELATIONCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx index 10f1fa0248b9..423885b3ee38 100644 --- a/dbaccess/source/ui/inc/RelationDesignView.hxx +++ b/dbaccess/source/ui/inc/RelationDesignView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 53af1dac45f5..bbd66b2ba7b8 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,4 @@ namespace dbaui #endif // DBAUI_RELATIONDIALOG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index 3bde644a78ad..b7213e440754 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,4 @@ namespace dbaui #endif // DBAUI_RELATION_TABLEVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx index 522aea42ff7c..299274aef315 100644 --- a/dbaccess/source/ui/inc/RtfReader.hxx +++ b/dbaccess/source/ui/inc/RtfReader.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ namespace dbaui #endif // DBAUI_RTFREADER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx index 5ecbbaf3a865..6835c99eef3e 100644 --- a/dbaccess/source/ui/inc/ScrollHelper.hxx +++ b/dbaccess/source/ui/inc/ScrollHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,4 @@ namespace dbaui } #endif // DBAUI_SCROLLHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx index 182bc3ffd1e0..edeed2d4f40b 100644 --- a/dbaccess/source/ui/inc/SqlNameEdit.hxx +++ b/dbaccess/source/ui/inc/SqlNameEdit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,4 @@ namespace dbaui #endif // DBAUI_SQLNAMEEDIT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx index 68ac03da0d91..5eb3429ce931 100644 --- a/dbaccess/source/ui/inc/TableConnection.hxx +++ b/dbaccess/source/ui/inc/TableConnection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,4 @@ namespace dbaui } #endif // DBAUI_TABLECONNECTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx index 7ca37f9e1d64..0a91e9bf5cc2 100644 --- a/dbaccess/source/ui/inc/TableConnectionData.hxx +++ b/dbaccess/source/ui/inc/TableConnectionData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -111,3 +112,4 @@ namespace dbaui #endif // DBAUI_TABLECONNECTIONDATA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx index 5925ae8c6f62..5b61c5ada9eb 100644 --- a/dbaccess/source/ui/inc/TableController.hxx +++ b/dbaccess/source/ui/inc/TableController.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -156,3 +157,4 @@ namespace dbaui #endif // DBUI_TABLECONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index 8b59d3c5f6a3..86012fa3706f 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,3 +197,4 @@ namespace dbaui //........................................................................ #endif // DBUI_TABLECOPYHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx index 5d6ff3a117dd..9acd1fbf02eb 100644 --- a/dbaccess/source/ui/inc/TableDesignControl.hxx +++ b/dbaccess/source/ui/inc/TableDesignControl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,4 @@ namespace dbaui #endif // DBAUI_TABLEDESIGNCONTROL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx index 7bea7f8f5e76..5e7c440a1466 100644 --- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx +++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,4 @@ namespace dbaui } #endif // DBAUI_TABLEDESIGNHELPBAR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx index 3350a2517baf..b7bc8356ed76 100644 --- a/dbaccess/source/ui/inc/TableDesignView.hxx +++ b/dbaccess/source/ui/inc/TableDesignView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -119,3 +120,4 @@ namespace dbaui } #endif // DBAUI_TABLEDESIGNVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx index 20ace4f664d0..6f716e30d5e8 100644 --- a/dbaccess/source/ui/inc/TableFieldDescription.hxx +++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -159,3 +160,4 @@ namespace dbaui } #endif // +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 123dc1b29c77..bc4679434a0f 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -112,3 +113,5 @@ private: } #endif // DBAUI_TABLEGRANTCONTROL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index 1e224504cd2f..3fe4afa56854 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ namespace dbaui } #endif // DBAUI_TABLEROW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index eab96a8eba5d..4a433f7c849e 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ namespace dbaui } #endif // DBAUI_TABLEROW_EXCHANGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx index 07bb577d8262..323656ca869d 100644 --- a/dbaccess/source/ui/inc/TableWindow.hxx +++ b/dbaccess/source/ui/inc/TableWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -207,3 +208,4 @@ namespace dbaui #endif //DBAUI_TABLEWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx index f030f82f766d..f8351362c001 100644 --- a/dbaccess/source/ui/inc/TableWindowAccess.hxx +++ b/dbaccess/source/ui/inc/TableWindowAccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ namespace dbaui }; } #endif // DBACCESS_TABLEWINDOWACCESS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx index c9c2f16612a2..aa44a8d6d5f5 100644 --- a/dbaccess/source/ui/inc/TableWindowData.hxx +++ b/dbaccess/source/ui/inc/TableWindowData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ namespace dbaui } #endif // DBAUI_TABLEWINDOWDATA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx index a1d0b67099d4..a3de07dac935 100644 --- a/dbaccess/source/ui/inc/TableWindowListBox.hxx +++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx index 61fc124f7b6a..e81ab0be5597 100644 --- a/dbaccess/source/ui/inc/TableWindowTitle.hxx +++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ namespace dbaui } #endif // DBAUI_TABLEWINDOWTITLE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx index 4dbdca7b2f39..e9c7880caf9c 100644 --- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx +++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ class ODbDataSourceAdministrationHelper; #endif // _DBAUI_TABLESSINGLEDLG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx index f5f073f8e4b3..1e87054a9ece 100644 --- a/dbaccess/source/ui/inc/TokenWriter.hxx +++ b/dbaccess/source/ui/inc/TokenWriter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -255,3 +256,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx index 5770f6b1c0dd..10ea51cf58aa 100644 --- a/dbaccess/source/ui/inc/TypeInfo.hxx +++ b/dbaccess/source/ui/inc/TypeInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -142,3 +143,4 @@ const sal_uInt16 TYPE_BIT = 31; #endif // DBAUI_TYPEINFO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index 29664f3b9627..8bd112c38742 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -460,3 +461,4 @@ namespace dbaui #endif // DBAUI_TOOLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx index c9f94930eece..3b510f9a8926 100644 --- a/dbaccess/source/ui/inc/UserAdminDlg.hxx +++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -88,3 +89,5 @@ namespace dbaui //......................................................................... #endif // DBAUI_USERADMINDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx index a430694cdfd8..32f35779288e 100644 --- a/dbaccess/source/ui/inc/VertSplitView.hxx +++ b/dbaccess/source/ui/inc/VertSplitView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ namespace dbaui } #endif // DBAUI_VERTSPLITVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index 1135e9ec3f00..110e8227027d 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,4 @@ namespace dbaui #endif // DBAUI_WIZARD_CPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx index 14372d0d8f72..8c0f16228bd2 100644 --- a/dbaccess/source/ui/inc/WColumnSelect.hxx +++ b/dbaccess/source/ui/inc/WColumnSelect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 6596eea8c7c5..7249dcdc1104 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -418,3 +419,5 @@ namespace dbaui } #endif // DBAUI_WIZ_COPYTABLEDIALOG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx index d450fa1e0e86..b12578deda6b 100644 --- a/dbaccess/source/ui/inc/WExtendPages.hxx +++ b/dbaccess/source/ui/inc/WExtendPages.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx index 9c1e17af3ee2..06d6a76fe655 100644 --- a/dbaccess/source/ui/inc/WNameMatch.hxx +++ b/dbaccess/source/ui/inc/WNameMatch.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index 690c68f2c0fd..7aa6c138bd1b 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx index 3f3c8433d124..ab57648adf90 100644 --- a/dbaccess/source/ui/inc/WTypeSelect.hxx +++ b/dbaccess/source/ui/inc/WTypeSelect.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 15baef92f6aa..214e5f9113e3 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,5 @@ namespace dbaui }; } #endif // DBAUI_QYDLGTAB_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx index 87470c942ed9..092afbb98108 100644 --- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx +++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_ADVANCEDSETTINGSDLG_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/asyncmodaldialog.hxx b/dbaccess/source/ui/inc/asyncmodaldialog.hxx index 17d3187401fb..4cdc83d70dfc 100644 --- a/dbaccess/source/ui/inc/asyncmodaldialog.hxx +++ b/dbaccess/source/ui/inc/asyncmodaldialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,4 @@ namespace dbaui #endif // DBACCESS_ASYNCMODALDIALOG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx index 1334cf3d4c28..7bd5a7c67171 100644 --- a/dbaccess/source/ui/inc/browserids.hxx +++ b/dbaccess/source/ui/inc/browserids.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ #endif // DBACCESS_UI_BROWSER_ID_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 633b99f04e5c..ccc53bc650c7 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -365,3 +366,4 @@ namespace dbaui #endif // _SBA_BWRCTRLR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx index f16aab919ae3..b73016ea34e8 100644 --- a/dbaccess/source/ui/inc/brwview.hxx +++ b/dbaccess/source/ui/inc/brwview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,3 +114,4 @@ namespace dbaui } #endif // _SBX_BRWVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx index 0d4eea6c8c6e..355e8faafcad 100644 --- a/dbaccess/source/ui/inc/callbacks.hxx +++ b/dbaccess/source/ui/inc/callbacks.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,4 @@ namespace dbaui #endif // _DBACCESS_UI_CALLBACKS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 014fcb810860..0f581e61b670 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -63,3 +64,5 @@ namespace dbaui //........................................................................ #endif // CHARSETLISTBOX_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx index e7504c7522c0..f5f51690178c 100644 --- a/dbaccess/source/ui/inc/charsets.hxx +++ b/dbaccess/source/ui/inc/charsets.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,4 @@ namespace dbaui #endif // _DBAUI_CHARSETS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx index 6a2633cc6dea..4fde4f6d1b38 100644 --- a/dbaccess/source/ui/inc/commontypes.hxx +++ b/dbaccess/source/ui/inc/commontypes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,4 @@ namespace dbaui #endif // _DBAUI_COMMON_TYPES_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx index f58742891ca2..5983f252c8e5 100644 --- a/dbaccess/source/ui/inc/curledit.hxx +++ b/dbaccess/source/ui/inc/curledit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,3 +86,4 @@ public: #endif // _DBAUI_CURLEDIT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx index 445e379da75d..97659f454888 100644 --- a/dbaccess/source/ui/inc/databaseobjectview.hxx +++ b/dbaccess/source/ui/inc/databaseobjectview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -260,3 +261,4 @@ namespace dbaui #endif // DBACCESS_DATABASE_OBJECT_VIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx index 32b3dee93aec..cb2842591dd6 100644 --- a/dbaccess/source/ui/inc/datasourceconnector.hxx +++ b/dbaccess/source/ui/inc/datasourceconnector.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,4 @@ namespace dbaui #endif // _DBAUI_DATASOURCECONNECTOR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/datasourcemap.hxx b/dbaccess/source/ui/inc/datasourcemap.hxx index 2cc08819cf93..836f001bf580 100644 --- a/dbaccess/source/ui/inc/datasourcemap.hxx +++ b/dbaccess/source/ui/inc/datasourcemap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -262,3 +263,4 @@ namespace dbaui #endif // DBAUI_DATASOURCEMAP_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 69b789556e00..4ba63866454b 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,4 @@ private: #endif // _DBAUI_DBADMIN_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index a26271db3f21..29a8c3c2867e 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index dfd1dad59356..4a7cbf0131c6 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -165,3 +166,5 @@ namespace dbaui } #endif // DBAUI_DBTREELISTBOX_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 6919aac7ea0e..882f78b806de 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -131,3 +132,4 @@ private: #endif // DBAUI_DBWIZ_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index 318012d2d5da..ad8c6fb07eef 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -193,3 +194,4 @@ private: #endif // DBAUI_DBWIZ2_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx index 9111cbb265b0..c84b1dcdfd69 100644 --- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx +++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -142,3 +143,4 @@ namespace dbaui #endif // DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index f139705d5e68..dcb9ec5f96c1 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,4 @@ namespace dbaui #endif // _DBACCESS_UI_DIRECTSQL_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx index a23cabb2e195..a1a3c82ec76a 100644 --- a/dbaccess/source/ui/inc/dlgattr.hxx +++ b/dbaccess/source/ui/inc/dlgattr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ namespace dbaui #endif//DBAUI_SBATTRDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 06a505c32eea..315aad0e7aa5 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -95,3 +96,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index b0a768811b9d..3617c72e4a47 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ namespace dbaui #endif // _DBAUI_DLGSIZE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx index cb08be7812d5..7437d8b54b6c 100644 --- a/dbaccess/source/ui/inc/dsitems.hxx +++ b/dbaccess/source/ui/inc/dsitems.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ typedef sal_Int32 ItemID; #endif // _DBAUI_DATASOURCEITEMS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx index 551ba4fe40b7..a7a0d5c6c80b 100644 --- a/dbaccess/source/ui/inc/dsmeta.hxx +++ b/dbaccess/source/ui/inc/dsmeta.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -140,3 +141,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_DSMETA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx index d58cf65f6959..2fbd64bc99d5 100644 --- a/dbaccess/source/ui/inc/exsrcbrw.hxx +++ b/dbaccess/source/ui/inc/exsrcbrw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ namespace dbaui } #endif // _SBA_EXTCTRLR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx index fce0f65f84c9..f85cc2bd62e9 100644 --- a/dbaccess/source/ui/inc/formadapter.hxx +++ b/dbaccess/source/ui/inc/formadapter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -445,3 +446,4 @@ namespace dbaui } #endif // _SBA_FORMADAPTER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx index cac2a92ca286..fd1c479917f1 100644 --- a/dbaccess/source/ui/inc/imageprovider.hxx +++ b/dbaccess/source/ui/inc/imageprovider.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,3 +185,4 @@ namespace dbaui #endif // DBACCESS_IMAGEPROVIDER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx index da4c4d540b66..7e01de118b72 100644 --- a/dbaccess/source/ui/inc/indexcollection.hxx +++ b/dbaccess/source/ui/inc/indexcollection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,4 @@ namespace dbaui #endif // _DBAUI_INDEXCOLLECTION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 45a0420b7469..f7d4c41a45fb 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -181,3 +182,4 @@ namespace dbaui #endif // _DBAUI_INDEXDIALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx index ee7261a8c22d..18e8f4ff0b5c 100644 --- a/dbaccess/source/ui/inc/indexes.hxx +++ b/dbaccess/source/ui/inc/indexes.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ namespace dbaui #endif // _DBAUI_INDEXES_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 40190bf81ac4..d3802b03746d 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -108,3 +109,4 @@ namespace dbaui #endif // _DBAUI_INDEXFIELDSCONTROL_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx index 7c93b1869dab..84609bb1e5d2 100644 --- a/dbaccess/source/ui/inc/linkeddocuments.hxx +++ b/dbaccess/source/ui/inc/linkeddocuments.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -137,3 +138,4 @@ namespace dbaui #endif // _DBAUI_LINKEDDOCUMENTS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx index aaf43b3fab11..6d5394667111 100644 --- a/dbaccess/source/ui/inc/listviewitems.hxx +++ b/dbaccess/source/ui/inc/listviewitems.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -66,3 +67,4 @@ namespace dbaui #endif // _DBAUI_LISTVIEWITEMS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/localresaccess.hxx b/dbaccess/source/ui/inc/localresaccess.hxx index c33e9470d790..9760ac354aac 100644 --- a/dbaccess/source/ui/inc/localresaccess.hxx +++ b/dbaccess/source/ui/inc/localresaccess.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,4 @@ public: #endif // _DBAUI_LOCALRESACCESS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index d98db6f0bdce..cc5f10791b2f 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ private: #endif // _DBAUI_MARKTREE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx index 4ce94fec8f79..a57513f6c5e7 100644 --- a/dbaccess/source/ui/inc/moduledbu.hxx +++ b/dbaccess/source/ui/inc/moduledbu.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -102,3 +103,4 @@ public: #endif // _DBAUI_MODULE_DBU_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/objectnamecheck.hxx b/dbaccess/source/ui/inc/objectnamecheck.hxx index 5b9b95b83f63..144877d56d62 100644 --- a/dbaccess/source/ui/inc/objectnamecheck.hxx +++ b/dbaccess/source/ui/inc/objectnamecheck.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ namespace dbaui //........................................................................ #endif // DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index a7c8c0bc8cb6..3e0e53e2d653 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,4 @@ namespace dbaui #endif // DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index baa703018dc5..73d9107b6176 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,4 @@ namespace dbaui #endif // _DBAUI_PARAMDIALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx index ac1cd0e2bd1a..fa678989c06f 100644 --- a/dbaccess/source/ui/inc/propertysetitem.hxx +++ b/dbaccess/source/ui/inc/propertysetitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,4 @@ namespace dbaui #endif // _DBAUI_PROPERTYSETITEM_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx index 79cd07b5a505..ef88f585631e 100644 --- a/dbaccess/source/ui/inc/propertystorage.hxx +++ b/dbaccess/source/ui/inc/propertystorage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace dbaui //........................................................................ #endif // PROPERTYSTORAGE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx index eaf798cc693a..7146b8306cfb 100644 --- a/dbaccess/source/ui/inc/querycontainerwindow.hxx +++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -122,3 +123,4 @@ namespace dbaui #endif // DBAUI_QUERYCONTAINERWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index ec36e6ed3e6e..0f2813cd0b05 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -257,3 +258,4 @@ namespace dbaui } #endif // DBAUI_QUERYCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 133df3eba3c2..bfb10cae1924 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -145,3 +146,4 @@ namespace dbaui #endif // DBAUI_QUERYFILTER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index da489299ac41..86dc874197d8 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -126,3 +127,4 @@ namespace dbaui #endif // DBAUI_QUERYORDER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 9281039b7cab..b1ead2c6c031 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ namespace dbaui }; } #endif // DBAUI_QUERYVIEW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index e3ff542d81a0..857c32d8f010 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -343,3 +344,4 @@ namespace dbaui } #endif // _SBA_GRID_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx index 7d73aee9bf81..0fe8ba96aae6 100644 --- a/dbaccess/source/ui/inc/sbamultiplex.hxx +++ b/dbaccess/source/ui/inc/sbamultiplex.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -434,3 +435,4 @@ namespace dbaui #endif // _SBA_MULTIPLEXER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index 4733a2640ebc..3ad5a4d93460 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -87,3 +88,4 @@ namespace dbaui #endif // DBAUI_SQLEDIT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 910a75883939..554310078fb2 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -133,3 +134,4 @@ public: #endif // _DBAUI_SQLMESSAGE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/statusbarontroller.hxx b/dbaccess/source/ui/inc/statusbarontroller.hxx index 400dbebe5719..57d82d317605 100644 --- a/dbaccess/source/ui/inc/statusbarontroller.hxx +++ b/dbaccess/source/ui/inc/statusbarontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -50,3 +51,4 @@ namespace dbaui } #endif // DBAUI_STATUSBARCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx index 214af158e485..713026625d6f 100644 --- a/dbaccess/source/ui/inc/stringlistitem.hxx +++ b/dbaccess/source/ui/inc/stringlistitem.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ public: #endif // _DBAUI_STRINGLISTITEM_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx index 5fcbc437d4f5..3b70a0324d46 100644 --- a/dbaccess/source/ui/inc/tabletree.hxx +++ b/dbaccess/source/ui/inc/tabletree.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,3 +197,4 @@ protected: #endif // _DBAUI_TABLETREE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index a5c6b4ff95f0..dcda4a3acdb3 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,5 @@ namespace dbaui //........................................................................ #endif // TEXTCONNECTIONSETTINGS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx index 0832612f3cc4..96ab7e3175d6 100644 --- a/dbaccess/source/ui/inc/toolboxcontroller.hxx +++ b/dbaccess/source/ui/inc/toolboxcontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -71,3 +72,4 @@ namespace dbaui //.......................................................................... #endif //DBACCESS_TOOLBOXCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx index e944504d7755..0bcbcdabe095 100644 --- a/dbaccess/source/ui/inc/undosqledit.hxx +++ b/dbaccess/source/ui/inc/undosqledit.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ namespace dbaui #endif // DBAUI_UNDOSQLEDIT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/unoadmin.hxx b/dbaccess/source/ui/inc/unoadmin.hxx index a64c2f2e9370..3ad794e9c52e 100644 --- a/dbaccess/source/ui/inc/unoadmin.hxx +++ b/dbaccess/source/ui/inc/unoadmin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -77,3 +78,4 @@ protected: #endif // _DBAUI_UNOADMIN_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index a5aee9f6850b..deb68c99b6a0 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -495,3 +496,4 @@ namespace dbaui #endif // _SBA_UNODATBR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 6ac787f83dc2..0022ab64af77 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ protected: #endif // _DBAUI_UNOSQLMESSAGE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx index ab48101d672a..cff3c9f11a72 100644 --- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx +++ b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -147,3 +148,4 @@ namespace dbaui #endif // DBAUI_UPDATEHELPERIMPL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/ConnectionData.hxx b/dbaccess/source/ui/querydesign/ConnectionData.hxx index 258da5fbe817..67a768e79f40 100644 --- a/dbaccess/source/ui/querydesign/ConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/ConnectionData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ class SbaJoinTabWinCont; DECLARE_LIST( SbaJoinTabConnList, SbaJoinTabConn* ); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx index eaef2fef1457..a2402acab43b 100644 --- a/dbaccess/source/ui/querydesign/QTableConnection.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -54,3 +55,5 @@ namespace dbaui }; } #endif // DBAUI_QUERYTABLECONNECTION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx index 6e3bed10173b..f7d2173907b1 100644 --- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx +++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,5 @@ namespace dbaui } #endif // DBAUI_QTABLECONNECTIONDATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx index 0f8fcfd943e5..deaad8621808 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ namespace dbaui #endif // DBAUI_QUERY_TABLEWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx index 4d867fa2097d..9a54e738a764 100644 --- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx +++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,4 @@ namespace dbaui #endif // DBAUI_QUERY_TABLEWINDOWDATA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx index 39c54ad24f09..c0ef7d5ef1ef 100644 --- a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ namespace dbaui #endif // DBAUI_QUERYADDTABCONNUNDOACTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx index eed462b00a1b..6cccdbcf9c34 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -157,3 +158,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx index e8d11256cfcb..557a94c14204 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -46,3 +47,4 @@ namespace dbaui } #endif // DBAUI_QUERYDESIGNUNDOACTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx index b8defd0d0227..692bd3946fda 100644 --- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,4 @@ namespace dbaui #endif // DBAUI_OQUERYMOVETABWINUNDOACT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx index 5e42e04fa764..11a2fc0412de 100644 --- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ namespace dbaui #endif //DBAUI_QUERYSIZETABWINUNDOACT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx index 5f6b6fd56944..42a2e738bc53 100644 --- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,4 @@ namespace dbaui #endif // DBAUI_QUERYTABCONNUNDOACTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx index 323d67284e50..f5988bd65786 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx index 0caf794d9eaf..1fa0df1f3a01 100644 --- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx +++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index ecd809edeccf..4ecb2e8e0245 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -343,3 +344,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx index 559bf0867396..090d71735665 100644 --- a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx +++ b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,4 @@ namespace dbaui #endif // DBAUI_TABLEFIELDINFO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index bca050fe7fd4..2e0b331fb13e 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -104,3 +105,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx index cfc13849f083..c9be2d46cc9e 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx +++ b/dbaccess/source/ui/relationdesign/RTableConnection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx index 39d8363d02b7..12c7b51e5b42 100644 --- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx +++ b/dbaccess/source/ui/relationdesign/RTableWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,4 @@ namespace dbaui #endif //DBAUI_RELTABLEWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx index b5e9c31c6752..87cbbe9fb928 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ namespace dbaui } #endif // DBAUI_TABLEFIELDDESCGENPAGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index e2da6dfa19bf..1d154ee5be0d 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -218,3 +219,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx index 825b5f4d682e..a45d2928889c 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ namespace dbaui #endif // DBAUI_TABLEFIELDCONTROL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx index 27857826a732..aa2a05482211 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -107,3 +108,4 @@ namespace dbaui +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx index 16a840b4977d..ff744b2f0d57 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.hxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -168,3 +169,4 @@ namespace dbaui #endif // DBAUI_TABLEUNDO_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx b/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx index 4ccd46f4c45a..f102ba02c39d 100644 --- a/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/AdabasSettingsDlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ protected: #endif // _DBAUI_ADABASSETTINGSDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index a5832a9f51be..08ef5e8f5fe5 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ namespace dbaui //......................................................................... #endif // DBAUI_COLUMNCONTROL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index eec1ca89fc9a..734933a35dc0 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ public: } // namespace dbaui //......................................................................... #endif // DBAUI_COLUMNMODEL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx index 7c59cfa496f9..e469e4997083 100644 --- a/dbaccess/source/ui/uno/ColumnPeer.hxx +++ b/dbaccess/source/ui/uno/ColumnPeer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -60,3 +61,4 @@ namespace dbaui #endif //DBAUI_COLUMNPEER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 4fee89192679..d34ed1b61c9b 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ protected: #endif // DBAUI_DBTYPEWIZDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index 1c85d1599c9b..2b91f9566992 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ protected: #endif // DBAUI_DBTYPEWIZDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 32aba9e4be82..3168c4d98751 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ protected: #endif // _DBAUI_TABLEFILTERDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index b2f603d09628..e46d1505ac6c 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ protected: #endif // _DBAUI_USERSETTINGSDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index 81af43fd92f0..3b0fc5d8c367 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ protected: #endif // _DBAUI_ADMINDLG_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 063cff286c57..acc82ae93cf2 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -142,3 +143,4 @@ namespace dbaui #endif // DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index fb04c512a3f1..09d6ef37ac11 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,3 +185,4 @@ namespace dbaui #endif // _DBAUI_INTERACTION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index ce936a406366..1f7dde873282 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -78,3 +79,4 @@ namespace dbaui #endif // DBAUI_UNODIRECTSQL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx index 79d3b996db81..cf3ccafded7d 100644 --- a/reportdesign/inc/ModuleHelper.hxx +++ b/reportdesign/inc/ModuleHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -98,3 +99,4 @@ namespace rptui #endif // _RPTUI_MODULE_HELPER_RPT_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/PropertyForward.hxx b/reportdesign/inc/PropertyForward.hxx index 9dfea3011eb3..bec7eb21c0a6 100644 --- a/reportdesign/inc/PropertyForward.hxx +++ b/reportdesign/inc/PropertyForward.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ namespace rptui //........................................................................ #endif // RPTUI_PROPERTYSETFORWARD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx index d932110bc5f3..79582a215b3f 100644 --- a/reportdesign/inc/ReportDefinition.hxx +++ b/reportdesign/inc/ReportDefinition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -393,3 +394,4 @@ namespace reportdesign // ============================================================================= #endif // REPORTDESIGN_API_REPORTDEFINITION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/ReportHelperDefines.hxx b/reportdesign/inc/ReportHelperDefines.hxx index 5fc58bef1691..2e6165f175b9 100644 --- a/reportdesign/inc/ReportHelperDefines.hxx +++ b/reportdesign/inc/ReportHelperDefines.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -193,3 +194,4 @@ #endif // INCLUDED_REPORTHELPERDEFINES_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/ReportVisitor.hxx b/reportdesign/inc/ReportVisitor.hxx index fd6ec9131c8f..13c080fd0a26 100644 --- a/reportdesign/inc/ReportVisitor.hxx +++ b/reportdesign/inc/ReportVisitor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,4 @@ namespace reportdesign // ============================================================================= #endif // INCLUDED_REPORT_VISTITOR_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 6a1fbf7a27ce..2e86a5d80e04 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -118,3 +119,5 @@ template void setStyleProperty(const ::com::sun::star::uno::Referenc } #endif // _REPORT_RPTUIDEF_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx index 5f8ecd6ea4e1..544e1a6e251e 100644 --- a/reportdesign/inc/RptModel.hxx +++ b/reportdesign/inc/RptModel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,4 @@ public: } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx index e57c13db34eb..0b16890ef982 100644 --- a/reportdesign/inc/RptObject.hxx +++ b/reportdesign/inc/RptObject.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -284,3 +285,4 @@ private: //============================================================================ #endif // _REPORT_RPTUIOBJ_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index 210397694a04..ca90ae3b2521 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,3 +97,5 @@ public: }; } #endif //_REPORT_RPTUIPAGE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx index 180fa616cf39..4b884424444b 100644 --- a/reportdesign/inc/UndoActions.hxx +++ b/reportdesign/inc/UndoActions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -298,3 +299,4 @@ namespace rptui } #endif //RPTUI_UNDOACTIONS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/UndoEnv.hxx b/reportdesign/inc/UndoEnv.hxx index aba6f31970e9..e48cd253a4ce 100644 --- a/reportdesign/inc/UndoEnv.hxx +++ b/reportdesign/inc/UndoEnv.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -148,3 +149,4 @@ namespace rptui } #endif // +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/conditionalexpression.hxx b/reportdesign/inc/conditionalexpression.hxx index 372cb65a924b..9b360a3fc9cb 100644 --- a/reportdesign/inc/conditionalexpression.hxx +++ b/reportdesign/inc/conditionalexpression.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,3 +122,5 @@ namespace rptui //........................................................................ #endif // CONDITIONALEXPRESSION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/dllapi.h b/reportdesign/inc/dllapi.h index 162338860bc9..1f79662e2248 100644 --- a/reportdesign/inc/dllapi.h +++ b/reportdesign/inc/dllapi.h @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,3 +40,4 @@ #endif /* INCLUDED_REPORTDESIGNDLLAPI_H */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/pch/precompiled_reportdesign.hxx b/reportdesign/inc/pch/precompiled_reportdesign.hxx index fd3a8733d2d6..c0dfd77c3e5f 100644 --- a/reportdesign/inc/pch/precompiled_reportdesign.hxx +++ b/reportdesign/inc/pch/precompiled_reportdesign.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,5 @@ #include "xmloff/xmltkmap.hxx" #include "xmloff/xmlnmspe.hxx" #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx index fa809d237c75..8d26195f2010 100644 --- a/reportdesign/inc/reportformula.hxx +++ b/reportdesign/inc/reportformula.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -132,3 +133,5 @@ namespace rptui //........................................................................ #endif // REPORTFORMULA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/FixedLine.hxx b/reportdesign/source/core/inc/FixedLine.hxx index dd7d14df57e2..5ae4790701d2 100644 --- a/reportdesign/source/core/inc/FixedLine.hxx +++ b/reportdesign/source/core/inc/FixedLine.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -173,3 +174,4 @@ namespace reportdesign } #endif //RPT_FIXEDLINE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/FixedText.hxx b/reportdesign/source/core/inc/FixedText.hxx index 9acdcb2d9148..f1208c6bf635 100644 --- a/reportdesign/source/core/inc/FixedText.hxx +++ b/reportdesign/source/core/inc/FixedText.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -158,3 +159,4 @@ namespace reportdesign } #endif //RPT_FIXEDTEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/FormatCondition.hxx b/reportdesign/source/core/inc/FormatCondition.hxx index 82628270395b..e4698d686655 100644 --- a/reportdesign/source/core/inc/FormatCondition.hxx +++ b/reportdesign/source/core/inc/FormatCondition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -115,3 +116,4 @@ namespace reportdesign } #endif //RPT_FORMATCONDITION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/FormattedField.hxx b/reportdesign/source/core/inc/FormattedField.hxx index 9f1186dc23d5..3c5304417f5f 100644 --- a/reportdesign/source/core/inc/FormattedField.hxx +++ b/reportdesign/source/core/inc/FormattedField.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -165,3 +166,4 @@ namespace reportdesign } #endif //RPT_FORMATTEDFIELD_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/Function.hxx b/reportdesign/source/core/inc/Function.hxx index 2b39d73decd6..21accff689d3 100644 --- a/reportdesign/source/core/inc/Function.hxx +++ b/reportdesign/source/core/inc/Function.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -125,3 +126,4 @@ namespace reportdesign } #endif //RPT_FUNCTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/Functions.hxx b/reportdesign/source/core/inc/Functions.hxx index a6d2e8751a55..416ef70460b4 100644 --- a/reportdesign/source/core/inc/Functions.hxx +++ b/reportdesign/source/core/inc/Functions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,4 @@ namespace reportdesign } #endif // REPORTDESIGN_API_FUNCTIONS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/Group.hxx b/reportdesign/source/core/inc/Group.hxx index 008435333217..cf43755094c1 100644 --- a/reportdesign/source/core/inc/Group.hxx +++ b/reportdesign/source/core/inc/Group.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -161,3 +162,5 @@ namespace reportdesign } // namespace reportdesign // ============================================================================= #endif // + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/Groups.hxx b/reportdesign/source/core/inc/Groups.hxx index c888fae5926f..c2ef3bc1b508 100644 --- a/reportdesign/source/core/inc/Groups.hxx +++ b/reportdesign/source/core/inc/Groups.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -106,3 +107,4 @@ namespace reportdesign } #endif // REPORTDESIGN_API_GROUPS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/ImageControl.hxx b/reportdesign/source/core/inc/ImageControl.hxx index 7dc65804ab48..79ca29ff822c 100644 --- a/reportdesign/source/core/inc/ImageControl.hxx +++ b/reportdesign/source/core/inc/ImageControl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,4 @@ namespace reportdesign } #endif //RPT_IMAGECONTROL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/ReportComponent.hxx b/reportdesign/source/core/inc/ReportComponent.hxx index 6ed9496a9f59..df07fadd0fb9 100644 --- a/reportdesign/source/core/inc/ReportComponent.hxx +++ b/reportdesign/source/core/inc/ReportComponent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ namespace reportdesign } #endif // RPT_REPORTCOMPONENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx b/reportdesign/source/core/inc/ReportControlModel.hxx index 4da5cc9df349..44f3b6c1eaa3 100644 --- a/reportdesign/source/core/inc/ReportControlModel.hxx +++ b/reportdesign/source/core/inc/ReportControlModel.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,4 @@ namespace reportdesign } #endif // RPT_REPORTCONTROLMODEL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/ReportDrawPage.hxx b/reportdesign/source/core/inc/ReportDrawPage.hxx index 87f34c0f1065..e8fcc2547b8d 100644 --- a/reportdesign/source/core/inc/ReportDrawPage.hxx +++ b/reportdesign/source/core/inc/ReportDrawPage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,4 @@ namespace reportdesign } #endif //REPORTDRAWPAGE_HXX_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/ReportEngineJFree.hxx b/reportdesign/source/core/inc/ReportEngineJFree.hxx index 1a53f24f2d7c..b56743807056 100644 --- a/reportdesign/source/core/inc/ReportEngineJFree.hxx +++ b/reportdesign/source/core/inc/ReportEngineJFree.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -136,3 +137,5 @@ namespace reportdesign }; } #endif //REPORTDESIGN_API_REPORTENGINEJFREE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx b/reportdesign/source/core/inc/ReportHelperImpl.hxx index d0eb2490dbbd..1b5f7d2e78a0 100644 --- a/reportdesign/source/core/inc/ReportHelperImpl.hxx +++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -1289,3 +1290,4 @@ void SAL_CALL clazz::setCharPosture( awt::FontSlant /*_charposture*/ ) throw (be #endif //INCLUDED_REPORTHELPERIMPL_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/ReportUndoFactory.hxx b/reportdesign/source/core/inc/ReportUndoFactory.hxx index 5e2a70f3ae19..7a9f26d03371 100644 --- a/reportdesign/source/core/inc/ReportUndoFactory.hxx +++ b/reportdesign/source/core/inc/ReportUndoFactory.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -83,3 +84,4 @@ namespace rptui #endif // REPORT_UNDOFACTORY_HXX_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/RptObjectListener.hxx b/reportdesign/source/core/inc/RptObjectListener.hxx index 0a781ee36c61..0174908452f2 100644 --- a/reportdesign/source/core/inc/RptObjectListener.hxx +++ b/reportdesign/source/core/inc/RptObjectListener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ public: }; } #endif // _REPORT_RPTUILIST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/Section.hxx b/reportdesign/source/core/inc/Section.hxx index 3d3f0f205b06..c424b908a4e4 100644 --- a/reportdesign/source/core/inc/Section.hxx +++ b/reportdesign/source/core/inc/Section.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -206,3 +207,5 @@ namespace reportdesign }; } #endif //REPORTDESIGN_API_SECTION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/Shape.hxx b/reportdesign/source/core/inc/Shape.hxx index 00a351f544b5..dcef6ae36897 100644 --- a/reportdesign/source/core/inc/Shape.hxx +++ b/reportdesign/source/core/inc/Shape.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -180,3 +181,4 @@ namespace reportdesign } #endif //RPT_SHAPE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index b2922a109037..343acfbdf859 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -182,3 +183,4 @@ namespace reportdesign // ============================================================================= #endif // REPORTDESIGN_TOOLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/conditionupdater.hxx b/reportdesign/source/core/inc/conditionupdater.hxx index 6db89dcc6386..ae7602ca0b82 100644 --- a/reportdesign/source/core/inc/conditionupdater.hxx +++ b/reportdesign/source/core/inc/conditionupdater.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,3 +74,5 @@ namespace rptui //........................................................................ #endif // CONDITIONUPDATER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/inc/core_resource.hxx b/reportdesign/source/core/inc/core_resource.hxx index 36e3e3149404..80b9a3228ccb 100644 --- a/reportdesign/source/core/inc/core_resource.hxx +++ b/reportdesign/source/core/inc/core_resource.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -76,3 +77,4 @@ namespace reportdesign #endif // REPORTDESIGN_CORE_RESOURCE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/core/sdr/formatnormalizer.hxx b/reportdesign/source/core/sdr/formatnormalizer.hxx index 8577d276d4c8..a3974f8e9103 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.hxx +++ b/reportdesign/source/core/sdr/formatnormalizer.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -92,3 +93,5 @@ namespace rptui //........................................................................ #endif // REPORTDESIGN_FORMATNORMALIZER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/dbloader2.hxx b/reportdesign/source/filter/xml/dbloader2.hxx index 4df384584eb0..442017d9a940 100644 --- a/reportdesign/source/filter/xml/dbloader2.hxx +++ b/reportdesign/source/filter/xml/dbloader2.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -100,3 +101,5 @@ public: }; } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlAutoStyle.hxx b/reportdesign/source/filter/xml/xmlAutoStyle.hxx index a0010cf886ad..ece3c364b7d6 100644 --- a/reportdesign/source/filter/xml/xmlAutoStyle.hxx +++ b/reportdesign/source/filter/xml/xmlAutoStyle.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,3 +60,4 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLAUTOSTYLE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlCell.hxx b/reportdesign/source/filter/xml/xmlCell.hxx index 84c0e54afec3..e5cdcbda48f5 100644 --- a/reportdesign/source/filter/xml/xmlCell.hxx +++ b/reportdesign/source/filter/xml/xmlCell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,3 +73,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLCELL_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlColumn.hxx b/reportdesign/source/filter/xml/xmlColumn.hxx index b144ac7db435..21a53a3221c9 100644 --- a/reportdesign/source/filter/xml/xmlColumn.hxx +++ b/reportdesign/source/filter/xml/xmlColumn.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLCOLUMN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlComponent.hxx b/reportdesign/source/filter/xml/xmlComponent.hxx index 97374e8955bc..1daca10d9a2a 100644 --- a/reportdesign/source/filter/xml/xmlComponent.hxx +++ b/reportdesign/source/filter/xml/xmlComponent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLCOMPONENT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx index b402c535a260..c7af29faf9c6 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLCONDPRTEXPR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlControlProperty.hxx b/reportdesign/source/filter/xml/xmlControlProperty.hxx index 7d256e033c40..6335f993e00e 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.hxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLCONTROLPROPERTY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlEnums.hxx b/reportdesign/source/filter/xml/xmlEnums.hxx index 8f4a9bc2a422..6986a36c4f9e 100644 --- a/reportdesign/source/filter/xml/xmlEnums.hxx +++ b/reportdesign/source/filter/xml/xmlEnums.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -177,3 +178,5 @@ namespace rptxml } // namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLENUMS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlExport.hxx b/reportdesign/source/filter/xml/xmlExport.hxx index d6c8aea1dcc2..3d71e8deac69 100644 --- a/reportdesign/source/filter/xml/xmlExport.hxx +++ b/reportdesign/source/filter/xml/xmlExport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -279,3 +280,5 @@ public: } // rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLEXPORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx index 9fa0f1b939d9..3a3d1ad0c851 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ private: } // namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFixedContent.hxx b/reportdesign/source/filter/xml/xmlFixedContent.hxx index 0637e01ef674..42e9eaeefb4f 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.hxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLFIXEDCONTENT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.hxx b/reportdesign/source/filter/xml/xmlFormatCondition.hxx index ed151240ecaa..446b0a9760d6 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.hxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLFORMATTEDFIELD_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFormattedField.hxx b/reportdesign/source/filter/xml/xmlFormattedField.hxx index 1d4ddae5629d..5a3a28a48b9c 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.hxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLFORMATTEDFIELD_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlFunction.hxx b/reportdesign/source/filter/xml/xmlFunction.hxx index 017965e608a7..2e6b33215b85 100644 --- a/reportdesign/source/filter/xml/xmlFunction.hxx +++ b/reportdesign/source/filter/xml/xmlFunction.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -65,3 +66,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLFunction_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlGroup.hxx b/reportdesign/source/filter/xml/xmlGroup.hxx index 03ae2dbbc7c0..06dfedf87785 100644 --- a/reportdesign/source/filter/xml/xmlGroup.hxx +++ b/reportdesign/source/filter/xml/xmlGroup.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -64,3 +65,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLGROUP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlHelper.hxx b/reportdesign/source/filter/xml/xmlHelper.hxx index cbcd2d93afe1..0fd7612e3248 100644 --- a/reportdesign/source/filter/xml/xmlHelper.hxx +++ b/reportdesign/source/filter/xml/xmlHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -91,3 +92,4 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlImage.hxx b/reportdesign/source/filter/xml/xmlImage.hxx index 6a0c284eeb1a..597c4ffea31a 100644 --- a/reportdesign/source/filter/xml/xmlImage.hxx +++ b/reportdesign/source/filter/xml/xmlImage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLIMAGE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index 579a1b79b231..4ea40033edda 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -103,3 +104,5 @@ private: } // namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_IMPORTDOCUMENTHANDLER_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlMasterFields.hxx b/reportdesign/source/filter/xml/xmlMasterFields.hxx index 41ec58ec1602..c684c020be24 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.hxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLMasterFields_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx index 7ecbb9ff9448..703428832507 100644 --- a/reportdesign/source/filter/xml/xmlPropertyHandler.hxx +++ b/reportdesign/source/filter/xml/xmlPropertyHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -47,3 +48,4 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif //RPT_XMLPROPHANDLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlReport.hxx b/reportdesign/source/filter/xml/xmlReport.hxx index 232350559c4b..858090f39f2c 100644 --- a/reportdesign/source/filter/xml/xmlReport.hxx +++ b/reportdesign/source/filter/xml/xmlReport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLREPORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlReportElement.hxx b/reportdesign/source/filter/xml/xmlReportElement.hxx index 7ca0b5c0b71c..333322430832 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.hxx +++ b/reportdesign/source/filter/xml/xmlReportElement.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -56,3 +57,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLREPORTELEMENT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx b/reportdesign/source/filter/xml/xmlReportElementBase.hxx index 970d20dd8180..c1d212748a86 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLREPORTELEMENTBASE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlRow.hxx b/reportdesign/source/filter/xml/xmlRow.hxx index 97c98c81e11f..e31a36003b26 100644 --- a/reportdesign/source/filter/xml/xmlRow.hxx +++ b/reportdesign/source/filter/xml/xmlRow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLCOLUMN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlSection.hxx b/reportdesign/source/filter/xml/xmlSection.hxx index 3f42e3b6a0da..866401974a0c 100644 --- a/reportdesign/source/filter/xml/xmlSection.hxx +++ b/reportdesign/source/filter/xml/xmlSection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -62,3 +63,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLSECTION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlStyleImport.hxx b/reportdesign/source/filter/xml/xmlStyleImport.hxx index 10a7a842108a..07ba5be94c56 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.hxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -160,3 +161,5 @@ namespace rptxml } // rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLSTYLEIMPORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlSubDocument.hxx b/reportdesign/source/filter/xml/xmlSubDocument.hxx index 874dfd909b2a..e26996e81ee0 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.hxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLSubDocument_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlTable.hxx b/reportdesign/source/filter/xml/xmlTable.hxx index 978723be6758..4b6bbd2f429b 100644 --- a/reportdesign/source/filter/xml/xmlTable.hxx +++ b/reportdesign/source/filter/xml/xmlTable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,3 +98,5 @@ namespace rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLTABLE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/filter/xml/xmlfilter.hxx b/reportdesign/source/filter/xml/xmlfilter.hxx index 30837681b028..9e4970d97d3d 100644 --- a/reportdesign/source/filter/xml/xmlfilter.hxx +++ b/reportdesign/source/filter/xml/xmlfilter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -245,3 +246,5 @@ public: } // rptxml // ----------------------------------------------------------------------------- #endif // RPT_XMLFILTER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/GroupProperties.hxx b/reportdesign/source/inc/GroupProperties.hxx index d1614661df59..8baff4b3a91c 100644 --- a/reportdesign/source/inc/GroupProperties.hxx +++ b/reportdesign/source/inc/GroupProperties.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ namespace rptshared }; } #endif //RPT_SHARED_GROUPS_PROPERTIES_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/inc/constasciistring.hxx b/reportdesign/source/inc/constasciistring.hxx index 48ca8e20ceba..157923d36b5c 100644 --- a/reportdesign/source/inc/constasciistring.hxx +++ b/reportdesign/source/inc/constasciistring.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ #ifndef _RPTSHARED_CONSTASCIISTRING_HXX_ #define _RPTSHARED_CONSTASCIISTRING_HXX_ @@ -59,3 +60,5 @@ inline ConstAsciiString::operator const ::rtl::OUString& () const #endif // _RPTSHARED_CONSTASCIISTRING_HXX_ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 12517480b3b5..d382722ba818 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -196,3 +197,4 @@ namespace rptui // ============================================================================= #endif // RPTUI_CONDITION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx index 7c8afeedeb03..f46304d897ba 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.hxx +++ b/reportdesign/source/ui/dlg/GroupExchange.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,4 @@ namespace rptui } #endif // RPTUI_GROUP_EXCHANGE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index fe9cbff6aa6c..cbfc8608d1bb 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -141,3 +142,4 @@ private: //============================================================================== #endif // RPTUI_ADDFIELDWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ColorChanger.hxx b/reportdesign/source/ui/inc/ColorChanger.hxx index a2e01c135007..db58419fca42 100644 --- a/reportdesign/source/ui/inc/ColorChanger.hxx +++ b/reportdesign/source/ui/inc/ColorChanger.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -68,3 +69,4 @@ namespace rptui } #endif //RPTUI_COLORCHANGER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ColorListener.hxx b/reportdesign/source/ui/inc/ColorListener.hxx index 4216e39a3652..b3ded2a5aaf8 100644 --- a/reportdesign/source/ui/inc/ColorListener.hxx +++ b/reportdesign/source/ui/inc/ColorListener.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -82,3 +83,4 @@ namespace rptui } #endif // RPTUI_COLORLISTENER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ColumnInfo.hxx b/reportdesign/source/ui/inc/ColumnInfo.hxx index 392a141e6382..215797729b1c 100644 --- a/reportdesign/source/ui/inc/ColumnInfo.hxx +++ b/reportdesign/source/ui/inc/ColumnInfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -55,3 +56,5 @@ namespace rptui } // namespace rptui // ============================================================================= #endif // RPTUI_COLUMNINFO_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 79907f4e5e87..20156d51b01d 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -184,3 +185,5 @@ namespace rptui // ............................................................................. #endif // RPTUI_CONDFORMAT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/DataProviderHandler.hxx b/reportdesign/source/ui/inc/DataProviderHandler.hxx index d5b3221f7745..458debb305b3 100644 --- a/reportdesign/source/ui/inc/DataProviderHandler.hxx +++ b/reportdesign/source/ui/inc/DataProviderHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -127,3 +128,5 @@ namespace rptui //........................................................................ #endif // RPT_DATAPROVIDERHANDLER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index f1eded66cd37..c73f366ea619 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -101,3 +102,5 @@ public: } // namespace rptui // ============================================================================= #endif // RPTUI_DATETIME_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/DefaultInspection.hxx b/reportdesign/source/ui/inc/DefaultInspection.hxx index a0382ab0e7f8..43c62a761458 100644 --- a/reportdesign/source/ui/inc/DefaultInspection.hxx +++ b/reportdesign/source/ui/inc/DefaultInspection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -109,3 +110,4 @@ namespace rptui #endif // RPT_DEFAULTINSPECTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx index ea63028e9d97..ffe4b5f37cb1 100644 --- a/reportdesign/source/ui/inc/DesignView.hxx +++ b/reportdesign/source/ui/inc/DesignView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -290,3 +291,4 @@ namespace rptui //================================================================== #endif // RPTUI_DESIGNVIEW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/EndMarker.hxx b/reportdesign/source/ui/inc/EndMarker.hxx index 90655077a167..7c435e94d35e 100644 --- a/reportdesign/source/ui/inc/EndMarker.hxx +++ b/reportdesign/source/ui/inc/EndMarker.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,3 +52,4 @@ namespace rptui } #endif // RPTUI_ENDMARKER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/FixedTextColor.hxx b/reportdesign/source/ui/inc/FixedTextColor.hxx index ca505ed3a965..7a9916e5a499 100644 --- a/reportdesign/source/ui/inc/FixedTextColor.hxx +++ b/reportdesign/source/ui/inc/FixedTextColor.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ namespace rptui #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx index e96f88e9f2bc..4c2038e8e6a3 100644 --- a/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx +++ b/reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ namespace rptui #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx index da9825adf349..da5471fbce52 100644 --- a/reportdesign/source/ui/inc/Formula.hxx +++ b/reportdesign/source/ui/inc/Formula.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,4 @@ protected: #endif // RPTUI_FORMULA_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 48da4e0eb180..743cd1a755b6 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -110,3 +111,5 @@ public: // ============================================================================= #endif //RPTUI_FUNCTIONHELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx index a03c9d447316..e6d5d51a4485 100644 --- a/reportdesign/source/ui/inc/GeometryHandler.hxx +++ b/reportdesign/source/ui/inc/GeometryHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -319,3 +320,5 @@ namespace rptui //........................................................................ #endif // RPT_GeometryHandler_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 173db7fbb9d3..84178a76feaa 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -200,3 +201,5 @@ public: } // namespace rptui // ============================================================================= #endif // RPTUI_GROUPS_SORTING_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/IReportControllerObserver.hxx b/reportdesign/source/ui/inc/IReportControllerObserver.hxx index 497fe874b3ef..09d76f9769b4 100644 --- a/reportdesign/source/ui/inc/IReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/IReportControllerObserver.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,4 @@ namespace rptui #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/InsertFunctions.hxx b/reportdesign/source/ui/inc/InsertFunctions.hxx index de3a2577be4e..802a6b993850 100644 --- a/reportdesign/source/ui/inc/InsertFunctions.hxx +++ b/reportdesign/source/ui/inc/InsertFunctions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -42,3 +43,4 @@ namespace rptui // --------- #endif // RPT_INSERTFUNCTIONS_HXX_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/MarkedSection.hxx b/reportdesign/source/ui/inc/MarkedSection.hxx index eb892aee92eb..a879e7053d2a 100644 --- a/reportdesign/source/ui/inc/MarkedSection.hxx +++ b/reportdesign/source/ui/inc/MarkedSection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -58,3 +59,5 @@ namespace rptui } // rptui #endif /* RPTUI_MARKEDSECTION_HXX */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/Navigator.hxx b/reportdesign/source/ui/inc/Navigator.hxx index a9cf2fd9222e..05cb003b85f0 100644 --- a/reportdesign/source/ui/inc/Navigator.hxx +++ b/reportdesign/source/ui/inc/Navigator.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ namespace rptui } // namespace rptui // ============================================================================= #endif // INCLUDED_RPTUI_NAVIGATOR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index 5c1d88ced606..e42530dd22a8 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -80,3 +81,5 @@ public: } // namespace rptui // ============================================================================= #endif // RPTUI_PAGENUMBER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportComponentHandler.hxx b/reportdesign/source/ui/inc/ReportComponentHandler.hxx index 080d913d59ab..c2b1929e1612 100644 --- a/reportdesign/source/ui/inc/ReportComponentHandler.hxx +++ b/reportdesign/source/ui/inc/ReportComponentHandler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -113,3 +114,5 @@ namespace rptui //........................................................................ #endif // RPT_REPORTCOMPONENTHANDLER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 6694c81c999b..c55e32cb2dd5 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -485,3 +486,4 @@ namespace rptui } #endif // RPTUI_REPORTCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportControllerObserver.hxx b/reportdesign/source/ui/inc/ReportControllerObserver.hxx index 9d9287767219..8c3d827110ba 100644 --- a/reportdesign/source/ui/inc/ReportControllerObserver.hxx +++ b/reportdesign/source/ui/inc/ReportControllerObserver.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -129,3 +130,4 @@ namespace rptui #endif /* INCLUDED_REPORTCONTROLLEROBSERVER_HXX */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportDefines.hxx b/reportdesign/source/ui/inc/ReportDefines.hxx index 9d207c9c9142..0e45ca91c418 100644 --- a/reportdesign/source/ui/inc/ReportDefines.hxx +++ b/reportdesign/source/ui/inc/ReportDefines.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,3 +38,5 @@ namespace rptui } #endif //RPTUI_REPORT_DEFINES_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportRuler.hxx b/reportdesign/source/ui/inc/ReportRuler.hxx index ba65b1b80b9f..97962a336ee5 100644 --- a/reportdesign/source/ui/inc/ReportRuler.hxx +++ b/reportdesign/source/ui/inc/ReportRuler.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -61,3 +62,5 @@ namespace rptui } // rptui //============================================================================== #endif // RPTUI_RULER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx index a95fd72b7f40..e8f64642afc6 100644 --- a/reportdesign/source/ui/inc/ReportSection.hxx +++ b/reportdesign/source/ui/inc/ReportSection.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -171,3 +172,4 @@ namespace rptui //================================================================== #endif // REPORT_REPORTSECTION_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx index 4267bc0ef6e4..11af785dc6a7 100644 --- a/reportdesign/source/ui/inc/ReportWindow.hxx +++ b/reportdesign/source/ui/inc/ReportWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -236,3 +237,4 @@ namespace rptui //================================================================== #endif // RPTUI_REPORT_WINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx index d5080e56d28d..ecb117488bd4 100644 --- a/reportdesign/source/ui/inc/ScrollHelper.hxx +++ b/reportdesign/source/ui/inc/ScrollHelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -227,3 +228,5 @@ namespace rptui }; } #endif // RPTUI_SCROLLHELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/SectionView.hxx b/reportdesign/source/ui/inc/SectionView.hxx index 71d07db7b7a2..63424dfc38a2 100644 --- a/reportdesign/source/ui/inc/SectionView.hxx +++ b/reportdesign/source/ui/inc/SectionView.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -75,3 +76,5 @@ public: }; } #endif //_REPORT_SECTIONVIEW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx index d9c2fa01d676..637b245097fd 100644 --- a/reportdesign/source/ui/inc/SectionWindow.hxx +++ b/reportdesign/source/ui/inc/SectionWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -138,3 +139,4 @@ namespace rptui //============================================================================== #endif // RPTUI_SECTIONWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/StartMarker.hxx b/reportdesign/source/ui/inc/StartMarker.hxx index d1746cc46b11..50d4311d9ed4 100644 --- a/reportdesign/source/ui/inc/StartMarker.hxx +++ b/reportdesign/source/ui/inc/StartMarker.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ namespace rptui } #endif // RPTUI_STARTMARKER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index d7aa74c240e8..6e600c4307da 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -187,3 +188,4 @@ namespace rptui } #endif //RPTUI_UITOOLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/Undo.hxx b/reportdesign/source/ui/inc/Undo.hxx index 479872b06573..199ecd92c1f8 100644 --- a/reportdesign/source/ui/inc/Undo.hxx +++ b/reportdesign/source/ui/inc/Undo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -151,3 +152,5 @@ namespace rptui }; } #endif // RPTUI_UNDO_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx index 13b8566933c6..dfa2f6ec7cdf 100644 --- a/reportdesign/source/ui/inc/ViewsWindow.hxx +++ b/reportdesign/source/ui/inc/ViewsWindow.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -359,3 +360,4 @@ namespace rptui //============================================================================== #endif // RPTUI_VIEWSWINDOW_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx index bc57a83dc45c..dc5533fbea8d 100644 --- a/reportdesign/source/ui/inc/dlgedclip.hxx +++ b/reportdesign/source/ui/inc/dlgedclip.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -84,3 +85,5 @@ private: }; } #endif // _REPORT_RPTUICLIP_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx b/reportdesign/source/ui/inc/dlgedfac.hxx index fd5738447cd6..415d27e9ba7b 100644 --- a/reportdesign/source/ui/inc/dlgedfac.hxx +++ b/reportdesign/source/ui/inc/dlgedfac.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -48,3 +49,4 @@ public: } #endif // _REPORT_RPTUIFAC_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx index 0c397c106dbb..4300beaf4d16 100644 --- a/reportdesign/source/ui/inc/dlgedfunc.hxx +++ b/reportdesign/source/ui/inc/dlgedfunc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -158,3 +159,5 @@ public: } #endif //_REPORT_RPTUIFUNC_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx index d335b8f28920..fb1a01e42301 100644 --- a/reportdesign/source/ui/inc/dlgpage.hxx +++ b/reportdesign/source/ui/inc/dlgpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -52,3 +53,5 @@ public: } // namespace rptui // ============================================================================= #endif // RPTUI_DLGPAGE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index dfce8dc99bae..727cd5bb1c62 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -162,3 +163,4 @@ namespace rptui #endif // RPTUI_METADATA_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/propbrw.hxx b/reportdesign/source/ui/inc/propbrw.hxx index bf64f7687046..ad31dfb4b24c 100644 --- a/reportdesign/source/ui/inc/propbrw.hxx +++ b/reportdesign/source/ui/inc/propbrw.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -116,3 +117,5 @@ private: } // rptui //============================================================================== #endif // _REPORT_PROPBRW_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/statusbarcontroller.hxx b/reportdesign/source/ui/inc/statusbarcontroller.hxx index 6fffd36cc4df..cd25a477d02e 100644 --- a/reportdesign/source/ui/inc/statusbarcontroller.hxx +++ b/reportdesign/source/ui/inc/statusbarcontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -90,3 +91,4 @@ namespace rptui } #endif // DBAUI_STATUSBARCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/source/ui/inc/toolboxcontroller.hxx b/reportdesign/source/ui/inc/toolboxcontroller.hxx index 447db93fe667..0b12e6551176 100644 --- a/reportdesign/source/ui/inc/toolboxcontroller.hxx +++ b/reportdesign/source/ui/inc/toolboxcontroller.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -89,3 +90,4 @@ namespace rptui //.......................................................................... #endif //RPTUI_TOOLBOXCONTROLLER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit v1.2.3 From 19934b8578f210d2a90aaceb994ec861549b9a4d Mon Sep 17 00:00:00 2001 From: Santiago Alessandri Date: Sat, 13 Nov 2010 21:19:14 +0000 Subject: Replaced createFromAscii in all dbaccess tree under base repo --- dbaccess/source/core/dataaccess/ModelImpl.hxx | 2 +- dbaccess/source/core/misc/DatabaseDataProvider.cxx | 2 +- dbaccess/source/ext/adabas/ANewDb.cxx | 4 +- dbaccess/source/ext/adabas/Acomponentmodule.cxx | 2 +- .../source/ext/macromigration/migrationengine.cxx | 2 +- dbaccess/source/filter/migration/cfgimport.cxx | 6 +- dbaccess/source/filter/xml/dbloader2.cxx | 18 +++--- dbaccess/source/filter/xml/xmlExport.cxx | 8 +-- dbaccess/source/filter/xml/xmlfilter.cxx | 2 +- dbaccess/source/ui/dlg/dbfindex.cxx | 4 +- dbaccess/source/ui/misc/controllerframe.cxx | 2 +- .../source/ui/querydesign/ConnectionLineAccess.cxx | 2 +- dbaccess/source/ui/querydesign/JAccess.cxx | 2 +- dbaccess/source/ui/querydesign/QueryDesignView.cxx | 38 +++++------ dbaccess/source/ui/querydesign/TableWindow.cxx | 2 +- .../source/ui/querydesign/TableWindowAccess.cxx | 6 +- .../source/ui/querydesign/querycontainerwindow.cxx | 2 +- dbaccess/source/ui/querydesign/querycontroller.cxx | 73 ++++++++++++---------- .../ui/relationdesign/RelationController.cxx | 4 +- dbaccess/source/ui/tabledesign/TEditControl.cxx | 8 +-- dbaccess/source/ui/tabledesign/TableController.cxx | 8 +-- .../source/ui/tabledesign/TableDesignControl.cxx | 2 +- .../source/ui/tabledesign/TableFieldControl.cxx | 2 +- dbaccess/source/ui/uno/unosqlmessage.cxx | 4 +- reportdesign/source/filter/xml/xmlfilter.cxx | 6 +- 25 files changed, 108 insertions(+), 103 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index d18f820bff47..d4899c247ab5 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -573,7 +573,7 @@ public: inline void checkDisposed() const { if ( !m_pImpl.is() ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString::createFromAscii( "Component is already disposed." ), getThis() ); + throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Component is already disposed.")), getThis() ); } inline void lockModify() diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index 0ef854211db8..08a7b4e364a1 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -119,7 +119,7 @@ uno::Any DatabaseDataProvider::queryInterface(uno::Type const & type) throw (uno //------------------------------------------------------------------------------ rtl::OUString DatabaseDataProvider::getImplementationName_Static( ) throw(uno::RuntimeException) { - return rtl::OUString::createFromAscii("com.sun.star.comp.chart2.data.DatabaseDataProvider"); + return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart2.data.DatabaseDataProvider")); } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx index 3fc0d952cf40..38311fde9076 100644 --- a/dbaccess/source/ext/adabas/ANewDb.cxx +++ b/dbaccess/source/ext/adabas/ANewDb.cxx @@ -87,7 +87,7 @@ Reference< XInterface > SAL_CALL OAdabasCreateDialog::Create(const Reference< XM //------------------------------------------------------------------------- ::rtl::OUString OAdabasCreateDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.adabasui.AdabasCreateDialog"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.adabasui.AdabasCreateDialog")); } //------------------------------------------------------------------------- @@ -100,7 +100,7 @@ Reference< XInterface > SAL_CALL OAdabasCreateDialog::Create(const Reference< XM ::comphelper::StringSequence OAdabasCreateDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.AdabasCreationDialog"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdabasCreationDialog")); return aSupported; } diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx index cab3b7170bc2..76f8f113e99c 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx @@ -266,7 +266,7 @@ namespace COMPMOD_NAMESPACE { ::rtl::OUString aMainKeyName(sRootKey); aMainKeyName += *pImplName; - aMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); + aMainKeyName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); try { diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 7d72f0ba8a90..f5ef73f23589 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -1223,7 +1223,7 @@ namespace dbmm const ::rtl::OUString& _rSourceLibName, const Reference< XNameAccess >& _rxTargetContainer ) { // The new library name is composed from the prefix, the base name, and the old library name. - const ::rtl::OUString sPrefix( ::rtl::OUString::createFromAscii( _rDocument.eType == eForm ? "Form_" : "Report_" ) ); + const ::rtl::OUString sPrefix = (_rDocument.eType == eForm)?rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Form_")): rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Report_")); ::rtl::OUString sBaseName( _rDocument.sHierarchicalName.copy( _rDocument.sHierarchicalName.lastIndexOf( '/' ) + 1 ) ); diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx index bd68ec585f02..dcfa5324026c 100644 --- a/dbaccess/source/filter/migration/cfgimport.cxx +++ b/dbaccess/source/filter/migration/cfgimport.cxx @@ -393,7 +393,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const : aMedDescr[nPos++].Value <<= sal_False; aMedDescr[nPos].Name = PROPERTY_URL; aMedDescr[nPos++].Value <<= _sDocumentLocation; - aMedDescr[nPos].Name = ::rtl::OUString::createFromAscii( "ReadOnly" ); + aMedDescr[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); aMedDescr[nPos++].Value <<= sal_True; Reference< XTypeDetection > xTypeDetection(_xORB->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),UNO_QUERY ); @@ -1108,8 +1108,8 @@ void SAL_CALL OCfgImport::setPropertyValue( if ( aInputSequence.getLength() ) { Reference< XInputStream> xInStreamHelper = new SequenceInputStream(aInputSequence);; // used for wrapping sequence to xinput - Reference< XObjectInputStream> xInStream = Reference< XObjectInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.ObjectInputStream")),UNO_QUERY); - Reference< XInputStream> xMarkInStream = Reference< XInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.MarkableInputStream")),UNO_QUERY); + Reference< XObjectInputStream> xInStream = Reference< XObjectInputStream >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectInputStream"))),UNO_QUERY); + Reference< XInputStream> xMarkInStream = Reference< XInputStream >(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream"))),UNO_QUERY); Reference< XActiveDataSink >(xMarkInStream,UNO_QUERY)->setInputStream(xInStreamHelper); Reference< XActiveDataSink > xInDataSource(xInStream, UNO_QUERY); OSL_ENSURE(xInDataSource.is(),"Couldn't create com.sun.star.io.ObjectInputStream!"); diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 715e58000ec2..6e2663ef0d79 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -122,7 +122,7 @@ public: // static methods static ::rtl::OUString getImplementationName_Static() throw( ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBTypeDetection"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBTypeDetection")); } static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw( ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > @@ -231,7 +231,7 @@ Sequence< ::rtl::OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(v Sequence< ::rtl::OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw( ) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExtendedTypeDetection"); + aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection")); return aSNS; } // ------------------------------------------------------------------------- @@ -262,7 +262,7 @@ public: // static methods static ::rtl::OUString getImplementationName_Static() throw( ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBContentLoader2"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBContentLoader2")); } static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw( ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > @@ -330,7 +330,7 @@ Sequence< ::rtl::OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(v Sequence< ::rtl::OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw( ) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.FrameLoader"); + aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.FrameLoader")); return aSNS; } @@ -643,17 +643,17 @@ extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey) Reference< XRegistryKey> xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey)); // register content loader for dispatch - ::rtl::OUString aImpl = ::rtl::OUString::createFromAscii("/"); + ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/")); aImpl += ::dbaxml::DBContentLoader::getImplementationName_Static(); ::rtl::OUString aImpltwo = aImpl; - aImpltwo += ::rtl::OUString::createFromAscii("/UNO/Loader"); + aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/Loader")); Reference< XRegistryKey> xNewKey = xKey->createKey( aImpltwo ); aImpltwo = aImpl; - aImpltwo += ::rtl::OUString::createFromAscii("/Loader"); + aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Loader")); Reference< XRegistryKey > xLoaderKey = xKey->createKey( aImpltwo ); - xNewKey = xLoaderKey->createKey( ::rtl::OUString::createFromAscii("Pattern") ); - xNewKey->setAsciiValue( ::rtl::OUString::createFromAscii("private:factory/sdatabase") ); + xNewKey = xLoaderKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pattern")) ); + xNewKey->setAsciiValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sdatabase")) ); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 65bd6dadf377..5a57f7801dde 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -118,13 +118,13 @@ namespace dbaxml //--------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODBExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdb.XMLSettingsExporter"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdb.XMLSettingsExporter")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); return aSupported; } @@ -137,13 +137,13 @@ namespace dbaxml //--------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdb.XMLFullExporter"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdb.XMLFullExporter")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); return aSupported; } diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 80593bf9e1d6..bb6f222debc7 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -241,7 +241,7 @@ sal_Int32 ReadThroughComponent( // get parser uno::Reference< XParser > xParser( rFactory->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), UNO_QUERY ); DBG_ASSERT( xParser.is(), "Can't create parser" ); if( !xParser.is() ) diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx index e2f41af35530..432b45a3d3eb 100644 --- a/dbaccess/source/ui/dlg/dbfindex.cxx +++ b/dbaccess/source/ui/dlg/dbfindex.cxx @@ -348,8 +348,8 @@ void ODbaseIndexDialog::Init() Sequence< ::rtl::OUString> aFolderContent( ::utl::LocalFileHelper::GetFolderContents(m_aDSN,bFolder)); - ::rtl::OUString aIndexExt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ndx")); - ::rtl::OUString aTableExt = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("dbf")); + ::rtl::OUString aIndexExt(RTL_CONSTASCII_USTRINGPARAM("ndx")); + ::rtl::OUString aTableExt(RTL_CONSTASCII_USTRINGPARAM("dbf")); ::std::vector< String > aUsedIndexes; diff --git a/dbaccess/source/ui/misc/controllerframe.cxx b/dbaccess/source/ui/misc/controllerframe.cxx index 23a336d76266..867a2288dada 100644 --- a/dbaccess/source/ui/misc/controllerframe.cxx +++ b/dbaccess/source/ui/misc/controllerframe.cxx @@ -236,7 +236,7 @@ namespace dbaui { if ( _rData.m_xDocEventBroadcaster.is() ) { - ::rtl::OUString sEventName( ::rtl::OUString::createFromAscii( _bActive ? "OnFocus" : "OnUnfocus" ) ); + ::rtl::OUString sEventName = _bActive ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnFocus")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnUnfocus")); Reference< XController2 > xController( _rData.m_rController.getXController(), UNO_QUERY_THROW ); _rData.m_xDocEventBroadcaster->notifyDocumentEvent( sEventName, xController, Any() ); } diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx index 8f532687e72c..411c49d68c2f 100644 --- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx +++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx @@ -81,7 +81,7 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString OConnectionLineAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ConnectionLineAccessibility"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ConnectionLineAccessibility")); } // ----------------------------------------------------------------------------- // XAccessibleContext diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx index 155aac4c27da..90feae92b25d 100644 --- a/dbaccess/source/ui/querydesign/JAccess.cxx +++ b/dbaccess/source/ui/querydesign/JAccess.cxx @@ -57,7 +57,7 @@ namespace dbaui // ----------------------------------------------------------------------------- ::rtl::OUString OJoinDesignViewAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.JoinViewAccessibility"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.JoinViewAccessibility")); } // ----------------------------------------------------------------------------- void OJoinDesignViewAccess::clearTableView() diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 60e71a4a8e7d..43835aca09bc 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -83,8 +83,8 @@ using namespace ::com::sun::star::container; // please look at the book LargeScale C++ to know why namespace { - static const ::rtl::OUString C_AND = ::rtl::OUString::createFromAscii(" AND "); - static const ::rtl::OUString C_OR = ::rtl::OUString::createFromAscii(" OR "); + static const ::rtl::OUString C_AND(RTL_CONSTASCII_USTRINGPARAM(" AND ")); + static const ::rtl::OUString C_OR(RTL_CONSTASCII_USTRINGPARAM(" OR ")); // forward declarations sal_Bool InsertJoin( const OQueryDesignView* _pView, @@ -389,9 +389,9 @@ namespace ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString(); if ( _bForce || isAppendTableAliasEnabled( _xConnection ) || pEntryTab->GetAliasName() != aDBName ) { - aTableListStr += ::rtl::OUString::createFromAscii(" "); + aTableListStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")); if ( generateAsBeforeTableAlias( _xConnection ) ) - aTableListStr += ::rtl::OUString::createFromAscii("AS "); + aTableListStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AS ")); aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() ); } aDBName = aTableListStr; @@ -975,7 +975,7 @@ namespace eErrorCode = eStatementTooLong; else { - _rsRet = ::rtl::OUString::createFromAscii(" ORDER BY "); + _rsRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY ")); _rsRet += aWorkStr; } } @@ -1210,7 +1210,7 @@ namespace if ( aGroupByStr.getLength() ) { aGroupByStr = aGroupByStr.replaceAt(aGroupByStr.getLength()-1,1, ::rtl::OUString(' ') ); - ::rtl::OUString aGroupByStr2 = ::rtl::OUString::createFromAscii(" GROUP BY "); + ::rtl::OUString aGroupByStr2(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY ")); aGroupByStr2 += aGroupByStr; aGroupByStr = aGroupByStr2; } @@ -1575,7 +1575,7 @@ namespace for(;aIter != aTabEnd;++aIter) { OQueryTableWindow* pTabWin = static_cast(aIter->second); - if (pTabWin->ExistsField( ::rtl::OUString::createFromAscii("*"), aDragLeft )) + if (pTabWin->ExistsField( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aDragLeft )) { aDragLeft->SetAlias(String()); aDragLeft->SetTable(String()); @@ -1689,22 +1689,22 @@ namespace case SQL_NODE_LESS: // take the opposite as we change the order i--; - aCondition = aCondition + ::rtl::OUString::createFromAscii(">"); + aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">")); break; case SQL_NODE_LESSEQ: // take the opposite as we change the order i--; - aCondition = aCondition + ::rtl::OUString::createFromAscii(">="); + aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">=")); break; case SQL_NODE_GREAT: // take the opposite as we change the order i--; - aCondition = aCondition + ::rtl::OUString::createFromAscii("<"); + aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); break; case SQL_NODE_GREATEQ: // take the opposite as we change the order i--; - aCondition = aCondition + ::rtl::OUString::createFromAscii("<="); + aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<=")); break; default: break; @@ -2232,7 +2232,7 @@ namespace for(;aIter != aEnd;++aIter) { OQueryTableWindow* pTabWin = static_cast(aIter->second); - if (pTabWin->ExistsField( ::rtl::OUString::createFromAscii("*"), aInfo )) + if (pTabWin->ExistsField( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aInfo )) { aInfo->SetAlias(String()); aInfo->SetTable(String()); @@ -2903,9 +2903,9 @@ sal_Bool OQueryDesignView::checkStatement() GenerateInnerJoinCriterias(xConnection,aJoinCrit,pConnList); if(aJoinCrit.getLength()) { - ::rtl::OUString aTmp = ::rtl::OUString::createFromAscii("( "); + ::rtl::OUString aTmp(RTL_CONSTASCII_USTRINGPARAM("( ")); aTmp += aJoinCrit; - aTmp += ::rtl::OUString::createFromAscii(" )"); + aTmp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" )")); if(aCriteriaListStr.getLength()) { aTmp += C_AND; @@ -2914,16 +2914,16 @@ sal_Bool OQueryDesignView::checkStatement() aCriteriaListStr = aTmp; } // ----------------- Statement aufbauen ---------------------- - ::rtl::OUStringBuffer aSqlCmd(::rtl::OUString::createFromAscii("SELECT ")); + ::rtl::OUStringBuffer aSqlCmd(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT "))); if(static_cast(getController()).isDistinct()) - aSqlCmd.append(::rtl::OUString::createFromAscii(" DISTINCT ")); + aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DISTINCT "))); aSqlCmd.append(aFieldListStr); - aSqlCmd.append(::rtl::OUString::createFromAscii(" FROM ")); + aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "))); aSqlCmd.append(aTableListStr); if (aCriteriaListStr.getLength()) { - aSqlCmd.append(::rtl::OUString::createFromAscii(" WHERE ")); + aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); aSqlCmd.append(aCriteriaListStr.makeStringAndClear()); } // ----------------- GroupBy aufbauen und Anh"angen ------------ @@ -2938,7 +2938,7 @@ sal_Bool OQueryDesignView::checkStatement() // ----------------- having Anh"angen ------------ if(aHavingStr.getLength()) { - aSqlCmd.append(::rtl::OUString::createFromAscii(" HAVING ")); + aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING "))); aSqlCmd.append(aHavingStr.makeStringAndClear()); } // ----------------- Sortierung aufbauen und Anh"angen ------------ diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 186260f20e92..f09d15bda269 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -194,7 +194,7 @@ BOOL OTableWindow::FillListBox() if (GetData()->IsShowAll()) { - SvLBoxEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString::createFromAscii("*") ); + SvLBoxEntry* pEntry = m_pListBox->InsertEntry( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")) ); pEntry->SetUserData( createUserData(NULL,false) ); } diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index aad8a07fa4cc..90bb7e4a9280 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -100,14 +100,14 @@ namespace dbaui Sequence< ::rtl::OUString > OTableWindowAccess::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString > aSupported(2); - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.accessibility.Accessible"); - aSupported[1] = ::rtl::OUString::createFromAscii("com.sun.star.accessibility.AccessibleContext"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.Accessible")); + aSupported[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.accessibility.AccessibleContext")); return aSupported; } // ----------------------------------------------------------------------------- ::rtl::OUString OTableWindowAccess::getImplementationName_Static(void) throw( RuntimeException ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.TableWindowAccessibility"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.TableWindowAccessibility")); } // ----------------------------------------------------------------------------- // XAccessibleContext diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index 56343b778e0a..227156ca515e 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -207,7 +207,7 @@ namespace dbaui ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::AddWindow)); - Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.Frame")),UNO_QUERY ); + Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame"))),UNO_QUERY ); m_xBeamer.set( xBeamerFrame ); OSL_ENSURE(m_xBeamer.is(),"No frame created!"); m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) ); diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 82122c97aed1..ac2c82b40a7c 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -124,12 +124,12 @@ namespace dbaui // need by registration static ::rtl::OUString getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OViewDesign"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OViewDesign")); } static Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ViewDesign"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ViewDesign")); return aSupported; } static Reference< XInterface > SAL_CALL Create(const Reference< XMultiServiceFactory >& _rM) @@ -156,11 +156,11 @@ namespace dbaui if (!_pNode->isToken()) { // Regelnamen als rule: ... - rString = ::rtl::OUString::createFromAscii("RULE_ID: "); + rString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RULE_ID: ")); rString += ::rtl::OUString::valueOf( (sal_Int32)_pNode->getRuleID()); - rString+= ::rtl::OUString::createFromAscii("("); + rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")); rString += OSQLParser::RuleIDToStr(_pNode->getRuleID()); - rString+= ::rtl::OUString::createFromAscii(")"); + rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")); _pParent = _pBox->InsertEntry(rString,_pParent); @@ -181,50 +181,55 @@ namespace dbaui case SQL_NODE_KEYWORD: { - rString+= ::rtl::OUString::createFromAscii("SQL_KEYWORD:"); + rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_KEYWORD:")); ::rtl::OString sT = OSQLParser::TokenIDToStr(_pNode->getTokenID()); rString += ::rtl::OUString(sT,sT.getLength(),RTL_TEXTENCODING_UTF8); break;} case SQL_NODE_COMPARISON: - {rString+= ::rtl::OUString::createFromAscii("SQL_COMPARISON:"); - rString += _pNode->getTokenValue(); // haenge Nodevalue an + { + rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_COMPARISON:")); + rString += _pNode->getTokenValue(); // haenge Nodevalue an // und beginne neu Zeile - break;} + break;} case SQL_NODE_NAME: - {rString+= ::rtl::OUString::createFromAscii("SQL_NAME:"); - rString+= ::rtl::OUString::createFromAscii("\""); - rString += _pNode->getTokenValue(); - rString+= ::rtl::OUString::createFromAscii("\""); - - break;} + { + rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_NAME:")); + rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")); + rString += _pNode->getTokenValue(); + rString+= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\"")); + break;} case SQL_NODE_STRING: - {rString += ::rtl::OUString::createFromAscii("SQL_STRING:'"); - rString += _pNode->getTokenValue(); - break;} + { + rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_STRING:'")); + rString += _pNode->getTokenValue(); + break;} case SQL_NODE_INTNUM: - {rString += ::rtl::OUString::createFromAscii("SQL_INTNUM:"); - rString += _pNode->getTokenValue(); - break;} + { + rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_INTNUM:")); + rString += _pNode->getTokenValue(); + break;} case SQL_NODE_APPROXNUM: - {rString += ::rtl::OUString::createFromAscii("SQL_APPROXNUM:"); - rString += _pNode->getTokenValue(); - break;} + { + rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_APPROXNUM:")); + rString += _pNode->getTokenValue(); + break;} case SQL_NODE_PUNCTUATION: - {rString += ::rtl::OUString::createFromAscii("SQL_PUNCTUATION:"); - rString += _pNode->getTokenValue(); // haenge Nodevalue an - break;} + { + rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_PUNCTUATION:")); + rString += _pNode->getTokenValue(); // haenge Nodevalue an + break;} case SQL_NODE_AMMSC: - {rString += ::rtl::OUString::createFromAscii("SQL_AMMSC:"); - rString += _pNode->getTokenValue(); // haenge Nodevalue an - - break;} + { + rString += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SQL_AMMSC:")); + rString += _pNode->getTokenValue(); // haenge Nodevalue an + break;} default: OSL_ASSERT("OSQLParser::ShowParseTree: unzulaessiger NodeType"); @@ -303,13 +308,13 @@ namespace //------------------------------------------------------------------------------ ::rtl::OUString OQueryController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OQueryDesign"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OQueryDesign")); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> OQueryController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.QueryDesign"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.QueryDesign")); return aSupported; } //------------------------------------------------------------------------- @@ -1290,7 +1295,7 @@ void OQueryController::executeQuery() InvalidateFeature(SID_DB_QUERY_PREVIEW); URL aWantToDispatch; - aWantToDispatch.Complete = ::rtl::OUString::createFromAscii(".component:DB/DataSourceBrowser"); + aWantToDispatch.Complete = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".component:DB/DataSourceBrowser")); ::rtl::OUString sFrameName( FRAME_NAME_QUERY_PREVIEW ); sal_Int32 nSearchFlags = FrameSearchFlag::CHILDREN; diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 43400cb2c6a9..fc685304e82e 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -112,13 +112,13 @@ using namespace ::osl; //------------------------------------------------------------------------------ ::rtl::OUString ORelationController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.ORelationDesign"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.ORelationDesign")); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> ORelationController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.RelationDesign"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RelationDesign")); return aSupported; } //------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 06bd03125f51..77249b19854e 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -415,7 +415,7 @@ CellController* OTableEditorCtrl::GetController(long nRow, sal_uInt16 nColumnId) Reference xTable = GetView()->getController().getTable(); if (IsReadOnly() || ( xTable.is() && xTable->getPropertySetInfo()->hasPropertyByName(PROPERTY_TYPE) && - ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) + ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))) return NULL; ////////////////////////////////////////////////////////////////////// @@ -1361,7 +1361,7 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow ) } // Reference xTable = GetView()->getController().getTable(); -// if( !IsCopyAllowed(nRow) || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) +// if( !IsCopyAllowed(nRow) || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))) // return sal_False; // return bCutAllowed && IsDeleteAllowed( nRow ); @@ -1382,7 +1382,7 @@ sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ ) else if(m_eChildFocus == ROW) { Reference xTable = GetView()->getController().getTable(); - if( !GetSelectRowCount() || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))) + if( !GetSelectRowCount() || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))) return sal_False; ////////////////////////////////////////////////////////////////////// @@ -1551,7 +1551,7 @@ sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ ) // Key darf nicht veraendert werden // Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine ::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgeführt - if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW")) + if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))) return sal_False; ////////////////////////////////////////////////////////////// // Wenn leeres Feld, kein PrimKey diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 5ecdf15f5cc9..5075a99e28ac 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -145,13 +145,13 @@ namespace //------------------------------------------------------------------------------ ::rtl::OUString OTableController::getImplementationName_Static() throw( RuntimeException ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OTableDesign"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OTableDesign")); } //------------------------------------------------------------------------------ Sequence< ::rtl::OUString> OTableController::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< ::rtl::OUString> aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.TableDesign"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.TableDesign")); return aSupported; } //------------------------------------------------------------------------- @@ -1020,7 +1020,7 @@ sal_Bool OTableController::checkColumns(sal_Bool _bNew) throw(::com::sun::star:: pActFieldDescr->SetAutoIncrement(sal_False); // #95927# pTypeInfo->bAutoIncrement pActFieldDescr->SetIsNullable(ColumnValue::NO_NULLS); - pActFieldDescr->SetName( createUniqueName(::rtl::OUString::createFromAscii("ID") )); + pActFieldDescr->SetName( createUniqueName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ID")) )); pActFieldDescr->SetPrimaryKey( sal_True ); m_vRowList.insert(m_vRowList.begin(),pNewRow); @@ -1279,7 +1279,7 @@ void OTableController::alterColumns() SQLException aNewException; aNewException.Message = sError; - aNewException.SQLState = ::rtl::OUString::createFromAscii( "S1000" ); + aNewException.SQLState = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S1000")); aNewException.NextException = ::cppu::getCaughtException(); throw aNewException; diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 97de4f457d62..88cec5c43327 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -113,7 +113,7 @@ void OTableRowView::KeyInput( const KeyEvent& rEvt ) if( rEvt.GetKeyCode().GetCode() == KEY_F2 ) { ::com::sun::star::util::URL aUrl; - aUrl.Complete =::rtl::OUString::createFromAscii(".uno:DSBEditDoc"); + aUrl.Complete =::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DSBEditDoc")); GetView()->getController().dispatch( aUrl,Sequence< PropertyValue >() ); } } diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx index 14ef3955eebe..5e096f0fdce7 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx @@ -68,7 +68,7 @@ sal_Bool OTableFieldControl::IsReadOnly() { // Die Spalten einer ::com::sun::star::sdbcx::View können nicht verändert werden Reference xTable = GetCtrl()->GetView()->getController().getTable(); - if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW")) + if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))) bRead = sal_True; else { diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index 1396cbcf6495..978468a8acd5 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -89,7 +89,7 @@ Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMul //------------------------------------------------------------------------- ::rtl::OUString OSQLMessageDialog::getImplementationName_Static() throw(RuntimeException) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.OSQLMessageDialog"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OSQLMessageDialog")); } //------------------------------------------------------------------------- @@ -102,7 +102,7 @@ Reference< XInterface > SAL_CALL OSQLMessageDialog::Create(const Reference< XMul ::comphelper::StringSequence OSQLMessageDialog::getSupportedServiceNames_Static() throw(RuntimeException) { ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdb.ErrorMessageDialog"); + aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.ErrorMessageDialog")); return aSupported; } diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx index 1e1f2ba71305..f4f3135d6f5d 100644 --- a/reportdesign/source/filter/xml/xmlfilter.cxx +++ b/reportdesign/source/filter/xml/xmlfilter.cxx @@ -151,7 +151,7 @@ sal_Int32 ReadThroughComponent( // get parser uno::Reference< XParser > xParser( rFactory->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), UNO_QUERY ); DBG_ASSERT( xParser.is(), "Can't create parser" ); if( !xParser.is() ) @@ -1109,8 +1109,8 @@ SvXMLImportContext* ORptFilter::CreateMetaContext(const ::rtl::OUString& rLocalN if ( (getImportFlags() & IMPORT_META) ) { uno::Reference xDocBuilder( - getServiceFactory()->createInstance(::rtl::OUString::createFromAscii( - "com.sun.star.xml.dom.SAXDocumentBuilder")), + getServiceFactory()->createInstance(::rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.dom.SAXDocumentBuilder"))), uno::UNO_QUERY_THROW); uno::Reference xDPS(GetModel(), uno::UNO_QUERY_THROW); pContext = new SvXMLMetaDocumentContext(*this,XML_NAMESPACE_OFFICE, rLocalName,xDPS->getDocumentProperties(), xDocBuilder); -- cgit v1.2.3 From 53bdb4e95fc13ac71bd4691cfcddba69779a75a1 Mon Sep 17 00:00:00 2001 From: Wol Date: Tue, 23 Nov 2010 23:41:49 +0000 Subject: Dead code, spelling mistakes --- .../ui/relationdesign/RTableConnectionData.cxx | 6 ++--- .../ui/relationdesign/RelationController.cxx | 12 +++++----- .../source/ui/relationdesign/RelationTableView.cxx | 28 ++-------------------- 3 files changed, 10 insertions(+), 36 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index db145f75664f..2390c639e69f 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -424,8 +424,6 @@ xKey.clear(); ::dbtools::throwGenericSQLException(sError,NULL); } -// OSL_ENSURE(xKey.is(),"No key found have insertion!"); - // The fields the relation marks may not be the same as our LineDatas mark after the relation has been updated if ( xColSup.is() ) { @@ -454,8 +452,8 @@ xKey.clear(); m_vConnLineData.push_back(pNewData); } } - } // if ( xColSup.is() ) - // NOTE : the caller is resposible for updating any other objects referencing the old LineDatas (for instance a ConnLine) + } + // NOTE : the caller is responsible for updating any other objects referencing the old LineDatas (for instance a ConnLine) //////////////////////////////////////////////////////////// // Kardinalitaet bestimmen diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index fc685304e82e..47058181cc40 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -348,7 +348,7 @@ namespace { ::comphelper::disposeComponent(xResult); loadTableData(m_xTables->getByName(*pIter)); - } // if ( xResult.is() && xResult->next() ) + } } catch( const Exception& ) { @@ -410,7 +410,7 @@ namespace } else continue; // table name could not be found so we do not show this table releation - } // if ( aFind == m_aTableData.end() ) + } TTableWindowData::value_type pReferencedTable = aRefFind->second; ::rtl::OUString sKeyName; @@ -454,7 +454,7 @@ namespace pTabConnData->SetCardinality(); } } - } // if ( xKeys.is() ) + } } } @@ -478,7 +478,7 @@ void ORelationController::mergeData(const TTableConnectionData& _aConnectionData { m_vTableData.push_back((*aConnDataIter)->getReferencedTable()); } - } // for(;aConnDataIter != aConnDataEnd;++aConnDataIter) + } if ( m_nThreadEvent ) { --m_nThreadEvent; @@ -535,8 +535,8 @@ void ORelationController::loadData() nStart = nEnd; nEnd += nMaxElements; nEnd = ::std::min(nEnd,nCount); - } // for(;pIter != pEnd;++pIter) - } // if ( aMeta.supportsThreads() ) + } + } else { RelationLoader* pThread = new RelationLoader(this,xMetaData,m_xTables,aNames,0,nCount); diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index d608ee531d25..b345ecaa4a07 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -180,7 +180,7 @@ void ORelationTableView::ReSync() pTabConnDataList->erase( ::std::remove(pTabConnDataList->begin(),pTabConnDataList->end(),*aConIter),pTabConnDataList->end() ); continue; } - } // if ( !arrInvalidTables.empty() ) + } addConnection( new ORelationTableConnection(this, *aConIter), sal_False ); // don't add the data again } @@ -385,30 +385,6 @@ void ORelationTableView::RemoveTabWin( OTableWindow* pTabWin ) } } // ----------------------------------------------------------------------------- -//namespace -//{ -// class OReleationAskDialog : public ButtonDialog -// { -// FixedImage m_aInfoImage; -// FixedText m_aTitle; -// FixedText m_aMessage; -// public: -// OReleationDialog(Window* _pParent) : ButtonDialog(_pParent,WB_HORZ | WB_STDDIALOG) -// ,m_aInfoImage(this) -// ,m_aTitle(this,WB_WORDBREAK | WB_LEFT) -// ,m_aMessage(this,WB_WORDBREAK | WB_LEFT) -// { -// m_aMessage.SetText(ModuleRes(STR_QUERY_REL_EDIT_RELATION)); -// m_aMessage.Show(); -// -// // Changed as per BugID 79541 Branding/Configuration -// String sDialogTitle( lcl_getProductName() ); -// SetText( sDialogTitle.AppendAscii( " Base" ) ); -// m_aTitle.Show(); -// } -// }; -//} -// ----------------------------------------------------------------------------- void ORelationTableView::lookForUiActivities() { if(m_pExistingConnection) @@ -477,7 +453,7 @@ void ORelationTableView::_elementRemoved( const container::ContainerEvent& _rEve m_pView->getController().InvalidateFeature(ID_BROWSER_UNDO); m_pView->getController().InvalidateFeature(ID_BROWSER_REDO); } - } // if ( _rEvent.Accessor >>= sName ) + } m_bInRemove = false; } // ----------------------------------------------------------------------------- -- cgit v1.2.3 From 0b176013df99ee6b10305306b9a9dd07ad51a8a5 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Tue, 23 Nov 2010 21:07:47 -0800 Subject: .bmp to .png, plus formatting issues. --- dbaccess/source/core/resource/strings.src | 49 ++++++++- dbaccess/source/ext/adabas/AdabasNewDb.src | 80 ++++++++------ .../source/ext/macromigration/macromigration.src | 3 + dbaccess/source/ui/app/app.src | 21 ++++ dbaccess/source/ui/browser/bcommon.src | 1 - dbaccess/source/ui/browser/sbabrw.src | 15 ++- dbaccess/source/ui/browser/sbagrid.src | 3 +- dbaccess/source/ui/control/TableGrantCtrl.src | 28 +---- dbaccess/source/ui/control/tabletree.src | 7 +- dbaccess/source/ui/control/undosqledit.src | 31 ------ dbaccess/source/ui/dlg/AdabasStat.src | 30 ------ dbaccess/source/ui/dlg/AutoControls.src | 9 +- dbaccess/source/ui/dlg/CollectionView.src | 5 +- dbaccess/source/ui/dlg/ConnectionPage.src | 8 +- dbaccess/source/ui/dlg/ExtensionNotPresent.src | 8 -- dbaccess/source/ui/dlg/RelationDlg.src | 7 -- dbaccess/source/ui/dlg/UserAdmin.src | 27 ----- dbaccess/source/ui/dlg/UserAdminDlg.src | 1 - dbaccess/source/ui/dlg/adtabdlg.src | 3 + dbaccess/source/ui/dlg/dbadmin.src | 3 +- dbaccess/source/ui/dlg/dbadmin2.src | 6 +- dbaccess/source/ui/dlg/dbadminsetup.src | 35 +------ dbaccess/source/ui/dlg/dbfindex.src | 9 +- dbaccess/source/ui/dlg/directsql.src | 1 - dbaccess/source/ui/dlg/dlgattr.src | 32 +----- dbaccess/source/ui/dlg/dlgsave.src | 1 - dbaccess/source/ui/dlg/dlgsize.src | 31 ------ dbaccess/source/ui/dlg/dsselect.src | 2 - dbaccess/source/ui/dlg/indexdialog.src | 7 +- dbaccess/source/ui/dlg/paramdialog.src | 2 - dbaccess/source/ui/dlg/queryfilter.src | 3 - dbaccess/source/ui/dlg/queryorder.src | 36 ------- dbaccess/source/ui/dlg/sqlmessage.src | 6 +- dbaccess/source/ui/imagelists/dbimagelists.src | 10 +- dbaccess/source/ui/misc/WizardPages.src | 26 ++--- dbaccess/source/ui/misc/dbumiscres.src | 2 +- dbaccess/source/ui/querydesign/query.src | 27 ++++- dbaccess/source/ui/querydesign/querydlg.src | 4 +- dbaccess/source/ui/relationdesign/relation.src | 57 +--------- dbaccess/source/ui/tabledesign/table.src | 115 +++++++++++++++------ dbaccess/source/ui/uno/copytablewizard.src | 3 + reportdesign/source/core/resource/strings.src | 13 +++ reportdesign/source/ui/dlg/CondFormat.src | 36 +++---- reportdesign/source/ui/dlg/DateTime.src | 6 +- reportdesign/source/ui/dlg/GroupsSorting.cxx | 9 +- reportdesign/source/ui/dlg/GroupsSorting.src | 95 +++++------------ reportdesign/source/ui/inc/GroupsSorting.hxx | 12 +-- reportdesign/source/ui/report/report.src | 4 +- 48 files changed, 371 insertions(+), 558 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src index dc7023ca6fba..c431f2cd233d 100644 --- a/dbaccess/source/core/resource/strings.src +++ b/dbaccess/source/core/resource/strings.src @@ -32,6 +32,7 @@ String RID_STR_TRIED_OPEN_TABLE { Text [ en-US ] = "Tried to open the table $name$."; }; + String RID_STR_CONNECTION_INVALID { Text [ en-US ] = "No connection could be established."; @@ -47,7 +48,6 @@ String RID_STR_NEED_CONFIG_WRITE_ACCESS Text [ en-US ] = "You have no write access to the configuration data the object is based on."; }; - String RID_STR_COULDNOTCONNECT_UNSPECIFIED { Text [ en-US ] = "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective."; @@ -77,106 +77,132 @@ String RID_STR_DATASOURCE_NOT_STORED { Text [ en-US ] = "The data source was not saved. Please use the interface XStorable to save the data source."; }; + String RID_STR_ONLY_QUERY { Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed."; }; + String RID_STR_NO_VALUE_CHANGED { Text [ en-US ] = "No values were modified."; }; + String RID_STR_NO_XROWUPDATE { Text [ en-US ] = "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet."; }; + String RID_STR_NO_XRESULTSETUPDATE { Text [ en-US ] = "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet."; }; + String RID_STR_NO_UPDATE_MISSING_CONDITION { Text [ en-US ] = "Values could not be modified, due to a missing condition statement."; }; + String RID_STR_NO_COLUMN_ADD { Text [ en-US ] = "The adding of columns is not supported."; }; + String RID_STR_NO_COLUMN_DROP { Text [ en-US ] = "The dropping of columns is not supported."; }; + String RID_STR_NO_CONDITION_FOR_PK { Text [ en-US ] = "The WHERE condition could not be created for the primary key."; }; + String RID_STR_COLUMN_UNKNOWN_PROP { Text [ en-US ] = "The column does not support the property '%value'."; }; + String RID_STR_COLUMN_NOT_SEARCHABLE { Text [ en-US ] = "The column is not searchable!"; }; + String RID_STR_NOT_SEQUENCE_INT8 { Text [ en-US ] = "The value of the columns is not of the type Sequence."; }; + String RID_STR_COLUMN_NOT_VALID { Text [ en-US ] = "The column is not valid."; }; + String RID_STR_COLUMN_MUST_VISIBLE { Text [ en-US ] = "The column '%name' must be visible as a column."; }; + String RID_STR_NO_XQUERIESSUPPLIER { Text [ en-US ] = "The interface XQueriesSupplier is not available."; }; + String RID_STR_NOT_SUPPORTED_BY_DRIVER { Text [ en-US ] = "The driver does not support this function."; }; + String RID_STR_NO_ABS_ZERO { Text [ en-US ] = "An 'absolute(0)' call is not allowed."; }; + String RID_STR_NO_RELATIVE { Text [ en-US ] = "Relative positioning is not allowed in this state."; }; + String RID_STR_NO_REFESH_AFTERLAST { Text [ en-US ] = "A row cannot be refreshed when the ResultSet is positioned after the last row."; }; + String RID_STR_NO_MOVETOINSERTROW_CALLED { Text [ en-US ] = "A new row cannot be inserted when the ResultSet is not first moved to the insert row."; }; + String RID_STR_NO_UPDATEROW { Text [ en-US ] = "A row cannot be modified in this state"; }; + String RID_STR_NO_DELETEROW { Text [ en-US ] = "A row cannot be deleted in this state."; }; + String RID_STR_NO_TABLE_RENAME { Text [ en-US ] = "The driver does not support table renaming."; }; + String RID_STR_NO_ALTER_COLUMN_DEF { Text [ en-US ] = "The driver does not support the modification of column descriptions."; }; + String RID_STR_COLUMN_ALTER_BY_NAME { Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the name."; }; + String RID_STR_COLUMN_ALTER_BY_INDEX { Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the index."; }; + String RID_STR_FILE_DOES_NOT_EXIST { Text[ en-US ] = "The file \"$file$\" does not exist."; @@ -200,7 +226,6 @@ String RID_STR_CONFLICTING_NAMES String RID_STR_COMMAND_LEADING_TO_ERROR { Text [ en-US ] = "The SQL command leading to this error is:\n\n$command$"; - }; String RID_STR_STATEMENT_WITHOUT_RESULT_SET @@ -247,79 +272,99 @@ String RID_NO_SUCH_DATA_SOURCE { Text [ en-US ] = "Error accessing data source '$name$':\n$error$"; }; + String RID_STR_NO_SUB_FOLDER { Text [ en-US ] = "There exists no folder named \"$folder$\"."; }; + String RID_STR_NO_DELETE_BEFORE_AFTER { Text [ en-US ] = "Cannot delete the before-first or after-last row."; }; + String RID_STR_NO_DELETE_INSERT_ROW { Text [ en-US ] = "Cannot delete the insert-row."; }; + String RID_STR_RESULT_IS_READONLY { Text [ en-US ] = "Result set is read only."; }; + String RID_STR_NO_DELETE_PRIVILEGE { Text [ en-US ] = "DELETE privilege not available."; }; + String RID_STR_ROW_ALREADY_DELETED { Text [ en-US ] = "Current row is already deleted."; }; + String RID_STR_UPDATE_FAILED { Text [ en-US ] = "Current row could be updated."; }; + //------------------------------------------------------------------------- + String RID_STR_NO_INSERT_PRIVILEGE { Text [ en-US ] = "INSERT privilege not available."; }; + String RID_STR_INTERNAL_ERROR { Text [ en-US ] = "Internal error: no statement object provided by the database driver."; }; + String RID_STR_EXPRESSION1 { Text [ en-US ] = "Expression1"; }; + String RID_STR_NO_SQL_COMMAND { Text [ en-US ] = "No SQL command was provided."; }; + String RID_STR_INVALID_INDEX { Text [ en-US ] = "Invalid column index."; }; + String RID_STR_INVALID_CURSOR_STATE { Text [ en-US ] = "Invalid cursor state."; }; + String RID_STR_CURSOR_BEFORE_OR_AFTER { Text [ en-US ] = "The cursor points to before the first or after the last row."; }; + String RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER { Text [ en-US ] = "The rows before the first and after the last row don't have a bookmark."; }; + String RID_STR_NO_BOOKMARK_DELETED { Text [ en-US ] = "The current row is deleted, and thus doesn't have a bookmark."; }; + String RID_STR_NO_EMBEDDING { Text [ en-US ] = "Embedding of database documents is not supported."; }; + String RID_STR_CONNECTION_REQUEST { Text [ en-US ] = "A connection for the following URL was requested \"$name$\"."; }; + String RID_STR_MISSING_EXTENSION { Text [ en-US ] = "The extension is not installed."; diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.src b/dbaccess/source/ext/adabas/AdabasNewDb.src index 33915b06266b..9a3eebb3e9de 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.src +++ b/dbaccess/source/ext/adabas/AdabasNewDb.src @@ -51,7 +51,8 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 12 , 6) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "Database ~name"; -}; + }; + Edit ET_DATABASENAME { Border = TRUE ; @@ -66,26 +67,28 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ; Text[ en-US ] = "User settings"; -}; + }; FixedText FT_CONUSR { Pos = MAP_APPFONT ( 12 , 31 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Control user"; -}; + }; + FixedText FT_SYSUSR { Pos = MAP_APPFONT ( 12 , 14 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Administrator"; -}; + }; + FixedText FT_DOMAIN_USR { Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Domain user"; -}; + }; Edit ET_SYSUSR { @@ -103,7 +106,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_SYSPWD ; Text[ en-US ] = "P~assword..."; -}; + }; Edit ET_CONUSR { @@ -121,7 +124,8 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_CONPWD ; Text[ en-US ] = "~Password..."; -}; + }; + Edit ET_DOMAIN_USR { Pos = MAP_APPFONT ( 77 + ADJUST_X, 47 + MOVE_Y) ; @@ -140,7 +144,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_DOMAINPWD ; Text[ en-US ] = "Passwo~rd..."; -}; + }; FixedImage BMP_CON { @@ -148,12 +152,14 @@ ModalDialog DLG_ADABAS_NEWDB Size = MAP_APPFONT ( 20 , 20 ) ; HelpID = HID_DLG_ADABAS_CON_PWD ; }; + FixedImage BMP_SYS { Pos = MAP_APPFONT ( 240 , 11 + MOVE_Y) ; Size = MAP_APPFONT ( 20 , 20 ) ; HelpID = HID_DLG_ADABAS_SYS_PWD ; }; + FixedImage BMP_DOMAIN { Pos = MAP_APPFONT ( 240 , 44 + MOVE_Y) ; @@ -166,7 +172,7 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Backup file"; -}; + }; Edit ET_RESTORE { @@ -184,7 +190,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_PBRESTORE ; Text[ en-US ] = "..."; -}; + }; /* DEVSPACE positions */ FixedLine FL_DBSETTINGS @@ -192,28 +198,28 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ; Text[ en-US ] = "Database settings"; -}; + }; FixedText FT_SYSDEVSPACE { Pos = MAP_APPFONT ( 12 , 83 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "S~YSDEVSPACE"; -}; + }; FixedText FT_TRANSACTIONLOG { Pos = MAP_APPFONT ( 12 , 99 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "TRANSACTI~ONLOG"; -}; + }; FixedText FT_DATADEVSPACE { Pos = MAP_APPFONT ( 12 , 116 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "DATAD~EVSPACE"; -}; + }; Edit ET_SYSDEVSPACE { @@ -231,7 +237,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ; Text[ en-US ] = "..."; -}; + }; Edit ET_TRANSACTIONLOG { @@ -249,7 +255,7 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ; Text[ en-US ] = "..."; -}; + }; Edit ET_DATADEVSPACE { @@ -260,7 +266,6 @@ ModalDialog DLG_ADABAS_NEWDB HelpID = HID_DLG_ADABAS_DATADEVSPACE ; }; - PushButton PB_DATADEVSPACE { Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ; @@ -268,14 +273,16 @@ ModalDialog DLG_ADABAS_NEWDB TabStop = TRUE ; HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ; Text[ en-US ] = "..."; -}; + }; + /* DEVSPACE sizes */ FixedText FT_TRANSACTIONLOG_SIZE { Pos = MAP_APPFONT ( 12 , 133 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "Transaction ~file (MB)"; -}; + }; + NumericField NF_TRANSACTIONLOG_SIZE { Pos = MAP_APPFONT ( 77 + ADJUST_X, 131 + MOVE_Y) ; @@ -283,15 +290,17 @@ ModalDialog DLG_ADABAS_NEWDB Border = TRUE ; TabStop = TRUE ; Spin = TRUE ; -StrictFormat = TRUE; + StrictFormat = TRUE; HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ; }; + FixedText FT_DATADEVSPACE_SIZE { Pos = MAP_APPFONT ( 12 , 150 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "Data~base size (MB)"; -}; + }; + NumericField NF_DATADEVSPACE_SIZE { Pos = MAP_APPFONT ( 77 + ADJUST_X, 148 + MOVE_Y) ; @@ -299,15 +308,17 @@ StrictFormat = TRUE; Border = TRUE ; TabStop = TRUE ; Spin = TRUE ; -StrictFormat = TRUE; + StrictFormat = TRUE; HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ; }; + FixedText FT_CACHE_SIZE { Pos = MAP_APPFONT ( 12 , 167 + MOVE_Y) ; Size = MAP_APPFONT ( 64 + ADJUST_X, 8 ) ; Text[ en-US ] = "Data ~buffer size (MB)"; -}; + }; + NumericField NF_CACHE_SIZE { Pos = MAP_APPFONT ( 77 + ADJUST_X, 165 + MOVE_Y) ; @@ -315,14 +326,16 @@ StrictFormat = TRUE; Border = TRUE ; TabStop = TRUE ; Spin = TRUE ; -StrictFormat = TRUE; + StrictFormat = TRUE; HelpID = HID_DLG_ADABAS_CACHE_SIZE ; }; + FixedLine FL_END { Pos = MAP_APPFONT ( 0 , WIN_Y - 24 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X , 1 ) ; }; + OKButton PB_OK { Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ; @@ -330,6 +343,7 @@ StrictFormat = TRUE; TabStop = TRUE ; DefButton = TRUE ; }; + CancelButton PB_CANCEL { Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ; @@ -340,26 +354,29 @@ StrictFormat = TRUE; String STR_BACKUPFILE_LOAD { Text[ en-US ] = "Backup file information"; -}; + }; Text[ en-US ] = "Create New Adabas D Database"; }; Image CHECK_GREEN { - ImageBitmap = Bitmap { File = "nu07.bmp"; }; + ImageBitmap = Bitmap { File = "nu07.png"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; + Image UNCHECK_RED { - ImageBitmap = Bitmap { File = "nu08.bmp"; }; + ImageBitmap = Bitmap { File = "nu08.png"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; + Image DEFAULT_BLUE { - ImageBitmap = Bitmap { File = "nu09.bmp"; }; + ImageBitmap = Bitmap { File = "nu09.png"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; + /* Fehlermeldungen beim Erstellen einer Adabas DB */ String STR_ADABAS_NO_PARAM_SET @@ -376,6 +393,7 @@ String STR_ADABAS_NO_SYSTEM_TABLES { Text[ en-US ] = "An error occurred as the system tables were being created."; }; + String STR_ADABAS_NO_BACKUP_FILE { Text[ en-US ] = "The backup file entered does not exist."; @@ -390,10 +408,12 @@ String STR_NO_SAME_USER { Text[ en-US ] = "The administrator and the control user cannot have the same name!"; }; + String STR_DEVSPACE_NO_FILE { Text[ en-US ] = "No name has been entered for the $name$ file!"; }; + String STR_NO_PERMISSION { Text[ en-US ] = "You have to have administrator rights to create a new database!"; @@ -423,11 +443,12 @@ String STR_ADABAS_CREATEPARAM_FILE { Text [ en-US ] = "Creating database configuration file." ; }; + String STR_ADABAS_START_DATABASE { Text [ en-US ] = "Starting database for the first time." ; - }; + String STR_ADABAS_DB_EXISTS { Text[ en-US ] = "The name entered already exists."; @@ -452,4 +473,3 @@ String STR_ADABAS_PASSWORD_ILLEGAL { Text[ en-US ] = "Spaces are not permitted in the password. Please enter a new password."; }; - diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src index 9742dcdfec71..b00ce03925ec 100644 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ b/dbaccess/source/ext/macromigration/macromigration.src @@ -339,6 +339,7 @@ TabPage TP_SUMMARY { Text [ en-US ] = "The migration was successful. Below is a log of the actions which have been taken to your document."; }; + String STR_UNSUCCESSFUL { Text [ en-US ] = "The migration was not successful. Examine the migration log below for details."; @@ -443,10 +444,12 @@ String STR_INVALID_NUMBER_ARGS { Text [ en-US ] = "Invalid number of initialization arguments. Expected 1."; }; + String STR_NO_DATABASE { Text [ en-US ] = "No database document found in the initializatin arguments."; }; + String STR_NOT_READONLY { Text [ en-US ] = "Not applicable to read-only documents."; diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index 2dec9005f847..b723d282bb14 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -312,43 +312,53 @@ String RID_STR_REPORTS_HELP_TEXT_WIZARD { Text [ en-US ] = "The wizard will guide you through the steps necessary to create a report." ; }; + String RID_STR_FORMS_HELP_TEXT { Text [ en-US ] = "Create a form by specifying the record source, controls, and control properties." ; }; + String RID_STR_REPORT_HELP_TEXT { Text [ de ] ="Erstellen Sie einen Bericht, indem Sie die Datensatzquelle, Steuerelemente und Steuerelementeigenschaften angeben." ; Text [ en-US ] = "Create a report by specifying the record source, controls, and control properties." ; }; + String RID_STR_FORMS_HELP_TEXT_WIZARD { Text [ en-US ] = "The wizard will guide you through the steps necessary to create a form." ; }; + String RID_STR_QUERIES_HELP_TEXT { Text [ en-US ] = "Create a query by specifying the filters, input tables, field names, and properties for sorting or grouping." ; }; + String RID_STR_QUERIES_HELP_TEXT_SQL { Text [ en-US ] = "Create a query entering an SQL statement directly." ; }; + String RID_STR_QUERIES_HELP_TEXT_WIZARD { Text [ en-US ] = "The wizard will guide you through the steps necessary to create a query." ; }; + String RID_STR_TABLES_HELP_TEXT_DESIGN { Text [ en-US ] = "Create a table by specifying the field names and properties, as well as the data types." ; }; + String RID_STR_TABLES_HELP_TEXT_WIZARD { Text [ en-US ] = "Choose from a selection of business and personal table samples, which you customize to create a table." ; }; + String RID_STR_VIEWS_HELP_TEXT_DESIGN { Text [ en-US ] = "Create a view by specifying the tables and field names you would like to have visible." ; }; + String RID_STR_VIEWS_HELP_TEXT_WIZARD { Text [ en-US ] = "Opens the view wizard" ; @@ -358,28 +368,34 @@ String STR_DATABASE { Text [ en-US ] = "Database" ; }; + String STR_TASKS { Text [ en-US ] = "Tasks" ; }; + String STR_DESCRIPTION { Text [ en-US ] = "Description" ; }; + String STR_PREVIEW { Text [ en-US ] = "Preview" ; }; + String STR_DISABLEPREVIEW { Text [ en-US ] = "Disable Preview" ; }; + QueryBox APP_SAVEMODIFIED { Buttons = WB_YES_NO_CANCEL ; DefButton = WB_DEF_YES ; Message [ en-US ] = "The database has been modified.\nDo you want to save the changes?" ; }; + QueryBox APP_CLOSEDOCUMENTS { Buttons = WB_YES_NO ; @@ -423,6 +439,7 @@ Menu RID_MENU_APP_PREVIEW }; }; }; + String RID_STR_FORM { Text [ en-US ] = "Form"; @@ -432,10 +449,12 @@ String RID_STR_REPORT { Text [ en-US ] = "Report"; }; + String STR_FRM_LABEL { Text [ en-US ] = "F~orm name" ; }; + String STR_RPT_LABEL { Text [ en-US ] = "~Report name" ; @@ -466,10 +485,12 @@ String RID_STR_EMBEDDED_DATABASE { Text [ en-US ] = "Embedded database"; }; + String RID_STR_NO_DIFF_CAT { Text [ en-US ] = "You cannot select different categories."; }; + String RID_STR_UNSUPPORTED_OBJECT_TYPE { Text [ en-US ] = "Unsupported object type found ($type$)."; diff --git a/dbaccess/source/ui/browser/bcommon.src b/dbaccess/source/ui/browser/bcommon.src index 8c79179eda20..d5b8401b4e8c 100644 --- a/dbaccess/source/ui/browser/bcommon.src +++ b/dbaccess/source/ui/browser/bcommon.src @@ -32,4 +32,3 @@ String RID_STR_TBL_TITLE { Text [ en-US ] = "Table #" ; }; - diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index 747a2d7ac8cf..d31d08cfcaa7 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -33,7 +33,6 @@ #ifndef DBACCESS_UI_BROWSER_ID_HXX #include "browserids.hxx" #endif -// #include #ifndef _GLOBLMN_HRC #include #endif @@ -63,6 +62,7 @@ String SBA_BROWSER_SETTING_ORDER { Text [ en-US ] = "Error setting the sort criteria"; }; + String SBA_BROWSER_SETTING_FILTER { Text [ en-US ] = "Error setting the filter criteria"; @@ -140,13 +140,13 @@ QueryBox QUERY_BRW_DELETE_QUERY_CONFIRM { Buttons = WB_YES_NO ; Message [ en-US ] = "The query already exists. Do you want to delete it?" ; - }; +}; QueryBox QUERY_CONNECTION_LOST { Buttons = WB_YES_NO ; Message [ en-US ] = "The connection to the database has been lost. Do you want to reconnect?" ; - }; +}; String STR_OPENTABLES_WARNINGS { @@ -161,22 +161,22 @@ String STR_OPENTABLES_WARNINGS_DETAILS String STR_CONNECTING_DATASOURCE { Text [ en-US ] = "Connecting to \"$name$\" ..."; - }; +}; String STR_LOADING_QUERY { Text [ en-US ] = "Loading query $name$ ..."; - }; +}; String STR_LOADING_TABLE { Text [ en-US ] = "Loading table $name$ ..."; - }; +}; String STR_NO_TABLE_FORMAT_INSIDE { Text [ en-US ] = "No table format could be found." ; - }; +}; String STR_COULDNOTCONNECT_DATASOURCE { @@ -202,4 +202,3 @@ Menu RID_MENU_REFRESH_DATA }; }; }; - diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src index 1362944d5847..ca43b02732ba 100644 --- a/dbaccess/source/ui/browser/sbagrid.src +++ b/dbaccess/source/ui/browser/sbagrid.src @@ -102,10 +102,12 @@ String STR_QRY_TITLE { Text [ en-US ] = "Query #" ; }; + String STR_TBL_TITLE { Text [ en-US ] = "Table #" ; }; + String STR_VIEW_TITLE { Text [ en-US ] = "View #" ; @@ -136,4 +138,3 @@ String STR_DATASOURCE_GRIDCONTROL_DESC { Text [ en-US ] = "Shows the selected table or query."; }; - diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src index 8da72a1f9fe1..8b870e4927b6 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.src +++ b/dbaccess/source/ui/control/TableGrantCtrl.src @@ -53,6 +53,7 @@ String STR_TABLE_PRIV_ALTER { Text [ en-US ] = "Alter structure"; }; + String STR_TABLE_PRIV_SELECT { Text [ en-US ] = "Read data"; @@ -67,30 +68,3 @@ String STR_TABLE_PRIV_DROP { Text [ en-US ] = "Drop structure"; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src index d08535f3e8da..71f3945e245e 100644 --- a/dbaccess/source/ui/control/tabletree.src +++ b/dbaccess/source/ui/control/tabletree.src @@ -33,7 +33,6 @@ #endif #include "browserids.hxx" - Menu MENU_TABLETREE_POPUP { ItemList = @@ -65,24 +64,28 @@ String STR_COULDNOTCONNECT { Text [ en-US ] = "No connection could be established for the URL #connurl#."; }; + String STR_COULDNOTCONNECT_PLEASECHECK { Text [ en-US ] = "Please check the current settings, for example user name and password."; }; + String STR_NOTABLEINFO { Text [ en-US ] = "Successfully connected, but information about database tables is not available."; }; + String STR_ALL_TABLES { Text [ en-US ] = "All tables"; }; + String STR_ALL_VIEWS { Text [ en-US ] = "All views"; }; + String STR_ALL_TABLES_AND_VIEWS { Text [ en-US ] = "All tables and views"; }; - diff --git a/dbaccess/source/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src index 814a304d18c0..aab44ad5e7db 100644 --- a/dbaccess/source/ui/control/undosqledit.src +++ b/dbaccess/source/ui/control/undosqledit.src @@ -33,34 +33,3 @@ String STR_QUERY_UNDO_MODIFYSQLEDIT { Text [ en-US ] = "Modify SQL statement(s)" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src index ff29ac12383d..418729d4564e 100644 --- a/dbaccess/source/ui/dlg/AdabasStat.src +++ b/dbaccess/source/ui/dlg/AdabasStat.src @@ -199,33 +199,3 @@ String STR_ADABAS_ERROR_SYSTEMTABLES { Text [ en-US ] = "No information could be displayed because no access rights exist for the required system tables."; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src index 1bfe3c0233a9..e43e2a13a7fb 100644 --- a/dbaccess/source/ui/dlg/AutoControls.src +++ b/dbaccess/source/ui/dlg/AutoControls.src @@ -69,13 +69,11 @@ String STR_MSACCESS_MDB_FILE Text[ en-US ] = "Microsoft Access database file"; }; - String STR_NO_ADDITIONAL_SETTINGS { Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button."; }; - String STR_COMMONURL { Text [ en-US ] = "Datasource URL" ; @@ -85,18 +83,15 @@ String STR_HOSTNAME { Text[ en-US ] = "~Host name"; }; + String STR_MOZILLA_PROFILE_NAME { Text[ en-US ] = "~Mozilla profile name"; }; + String STR_THUNDERBIRD_PROFILE_NAME { Text[ en-US ] = "~Thunderbird profile name"; }; - // ------------------------------------------------------------------------------------------------- - - - - diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src index d2774d76682b..0d26722a7033 100644 --- a/dbaccess/source/ui/dlg/CollectionView.src +++ b/dbaccess/source/ui/dlg/CollectionView.src @@ -43,14 +43,12 @@ #define FIXEDLINE_HEIGHT 1 #define IMG_SIZE 15 - ModalDialog DLG_COLLECTION_VIEW { OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; Closeable = TRUE ; - //Sizeable = TRUE; HelpId = HID_EXPLORERDLG_COLLECTION ; Size = MAP_APPFONT ( WIN_X , WIN_Y ) ; @@ -128,7 +126,6 @@ ModalDialog DLG_COLLECTION_VIEW Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ; }; - String STR_PATHNAME { Text [ en-US ] = "~Path:" ; @@ -139,11 +136,13 @@ String STR_NEW_FOLDER { Text [ en-US ] = "Folder" ; }; + Image IMG_NAVIGATION_BTN_UP_SC { ImageBitmap = Bitmap { File = "fp010"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; + Image IMG_NAVIGATION_CREATEFOLDER_SC { ImageBitmap = Bitmap { File = "fp015"; }; diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src index 8ead374bdef4..61515a2589a8 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ b/dbaccess/source/ui/dlg/ConnectionPage.src @@ -54,10 +54,8 @@ TabPage PAGE_CONNECTION Text[ en-US ] = "General"; }; - AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL) - FixedText FT_NO_ADDITIONAL_SETTINGS { Hide = TRUE; @@ -66,7 +64,6 @@ TabPage PAGE_CONNECTION Size = MAP_APPFONT ( PAGE_X - 12 , 3*FIXEDTEXT_HEIGHT ) ; }; - FixedText FT_HOSTNAME { Hide = TRUE; @@ -75,7 +72,6 @@ TabPage PAGE_CONNECTION Text[ en-US ] = "~Host name"; }; - FixedLine FL_SEPARATOR2 { Pos = MAP_APPFONT ( 4 , 3*FIXEDTEXT_HEIGHT + 3*UNRELATED_CONTROLS + RELATED_CONTROLS ) ; @@ -89,6 +85,7 @@ TabPage PAGE_CONNECTION Size = MAP_APPFONT ( 90 - 12 , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "~User name" ; }; + Edit ET_USERNAME { Border = TRUE ; @@ -96,6 +93,7 @@ TabPage PAGE_CONNECTION Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ; TabStop = TRUE ; }; + CheckBox CB_PASSWORD_REQUIRED { Pos = MAP_APPFONT ( 90 , 4*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ; @@ -118,6 +116,7 @@ TabPage PAGE_CONNECTION Size = MAP_APPFONT ( 90 - 12 , FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "~JDBC driver class" ; }; + Edit ET_JDBCDRIVERCLASS { Border = TRUE ; @@ -184,4 +183,3 @@ String STR_MSACCESS_2007_FILTERNAME { Text [ en-US ] = "MS Access 2007 file"; }; - diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src index 9507c4256360..b224714cd482 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src @@ -35,13 +35,7 @@ String RID_STR_EXTENSION_NOT_PRESENT { // #i96130# use hard coded name Text [ en-US ] = "To open a report you require the extension Sunâ„¢ Report Builder.\n\nClick 'Download...' to download and install the extension."; - // OLD: Text [ en-US ] = "To open a report you require the extension %RPT_EXTENSION_NAME.\n\nClick 'Download...' to download and install the extension."; }; -// To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name -// String RID_STR_EXTENSION_NAME -// { -// Text = "Sun(TM) Report Builder"; -// }; ModalDialog RID_EXTENSION_NOT_PRESENT_DLG { @@ -66,7 +60,6 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG { Pos = MAP_APPFONT ( 32 , CELL_PADDING ) ; Size = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ; - // Border = TRUE ; // Text will set outside from RID_STR_EXTENSION_NOT_PRESENT }; @@ -86,4 +79,3 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG TabStop = TRUE ; }; }; - diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src index 68399ca52619..908cbab62c92 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.src +++ b/dbaccess/source/ui/dlg/RelationDlg.src @@ -33,7 +33,6 @@ #endif #include "dbaccess_helpid.hrc" - ModalDialog DLG_REL_PROPERTIES { OutputSize = TRUE ; @@ -43,7 +42,6 @@ ModalDialog DLG_REL_PROPERTIES Moveable = TRUE ; Closeable = TRUE ; - Window WND_CONTROL { Pos = MAP_APPFONT( 0, 0 ); @@ -86,9 +84,6 @@ ModalDialog DLG_REL_PROPERTIES }; }; - - - FixedLine FL_CASC_UPD { Pos = MAP_APPFONT ( 6 , 114 ) ; @@ -124,7 +119,6 @@ ModalDialog DLG_REL_PROPERTIES HelpId = HID_DLG_REL_CASC_UPD_DEFAULT ; Text [ en-US ] = "Set ~default" ; }; -// zweite FixedLine FixedLine FL_CASC_DEL { Pos = MAP_APPFONT ( 96 , 114 ) ; @@ -182,4 +176,3 @@ ModalDialog DLG_REL_PROPERTIES }; }; - diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src index 2cab4f9e89f0..34a42a048931 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.src +++ b/dbaccess/source/ui/dlg/UserAdmin.src @@ -71,7 +71,6 @@ TabPage TAB_PAGE_USERADMIN HelpId = HID_TAB_PAGE_LBUSER ; }; - PushButton PB_NEWUSER { Pos = MAP_APPFONT ( 12 , 29 ) ; @@ -150,7 +149,6 @@ ModalDialog DLG_PASSWORD Size = MAP_APPFONT ( WIN_X - 3 - 6 - 6 - 50 , 8 ) ; Text [ en-US ] = "User \"$name$: $\""; }; - FixedText FT_OLDPASSWORD { Pos = MAP_APPFONT ( 6 , 17 ) ; @@ -215,28 +213,3 @@ String STR_ERROR_PASSWORDS_NOT_IDENTICAL { Text [ en-US ] = "The passwords do not match. Please enter the password again."; }; - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src index faa7f33302d7..5509820d1828 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.src +++ b/dbaccess/source/ui/dlg/UserAdminDlg.src @@ -35,7 +35,6 @@ #include "dbu_dlg.hrc" #endif - TabDialog DLG_DATABASE_USERADMIN { OutputSize = TRUE ; diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src index af1d861a0faa..ecff324d7ec9 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.src +++ b/dbaccess/source/ui/dlg/adtabdlg.src @@ -67,6 +67,7 @@ ModelessDialog DLG_JOIN_TABADD Hide = TRUE; Group = TRUE; }; + PushButton PB_ADDTABLE { Pos = MAP_APPFONT ( 123 , 6 ) ; @@ -75,6 +76,7 @@ ModelessDialog DLG_JOIN_TABADD TabStop = TRUE ; DefButton = TRUE ; }; + CancelButton PB_CLOSE { Pos = MAP_APPFONT ( 123 , 22 ) ; @@ -83,6 +85,7 @@ ModelessDialog DLG_JOIN_TABADD Text [ en-US ] = "~Close" ; TabStop = TRUE ; }; + HelpButton PB_HELP { Pos = MAP_APPFONT ( 123 , 43 ) ; diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index c4457c62eec0..e0fb99ac299a 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -82,7 +82,6 @@ Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ; \ Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \ }; \ - \ FixedText FT_PORTNUMBER \ { \ Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ; \ @@ -725,8 +724,8 @@ TabPage PAGE_TEXT HelpId = HID_DSADMIN_PAGE_TEXT; AUTO_SEPARATORCONTROLGROUP(UNRELATED_CONTROLS, PAGE_X) - }; + //......................................................................... TabPage PAGE_USERDRIVER { diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src index 50b796541872..0c0bd3a48504 100644 --- a/dbaccess/source/ui/dlg/dbadmin2.src +++ b/dbaccess/source/ui/dlg/dbadmin2.src @@ -71,22 +71,27 @@ String STR_ADDRESSBOOK_SYSTEM { Text[ en-US ] = "Windows address book"; }; + String STR_ADDRESSBOOK_OUTLOOK { Text[ en-US ] = "MS Outlook"; }; + String STR_ADDRESSBOOK_MOZILLA { Text[ en-US ] = "Mozilla address book"; }; + String STR_ADDRESSBOOK_THUNDERBIRD { Text[ en-US ] = "Thunderbird address book"; }; + String STR_ADDRESSBOOK_EVOLUTION { Text[ en-US ] = "Evolution address book"; }; + String STR_ADDRESSBOOK_LDAP { Text[ en-US ] = "LDAP address book"; @@ -185,4 +190,3 @@ TabPage PAGE_TABLESUBSCRIPTION Text [ en-US ] = "Mark the tables that should be visible for the applications."; }; }; - diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index 7b0dbe011342..8e0cd31b521e 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -142,7 +142,6 @@ ModalDialog DLG_DATABASE_WIZARD }; }; - String STR_DATABASEDEFAULTNAME { Text[ en-US ] = "New Database" ; @@ -164,7 +163,6 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO WordBreak = TRUE; }; - FixedText FT_MYSQL_HELPTEXT { Pos = MAP_APPFONT (START_X , 27 ) ; @@ -202,7 +200,6 @@ TabPage PAGE_DBWIZARD_MYSQL_INTRO Text[ en-US ] = "Connect directly" ; Hide = TRUE ; }; - }; #define AUTHENTEDIT_X (EDIT_X - 10) @@ -222,7 +219,6 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION WordBreak = TRUE; }; - FixedText FT_AUTHENTIFICATIONHELPTEXT\ { Pos = MAP_APPFONT (START_X , 27 ) ; @@ -261,7 +257,6 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; Text[ en-US ] = "~Test Connection" ; }; - }; @@ -272,7 +267,6 @@ TabPage PAGE_DBWIZARD_FINAL Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; Hide = TRUE ; - FixedText FT_FINALHEADER { Pos = MAP_APPFONT ( START_X , 8 ) ; @@ -289,7 +283,6 @@ TabPage PAGE_DBWIZARD_FINAL WordBreak = TRUE ; }; - RadioButton RB_REGISTERDATASOURCE { HelpId = HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE; @@ -299,7 +292,6 @@ TabPage PAGE_DBWIZARD_FINAL Text[ en-US ] = "~Yes, register the database for me" ; }; - RadioButton RB_DONTREGISTERDATASOURCE { HelpId = HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE ; @@ -348,7 +340,6 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; Hide = TRUE ; - String STR_MYSQLJDBC_HEADERTEXT { Text[ en-US ] = "Set up connection to a MySQL database using JDBC" ; @@ -410,42 +401,34 @@ TabPage PAGE_DBWIZARD_DBASE Text[ en-US ] = "Set up a connection to dBASE files" ; }; - String STR_DBASE_HELPTEXT { Text[ en-US ] = "Select the folder where the dBASE files are stored." ; }; - AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION) + AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION) }; - TabPage PAGE_DBWIZARD_TEXT { - String STR_TEXT_HEADERTEXT { Text[ en-US ] = "Set up a connection to text files" ; }; - String STR_TEXT_HELPTEXT { Text[ en-US ] = "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode." ; }; - String STR_TEXT_PATH_OR_FILE{ Text[ en-US ] = "Path to text files"; }; - AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE) AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X) }; - - TabPage PAGE_DBWIZARD_MSACCESS { SVLook = TRUE ; @@ -458,17 +441,14 @@ TabPage PAGE_DBWIZARD_MSACCESS Text[ en-US ] = "Set up a connection to a Microsoft Access database" ; }; - String STR_MSACCESS_HELPTEXT { Text[ en-US ] = "Please select the Microsoft Access file you want to access."; }; AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION) -// FT_MSACCESS_MDB_FILE }; - TabPage PAGE_DBWIZARD_LDAP { SVLook = TRUE ; @@ -484,7 +464,6 @@ TabPage PAGE_DBWIZARD_LDAP WordBreak = TRUE; }; - FixedText FT_LDAP_HELPTEXT { Pos = MAP_APPFONT (START_X , 27 ) ; @@ -509,7 +488,6 @@ TabPage PAGE_DBWIZARD_LDAP }; }; - TabPage PAGE_DBWIZARD_ADABAS { SVLook = TRUE ; @@ -522,7 +500,6 @@ TabPage PAGE_DBWIZARD_ADABAS Text[ en-US ] = "Set up a connection to an Adabas D database" ; }; - String STR_ADABAS_HELPTEXT{ Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ; }; @@ -530,7 +507,6 @@ TabPage PAGE_DBWIZARD_ADABAS AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME) }; - TabPage PAGE_DBWIZARD_ADO { SVLook = TRUE ; @@ -548,7 +524,6 @@ TabPage PAGE_DBWIZARD_ADO }; AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL) - }; @@ -581,8 +556,6 @@ TabPage PAGE_DBWIZARD_USERDEFINED AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE) }; - - TabPage PAGE_DBWIZARD_JDBC { SVLook = TRUE ; @@ -622,12 +595,10 @@ TabPage PAGE_DBWIZARD_ORACLE Text[ en-US ] = "Default: 1521" ; }; - String STR_ORACLE_DRIVERCLASSTEXT{ Text [ en-US ] = "Oracle JDBC ~driver class"; }; - String STR_ORACLE_HELPTEXT{ Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ; }; @@ -648,12 +619,10 @@ TabPage PAGE_DBWIZARD_SPREADSHEET Text[ en-US ] = "Set up a connection to spreadsheets"; }; - String STR_SPREADSHEET_HELPTEXT{ Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ; }; - AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH ) String STR_SPREADSHEETPATH{ @@ -669,5 +638,3 @@ TabPage PAGE_DBWIZARD_SPREADSHEET Text[ en-US ] = "~Password required" ; }; }; - - diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src index 244c3545b870..8c253554ffde 100644 --- a/dbaccess/source/ui/dlg/dbfindex.src +++ b/dbaccess/source/ui/dlg/dbfindex.src @@ -119,7 +119,7 @@ ModalDialog DLG_DBASE_INDEXES { ImageBitmap = Bitmap { - File = "one_left.bmp" ; + File = "one_left.png" ; }; MaskColor = Color { @@ -138,7 +138,7 @@ ModalDialog DLG_DBASE_INDEXES { ImageBitmap = Bitmap { - File = "all_left.bmp" ; + File = "all_left.png" ; }; MaskColor = Color { @@ -157,7 +157,7 @@ ModalDialog DLG_DBASE_INDEXES { ImageBitmap = Bitmap { - File = "one_right.bmp" ; + File = "one_right.png" ; }; MaskColor = Color { @@ -176,7 +176,7 @@ ModalDialog DLG_DBASE_INDEXES { ImageBitmap = Bitmap { - File = "all_right.bmp" ; + File = "all_right.png" ; }; MaskColor = Color { @@ -186,5 +186,4 @@ ModalDialog DLG_DBASE_INDEXES }; }; }; - }; diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src index 230fe4dac320..74d9b3b69775 100644 --- a/dbaccess/source/ui/dlg/directsql.src +++ b/dbaccess/source/ui/dlg/directsql.src @@ -131,4 +131,3 @@ String STR_DIRECTSQL_CONNECTIONLOST { Text [ en-US ] = "The connection to the database has been lost. This dialog will be closed."; }; - diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src index 8dce0835aa69..a1f689bcb33a 100644 --- a/dbaccess/source/ui/dlg/dlgattr.src +++ b/dbaccess/source/ui/dlg/dlgattr.src @@ -36,6 +36,7 @@ #ifndef DBAUI_SBATTRDLG_HRC #include "dlgattr.hrc" #endif + //================================================ // Der Attributdialog: TabDialog DLG_ATTR @@ -89,34 +90,3 @@ TabDialog DLG_ATTR Text [ en-US ] = "Table Format" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src index d550704b85f8..5ebc5374155c 100644 --- a/dbaccess/source/ui/dlg/dlgsave.src +++ b/dbaccess/source/ui/dlg/dlgsave.src @@ -138,4 +138,3 @@ ModalDialog DLG_SAVE_AS Text [ en-US ] = "Insert as"; }; }; - diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src index ade6f3ff1222..949dc38fc489 100644 --- a/dbaccess/source/ui/dlg/dlgsize.src +++ b/dbaccess/source/ui/dlg/dlgsize.src @@ -156,34 +156,3 @@ ModalDialog DLG_COLWIDTH }; Text [ en-US ] = "Column Width" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src index 8eff7fffe6c4..8c59a26d1a16 100644 --- a/dbaccess/source/ui/dlg/dsselect.src +++ b/dbaccess/source/ui/dlg/dsselect.src @@ -103,5 +103,3 @@ ModalDialog DLG_DATASOURCE_SELECTION Text [ en-US ] = "Choose a database"; }; }; - - diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src index f765ad0e667d..05b294d3aa07 100644 --- a/dbaccess/source/ui/dlg/indexdialog.src +++ b/dbaccess/source/ui/dlg/indexdialog.src @@ -57,7 +57,6 @@ ModalDialog DLG_INDEXDESIGN ToolBox TLB_ACTIONS { Pos = MAP_APPFONT ( 6 , 6 ) ; - // Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ; ButtonType = BUTTON_SYMBOL; Align = BOXALIGN_TOP; HelpId = HID_INDEX_DIALOG_ACTION_TB; @@ -171,14 +170,17 @@ String STR_TAB_INDEX_SORTORDER { Text [ en-US ] = "Sort order" ; }; + String STR_TAB_INDEX_FIELD { Text [ en-US ] = "Index field" ; }; + String STR_ORDER_ASCENDING { Text [ en-US ] = "Ascending" ; }; + String STR_ORDER_DESCENDING { Text [ en-US ] = "Descending" ; @@ -196,7 +198,7 @@ String STR_LOGICAL_INDEX_NAME Image IMG_PKEYICON { - ImageBitmap = Bitmap { File = "pkey.bmp"; }; + ImageBitmap = Bitmap { File = "pkey.png"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; @@ -228,4 +230,3 @@ String STR_INDEXDESIGN_DOUBLE_COLUMN_NAME { Text [ en-US ] = "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice."; }; - diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src index 3993096f8847..6e8b61debff5 100644 --- a/dbaccess/source/ui/dlg/paramdialog.src +++ b/dbaccess/source/ui/dlg/paramdialog.src @@ -43,7 +43,6 @@ ModalDialog DLG_PARAMETERS Moveable = TRUE ; Closeable = TRUE ; - FixedLine FL_PARAMS { Pos = MAP_APPFONT ( 4 , 3 ) ; @@ -97,4 +96,3 @@ ModalDialog DLG_PARAMETERS Text [ en-US ] = "The entry could not be converted to a valid value for the \"$name$\"column"; }; }; - diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src index ca70bb9760f5..60019320839d 100644 --- a/dbaccess/source/ui/dlg/queryfilter.src +++ b/dbaccess/source/ui/dlg/queryfilter.src @@ -75,7 +75,6 @@ ModalDialog DLG_FILTERCRIT TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; -// STRLST_AND_OR StringList [ en-US ] = { < "AND" ; Default ; > ; @@ -115,7 +114,6 @@ ModalDialog DLG_FILTERCRIT TabStop = TRUE ; DropDown = TRUE ; CurPos = 0 ; -// STRLST_AND_OR StringList [ en-US ] = { < "AND" ; Default ; > ; @@ -210,4 +208,3 @@ ModalDialog DLG_FILTERCRIT Text [ en-US ] = "=;<>;<;<=;>;>=;like;not like;null;not null"; }; }; - diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src index 2f2f85a797a0..fe750422564f 100644 --- a/dbaccess/source/ui/dlg/queryorder.src +++ b/dbaccess/source/ui/dlg/queryorder.src @@ -173,39 +173,3 @@ ModalDialog DLG_ORDERCRIT Text [ en-US ] = "" ; }; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src index ede10863c152..979fdd3709df 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.src +++ b/dbaccess/source/ui/dlg/sqlmessage.src @@ -38,19 +38,19 @@ //------------------------------------------------------------------------- Image BMP_EXCEPTION_ERROR { - ImageBitmap = Bitmap { File = "exerror.bmp"; }; + ImageBitmap = Bitmap { File = "exerror.png"; }; MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; }; Image BMP_EXCEPTION_WARNING { - ImageBitmap = Bitmap { File = "exwarning.bmp"; }; + ImageBitmap = Bitmap { File = "exwarning.png"; }; MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; }; Image BMP_EXCEPTION_INFO { - ImageBitmap = Bitmap { File = "exinfo.bmp"; }; + ImageBitmap = Bitmap { File = "exinfo.png"; }; MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; }; diff --git a/dbaccess/source/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src index 9c5d4d78a0bc..8f993554f7c7 100644 --- a/dbaccess/source/ui/imagelists/dbimagelists.src +++ b/dbaccess/source/ui/imagelists/dbimagelists.src @@ -68,16 +68,19 @@ Image IMG_FORMFOLDER_TREE_L ImageBitmap = Bitmap { File = "forms_32"; }; MASKCOLOR; }; + Image IMG_REPORTFOLDER_TREE_L { ImageBitmap = Bitmap { File = "reports_32"; }; MASKCOLOR; }; + Image IMG_QUERYFOLDER_TREE_L { ImageBitmap = Bitmap { File = "queries_32"; }; MASKCOLOR; }; + Image IMG_TABLEFOLDER_TREE_L { ImageBitmap = Bitmap { File = "tables_32"; }; @@ -92,7 +95,7 @@ Image IMG_TABLEFOLDER_TREE_L Image DATABASE_TREE_ICON { - ImageBitmap = Bitmap { File = "db.bmp"; }; + ImageBitmap = Bitmap { File = "db.png"; }; MaskColor = Color { Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; }; }; @@ -125,13 +128,13 @@ Image VIEW_TREE_ICON Image QUERY_TREE_ICON { - ImageBitmap = Bitmap { File = "sx03202.bmp"; }; + ImageBitmap = Bitmap { File = "sx03202.png"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; Image QUERYFOLDER_TREE_ICON { - ImageBitmap = Bitmap { File = "sx03201.bmp"; }; + ImageBitmap = Bitmap { File = "sx03201.png"; }; MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; @@ -164,4 +167,3 @@ Image REPORTFOLDER_TREE_ICON ImageBitmap = Bitmap { File = "reports_16"; }; MASKCOLOR; }; - diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src index 8f6f1c3fc319..c52576702594 100644 --- a/dbaccess/source/ui/misc/WizardPages.src +++ b/dbaccess/source/ui/misc/WizardPages.src @@ -70,7 +70,6 @@ ModalDialog WIZ_RTFCOPYTABLE Text [ en-US ] = "Copy RTF Table" ; - OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; @@ -123,11 +122,10 @@ TabPage TAB_WIZ_COLUMN_SELECT FixedLine FL_COLUMN_SELECT { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ; - Text [ en-US ] = "Existing columns" ; + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ; + Text [ en-US ] = "Existing columns" ; }; - MultiListBox LB_ORG_COLUMN_NAMES { Border = TRUE ; @@ -149,7 +147,7 @@ TabPage TAB_WIZ_COLUMN_SELECT { ImageBitmap = Bitmap { - File = "one_right.bmp" ; + File = "one_right.png" ; }; MaskColor = Color { @@ -169,7 +167,7 @@ TabPage TAB_WIZ_COLUMN_SELECT { ImageBitmap = Bitmap { - File = "all_right.bmp" ; + File = "all_right.png" ; }; MaskColor = Color { @@ -188,7 +186,7 @@ TabPage TAB_WIZ_COLUMN_SELECT { ImageBitmap = Bitmap { - File = "one_left.bmp" ; + File = "one_left.png1" ; }; MaskColor = Color { @@ -207,7 +205,7 @@ TabPage TAB_WIZ_COLUMN_SELECT { ImageBitmap = Bitmap { - File = "all_left.bmp" ; + File = "all_left.png" ; }; MaskColor = Color { @@ -314,6 +312,7 @@ Menu RID_SBA_RTF_PKEYPOPUP }; }; }; + //================================================================== // TAB_WIZ_NAME_MATCHING //================================================================== @@ -368,7 +367,7 @@ TabPage TAB_WIZ_NAME_MATCHING { ImageBitmap = Bitmap { - File = "sortup.bmp" ; + File = "sortup.png" ; }; MaskColor = Color { @@ -387,7 +386,7 @@ TabPage TAB_WIZ_NAME_MATCHING { ImageBitmap = Bitmap { - File = "sortdown.bmp" ; + File = "sortdown.png" ; }; MaskColor = Color { @@ -407,7 +406,7 @@ TabPage TAB_WIZ_NAME_MATCHING { ImageBitmap = Bitmap { - File = "sortup.bmp" ; + File = "sortup.png" ; }; MaskColor = Color { @@ -426,7 +425,7 @@ TabPage TAB_WIZ_NAME_MATCHING { ImageBitmap = Bitmap { - File = "sortdown.bmp" ; + File = "sortdown.png" ; }; MaskColor = Color { @@ -453,6 +452,7 @@ TabPage TAB_WIZ_NAME_MATCHING Text [ en-US ] = "Non~e" ; }; }; + TabPage TAB_WIZ_COPYTABLE { SVLook = TRUE ; diff --git a/dbaccess/source/ui/misc/dbumiscres.src b/dbaccess/source/ui/misc/dbumiscres.src index 552a076147d5..ae5979c0a96a 100644 --- a/dbaccess/source/ui/misc/dbumiscres.src +++ b/dbaccess/source/ui/misc/dbumiscres.src @@ -61,7 +61,6 @@ String STR_MISSING_TABLES_XDROP String STR_BUTTON_TEXT_ALL { Text [ en-US ] = "~All"; - }; String STR_UNDO_COLON @@ -93,6 +92,7 @@ String STR_NAMED_OBJECT_ALREADY_EXISTS { Text [ en-US ] = "The name '$#$' already exists.\nPlease enter another name." ; }; + String RID_STR_EXTENSION_NOT_PRESENT { // #i96130# use hard coded name diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src index 64cca3c2b4c7..aae5a07545ae 100644 --- a/dbaccess/source/ui/querydesign/query.src +++ b/dbaccess/source/ui/querydesign/query.src @@ -97,19 +97,17 @@ Menu RID_QUERYCOLPOPUPMENU }; }; }; + ImageList IMG_JOINS { Prefix = "jo"; - MaskColor = Color { - Red = 0xffff; - Green = 0x0000; - Blue = 0xffff; - }; + MaskColor = Color { Red = 0xffff; Green = 0x0000; Blue = 0xffff; }; IdList = { IMG_PRIMARY_KEY; IMG_FOREIGN_KEY; }; IdCount = { 2; }; }; + String STR_QUERY_UNDO_TABWINSHOW { Text [ en-US ] = "Add Table Window" ; @@ -147,6 +145,7 @@ String STR_QUERY_UNDO_TABFIELDCREATE { Text [ en-US ] = "Add Column" ; }; + String RID_STR_TABLE_DOESNT_EXIST { Text [ en-US ] = "Invalid expression, table '$name$' does not exist."; @@ -156,6 +155,7 @@ String RID_STR_FIELD_DOESNT_EXIST { Text [ en-US ] = "Invalid expression, field name '$name$' does not exist."; }; + String RID_STR_TOMUCHTABLES { Text [ en-US ] = "The query covers #num# tables. The selected database type, however, can only process a maximum of #maxnum# table(s) per statement."; @@ -170,10 +170,12 @@ String STR_QUERY_UNDO_MODIFY_CELL { Text [ en-US ] = "Edit Column Description"; }; + String STR_QUERY_UNDO_SIZE_COLUMN { Text [ en-US ] = "Adjust column width"; }; + String STR_QUERY_SORTTEXT { Text [ en-US ] = "(not sorted);ascending;descending" ; @@ -183,14 +185,17 @@ String STR_QUERY_FUNCTIONS { Text [ en-US ] = "(no function);Group"; }; + String STR_QUERY_NOTABLE { Text [ en-US ] = "(no table)"; }; + String STR_QRY_ORDERBY_UNRELATED { Text [ en-US ] = "The database only supports sorting for visible fields."; }; + Menu RID_QUERYFUNCTION_POPUPMENU { ItemList = @@ -229,6 +234,7 @@ Menu RID_QUERYFUNCTION_POPUPMENU }; }; }; + String STR_QUERY_HANDLETEXT { Text [ en-US ] = "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or"; @@ -243,38 +249,47 @@ ErrorBox ERR_QRY_CRITERIA_ON_ASTERISK { Message [ en-US ] = "A condition cannot be applied to field [*]" ; }; + String STR_QRY_TOO_LONG_STATEMENT { Text [ en-US ] = "The SQL statement created is too long."; }; + String STR_QRY_TOOCOMPLEX { Text [ en-US ] = "Query is too complex" ; }; + String STR_QRY_NOSELECT { Text [ en-US ] = "Nothing has been selected." ; }; + String STR_QRY_TOOMANYCOND { Text [ en-US ] = "Too many search criteria" ; }; + String STR_QRY_SYNTAX { Text [ en-US ] = "SQL syntax error" ; }; + ErrorBox ERR_QRY_ORDERBY_ON_ASTERISK { Message [ en-US ] = "[*] cannot be used as a sort criterion."; }; + String STR_QUERY_TRUE { Text [ en-US ] = "TRUE" ; }; + String STR_QUERY_FALSE { Text [ en-US ] = "FALSE" ; }; + String STR_QRY_TOO_MANY_TABLES { Text [ en-US ] = "There are too many tables."; @@ -284,10 +299,12 @@ String STR_QRY_NATIVE { Text [ en-US ] = "The statement will not be applied when querying in the SQL dialect of the database." ; }; + ErrorBox ERR_QRY_AMB_FIELD { Message [ en-US ] = "Field name not found or not unique" ; }; + String STR_QRY_ILLEGAL_JOIN { Text [ en-US ] = "Join could not be processed" ; diff --git a/dbaccess/source/ui/querydesign/querydlg.src b/dbaccess/source/ui/querydesign/querydlg.src index 687df3159186..fe8f32da49a1 100644 --- a/dbaccess/source/ui/querydesign/querydlg.src +++ b/dbaccess/source/ui/querydesign/querydlg.src @@ -182,13 +182,13 @@ String STR_QUERY_FULL_JOIN { Text [ en-US ] = "Contains ALL records from '%1' and from '%2'."; }; + String STR_QUERY_CROSS_JOIN { Text [ en-US ] = "Contains the cartesian product of ALL records from '%1' and from '%2'."; }; + String STR_QUERY_NATURAL_JOIN { Text [ en-US ] = "Contains only one column for each pair of equally-named columns from '%1' and from '%2'."; }; - - diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src index e3c555debd79..4420ade06100 100644 --- a/dbaccess/source/ui/relationdesign/relation.src +++ b/dbaccess/source/ui/relationdesign/relation.src @@ -44,22 +44,27 @@ String STR_QUERY_REL_EDIT_RELATION { Text [ en-US ] = "This relation already exists. Do you want to edit it or create a new one?" ; }; + String STR_QUERY_REL_EDIT { Text [ en-US ] = "Edit..." ; }; + String STR_QUERY_REL_CREATE { Text [ en-US ] = "Create..." ; }; + String STR_RELATIONDESIGN { Text [ en-US ] = " - %PRODUCTNAME Base: Relation design" ; }; + String STR_RELATIONDESIGN_NOT_AVAILABLE { Text [ en-US ] = "The database does not support relations." ; }; + QueryBox RELATION_DESIGN_SAVEMODIFIED { Buttons = WB_YES_NO_CANCEL ; @@ -76,55 +81,3 @@ String STR_QUERY_REL_COULD_NOT_CREATE { Text [ en-US ] = "The database could not create the relation. May be foreign keys for this kind of table aren't supported.\nPlease check your documentation of the database."; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src index e2a73292ec8d..0a9c5f4e46e5 100644 --- a/dbaccess/source/ui/tabledesign/table.src +++ b/dbaccess/source/ui/tabledesign/table.src @@ -65,18 +65,22 @@ String STR_VALUE_YES { Text [ en-US ] = "Yes" ; }; + String STR_VALUE_NO { Text [ en-US ] = "No" ; }; + String STR_VALUE_ASC { Text [ en-US ] = "Ascending" ; }; + String STR_VALUE_DESC { Text [ en-US ] = "Descending" ; }; + String STR_VALUE_NONE { // Bemerkung : sollte auch in anderen Sprachen irgendwie zum Wort 'Wert' passen : Wert - keiner .... @@ -87,46 +91,57 @@ String STR_TAB_FIELD_NAME { Text [ en-US ] = "Field name" ; }; + String STR_TAB_FIELD_COLUMN_NAME { Text [ en-US ] = "Field Name" ; }; + String STR_TAB_FIELD_DATATYPE { Text [ en-US ] = "Field ~type" ; }; + String STR_TAB_FIELD_COLUMN_DATATYPE { Text [ en-US ] = "Field Type" ; }; + String STR_TAB_FIELD_LENGTH { Text [ en-US ] = "Field length" ; }; + String STR_TAB_HELP_TEXT { Text [ en-US ] = "Description" ; }; + String STR_COLUMN_DESCRIPTION { Text [ en-US ] = "Column Description" ; }; + String STR_TAB_FIELD_NULLABLE { Text [ en-US ] = "Input required" ; }; + String STR_FIELD_AUTOINCREMENT { Text [ en-US ] = "~AutoValue"; }; + String STR_TAB_PROPERTIES { Text [ en-US ] = "Field Properties" ; }; + String STR_TABPAGE_GENERAL { Text [ en-US ] = "General" ; }; + String STR_TAB_TABLE_DESCRIPTION { Text [ en-US ] = "Description:"; @@ -156,61 +171,67 @@ Menu RID_TABLEDESIGNROWPOPUPMENU { ItemList = { - MenuItem - { - ITEM_EDIT_CUT - }; - MenuItem - { - ITEM_EDIT_COPY - }; - MenuItem - { - ITEM_EDIT_PASTE - }; - MenuItem - { - ITEM_EDIT_DELETE - }; - MenuItem - { - Identifier = SID_TABLEDESIGN_INSERTROWS ; - HelpID = SID_TABLEDESIGN_INSERTROWS ; - Text [ en-US ] = "Insert Rows" ; + MenuItem + { + ITEM_EDIT_CUT }; - MenuItem - { - Separator = TRUE ; - }; - MenuItem - { - Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - Checkable = TRUE ; - Text [ en-US ] = "Primary Key" ; + MenuItem + { + ITEM_EDIT_COPY + }; + MenuItem + { + ITEM_EDIT_PASTE + }; + MenuItem + { + ITEM_EDIT_DELETE + }; + MenuItem + { + Identifier = SID_TABLEDESIGN_INSERTROWS ; + HelpID = SID_TABLEDESIGN_INSERTROWS ; + Text [ en-US ] = "Insert Rows" ; + }; + MenuItem + { + Separator = TRUE ; + }; + MenuItem + { + Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + Checkable = TRUE ; + Text [ en-US ] = "Primary Key" ; }; }; }; + String STR_TABED_UNDO_CELLMODIFIED { Text [ en-US ] = "Modify cell" ; }; + String STR_TABED_UNDO_ROWDELETED { Text [ en-US ] = "Delete row" ; }; + String STR_TABED_UNDO_TYPE_CHANGED { Text [ en-US ] = "Modify field type"; }; + String STR_TABED_UNDO_ROWINSERTED { Text [ en-US ] = "Insert row" ; }; + String STR_TABED_UNDO_NEWROWINSERTED { Text [ en-US ] = "Insert new row" ; }; + String STR_TABED_UNDO_PRIMKEY { Text [ en-US ] = "Insert/remove primary key" ; @@ -220,114 +241,141 @@ String STR_DEFAULT_VALUE { Text [ en-US ] = "~Default value" ; }; + String STR_FIELD_REQUIRED { Text [ en-US ] = "~Entry required" ; }; + String STR_TEXT_LENGTH { Text [ en-US ] = "~Length" ; }; + String STR_NUMERIC_TYPE { Text [ en-US ] = "~Type" ; }; + String STR_LENGTH { Text [ en-US ] = "~Length" ; }; + String STR_SCALE { Text [ en-US ] = "Decimal ~places" ; }; + String STR_FORMAT { Text [ en-US ] = "Format example"; }; + String STR_HELP_BOOL_DEFAULT { Text [ en-US ] = "Select a value that is to appear in all new records as default.\nIf the field is not to have a default value, select the empty string."; }; + String STR_HELP_DEFAULT_VALUE { Text [ en-US ] = "Enter a default value for this field.\n\nWhen you later enter data in the table, this string will be used in each new record for the field selected. It should, therefore, correspond to the cell format that needs to be entered below." ; }; + String STR_HELP_FIELD_REQUIRED { Text [ en-US ] = "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data." ; }; + String STR_HELP_TEXT_LENGTH { Text [ en-US ] = "Enter the maximum text length permitted." ; }; + String STR_HELP_NUMERIC_TYPE { Text [ en-US ] = "Enter the number format." ; }; + String STR_HELP_LENGTH { Text [ en-US ] = "Determine the length data can have in this field.\n\nIf decimal fields, then the maximum length of the number to be entered, if binary fields, then the length of the data block.\nThe value will be corrected accordingly when it exceeds the maximum for this database." ; }; + String STR_HELP_SCALE { Text [ en-US ] = "Specify the number of decimal places permitted in this field." ; }; + String STR_HELP_FORMAT_CODE { Text [ en-US ] = "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format)."; }; + String STR_HELP_FORMAT_BUTTON { Text [ en-US ] = "This is where you determine the output format of the data."; }; + String STR_HELP_AUTOINCREMENT { Text [ en-US ] = "Choose if this field should contain AutoIncrement values.\n\nYou can not enter data in fields of this type. An intrinsic value will be assigned to each new record automatically (resulting from the increment of the previous record)." ; }; + PushButton PB_FORMAT { TabStop = TRUE ; Text [ en-US ] = "~..."; }; + String STR_TABLEDESIGN_DUPLICATE_NAME { Text [ en-US ] = "The table cannot be saved because column name \"$column$\" was assigned twice."; }; + String STR_TBL_COLUMN_IS_KEYCOLUMN { Text [ en-US ] = "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?"; }; + String STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE { Text [ en-US ] = "Primary Key Affected"; }; + String STR_COLUMN_NAME { Text [ en-US ] = "Column"; }; + String STR_QRY_CONTINUE { Text [ en-US ] = "Continue anyway?" ; }; + String STR_STAT_WARNING { Text [ en-US ] = "Warning!" ; }; + QueryBox TABLE_DESIGN_SAVEMODIFIED { Buttons = WB_YES_NO_CANCEL ; DefButton = WB_DEF_YES ; Message [ en-US ] = "The table has been changed.\nDo you want to save the changes?" ; }; + QueryBox TABLE_QUERY_CONNECTION_LOST { Buttons = WB_YES_NO ; Message [ en-US ] = "The connection to the database was lost! The table design can only be used with limited functionality without a connection.\nReconnect?" ; }; + String STR_TABLEDESIGN_CONNECTION_MISSING { Text [ en-US ] = "The table could not be saved due to problems connecting to the database."; }; + String STR_TABLEDESIGN_DATASOURCE_DELETED { Text [ en-US ] = "The table filter could not be adjusted because the data source has been deleted."; @@ -339,14 +387,18 @@ QueryBox QUERY_SAVE_TABLE_EDIT_INDEXES Buttons = WB_YES_NO ; }; + String STR_TABLEDESIGN_NO_PRIM_KEY_HEAD { Text [ en-US ] = "No primary key" ; }; + String STR_TABLEDESIGN_NO_PRIM_KEY { Text [ en-US ] = "A unique index or primary key is required for data record identification in this database.\nYou can only enter data into this table when one of these two structural conditions has been met.\n\nShould a primary key be created now?" ; }; + + String STR_TABLEDESIGN_TITLE { Text [ en-US ] = " - %PRODUCTNAME Base: Table Design"; @@ -382,6 +434,7 @@ String STR_AUTOINCREMENT_VALUE { Text [ en-US ] = "A~uto-increment statement"; }; + String STR_HELP_AUTOINCREMENT_VALUE { Text [ en-US ] = "Enter an SQL statement for the auto-increment field.\n\nThis statement will be directly transferred to the database when the table is created."; diff --git a/dbaccess/source/ui/uno/copytablewizard.src b/dbaccess/source/ui/uno/copytablewizard.src index fc6d00804607..a0dd16eabf4e 100644 --- a/dbaccess/source/ui/uno/copytablewizard.src +++ b/dbaccess/source/ui/uno/copytablewizard.src @@ -66,14 +66,17 @@ String STR_CTW_ERROR_DURING_INITIALIZATION { Text [ en-US ] = "An error occurred during initialization."; }; + String STR_CTW_ERROR_UNSUPPORTED_SETTING { Text [ en-US ] = "Unsupported setting in the copy source descriptor: $name$."; }; + String STR_CTW_ERROR_NO_QUERY { Text [ en-US ] = "To copy a query, your connection must be able to provide queries."; }; + String STR_CTW_ERROR_INVALID_INTERACTIONHANDLER { Text [ en-US ] = "The given interaction handler is invalid."; diff --git a/reportdesign/source/core/resource/strings.src b/reportdesign/source/core/resource/strings.src index d6191e2f381e..bdc63648633a 100644 --- a/reportdesign/source/core/resource/strings.src +++ b/reportdesign/source/core/resource/strings.src @@ -31,26 +31,32 @@ String RID_STR_DETAIL { Text [ en-US ] = "Detail"; }; + String RID_STR_PAGE_HEADER { Text [ en-US ] = "Page Header"; }; + String RID_STR_PAGE_FOOTER { Text [ en-US ] = "Page Footer"; }; + String RID_STR_GROUP_HEADER { Text [ en-US ] = "Group Header"; }; + String RID_STR_GROUP_FOOTER { Text [ en-US ] = "Group Footer"; }; + String RID_STR_REPORT_HEADER { Text [ en-US ] = "Report Header"; }; + String RID_STR_REPORT_FOOTER { Text [ en-US ] = "Report Footer"; @@ -65,30 +71,37 @@ String RID_STR_ERROR_WRONG_ARGUMENT { Text [ en-US ] = "You tried to set an illegal argument. Please have a look at '#1' for valid arguments."; }; + String RID_STR_ARGUMENT_IS_NULL { Text [ en-US ] = "The element is invalid."; }; + String RID_STR_FIXEDTEXT { Text [ en-US ] = "Label field" ; }; + String RID_STR_FORMATTEDFIELD { Text [ en-US ] = "Formatted field"; }; + String RID_STR_IMAGECONTROL { Text [ en-US ] = "Image control" ; }; + String RID_STR_REPORT { Text [ en-US ] = "Report"; }; + String RID_STR_SHAPE { Text [ en-US ] = "Shape"; }; + String RID_STR_FIXEDLINE { Text [ en-US ] = "Fixed line"; diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index f688d243cafe..2e5e352bcbde 100644 --- a/reportdesign/source/ui/dlg/CondFormat.src +++ b/reportdesign/source/ui/dlg/CondFormat.src @@ -276,12 +276,12 @@ ImageList IMG_CONDFORMAT_DLG_SC MASKCOLOR; FileList = { - < "res/commandimagelist/sc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; - < "res/commandimagelist/sc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; - < "res/commandimagelist/sc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; - < "res/commandimagelist/sc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; - < "res/commandimagelist/sc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; - < "res/commandimagelist/sc_fontdialog.png" ; SID_CHAR_DLG ; > ; + < "res/commandimagelist/sc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; + < "res/commandimagelist/sc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; + < "res/commandimagelist/sc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; + < "res/commandimagelist/sc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; + < "res/commandimagelist/sc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; + < "res/commandimagelist/sc_fontdialog.png" ; SID_CHAR_DLG ; > ; }; }; @@ -290,12 +290,12 @@ ImageList IMG_CONDFORMAT_DLG_LC MASKCOLOR; FileList = { - < "res/commandimagelist/lc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; - < "res/commandimagelist/lc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; - < "res/commandimagelist/lc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; - < "res/commandimagelist/lc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; - < "res/commandimagelist/lc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; - < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ; > ; + < "res/commandimagelist/lc_bold.png" ; SID_ATTR_CHAR_WEIGHT ; > ; + < "res/commandimagelist/lc_italic.png" ; SID_ATTR_CHAR_POSTURE ; > ; + < "res/commandimagelist/lc_underline.png" ; SID_ATTR_CHAR_UNDERLINE ; > ; + < "res/commandimagelist/lc_backgroundcolor.png" ; SID_BACKGROUND_COLOR ; > ; + < "res/commandimagelist/lc_fontcolor.png" ; SID_ATTR_CHAR_COLOR2 ; > ; + < "res/commandimagelist/lc_fontdialog.png" ; SID_CHAR_DLG ; > ; }; }; @@ -350,9 +350,9 @@ ImageList IMG_ADDFIELD_DLG_SC MASKCOLOR; FileList = { - < "res/commandimagelist/sc_sortup.png" ; SID_FM_SORTUP ; > ; - < "res/commandimagelist/sc_sortdown.png" ; SID_FM_SORTDOWN ; > ; - < "res/commandimagelist/sc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; + < "res/commandimagelist/sc_sortup.png" ; SID_FM_SORTUP ; > ; + < "res/commandimagelist/sc_sortdown.png" ; SID_FM_SORTDOWN ; > ; + < "res/commandimagelist/sc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; }; }; @@ -361,9 +361,9 @@ ImageList IMG_ADDFIELD_DLG_LC MASKCOLOR; FileList = { - < "res/commandimagelist/lc_sortup.png" ; SID_FM_SORTUP ; > ; - < "res/commandimagelist/lc_sortdown.png" ; SID_FM_SORTDOWN ; > ; - < "res/commandimagelist/lc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; + < "res/commandimagelist/lc_sortup.png" ; SID_FM_SORTUP ; > ; + < "res/commandimagelist/lc_sortdown.png" ; SID_FM_SORTDOWN ; > ; + < "res/commandimagelist/lc_removefiltersort.png" ; SID_FM_REMOVE_FILTER_SORT ; > ; }; }; diff --git a/reportdesign/source/ui/dlg/DateTime.src b/reportdesign/source/ui/dlg/DateTime.src index 0e30747fb78c..4324db909568 100644 --- a/reportdesign/source/ui/dlg/DateTime.src +++ b/reportdesign/source/ui/dlg/DateTime.src @@ -74,8 +74,8 @@ ModalDialog RID_DATETIME_DLG { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 2*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; - // Text [ en-US ] = "Time"; }; + CheckBox CB_TIME { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 3*UNRELATED_CONTROLS + CHECKBOX_HEIGHT + LISTBOX_HEIGHT) ; @@ -100,11 +100,13 @@ ModalDialog RID_DATETIME_DLG TabStop = TRUE; Sort = FALSE; }; + FixedLine FL_SEPARATOR1 { Pos = MAP_APPFONT ( RELATED_CONTROLS , RELATED_CONTROLS + 5*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT) ; Size = MAP_APPFONT ( PAGE_WIDTH - 2*RELATED_CONTROLS , 1 ) ; }; + OKButton PB_OK { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; @@ -112,12 +114,14 @@ ModalDialog RID_DATETIME_DLG TabStop = TRUE ; DefButton = TRUE ; }; + CancelButton PB_CANCEL { Pos = MAP_APPFONT ( RELATED_CONTROLS + UNRELATED_CONTROLS + BUTTON_WIDTH , RELATED_CONTROLS + 6*UNRELATED_CONTROLS + 2*CHECKBOX_HEIGHT + 2*LISTBOX_HEIGHT +1) ; Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; TabStop = TRUE ; }; + HelpButton PB_HELP { TabStop = TRUE ; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index b08d8da392c1..5c6c23935548 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -1000,7 +1000,7 @@ OGroupsSortingDialog::OGroupsSortingDialog( Window* _pParent pControlsLst[i]->SetGetFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusGot)); pControlsLst[i]->SetLoseFocusHdl(LINK(this, OGroupsSortingDialog, OnControlFocusLost)); pControlsLst[i]->Show(TRUE); - } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i) + } for (size_t i = 0; i < (SAL_N_ELEMENTS(pControlsLst))-1; ++i) static_cast(pControlsLst[i])->SetSelectHdl(LINK(this,OGroupsSortingDialog,LBChangeHdl)); @@ -1341,7 +1341,8 @@ void OGroupsSortingDialog::displayGroup(const uno::Reference& _x m_aGroupOnLst.InsertEntry(String(ModuleRes(STR_RPT_INTERVAL))); m_aGroupOnLst.SetEntryData(1,reinterpret_cast(report::GroupOn::INTERVAL)); break; - } // switch(nDataType) + } + USHORT nPos = 0; switch(_xGroup->getGroupOn()) { @@ -1409,7 +1410,7 @@ void OGroupsSortingDialog::Resize() for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) { nMaxTextWidth = ::std::max(static_cast(GetTextWidth(pControls[i]->GetText())),nMaxTextWidth); - } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i) + } // aTotalOutputSize.Width() - m_aHeaderLst.GetSizePixel().Width() - 3*aSpace.Width() for (size_t i = 0; i < SAL_N_ELEMENTS(pControls); ++i) @@ -1420,7 +1421,7 @@ void OGroupsSortingDialog::Resize() aPos.Y() = pControlsLst[i]->GetPosPixel().Y(); pControlsLst[i]->SetPosSizePixel(aPos,Size(aTotalOutputSize.Width() - aPos.X() - aSpace.Width(),pControlsLst[i]->GetSizePixel().Height())); - } // for (int i = 0; i < SAL_N_ELEMENTS(pControls); ++i) + } m_aFL.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL.GetSizePixel().Height())); m_aFL2.SetSizePixel(Size(aTotalOutputSize.Width() - aSpace.Width(),m_aFL2.GetSizePixel().Height())); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index b9163bc6ce34..159a457011ce 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.src +++ b/reportdesign/source/ui/dlg/GroupsSorting.src @@ -66,57 +66,13 @@ FloatingWindow RID_GROUPS_SORTING { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 3*UNRELATED_CONTROLS + BROWSER_HEIGHT ) ; Size = MAP_APPFONT ( FIXEDTEXT_WIDTH , FIXEDTEXT_HEIGHT ) ; -// Text [ en-US ] = "Move group" ; Text [ en-US ] = "Group actions" ; }; -// /* -// | PAGE_WIDTH | -// | /-----\ {-------\ /---------\ | -// | unreleated FT_MOVELABEL |PB_UP| unreleated |PB_DOWN| unreleated |PD_DELETE| unreleated | -// | \_____/ \_______/ \_________/ | -// -// Don't set any position here, it will be done in OGroupsSortingDialog::Resize() -// -// Find possible IMAGEBUTTON_* in rscicpx.cxx -// Symbol is vclrsc.hxx -// */ -// ImageButton PB_UP -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - 3*UNRELATED_CONTROLS - 3*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT -1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; -// // Symbol = IMAGEBUTTON_ARROW_UP ; // arrow up -// Symbol = IMAGEBUTTON_SPIN_UP ; // triangle up -// // Symbol = IMAGEBUTTON_FLOAT; -// }; -// -// ImageButton PB_DOWN -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - 2*UNRELATED_CONTROLS - 2*14 - 2*RELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; -// // Symbol = IMAGEBUTTON_ARROW_DOWN ; // arrow down -// // Symbol = IMAGEBUTTON_FIRST ; -// Symbol = IMAGEBUTTON_SPIN_DOWN; -// -// }; -// -// ImageButton PB_DELETE -// { -// Pos = MAP_APPFONT ( PAGE_WIDTH - UNRELATED_CONTROLS - 14, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; -// Size = MAP_APPFONT ( 14 , 14 ) ; -// TabStop = TRUE; -// Symbol = IMAGEBUTTON_CLOSE ; -// }; - - ToolBox TB_TOOLBOX { Pos = MAP_APPFONT ( PAGE_WIDTH - 4*14 - UNRELATED_CONTROLS, 3*UNRELATED_CONTROLS + BROWSER_HEIGHT - 1 ) ; ButtonType = BUTTON_SYMBOL; -// Align = BOXALIGN_TOP; -// HelpId = HID_RPT_CONDFORMAT_TB; Customize = FALSE; ItemList = { @@ -127,7 +83,6 @@ FloatingWindow RID_GROUPS_SORTING HelpID = HID_RPT_GROUPSORT_MOVE_UP ; Text [ en-US ] = "Move up" ; Checkable = TRUE; -// Disable = TRUE; }; ToolBoxItem { @@ -136,7 +91,6 @@ FloatingWindow RID_GROUPS_SORTING HelpID = HID_RPT_GROUPSORT_MOVE_DOWN ; Text [ en-US ] = "Move down" ; Checkable = TRUE; -// Disable = TRUE; }; ToolBoxItem { @@ -145,7 +99,6 @@ FloatingWindow RID_GROUPS_SORTING HelpID = HID_RPT_GROUPSORT_DELETE ; Text [ en-US ] = "~Delete" ; Checkable = TRUE; -// Disable = TRUE; }; }; }; @@ -164,6 +117,7 @@ FloatingWindow RID_GROUPS_SORTING Hide = TRUE; Text [ en-US ] = "Sorting" ; }; + ListBox LST_ORDER { Border = TRUE; @@ -180,6 +134,7 @@ FloatingWindow RID_GROUPS_SORTING }; }; + FixedText FT_HEADER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 5*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 2*FIXEDTEXT_HEIGHT) ; @@ -188,6 +143,7 @@ FloatingWindow RID_GROUPS_SORTING Text [ en-US ] = "Group Header" ; }; + ListBox LST_HEADERLST { Border = TRUE; @@ -203,6 +159,7 @@ FloatingWindow RID_GROUPS_SORTING < "Not present" ; Default ; > ; }; }; + FixedText FT_FOOTER { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 6*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 3*FIXEDTEXT_HEIGHT) ; @@ -211,6 +168,7 @@ FloatingWindow RID_GROUPS_SORTING Text [ en-US ] = "Group Footer" ; }; + ListBox LST_FOOTERLST { Border = TRUE; @@ -226,6 +184,7 @@ FloatingWindow RID_GROUPS_SORTING < "Not present" ; Default ; > ; }; }; + FixedText FT_GROUPON { Pos = MAP_APPFONT ( UNRELATED_CONTROLS, 7*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 4*FIXEDTEXT_HEIGHT) ; @@ -234,6 +193,7 @@ FloatingWindow RID_GROUPS_SORTING Text [ en-US ] = "Group On" ; }; + ListBox LST_GROUPONLST { Border = TRUE; @@ -248,6 +208,7 @@ FloatingWindow RID_GROUPS_SORTING < "Each Value" ; Default ; > ; }; }; + FixedText FT_GROUPINTERVAL { Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 8*UNRELATED_CONTROLS + BROWSER_HEIGHT + BUTTON_HEIGHT + 5*FIXEDTEXT_HEIGHT) ; @@ -255,6 +216,7 @@ FloatingWindow RID_GROUPS_SORTING Hide = TRUE; Text [ en-US ] = "Group Interval" ; }; + NumericField ED_GROUPINTERVALLST { Border = TRUE; @@ -302,58 +264,58 @@ FloatingWindow RID_GROUPS_SORTING WordBreak = TRUE; }; -//BTN Image IMG_UP_H -//BTN { -//BTN ImageBitmap = Bitmap { File = "arrow_move_up_hc" ; }; -//BTN }; -//BTN Image IMG_DOWN_H -//BTN { -//BTN ImageBitmap = Bitmap { File = "arrow_move_down_hc" ; }; -//BTN }; - - }; String STR_RPT_EXPRESSION { Text [ en-US ] = "Field/Expression" ; }; + String STR_RPT_SORTING { Text [ en-US ] = "Sort Order" ; }; + String STR_RPT_PREFIXCHARS { Text [ en-US ] = "Prefix Characters" ; }; + String STR_RPT_YEAR { Text [ en-US ] = "Year" ; }; + String STR_RPT_QUARTER { Text [ en-US ] = "Quarter" ; }; + String STR_RPT_MONTH { Text [ en-US ] = "Month" ; }; + String STR_RPT_WEEK { Text [ en-US ] = "Week" ; }; + String STR_RPT_DAY { Text [ en-US ] = "Day" ; }; + String STR_RPT_HOUR { Text [ en-US ] = "Hour" ; }; + String STR_RPT_MINUTE { Text [ en-US ] = "Minute" ; }; + String STR_RPT_INTERVAL { Text [ en-US ] = "Interval" ; @@ -373,42 +335,31 @@ String STR_RPT_HELP_FOOTER { Text [ en-US ] = "Display a footer for this group?" ; }; + String STR_RPT_HELP_GROUPON { Text [ en-US ] = "Select the value or range of values that starts a new group." ; }; + String STR_RPT_HELP_INTERVAL { Text [ en-US ] = "Interval or number of characters to group on." ; }; + String STR_RPT_HELP_KEEP { Text [ en-US ] = "Keep group together on one page?" ; }; + String STR_RPT_HELP_SORT { Text [ en-US ] = "Select ascending or descending sort order. Ascending means from A to Z or 0 to 9" ; }; - Menu RID_GROUPSROWPOPUPMENU { ItemList = { -/* - MenuItem - { - ITEM_EDIT_CUT - }; - MenuItem - { - ITEM_EDIT_COPY - }; - MenuItem - { - ITEM_EDIT_PASTE - }; -*/ MenuItem { ITEM_EDIT_DELETE diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 5a05e2593b39..5bd349b1d52d 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -65,18 +65,15 @@ class OReportController; \************************************************************************/ class OGroupsSortingDialog : public FloatingWindow - , public ::cppu::BaseMutex - , public ::comphelper::OPropertyChangeListener - ,public dbaui::OToolBoxHelper - ,public vcl::IImageListProvider + , public ::cppu::BaseMutex + , public ::comphelper::OPropertyChangeListener + , public dbaui::OToolBoxHelper + , public vcl::IImageListProvider { friend class OFieldExpressionControl; FixedLine m_aFL2; FixedText m_aMove; -//BTN ImageButton m_aPB_Up; -//BTN ImageButton m_aPB_Down; -//BTN ImageButton m_aPB_Delete; ToolBox m_aToolBox; FixedLine m_aFL3; @@ -106,7 +103,6 @@ private: DECL_LINK( OnControlFocusLost, Control* ); DECL_LINK( OnControlFocusGot, Control* ); DECL_LINK( LBChangeHdl, ListBox* ); -//BTN DECL_LINK( ClickHdl, ImageButton* ); DECL_LINK( OnFormatAction, ToolBox* ); /** returns the groups diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index 50f8138c861c..52f5fe402c79 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -112,13 +112,13 @@ String RID_STR_PROPTITLE_GROUP Image RID_IMG_TREENODE_COLLAPSED { - ImageBitmap = Bitmap { File = "plus.bmp"; } ; + ImageBitmap = Bitmap { File = "plus.png"; } ; MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; }; Image RID_IMG_TREENODE_EXPANDED { - ImageBitmap = Bitmap { File = "minus.bmp"; } ; + ImageBitmap = Bitmap { File = "minus.png"; } ; MaskColor = Color { Red = 0xFF00; Green = 0x0000; Blue = 0xFF00; }; }; -- cgit v1.2.3 From db65737e58661805c74959878cac228db2c59063 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Fri, 26 Nov 2010 01:48:53 +0900 Subject: Remove dead codes and undesired comments with fixed typo Hi, yet another cleanup on base. Cheers, -- Takeshi Abe >From dff2f8d6d37863a5517a412ea4f92ebdbee536ff Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Fri, 26 Nov 2010 01:45:21 +0900 Subject: [PATCH] Remove dead codes and undesired comments with fixed typo --- dbaccess/source/ui/browser/sbagrid.cxx | 3 -- dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 1 - dbaccess/source/ui/dlg/ExtensionNotPresent.hrc | 1 - dbaccess/source/ui/dlg/dbwizsetup.cxx | 1 - dbaccess/source/ui/inc/RefFunctor.hxx | 4 -- dbaccess/source/ui/inc/TableRow.hxx | 3 -- dbaccess/source/ui/inc/sbagrid.hxx | 2 - dbaccess/source/ui/misc/RowSetDrop.cxx | 7 ++- dbaccess/source/ui/misc/WCPage.cxx | 5 +- dbaccess/source/ui/misc/WCopyTable.cxx | 1 - dbaccess/source/ui/misc/WTypeSelect.cxx | 1 - .../ui/relationdesign/RelationController.cxx | 2 - dbaccess/source/ui/tabledesign/TEditControl.cxx | 28 ++-------- .../source/ui/tabledesign/TableDesignControl.cxx | 3 -- dbaccess/source/ui/tabledesign/TableDesignView.cxx | 1 - reportdesign/inc/RptPage.hxx | 1 - reportdesign/inc/RptResId.hrc | 1 - reportdesign/qa/complex/ReportDesignerTest.java | 63 ---------------------- reportdesign/source/core/api/ReportDefinition.cxx | 46 ++-------------- reportdesign/source/core/inc/Tools.hxx | 6 +-- reportdesign/source/core/sdr/RptPage.cxx | 29 ++-------- reportdesign/source/ui/dlg/AddField.cxx | 8 +-- reportdesign/source/ui/dlg/GroupsSorting.hrc | 10 ---- .../source/ui/inspection/GeometryHandler.cxx | 15 ++---- 24 files changed, 22 insertions(+), 220 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 14d11b1337ba..f4d783f4df89 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -257,8 +257,6 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt // TODO: why the hell this whole class does not use any mutex? -// if (0 == m_nPeerCreationLevel) - { Reference< ::com::sun::star::frame::XDispatch > xDisp(getPeer(), UNO_QUERY); for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin(); aIter != m_aStatusMultiplexer.end(); @@ -267,7 +265,6 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt if ((*aIter).second && (*aIter).second->getLength()) xDisp->addStatusListener((*aIter).second, (*aIter).first); } - } } //--------------------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index da3735b18cc7..48c0931b946e 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -48,7 +48,6 @@ namespace dbaui //......................................................................... class IDatabaseSettingsDialog; -// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet ); //======================================================================== diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc index 69794e3a76bc..712193982075 100644 --- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc +++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc @@ -37,7 +37,6 @@ #define BUTTON_HEIGHT 14 #define BUTTON_WIDTH 55 #define BROWSER_HEIGHT 75 -// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING) #define LEFT_PADDING 32 /* size for the icon */ #define RIGHT_PADDING 16 #define DLG_WIDTH ( 250 ) diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 4ff3174e45ca..c09b34bb151f 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -181,7 +181,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() ); m_pImpl->translateProperties(xDatasource, *m_pOutSet); -// eType = m_pImpl->getDatasourceType(*m_pOutSet); SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT)); ShowButtonFixedLine(sal_True); diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx index 20912af0af1c..41d48ca7b094 100644 --- a/dbaccess/source/ui/inc/RefFunctor.hxx +++ b/dbaccess/source/ui/inc/RefFunctor.hxx @@ -47,10 +47,6 @@ namespace dbaui { m_aFunction(_aType.get()); } -// inline void operator()(const ::rtl::Reference& _aType) -// { -// m_aFunction(_aType.get()); -// } }; // ----------------------------------------------------------------------------- } // namespace dbaui diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx index 3fe4afa56854..9f29ea2b1684 100644 --- a/dbaccess/source/ui/inc/TableRow.hxx +++ b/dbaccess/source/ui/inc/TableRow.hxx @@ -37,9 +37,6 @@ namespace dbaui { -// class OTableRow; -// friend SvStream& operator<<( SvStream& rStr, OTableRow& _rRow ); - class OFieldDescription; class OTypeInfo; class OTableRow diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 857c32d8f010..0f91c8fa06d8 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -29,8 +29,6 @@ #ifndef _SBA_GRID_HXX #define _SBA_GRID_HXX -// #include - #include #include diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 386c17312221..e7931223700e 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -48,7 +48,6 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::lang; -// using namespace ::com::sun::star::sdbcx; // export data ORowSetImportExport::ORowSetImportExport( Window* _pParent, @@ -84,7 +83,7 @@ void ORowSetImportExport::initialize() m_aColumnTypes.reserve(nCount); for (sal_Int32 i = 1;i <= nCount; ++i) { - sal_Int32 nPos = -1; // -1 means column is autoincrement or doesn't exists + sal_Int32 nPos = -1; // -1 means column is autoincrement or doesn't exist if(!m_xTargetResultSetMetaData->isAutoIncrement(i)) { try @@ -95,7 +94,7 @@ void ORowSetImportExport::initialize() catch(const SQLException&) { if(m_xTargetResultSetMetaData->isNullable(i)) - nPos = 0; // column doesn't exists but we could set it to null + nPos = 0; // column doesn't exist but we could set it to null } } @@ -131,7 +130,7 @@ BOOL ORowSetImportExport::Read() { sal_Int32 nPos = -1; *pBegin >>= nPos; - OSL_ENSURE(nPos != -1,"Invalid posiotion!"); + OSL_ENSURE(nPos != -1,"Invalid position!"); bContinue = (m_xResultSet.is() && m_xResultSet->absolute(nPos) && insertNewRow()); } } diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 905846ba9892..9677140a9b2c 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -134,7 +134,7 @@ IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ ) SetAppendDataRadio(); return 0; } -//--------dyf ADD + void OCopyTable::SetAppendDataRadio() { m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_True); @@ -144,7 +144,6 @@ void OCopyTable::SetAppendDataRadio() m_pParent->setOperation(CopyTableOperation::AppendData); } -//--------add end //------------------------------------------------------------------------ IMPL_LINK( OCopyTable, RadioChangeHdl, Button*, pButton ) { @@ -351,7 +350,6 @@ void OCopyTable::setCreatePrimaryKey( bool _bDoCreate, const ::rtl::OUString& _r } // ----------------------------------------------------------------------------- -//---dyf add 2006/7/10 void OCopyTable::setCreateStyleAction() { // reselect the last action before @@ -382,6 +380,5 @@ void OCopyTable::setCreateStyleAction() } } } -//---add end /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 87763f075f4e..ba8e1f02121f 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -1049,7 +1049,6 @@ void OCopyTableWizard::CheckButtons() void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::EnableButton" ); -// CheckButtons(); Button* pButton; if(eStyle == WIZARD_NEXT) pButton = &m_pbNext; diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 210b3225d6fb..68bf316c33dd 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdbcx; //======================================================================== // OWizTypeSelectControl diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 47058181cc40..b15bf8455b48 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -96,8 +96,6 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::util; -// using namespace ::com::sun::star::sdbcx; -// using namespace ::connectivity; using namespace ::dbtools; using namespace ::dbaui; using namespace ::comphelper; diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 77249b19854e..41d944c080d7 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -240,11 +240,6 @@ void OTableEditorCtrl::SetReadOnly( sal_Bool bRead ) sal_uInt16 nCol(GetCurColumnId()); DeactivateCell(); - ////////////////////////////////////////////////////////////////////// - // ::com::sun::star::beans::Property Controls disablen -// if (pDescrWin) -// pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly()); - ////////////////////////////////////////////////////////////////////// // Cursor des Browsers anpassen BrowserMode nMode(BROWSER_COLUMNSELECTION | BROWSER_MULTISELECTION | BROWSER_KEEPSELECTION | @@ -313,7 +308,7 @@ void OTableEditorCtrl::InitCellController() const Size aTemp( pControls[i]->GetOptimalSize(WINDOWSIZE_PREFERRED) ); if ( aTemp.Height() > aHeight.Height() ) aHeight.Height() = aTemp.Height(); - } // for(int i= 0; i < SAL_N_ELEMENTS(pControls);++i + } SetDataRowHeight(aHeight.Height()); ClearModified(); @@ -402,8 +397,6 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, if (rDev.IsClipRegion()) rDev.SetClipRegion(); -// rDev.DrawText(rRect.TopLeft(), aText); -// rDev.SetClipRegion( ); } //------------------------------------------------------------------------------ @@ -710,15 +703,6 @@ sal_Bool OTableEditorCtrl::SaveModified() switch( nColId ) { - ////////////////////////////////////////////////////////////// - // NameCell - case FIELD_NAME: - { - // removed the former duplicate-check. this is done in OTableDocShell::CheckDefConsistency now. - // FS - 07.12.99 - 69575 - - } break; - ////////////////////////////////////////////////////////////// // TypeCell case FIELD_TYPE: @@ -1191,7 +1175,6 @@ void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::s break; case FIELD_PROPERTY_NUMTYPE: - // pFieldDescr->SetNumType( _rNewData ); OSL_ENSURE(sal_False, "OTableEditorCtrl::SetCellData: invalid column!"); break; @@ -1276,7 +1259,7 @@ Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) case FIELD_PROPERTY_NUMTYPE: OSL_ENSURE(sal_False, "OTableEditorCtrl::GetCellData: invalid column!"); - // return pFieldDescr->GetNumType(); + break; case FIELD_PROPERTY_AUTOINC: sValue = pFieldDescr->IsAutoIncrement() ? strYes : strNo; @@ -1360,11 +1343,6 @@ sal_Bool OTableEditorCtrl::IsCutAllowed( long nRow ) } } -// Reference xTable = GetView()->getController().getTable(); -// if( !IsCopyAllowed(nRow) || (xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))) -// return sal_False; - - // return bCutAllowed && IsDeleteAllowed( nRow ); return bIsCutAllowed; } @@ -1779,7 +1757,7 @@ void OTableEditorCtrl::AdjustFieldDescription(OFieldDescription* _pFieldDesc, { _pFieldDesc->SetIsNullable(ColumnValue::NO_NULLS); _pFieldDesc->SetControlDefault(Any()); - } // if(!_bSet && _pFieldDesc->getTypeInfo()->bNullable) + } if ( _pFieldDesc->IsAutoIncrement() && !_bPrimaryKey ) { OTableController& rController = GetView()->getController(); diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 88cec5c43327..4c3ef7d87cd4 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -75,9 +75,6 @@ void OTableRowView::Init() { EditBrowseBox::Init(); -// SetMapMode( MapMode(MAP_TWIP) ); -// GetDataWindow().SetMapMode( GetMapMode() ); - Font aFont( GetDataWindow().GetFont() ); aFont.SetWeight( WEIGHT_NORMAL ); GetDataWindow().SetFont( aFont ); diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 66b5d8c621f3..39ffb23df34d 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -148,7 +148,6 @@ void OTableBorderWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, if ( IsControlFont() ) aFont.Merge( GetControlFont() ); SetPointFont( aFont ); -// Set/*Zoomed*/PointFont( aFont ); } if ( bFont || bForeground ) diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx index ca90ae3b2521..6f0abc6de953 100644 --- a/reportdesign/inc/RptPage.hxx +++ b/reportdesign/inc/RptPage.hxx @@ -40,7 +40,6 @@ namespace rptui //============================================================================ class OReportModel; -//class OReportSection; class REPORTDESIGN_DLLPUBLIC OReportPage : public SdrPage { diff --git a/reportdesign/inc/RptResId.hrc b/reportdesign/inc/RptResId.hrc index f6724fe50747..013cafdd8b3e 100644 --- a/reportdesign/inc/RptResId.hrc +++ b/reportdesign/inc/RptResId.hrc @@ -234,7 +234,6 @@ #define RID_STR_PARAADJUST (RID_STRING_START + 161) -// #define RID_STR_ (RID_STRING_START + 130) // ----------------------------------------------------------------------- #define RID_PAGEDIALOG_PAGE ( RID_PAGE_START + 1 ) #define RID_PAGEDIALOG_BACKGROUND ( RID_PAGE_START + 2 ) diff --git a/reportdesign/qa/complex/ReportDesignerTest.java b/reportdesign/qa/complex/ReportDesignerTest.java index 3bbb9a42fe26..cf03362cfa17 100755 --- a/reportdesign/qa/complex/ReportDesignerTest.java +++ b/reportdesign/qa/complex/ReportDesignerTest.java @@ -47,9 +47,6 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import com.sun.star.util.XCloseable; -// import util.BasicMacroTools; -// import util.DesktopTools; -// import util.dbg; import complexlib.ComplexTestCase; import util.utils; import helper.OfficeProvider; @@ -58,26 +55,6 @@ import helper.OfficeWatcher; import convwatch.DB; -// import java.util.Date; -// import java.text.SimpleDateFormat; -// import java.text.ParsePosition; -// import java.sql.Time; -// -// import java.io.BufferedReader; -// import java.io.File; -// import java.io.FileReader; -// import java.io.IOException; -// import java.io.FilenameFilter; -// -// import java.util.Vector; -// -// import helper.AppProvider; -// import java.text.DecimalFormat; -// import util.DynamicClassLoader; -// import java.util.StringTokenizer; - - - class PropertySetHelper { @@ -327,15 +304,6 @@ public class ReportDesignerTest extends ComplexTestCase { XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), null); log.println("Load done"); -// context = createUnoService("com.sun.star.sdb.DatabaseContext") -// oDataBase = context.getByName("hh") -// oDBDoc = oDataBase.DatabaseDocument -// -// dim args(1) as new com.sun.star.beans.PropertyValue -// args(0).Name = "ActiveConnection" -// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection") -// reportContainer = oDBDoc.getReportDocuments() -// report = reportContainer.loadComponentFromURL("Report40","",0,args) try { @@ -346,45 +314,24 @@ public class ReportDesignerTest extends ComplexTestCase { XNameAccess xNameAccess = (XNameAccess) UnoRuntime.queryInterface(XNameAccess.class, x); showElements(xNameAccess); Object aObj = xNameAccess.getByName(sFileURL); -// log.println("1"); - // PropertySetHelper aHelper = new PropertySetHelper(aObj); XDocumentDataSource xDataSource = (XDocumentDataSource)UnoRuntime.queryInterface(XDocumentDataSource.class, aObj); -// Object aDatabaseDocmuent = aHelper.getPropertyValueAsObject("DatabaseDocument"); XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument(); - // XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, aDatabaseDocument); assure("can't access DatabaseDocument", xOfficeDBDoc != null); -// log.println("2"); XModel xDBSource = (XModel)UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc); Object aController = xDBSource.getCurrentController(); assure("Controller of xOfficeDatabaseDocument is empty!", aController != null); -// log.println("3"); XDatabaseDocumentUI aDBDocUI = (XDatabaseDocumentUI)UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController); boolean isConnect = aDBDocUI.connect(); -// if (isConnect) -// { -// System.out.println("true"); -// } -// else -// { -// System.out.println("false"); -// } -// log.println("4"); - - // aHelper = new PropertySetHelper(aController); - - // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection"); Object aActiveConnectionObj = aDBDocUI.getActiveConnection(); assure("ActiveConnection is empty", aActiveConnectionObj != null); -// log.println("5"); XReportDocumentsSupplier xSupplier = (XReportDocumentsSupplier)UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc); xNameAccess = xSupplier.getReportDocuments(); assure("xOfficeDatabaseDocument returns no Report Document", xNameAccess != null); -// log.println("5"); showElements(xNameAccess); @@ -403,11 +350,6 @@ public class ReportDesignerTest extends ComplexTestCase { log.println("ERROR: Exception caught"); } - // String mTestDocumentPath = (String) param.get("TestDocumentPath"); - // System.out.println("mTestDocumentPath: '" + mTestDocumentPath + "'"); - // // workaround for issue using deprecated "DOCPTH" prop - // System.setProperty("DOCPTH", mTestDocumentPath); - // Close the document closeComponent(xDocComponent); } @@ -440,8 +382,6 @@ public class ReportDesignerTest extends ComplexTestCase { sDestinationVersion, sDestinationName, sDestinationCreatorType, sDocumentPoolDir, sDocumentPoolName, m_sMailAddress, sSpecial); - // DB.test(); - // System.exit(1); } private void loadAndStoreReports(XNameAccess _xNameAccess, ArrayList _aPropertyList, int _nType) @@ -505,9 +445,6 @@ public class ReportDesignerTest extends ComplexTestCase { sOutputPath += "tmp_123"; sOutputPath += System.getProperty("file.separator"); - // sOutputPath += getFileFormat(_nType); - // sOutputPath += System.getProperty("file.separator"); - File aOutputFile = new File(sOutputPath); // create the directory of the given output path aOutputFile.mkdirs(); diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 18764eab4061..ac79d071208d 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -239,7 +239,6 @@ void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _r catch( const uno::Exception& ) { OSL_ENSURE( sal_False, "lcl_extractAndStartStatusIndicator: caught an exception!" ); -// DBG_UNHANDLED_EXCEPTION(); } } // ----------------------------------------------------------------------------- @@ -318,30 +317,23 @@ OStyle::OStyle() registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( static_cast< ::rtl::OUString *>(NULL) ), &sName ); registerPropertyNoMember(PROPERTY_BACKCOLOR, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_GRAPHICFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION, ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); - //registerPropertyNoMember(PROPERTY_BACKGRAPHICURL, ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); registerPropertyNoMember(PROPERTY_BACKTRANSPARENT, ++i,nBound,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKCOLOR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"), ++i,nBound,::getCppuType((rtl::OUString*)0) ,&sEmpty); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FIRSTPAGE), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); - // registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC), ++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL), ++i,nBound,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), ++i,nBound,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); @@ -349,12 +341,10 @@ OStyle::OStyle() registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW), ++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); // @@ -363,12 +353,10 @@ OStyle::OStyle() registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFLOC), ++i,nBound|nMayBeVoid,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRGRFURL), ++i,nBound|nMayBeVoid,::getCppuType((const ::rtl::OUString*)0) ,&sEmpty); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBACKTRAN), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bTrue); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKCOL), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBODYDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBRDDIST), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRBOTTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRDYNAMIC), ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRHEIGHT), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRDYNAMIC), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRON), ++i,nBound|nMayBeVoid,::getBooleanCppuType() ,&bFalse); @@ -376,23 +364,18 @@ OStyle::OStyle() registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRLEFTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRON), ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTBDIS),++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRRIGHTMAR), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRSHADOW), ++i,nBound|nMayBeVoid,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRSHARED), ++i,nBound,::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBOR), ++i,nBound|nMayBeVoid,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_HDRTOPBDIS), ++i,nBound|nMayBeVoid,::getCppuType((const sal_Int32*)0) ,&nZero); // registerProperty(PROPERTY_HEIGHT, ++i,nBound,&m_aSize.Height, ::getCppuType((const sal_Int32*)0) ); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_BACKTRANS), ++i,nBound, ::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(PROPERTY_ISLANDSCAPE, ++i,nBound, ::getBooleanCppuType() ,&bFalse); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBORDER), ++i,nBound, ::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTBRDDIST), ++i,nBound, ::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(PROPERTY_LEFTMARGIN, ++i,beans::PropertyAttribute::BOUND, ::getCppuType((const sal_Int32*)0) ,&nMargin); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTFTRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_LEFTHDRCONT), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); registerPropertyNoMember(PROPERTY_NUMBERINGTYPE, ++i,nBound,::getCppuType((const sal_Int16*)0) ,&nNummeringType); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALEVAL), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(PROPERTY_PAGESTYLELAYOUT, ++i,nBound,::getCppuType((const style::PageStyleLayout*)0) ,&ePageStyleLayout); @@ -401,8 +384,6 @@ OStyle::OStyle() registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTBRDDIST),++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(PROPERTY_RIGHTMARGIN, ++i,beans::PropertyAttribute::BOUND,::getCppuType((const sal_Int32*)0) ,&nMargin); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTFTRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_RIGHTHDRCON), ++i,nBound,::getCppuType((const uno::Reference< sheet::XHeaderFooterContent >*)0) ,NULL); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOPAG), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOX), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_SCALETOY), ++i,nBound,::getCppuType((const sal_Int16*)0) ,&n16Zero); @@ -411,12 +392,9 @@ OStyle::OStyle() registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBORDER), ++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine); registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_TOPBRDDIST), ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero); registerPropertyNoMember(PROPERTY_TOPMARGIN, ++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_FTRBACKTRAN),++i,nBound,::getBooleanCppuType() ,&bFalse); - //registerPropertyNoMember(MAP_CHAR_LEN(OLD_UNO_PAGE_HDRBACKTRAN),++i,nBound,::getBooleanCppuType() ,&bFalse); uno::Reference< container::XNameContainer> xAttribs = ::comphelper::NameContainer_createInstance(::getCppuType(static_cast< xml::AttributeData* >(NULL))); registerPropertyNoMember(MAP_CHAR_LEN("UserDefinedAttributes"), ++i,nBound,::getCppuType((uno::Reference*)0) ,&xAttribs); registerProperty(PROPERTY_WIDTH, ++i,nBound,&m_aSize.Width,::getCppuType((const sal_Int32*)0) ); - //registerPropertyNoMember(MAP_CHAR_LEN(SC_UNONAME_WRITING), ++i,nBound,:.getCppuType((sal_Int16*)0) ,&n16Zero); registerPropertyNoMember(MAP_CHAR_LEN("PrinterName"), ++i,nBound,::getCppuType((const ::rtl::OUString*)0),&sEmpty); uno::Sequence aSe; registerPropertyNoMember(MAP_CHAR_LEN("PrinterSetup"), ++i,nBound,::getCppuType((const uno::Sequence*)0),&aSe); @@ -1409,10 +1387,6 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::getCurrentSelectio void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference< embed::XStorage >& _xStorageToLoadFrom, const uno::Sequence< beans::PropertyValue >& _aMediaDescriptor ) { -// ::osl::MutexGuard aGuard(m_aMutex); -// ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); -// - m_pImpl->m_xStorage = _xStorageToLoadFrom; ::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor ); @@ -1512,7 +1486,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS { const ::rtl::OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),::rtl::OUString()) ); xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BaseURI")), uno::makeAny(sVal)); - } // if ( aSaveOpt.IsSaveRelFSys() ) + } const ::rtl::OUString sHierarchicalDocumentName( aDescriptor.getUnpackedValueOrDefault(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HierarchicalDocumentName")),::rtl::OUString()) ); xInfoSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath")), uno::makeAny(sHierarchicalDocumentName)); @@ -1565,7 +1539,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS sWarnFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("meta.xml")); } } - } // if( !bErr ) + } if( !bErr ) { @@ -1594,7 +1568,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS bErr = sal_True; sErrFile = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("content.xml")); } - } // if ( !bErr ) + } uno::Any aImage; uno::Reference< embed::XVisualObject > xCurrentController(getCurrentController(),uno::UNO_QUERY); @@ -1909,15 +1883,12 @@ void SAL_CALL OReportDefinition::setVisualAreaSize( ::sal_Int64 _nAspect, const { ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(ReportDefinitionBase::rBHelper.bDisposed); - //if( nAspect == embed::Aspects::MSOLE_CONTENT ) - { bool bChanged = (m_pImpl->m_aVisualAreaSize.Width != _aSize.Width || m_pImpl->m_aVisualAreaSize.Height != _aSize.Height); m_pImpl->m_aVisualAreaSize = _aSize; if( bChanged ) setModified( sal_True ); - } m_pImpl->m_nAspect = _nAspect; } // ----------------------------------------------------------------------------- @@ -2081,8 +2052,6 @@ uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewDat { m_pImpl->m_xViewData.set(m_aProps->m_xContext->getServiceManager()->createInstanceWithContext( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.IndexedPropertyValues")),m_aProps->m_xContext ),uno::UNO_QUERY); - //uno::Sequence< beans::PropertyValue > aProps; - //m_pImpl->m_xViewData->insertByIndex(m_pImpl->m_xViewData->getCount(),uno::makeAny(aProps)); uno::Reference< container::XIndexContainer > xContainer(m_pImpl->m_xViewData,uno::UNO_QUERY); ::std::vector< uno::Reference< frame::XController> >::iterator aIter = m_pImpl->m_aControllers.begin(); ::std::vector< uno::Reference< frame::XController> >::iterator aEnd = m_pImpl->m_aControllers.end(); @@ -2097,7 +2066,7 @@ uno::Reference< container::XIndexAccess > SAL_CALL OReportDefinition::getViewDat catch(uno::Exception&) { } - } // if ( aIter->is() ) + } } } @@ -2271,7 +2240,7 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstanceWith *pIter >>= aValue; if( aValue.Name.equalsAscii( "Storage" ) ) aValue.Value >>= xStorage; - } // for(;pIter != pEnd ;++pIter) + } m_pImpl->m_pObjectContainer->SwitchPersistence(xStorage); xRet = static_cast< ::cppu::OWeakObject* >(SvXMLEmbeddedObjectHelper::Create( xStorage,*this, EMBEDDEDOBJECTHELPER_MODE_READ )); } @@ -2327,35 +2296,30 @@ uno::Reference< uno::XInterface > SAL_CALL OReportDefinition::createInstance( co { if ( !m_pImpl->m_xGradientTable.is() ) m_pImpl->m_xGradientTable.set(SvxUnoGradientTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY); - //comphelper::NameContainer_createInstance( ::getCppuType( (const awt::Gradient*) 0 ) ).get(); return m_pImpl->m_xGradientTable; } else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.HatchTable") ) == 0 ) { if ( !m_pImpl->m_xHatchTable.is() ) m_pImpl->m_xHatchTable.set(SvxUnoHatchTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY); - //comphelper::NameContainer_createInstance( ::getCppuType( (const drawing::Hatch*) 0 ) ).get(); return m_pImpl->m_xHatchTable; } else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.BitmapTable") ) == 0 ) { if ( !m_pImpl->m_xBitmapTable.is() ) m_pImpl->m_xBitmapTable.set(SvxUnoBitmapTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY); - //comphelper::NameContainer_createInstance( ::getCppuType( (const ::rtl::OUString*) 0 ) ).get(); return m_pImpl->m_xBitmapTable; } else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TransparencyGradientTable") ) == 0 ) { if ( !m_pImpl->m_xTransparencyGradientTable.is() ) m_pImpl->m_xTransparencyGradientTable.set(SvxUnoTransGradientTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY); - //comphelper::NameContainer_createInstance( ::getCppuType( (const awt::Gradient*) 0 ) ).get(); return m_pImpl->m_xTransparencyGradientTable; } else if ( aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) == 0 ) { if ( !m_pImpl->m_xDashTable.is() ) m_pImpl->m_xDashTable.set(SvxUnoDashTable_createInstance(m_pImpl->m_pReportModel.get()),uno::UNO_QUERY); - //comphelper::NameContainer_createInstance( ::getCppuType( (const drawing::LineDash*) 0 ) ).get(); return m_pImpl->m_xDashTable; } else if( 0 == aServiceSpecifier.reverseCompareToAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MarkerTable") ) ) diff --git a/reportdesign/source/core/inc/Tools.hxx b/reportdesign/source/core/inc/Tools.hxx index 343acfbdf859..f61bd095ff2a 100644 --- a/reportdesign/source/core/inc/Tools.hxx +++ b/reportdesign/source/core/inc/Tools.hxx @@ -50,7 +50,6 @@ namespace reportdesign if ( _bOn && !_xSection.is() ) _xSection = new OSection(_xParent,_xParent->getContext(),_bPageSection); else if ( !_bOn ) - //_xSection.clear(); ::comphelper::disposeComponent(_xSection); } @@ -96,7 +95,7 @@ namespace reportdesign public: template static void setSize(const ::com::sun::star::awt::Size& aSize,T* _pShape) { - OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal with or height!"); + OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!"); ::osl::MutexGuard aGuard(_pShape->m_aMutex); if ( _pShape->m_aProps.aComponent.m_xShape.is() ) @@ -118,7 +117,7 @@ namespace reportdesign if ( _pShape->m_aProps.aComponent.m_xShape.is() ) { ::com::sun::star::awt::Size aSize = _pShape->m_aProps.aComponent.m_xShape->getSize(); - OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal with or height!"); + OSL_ENSURE(aSize.Width >= 0 && aSize.Height >= 0,"Illegal width or height!"); return aSize; } return ::com::sun::star::awt::Size(_pShape->m_aProps.aComponent.m_nWidth,_pShape->m_aProps.aComponent.m_nHeight); @@ -154,7 +153,6 @@ namespace reportdesign if ( _pShape->m_aProps.aComponent.m_xShape.is() ) { ::com::sun::star::awt::Point aPosition = _pShape->m_aProps.aComponent.m_xShape->getPosition(); -// OSL_ENSURE(aPosition.X >= 0 && aPosition.Y >= 0,"Illegal position!"); return aPosition; } return ::com::sun::star::awt::Point(_pShape->m_aProps.aComponent.m_nPosX,_pShape->m_aProps.aComponent.m_nPosY); diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index fe9ae18cdb52..5ed073d3fff6 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -92,7 +92,7 @@ ULONG OReportPage::getIndexOf(const uno::Reference< report::XReportComponent >& { break; } - } // for (; i < nCount; ++i) + } return i; } //---------------------------------------------------------------------------- @@ -106,7 +106,7 @@ void OReportPage::removeSdrObject(const uno::Reference< report::XReportComponent OSL_ENSURE(pBase,"Why is this not a OObjectBase?"); if ( pBase ) pBase->EndListening(); - /*delete */RemoveObject(nPos); + RemoveObject(nPos); } } // ----------------------------------------------------------------------------- @@ -132,26 +132,11 @@ SdrObject* OReportPage::RemoveObject(ULONG nObjNum) return pObj; } //---------------------------------------------------------------------------- -//namespace -//{ -// ::rtl::OUString lcl_getControlName(const uno::Reference< lang::XServiceInfo >& _xServiceInfo) -// { -// if ( _xServiceInfo->supportsService( SERVICE_FIXEDTEXT )) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FixedText")); -// if ( _xServiceInfo->supportsService( SERVICE_FORMATTEDFIELD )) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.FormattedField")); -// if ( _xServiceInfo->supportsService( SERVICE_IMAGECONTROL)) -// return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.DatabaseImageControl")); -// -// return ::rtl::OUString(); -// } -//} -//---------------------------------------------------------------------------- void OReportPage::insertObject(const uno::Reference< report::XReportComponent >& _xObject) { DBG_CHKTHIS( rpt_OReportPage,NULL); OSL_ENSURE(_xObject.is(),"Object is not valid to create a SdrObject!"); - if ( !_xObject.is() ) // || !m_pView ) + if ( !_xObject.is() ) return; ULONG nPos = getIndexOf(_xObject); if ( nPos < GetObjCount() ) @@ -232,14 +217,6 @@ void OReportPage::NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertRe uno::Reference< drawing::XShape> xShape(pObj->getUnoShape(),uno::UNO_QUERY); pSection->notifyElementAdded(xShape); - //// check if we are a shape - //uno::Reference xProp(xShape,uno::UNO_QUERY); - //if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID"))) ) - //{ - // // use MimeConfigurationHelper::GetStringClassIDRepresentation(MimeConfigurationHelper::GetSequenceClassID(SO3_SCH_OLE_EMBED_CLASSID_8)) - // xProp->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CLSID")),uno::makeAny(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("12dcae26-281f-416f-a234-c3086127382e")))); - //} - // now that the shape is inserted into its structures, we can allow the OObjectBase // to release the reference to it OObjectBase* pObjectBase = dynamic_cast< OObjectBase* >( pObj ); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index e74d9bb4a6ec..431e72e5bccc 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -76,8 +76,6 @@ class OAddFieldWindowListBox : public SvTreeListBox OAddFieldWindowListBox(const OAddFieldWindowListBox&); void operator =(const OAddFieldWindowListBox&); -protected: -// virtual void Command( const CommandEvent& rEvt ); public: OAddFieldWindowListBox( OAddFieldWindow* _pParent ); @@ -207,7 +205,6 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent m_aHelpText.SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() ); SetSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y)); - //Show(); if ( m_xRowSet.is() ) { @@ -448,7 +445,7 @@ void OAddFieldWindow::fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessD uno::Reference xModel(xDocument->getDatabaseDocument(),uno::UNO_QUERY); if ( xModel.is() ) _rDescriptor[ daDatabaseLocation ] <<= xModel->getURL(); - } // if ( xDocument.is() ) + } } _rDescriptor[ ::svx::daCommand ] <<= GetCommand(); @@ -457,7 +454,6 @@ void OAddFieldWindow::fillDescriptor(SvLBoxEntry* _pSelected,::svx::ODataAccessD _rDescriptor[ ::svx::daConnection ] <<= getConnection(); ColumnInfo* pInfo = static_cast(_pSelected->GetUserData()); - // ::rtl::OUString sColumnName = m_pListBox->GetEntryText( _pSelected ); _rDescriptor[ ::svx::daColumnName ] <<= pInfo->sColumnName; if ( m_xColumns->hasByName( pInfo->sColumnName ) ) _rDescriptor[ ::svx::daColumnObject ] <<= m_xColumns->getByName(pInfo->sColumnName); @@ -553,7 +549,7 @@ IMPL_LINK( OAddFieldWindow, OnSortAction, ToolBox*, /*NOTINTERESTEDIN*/ ) eSortMode = SortAscending; else if ( m_aActions.IsItemChecked(SID_FM_SORTDOWN) ) eSortMode = SortDescending; - } // if ( SID_FM_REMOVE_FILTER_SORT != nCurItem ) + } m_pListBox->GetModel()->SetSortMode(eSortMode); if ( SID_FM_REMOVE_FILTER_SORT == nCurItem ) diff --git a/reportdesign/source/ui/dlg/GroupsSorting.hrc b/reportdesign/source/ui/dlg/GroupsSorting.hrc index 8dfbfd3224a4..049afa79d37b 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.hrc +++ b/reportdesign/source/ui/dlg/GroupsSorting.hrc @@ -50,18 +50,8 @@ #define PB_DOWN (21) #define FL_SEPARATOR2 (22) #define FL_SEPARATOR3 (23) -//BTN #define IMG_UP_H (24) -//BTN #define IMG_DOWN_H (25) -//BTN #define PB_DELETE (26) #define TB_TOOLBOX (27) -// #define IMG_GROUPSORT_MOVE_DOWN (28) -// #define IMG_GROUPSORT_MOVE_UP (29) -// #define IMG_GROUPSORT_DELETE (30) -// #define IMG_GROUPSORT_MOVE_DOWN_H (31) -// #define IMG_GROUPSORT_MOVE_UP_H (32) -// #define IMG_GROUPSORT_DELETE_H (33) - #define CHECKBOX_HEIGHT 8 #define FIXEDTEXT_HEIGHT 8 diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index a90a80a26f65..240b4e86afd4 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -127,7 +127,6 @@ namespace rptui { //........................................................................ using namespace ::com::sun::star; -//using namespace formula; // comparing two property instances struct PropertyCompare : public ::std::binary_function< beans::Property, ::rtl::OUString , bool > @@ -1329,7 +1328,7 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie } aNewProps.push_back(*pFind); } - } // for (size_t i = 0; i < SAL_N_ELEMENTS(pIncludeProperties) ;++i ) + } // special property for shapes // if ( uno::Reference< report::XShape>(m_xReportComponent,uno::UNO_QUERY).is() ) @@ -1450,7 +1449,6 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr eResult = inspection::InteractiveSelectionResult_ObtainedValue; beans::PropertyChangeEvent aScopeEvent; aScopeEvent.PropertyName = PROPERTY_FILLCOLOR; - // aScopeEvent.OldValue <<= _nOldDataFieldType; aScopeEvent.NewValue <<= xShape->getPropertyValue(PROPERTY_FILLCOLOR); m_aPropertyListeners.notify( aScopeEvent, &beans::XPropertyChangeListener::propertyChange ); } @@ -1519,7 +1517,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString & { _rxInspectorUI->rebuildPropertyUI(PROPERTY_DATAFIELD); _rxInspectorUI->rebuildPropertyUI(PROPERTY_FORMULALIST); - } // if ( bEnable ) + } m_xFormComponentHandler->actuatingPropertyChanged(ActuatingPropertyName, NewValue, OldValue, _rxInspectorUI, _bFirstTimeInit); } break; @@ -1669,7 +1667,7 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUStrin const uno::Sequence< ::rtl::OUString > aMimeTypes( xReportDefinition->getAvailableMimeTypes() ); sRet = aMimeTypes[nPos]; } - } // if ( aFind != aList.end() ) + } return sRet; } // ----------------------------------------------------------------------------- @@ -1916,13 +1914,6 @@ void GeometryHandler::loadDefaultFunctions() DefaultFunction aDefault; aDefault.m_bDeepTraversing = sal_False; - //aDefault.m_sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Counter")); - //aDefault.m_sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%FunctionName] + 1")); - //aDefault.m_sSearchString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+[:alnum:]*\\][:space:]*\\+[:space:]*1")); - //aDefault.m_sInitialFormula.IsPresent = sal_True; - //aDefault.m_sInitialFormula.Value = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:1")); - //m_aDefaultFunctions.push_back(aDefault); - aDefault.m_bPreEvaluated = sal_True; aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION)); -- cgit v1.2.3 From 72d87fecf77f9c9bfab371e63eae4417b3b80eb1 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sun, 28 Nov 2010 01:33:36 +0900 Subject: cppcheck: variables assigned but never used --- dbaccess/source/ui/relationdesign/RelationController.cxx | 3 --- 1 file changed, 3 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index b15bf8455b48..eae22012b8b7 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -365,12 +365,10 @@ namespace Reference xTableProp(_aTable,UNO_QUERY); const ::rtl::OUString sSourceName = ::dbtools::composeTableName( m_xMetaData, xTableProp, ::dbtools::eInTableDefinitions, false, false, false ); TTableDataHelper::iterator aFind = m_aTableData.find(sSourceName); - bool bNotFound = true, bAdded = false; if ( aFind == m_aTableData.end() ) { aFind = m_aTableData.insert(TTableDataHelper::value_type(sSourceName,::boost::shared_ptr(new OTableWindowData(xTableProp,sSourceName, sSourceName)))).first; aFind->second->ShowAll(FALSE); - bAdded = true; } TTableWindowData::value_type pReferencingTable = aFind->second; Reference xKeys = pReferencingTable->getKeys(); @@ -392,7 +390,6 @@ namespace xKey->getPropertyValue(PROPERTY_TYPE) >>= nKeyType; if ( KeyType::FOREIGN == nKeyType ) { - bNotFound = false; ::rtl::OUString sReferencedTable; xKey->getPropertyValue(PROPERTY_REFERENCEDTABLE) >>= sReferencedTable; ////////////////////////////////////////////////////////////////////// -- cgit v1.2.3 From d609f7b6e2c44a284d860d6be91da67e85087544 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Mon, 29 Nov 2010 23:29:33 +0900 Subject: Remove undesirable comments --- .../source/core/dataaccess/databasecontext.cxx | 2 +- dbaccess/source/ui/control/RelationControl.cxx | 5 ++--- .../source/ui/querydesign/SelectionBrowseBox.cxx | 2 +- .../ui/relationdesign/RTableConnectionData.cxx | 2 +- .../source/ui/tabledesign/FieldDescriptions.cxx | 2 +- dbaccess/source/ui/tabledesign/TableController.cxx | 4 ++-- reportdesign/source/core/sdr/RptObject.cxx | 4 ++-- reportdesign/source/ui/dlg/GroupsSorting.cxx | 4 ++-- reportdesign/source/ui/inc/UITools.hxx | 2 +- reportdesign/source/ui/misc/FunctionHelper.cxx | 6 +++--- reportdesign/source/ui/misc/UITools.cxx | 22 +++++++++++----------- reportdesign/source/ui/misc/Undo.cxx | 2 +- .../source/ui/misc/statusbarcontroller.cxx | 4 ++-- reportdesign/source/ui/report/ReportController.cxx | 2 +- 14 files changed, 31 insertions(+), 32 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 16d578588f0d..2f32428cb2b7 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -160,7 +160,7 @@ namespace dbaccess { Reference xCloseable(xModel,UNO_QUERY_THROW); xCloseable->close(sal_False); - } // if ( !xModel->getControllers()->hasMoreElements() ) + } } catch(const CloseVetoException&) { diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 0687b61d7b8e..b92fa0014b36 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -134,7 +134,7 @@ namespace dbaui DBG_NAME(ORelationControl) //------------------------------------------------------------------------ ORelationControl::ORelationControl( OTableListBoxControl* pParent ,const OJoinTableView::OTableWindowMap* _pTableMap) - :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | /*WB_3DLOOK | */WB_BORDER | BROWSER_AUTOSIZE_LASTCOL) + :EditBrowseBox( pParent, EBBF_SMART_TAB_TRAVEL | EBBF_NOROWPICTURE, WB_TABSTOP | WB_BORDER | BROWSER_AUTOSIZE_LASTCOL) ,m_pTableMap(_pTableMap) ,m_pBoxControl(pParent) ,m_xSourceDef( NULL ) @@ -518,7 +518,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent pInitialRight = aIter->second; m_strCurrentRight = aIter->first; } - } // for(;aIter != m_pTableMap->end();++aIter) + } if ( !pInitialRight ) { @@ -668,7 +668,6 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent { _pTableSeparator->SetZOrder(&m_lmbRightTable, WINDOW_ZORDER_BEHIND); m_pRC_Tables->SetZOrder(_pTableSeparator, WINDOW_ZORDER_BEHIND); - //aDlgPoint = m_pTableSeparator->GetPosPixel() + Point(0,aSize.Height()) + LogicToPixel( Point(0,6), MAP_APPFONT ); _pTableSeparator->SetPosPixel(Point(0,m_aFL_InvolvedFields.GetPosPixel().Y())); const Size aSize = _pTableSeparator->GetSizePixel(); aDlgPoint.Y() = _pTableSeparator->GetPosPixel().Y() + aSize.Height(); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 8a3633d3653a..6bb3a056bb80 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1588,7 +1588,7 @@ void OSelectionBrowseBox::InsertColumn(OTableFieldDescRef pEntry, USHORT& _nColu getFields()[nOldPosition - 1] = pEntry; ColumnMoved(pEntry->GetColumnId(),FALSE); - } // if ( pEntry->GetColumnId() != nColumnId ) + } if ( pEntry->GetFunctionType() & (FKT_AGGREGATE) ) { diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index 2390c639e69f..b4dc806ea161 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -416,7 +416,7 @@ xKey.clear(); } } xKey.clear(); - } // for(sal_Int32 i=0;igetCount();++i) + } if ( bDropRelation ) { DropRelation(); diff --git a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx index 0f7ef63d5d94..a307f0766766 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescriptions.cxx @@ -561,7 +561,7 @@ sal_Int32 OFieldDescription::GetPrecision() const if ( !nPrec ) nPrec = pTypeInfo->nPrecision; break; - } // switch ( pTypeInfo->nType ) + } } return nPrec; diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 43faa0cd056c..0061bac5fed3 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -1205,7 +1205,7 @@ void OTableController::alterColumns() } else bReload = sal_True; - } // for(sal_Int32 nPos = 0;aIter != aEnd;++aIter,++nPos) + } // alter column settings aIter = m_vRowList.begin(); @@ -1236,7 +1236,7 @@ void OTableController::alterColumns() xColumn->setPropertyValue(PROPERTY_FORMATKEY,makeAny(pField->GetFormatKey())); if(xInfo->hasPropertyByName(PROPERTY_ALIGN)) xColumn->setPropertyValue(PROPERTY_ALIGN,makeAny(dbaui::mapTextAllign(pField->GetHorJustify()))); - } // if ( xColumns->hasByName(pField->GetName()) ) + } } // second drop all columns which could be found by name Reference xKeyColumns = getKeyColumns(); diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index ff9b64e01f2a..9410c75019e6 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -207,7 +207,7 @@ namespace default: OSL_ENSURE(0,"Illegal text alignment value!"); break; - } // switch(nTextAlign) + } aRet <<= (style::ParagraphAdjust)nTextAlign; } else @@ -951,7 +951,7 @@ SdrObject* OUnoObject::Clone() const Reference xDest(pClone->getUnoShape(),uno::UNO_QUERY); if ( xSource.is() && xDest.is() ) comphelper::copyProperties(xSource.get(),xDest.get()); - } // if ( pClone ) + } return pClone; } //---------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 9badbe8031ce..566b85fa8c5b 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -248,7 +248,7 @@ uno::Sequence OFieldExpressionControl::fillSelectedGroups() } if ( !vClipboardList.empty() ) aList = uno::Sequence< uno::Any >(&vClipboardList[0], vClipboardList.size()); - } // if ( nCount > 1 ) + } return aList; } //------------------------------------------------------------------------------ @@ -264,7 +264,7 @@ void OFieldExpressionControl::StartDrag( sal_Int8 /*_nAction*/ , const Point& /* OGroupExchange* pData = new OGroupExchange(aClipboardList); uno::Reference< ::com::sun::star::datatransfer::XTransferable> xRef = pData; pData->StartDrag(this, DND_ACTION_MOVE ); - } // if(!vClipboardList.empty()) + } } } //------------------------------------------------------------------------------ diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx index 6e600c4307da..6cf3ef141b86 100644 --- a/reportdesign/source/ui/inc/UITools.hxx +++ b/reportdesign/source/ui/inc/UITools.hxx @@ -69,7 +69,7 @@ namespace rptui ::com::sun::star::uno::Reference< T > xObject(_xCollection->getByIndex(i),::com::sun::star::uno::UNO_QUERY); if ( xObject == _xSearch ) break; - } // for (;i(new FunctionDescription(aCategoryFind->second.get(),_xFunctionDescription)))).first; - } // if ( aFind == m_aFunctions.end() ) + } pDesc = aFunctionFind->second; - } // if ( _xFunctionDescription.is() ) + } return pDesc; } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 6e1ed17c4e2e..2abd72becd67 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -175,14 +175,14 @@ void adjustSectionName(const uno::Reference< report::XGroup >& _xGroup,sal_Int32 ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPHEADER)); sName += ::rtl::OUString::valueOf(_nPos); _xGroup->getHeader()->setName(sName); - } // if ( _xGroup->getHeaderOn() ) + } if ( _xGroup->getFooterOn() && !_xGroup->getFooter()->getName().getLength() ) { ::rtl::OUString sName = String(ModuleRes(RID_STR_GROUPFOOTER)); sName += ::rtl::OUString::valueOf(_nPos); _xGroup->getFooter()->setName(sName); - } // if ( _xGroup->getHeaderOn() ) + } } // ----------------------------------------------------------------------------- ::rtl::Reference< comphelper::OPropertyChangeMultiplexer> addStyleListener(const uno::Reference< report::XReportDefinition >& _xReportDefinition,::comphelper::OPropertyChangeListener* _pListener) @@ -261,7 +261,7 @@ namespace case COMPLEX: aLocale = _rxReportControlFormat->getCharLocaleComplex(); break; - } // switch(_nWhich) + } _rItemSet.Put(SvxLanguageItem(MsLangId::convertLocaleToLanguageWithFallback(aLocale),_nLanguage)); @@ -288,7 +288,7 @@ namespace pClone->PutValue(_xShape->getPropertyValue(aIt->sName), aIt->nMemberId); _rItemSet.Put(*pClone, aIt->nWID); } - } // if ( xInfo->hasPropertyByName(sPropertyName) ) + } ++aIt; } } @@ -319,11 +319,11 @@ namespace catch(uno::Exception&) { // shapes have a bug so we ignore this one. } - } // if ( pItem ) + } } } ++aIt; - } // while ( pPropertyMap->pName ) + } } // ------------------------------------------------------------------------- void lcl_CharPropertiesToItems( const uno::Reference& _rxReportControlFormat, @@ -398,7 +398,7 @@ namespace aNewFont.SetFamily(pFontItem->GetFamily()); aNewFont.SetPitch(pFontItem->GetPitch()); aNewFont.SetCharSet(pFontItem->GetCharSet()); - } // if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_FONT,sal_True,&pItem) && pItem->ISA(SvxFontItem)) + } if ( SFX_ITEM_SET == _rItemSet.GetItemState( _nFontHeight,sal_True,&pItem) && pItem->ISA(SvxFontHeightItem)) { const SvxFontHeightItem* pFontItem = static_cast(pItem); @@ -544,7 +544,7 @@ namespace { const SvxCaseMapItem* pFontItem = static_cast(pItem); lcl_pushBack( _out_rProperties, PROPERTY_CHARCASEMAP, uno::makeAny( pFontItem->GetValue() ) ); - } // if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_CASEMAP,sal_True,&pItem) && pItem->ISA(SvxCaseMapItem)) + } struct Items { USHORT nWhich; ::rtl::OUString sPropertyName; @@ -561,7 +561,7 @@ namespace lang::Locale aCharLocale; MsLangId::convertLanguageToLocale( pFontItem->GetLanguage(), aCharLocale ); lcl_pushBack( _out_rProperties, pItems[k].sPropertyName, uno::makeAny( aCharLocale ) ); - } // if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_LANGUAGE,sal_True,&pItem) && pItem->ISA(SvxLanguageItem)) + } } if ( SFX_ITEM_SET == _rItemSet.GetItemState( ITEMID_ESCAPEMENT,sal_True,&pItem) && pItem->ISA(SvxEscapementItem)) { @@ -813,14 +813,14 @@ void applyCharacterSettings( const uno::Reference< report::XReportControlFormat aAwtFont.Name = ::rtl::OUString(); // hack to _rxReportControlFormat->setFontDescriptor( aAwtFont ); _rxReportControlFormat->setCharFontName( sTemp ); - } // if ( aSettings.get( "Font" ) >>= aAwtFont ) + } if ( aSettings.get( "FontAsian" ) >>= aAwtFont ) { ::rtl::OUString sTemp = aAwtFont.Name; aAwtFont.Name = ::rtl::OUString(); // hack to _rxReportControlFormat->setFontDescriptorAsian( aAwtFont ); _rxReportControlFormat->setCharFontNameAsian( sTemp ); - } // if ( aSettings.get( "Font" ) >>= aAwtFont ) + } if ( aSettings.get( "FontComplex" ) >>= aAwtFont ) { ::rtl::OUString sTemp = aAwtFont.Name; diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/Undo.cxx index 3a434d179985..249bac85b1b0 100644 --- a/reportdesign/source/ui/misc/Undo.cxx +++ b/reportdesign/source/ui/misc/Undo.cxx @@ -70,7 +70,7 @@ namespace _xSection->remove(xShape); --nCount; } - } // if ( _xSection.is() ) + } } //---------------------------------------------------------------------------- void lcl_insertElements(const uno::Reference< report::XSection >& _xSection,const ::std::vector< uno::Reference< drawing::XShape> >& _aControls) diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx b/reportdesign/source/ui/misc/statusbarcontroller.cxx index a169c8279026..6891d5dcd5dc 100644 --- a/reportdesign/source/ui/misc/statusbarcontroller.cxx +++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx @@ -113,7 +113,7 @@ void SAL_CALL OStatusbarController::initialize( const Sequence< Any >& _rArgumen if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) { m_pController = TStatusbarHelper::createFromQuery(new SvxZoomSliderControl(m_nSlotId = SID_ATTR_ZOOMSLIDER,m_nId,*pStatusBar)); - } // if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) + } else if ( m_aCommandURL.equalsAscii(".uno:Zoom") ) { m_pController = TStatusbarHelper::createFromQuery(new SvxZoomStatusBarControl(m_nSlotId = SID_ATTR_ZOOM,m_nId,*pStatusBar)); @@ -146,7 +146,7 @@ void SAL_CALL OStatusbarController::statusChanged( const FeatureStateEvent& _aEv aZoomSlider.PutValue(_aEvent.State); static_cast(m_pController.get())->StateChanged(m_nSlotId,SFX_ITEM_AVAILABLE,&aZoomSlider); } - } // if ( m_aCommandURL.equalsAscii(".uno:ZoomSlider") ) + } else if ( m_aCommandURL.equalsAscii(".uno:Zoom") ) { Sequence< PropertyValue > aSeq; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 6275f2fa4e01..059e021a9498 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -1481,7 +1481,7 @@ void OReportController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue > { const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT)); pListAction.reset(new UndoManagerListAction(m_aUndoManager,sUndoAction)); - } // if ( !pListAction.get() ) + } uno::Reference< report::XReportControlFormat> xReportControlFormat(*aIter,uno::UNO_QUERY); lcl_setFontWPU_nothrow(xReportControlFormat,_nId); } -- cgit v1.2.3 From da474bc40c74d6867faf05ed02b688fb2f460ab0 Mon Sep 17 00:00:00 2001 From: Takeshi Abe Date: Sat, 4 Dec 2010 12:33:49 +0900 Subject: Replace all occured, occurance etc. --- dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 2 +- dbaccess/source/core/api/CacheSet.cxx | 4 ++-- dbaccess/source/core/api/KeySet.cxx | 2 +- dbaccess/source/core/api/RowSet.hxx | 2 +- dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 6 +++--- dbaccess/source/core/misc/DatabaseDataProvider.cxx | 2 +- dbaccess/source/ui/browser/brwctrlr.cxx | 4 ++-- dbaccess/source/ui/browser/sbagrid.cxx | 2 +- dbaccess/source/ui/browser/sbagrid.src | 2 +- dbaccess/source/ui/browser/unodatbr.cxx | 2 +- dbaccess/source/ui/control/dbtreelistbox.cxx | 2 +- dbaccess/source/ui/control/tabletree.cxx | 2 +- dbaccess/source/ui/dlg/adminpages.hxx | 2 +- dbaccess/source/ui/inc/JoinController.hxx | 4 ++-- dbaccess/source/ui/inc/datasourcemap.hxx | 2 +- dbaccess/source/ui/inc/dbadmin.hxx | 2 +- dbaccess/source/ui/inc/dbu_resource.hrc | 2 +- dbaccess/source/ui/inc/dbwiz.hxx | 2 +- dbaccess/source/ui/inc/dbwizsetup.hxx | 2 +- dbaccess/source/ui/misc/RowSetDrop.cxx | 2 +- dbaccess/source/ui/querydesign/QueryDesignView.cxx | 4 ++-- dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 +- dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 4 ++-- dbaccess/source/ui/querydesign/TableWindow.cxx | 4 ++-- dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 4 ++-- dbaccess/source/ui/querydesign/querycontroller.cxx | 2 +- dbaccess/source/ui/relationdesign/RelationTableView.cxx | 2 +- dbaccess/source/ui/tabledesign/TableController.cxx | 2 +- dbaccess/source/ui/uno/copytablewizard.cxx | 4 ++-- dbaccess/source/ui/uno/dbinteraction.hxx | 2 +- reportdesign/qa/complex/ReportDesignerTest.java | 2 +- reportdesign/source/core/api/ReportDefinition.cxx | 2 +- reportdesign/source/core/misc/conditionalexpression.cxx | 10 +++++----- reportdesign/source/ui/misc/UITools.cxx | 4 ++-- reportdesign/source/ui/report/ViewsWindow.cxx | 2 +- reportdesign/source/ui/report/propbrw.cxx | 4 ++-- 36 files changed, 52 insertions(+), 52 deletions(-) mode change 100755 => 100644 reportdesign/qa/complex/ReportDesignerTest.java (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java index 02fb820f3fd4..0c712086d2fe 100644 --- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java @@ -653,7 +653,7 @@ public class DatabaseDocument extends TestCase implements com.sun.star.document. " oEvent.EventName = \"OnLoad\"\n" + " oEvent.Source = ThisComponent\n" + "\n" + - " oCallback.documentEventOccured( oEvent )\n" + + " oCallback.documentEventOccurred( oEvent )\n" + "End Sub\n"; XModel databaseDoc = impl_createDocWithMacro( libName, moduleName, eventHandlerCode ); final String documentURL = databaseDoc.getURL(); diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index f8e0d90d31a5..88eafa3c7d3a 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -137,11 +137,11 @@ OCacheSet::~OCacheSet() } catch(Exception&) { - OSL_ENSURE(0,"Exception occured"); + OSL_ENSURE(0,"Exception occurred"); } catch(...) { - OSL_ENSURE(0,"Unknown Exception occured"); + OSL_ENSURE(0,"Unknown Exception occurred"); } DBG_DTOR(OCacheSet,NULL); diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 46526def1d16..e6abca865e00 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -133,7 +133,7 @@ OKeySet::~OKeySet() } catch(...) { - OSL_ENSURE(0,"Unknown Exception occured"); + OSL_ENSURE(0,"Unknown Exception occurred"); } m_xComposer = NULL; diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index b686bc65a0e5..fb20dd8c2002 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -179,7 +179,7 @@ namespace dbaccess m_xActiveConnection points to a valid SDB-level connection @throws com::sun::star::sdb::SQLException - if an database-related error occured + if an database-related error occurred @throws com::sun::star::uno::RuntimeException if any of the components involved throws a com::sun::star::uno::RuntimeException diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index 35262dd70038..e3301f12a52f 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -163,7 +163,7 @@ namespace dbaccess Reference< XEventsSupplier > xEventsSupplier( m_pData->xDocument.get(), UNO_QUERY ); if ( !xEventsSupplier.is() ) { - OSL_ENSURE( false, "DocumentEventExecutor::documentEventOccured: no document anymore, but still being notified?" ); + OSL_ENSURE( false, "DocumentEventExecutor::documentEventOccurred: no document anymore, but still being notified?" ); return; } @@ -176,7 +176,7 @@ namespace dbaccess { // this is worth an assertion: We are listener at the very same document which we just asked // for its events. So when EventName is fired, why isn't it supported by xDocEvents? - OSL_ENSURE( false, "DocumentEventExecutor::documentEventOccured: an unsupported event is notified!" ); + OSL_ENSURE( false, "DocumentEventExecutor::documentEventOccurred: an unsupported event is notified!" ); return; } @@ -199,7 +199,7 @@ namespace dbaccess bool bNonEmptyScript = sScript.getLength() != 0; OSL_ENSURE( bDispatchScriptURL && bNonEmptyScript, - "DocumentEventExecutor::documentEventOccured: invalid/unsupported script descriptor" ); + "DocumentEventExecutor::documentEventOccurred: invalid/unsupported script descriptor" ); if ( bDispatchScriptURL && bNonEmptyScript ) { diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index 3e1fbc1c2b25..3e3540ddbc5f 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -240,7 +240,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat { } } - if ( !bRet ) // no command set or an error occured, use Internal data handler + if ( !bRet ) // no command set or an error occurred, use Internal data handler { uno::Reference< lang::XInitialization> xIni(m_xInternal,uno::UNO_QUERY); if ( xIni.is() ) diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 82663d00fccb..d1a38b9afcfd 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1410,7 +1410,7 @@ IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotIntere //------------------------------------------------------------------------------ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( RuntimeException ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::errorOccured" ); + RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::errorOccurred" ); ::osl::MutexGuard aGuard( getMutex() ); SQLExceptionInfo aInfo( aEvent.Reason ); @@ -1419,7 +1419,7 @@ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErr if ( m_nFormActionNestingLevel ) { - OSL_ENSURE( !m_aCurrentError.isValid(), "SbaXDataBrowserController::errorOccured: can handle one error per transaction only!" ); + OSL_ENSURE( !m_aCurrentError.isValid(), "SbaXDataBrowserController::errorOccurred: can handle one error per transaction only!" ); m_aCurrentError = aInfo; } else diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index f4d783f4df89..ca4f4aaf32ce 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1113,7 +1113,7 @@ Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos) } catch(Exception&) { - OSL_ENSURE(0,"SbaGridControl::getField Exception occured!"); + OSL_ENSURE(0,"SbaGridControl::getField Exception occurred!"); } return xEmptyReturn; diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src index ca43b02732ba..b3fd77757364 100644 --- a/dbaccess/source/ui/browser/sbagrid.src +++ b/dbaccess/source/ui/browser/sbagrid.src @@ -124,7 +124,7 @@ String STR_NO_COLUMNNAME_MATCHING Text [ en-US ] = "No matching column names were found."; }; -String STR_ERROR_OCCURED_WHILE_COPYING +String STR_ERROR_OCCURRED_WHILE_COPYING { Text [ en-US ] = "An error occurred. Do you want to continue copying?"; }; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index af280c66794f..3bf1e1021c76 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -2174,7 +2174,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent) } else return 0L; - // 0 indicates that an error occured + // 0 indicates that an error occurred } else { // we have to expand the queries or bookmarks diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 1c272c4839b3..ecec957c6ef4 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -155,7 +155,7 @@ void DBTreeListBox::RequestingChilds( SvLBoxEntry* pParent ) { if (!m_aPreExpandHandler.Call(pParent)) { - // an error occured. The method calling us will reset the entry flags, so it can't be expanded again. + // an error occurred. The method calling us will reset the entry flags, so it can't be expanded again. // But we want that the user may do a second try (i.e. because he misstypes a password in this try), so // we have to reset these flags controlling the expand ability PostUserEvent(LINK(this, DBTreeListBox, OnResetEntry), pParent); diff --git a/dbaccess/source/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx index 73212e395748..0e7d8d8aff66 100644 --- a/dbaccess/source/ui/control/tabletree.cxx +++ b/dbaccess/source/ui/control/tabletree.cxx @@ -199,7 +199,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn } catch(Exception&) { - // a non-SQLException exception occured ... simply throw an SQLException + // a non-SQLException exception occurred ... simply throw an SQLException SQLException aInfo; aInfo.Message = sCurrentActionError; throw aInfo; diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index eba739fec877..95a6f63d01ec 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -151,7 +151,7 @@ namespace dbaui @param _sReturn contains the selected name. @return - if an error occured, otherwise + if an error occurred, otherwise */ sal_Bool getSelectedDataSource(::rtl::OUString& _sReturn,::rtl::OUString& _sCurr); diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx index 7c27a499e783..5f7af2163220 100644 --- a/dbaccess/source/ui/inc/JoinController.hxx +++ b/dbaccess/source/ui/inc/JoinController.hxx @@ -150,14 +150,14 @@ namespace dbaui /** only defines a method to save a SQLException in d&d methods to show the error at a later state set the internal member m_aExceptionInfo to _rInfo */ - void setErrorOccured(const ::dbtools::SQLExceptionInfo& _rInfo) + void setErrorOccurred(const ::dbtools::SQLExceptionInfo& _rInfo) { m_aExceptionInfo = _rInfo; } /** just returns the internal member and clears it */ - ::dbtools::SQLExceptionInfo clearOccuredError() + ::dbtools::SQLExceptionInfo clearOccurredError() { ::dbtools::SQLExceptionInfo aInfo = m_aExceptionInfo; m_aExceptionInfo = ::dbtools::SQLExceptionInfo(); diff --git a/dbaccess/source/ui/inc/datasourcemap.hxx b/dbaccess/source/ui/inc/datasourcemap.hxx index 836f001bf580..54802093e17d 100644 --- a/dbaccess/source/ui/inc/datasourcemap.hxx +++ b/dbaccess/source/ui/inc/datasourcemap.hxx @@ -113,7 +113,7 @@ namespace dbaui void clearModifiedFlag(const ::rtl::OUString& _rName); /** tell the map that a data source is scheduled to be deleted. - @return id for accessing the deleted data source later. -1 if no free id existed or an error occured + @return id for accessing the deleted data source later. -1 if no free id existed or an error occurred */ sal_Int32 markDeleted(const ::rtl::OUString& _rName); diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx index 4ba63866454b..c01550fb8647 100644 --- a/dbaccess/source/ui/inc/dbadmin.hxx +++ b/dbaccess/source/ui/inc/dbadmin.hxx @@ -123,7 +123,7 @@ private: { AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_KEEP // don't leave the page (e.g. because an error occurred) }; /** apply all changes made */ diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index a1f852d2130e..c08d6597e829 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -328,7 +328,7 @@ #define STR_TABLEDESIGN_DBFIELDTYPES RID_STR_GEN_START + 8 #define STR_QRY_CONTINUE RID_STR_GEN_START + 9 #define STR_COLUMN_NAME RID_STR_GEN_START + 10 -#define STR_ERROR_OCCURED_WHILE_COPYING RID_STR_GEN_START + 11 +#define STR_ERROR_OCCURRED_WHILE_COPYING RID_STR_GEN_START + 11 #define STR_MISSING_TABLES_XDROP RID_STR_GEN_START + 12 #define STR_QUERY_DELETE_TABLE RID_STR_GEN_START + 13 #define STR_BUTTON_TEXT_ALL RID_STR_GEN_START + 14 diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx index 882f78b806de..414a3a0b5108 100644 --- a/dbaccess/source/ui/inc/dbwiz.hxx +++ b/dbaccess/source/ui/inc/dbwiz.hxx @@ -116,7 +116,7 @@ protected: { AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_KEEP // don't leave the page (e.g. because an error occurred) }; /** apply all changes made */ diff --git a/dbaccess/source/ui/inc/dbwizsetup.hxx b/dbaccess/source/ui/inc/dbwizsetup.hxx index ad8c6fb07eef..a6b4db6b6b02 100644 --- a/dbaccess/source/ui/inc/dbwizsetup.hxx +++ b/dbaccess/source/ui/inc/dbwizsetup.hxx @@ -149,7 +149,7 @@ protected: { AR_LEAVE_MODIFIED, // somthing was modified and has successfully been committed AR_LEAVE_UNCHANGED, // no changes were made - AR_KEEP // don't leave the page (e.g. because an error occured) + AR_KEEP // don't leave the page (e.g. because an error occurred) }; private: diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index e7931223700e..cb22ad23c43a 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -257,7 +257,7 @@ sal_Bool ORowSetImportExport::insertNewRow() { if(!m_bAlreadyAsked) { - String sAskIfContinue = String(ModuleRes(STR_ERROR_OCCURED_WHILE_COPYING)); + String sAskIfContinue = String(ModuleRes(STR_ERROR_OCCURRED_WHILE_COPYING)); OSQLWarningBox aDlg( m_pParent, sAskIfContinue, WB_YES_NO | WB_DEF_YES ); if(aDlg.Execute() == RET_YES) m_bAlreadyAsked = sal_True; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index ed1f7e1c6c1d..cd4fd7c016fc 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -247,7 +247,7 @@ namespace bError = sal_True; } } - // check if error occured + // check if error occurred if ( bError ) eErrorCode = eIllegalJoin; @@ -2823,7 +2823,7 @@ sal_Bool OQueryDesignView::checkStatement() { sal_Bool bRet = sal_True; if ( m_pSelectionBox ) - bRet = m_pSelectionBox->Save(); // an error occured so we return no + bRet = m_pSelectionBox->Save(); // an error occurred so we return no return bRet; } //------------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 6bb3a056bb80..a3763deafc02 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -640,7 +640,7 @@ sal_Bool OSelectionBrowseBox::fillColumnRef(const ::rtl::OUString& _sColumnName, if ( pTabWinList ) { sal_uInt16 nTabCount = 0; - if ( !static_cast(getDesignView()->getTableView())->FindTableFromField(_sColumnName,_pEntry,nTabCount) ) // error occured: column not in table window + if ( !static_cast(getDesignView()->getTableView())->FindTableFromField(_sColumnName,_pEntry,nTabCount) ) // error occurred: column not in table window { String sErrorMsg(ModuleRes(RID_STR_FIELD_DOESNT_EXIST)); sErrorMsg.SearchAndReplaceAscii("$name$",_sColumnName); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 4ecb2e8e0245..8d25da432916 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -259,7 +259,7 @@ namespace dbaui @param _bListAction Will be set to when we are in a list action otherwise @return - if an error occured otherwise + if an error occurred otherwise */ sal_Bool saveField(const String& _sFieldName,OTableFieldDescRef& _pEntry,sal_Bool& _bListAction); @@ -283,7 +283,7 @@ namespace dbaui @param _bListAction Will be set to when we are in a list action otherwise @return - if an error occured otherwise + if an error occurred otherwise */ sal_Bool fillColumnRef( const ::connectivity::OSQLParseNode* _pColumnRef, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index 0bf51df79eac..13c0797033ed 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -205,7 +205,7 @@ BOOL OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occured!"); + OSL_ENSURE(0,"Exception occurred!"); } try { @@ -234,7 +234,7 @@ BOOL OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occured!"); + OSL_ENSURE(0,"Exception occurred!"); } return TRUE; diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx index 530f808b46f9..b324c9263097 100644 --- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx @@ -77,7 +77,7 @@ OTableWindowListBox::OTableWindowListBox( OTableWindow* pParent ) void OTableWindowListBox::dragFinished( ) { // first show the error msg when existing - m_pTabWin->getDesignView()->getController().showError(m_pTabWin->getDesignView()->getController().clearOccuredError()); + m_pTabWin->getDesignView()->getController().showError(m_pTabWin->getDesignView()->getController().clearOccurredError()); // second look for ui activities which should happen after d&d if (m_nUiEvent) Application::RemoveUserEvent(m_nUiEvent); @@ -322,7 +322,7 @@ IMPL_LINK( OTableWindowListBox, DropHdl, void *, /*EMPTY_ARG*/) catch(const SQLException& e) { // remember the exception so that we can show them later when d&d is finished - m_pTabWin->getDesignView()->getController().setErrorOccured(::dbtools::SQLExceptionInfo(e)); + m_pTabWin->getDesignView()->getController().setErrorOccurred(::dbtools::SQLExceptionInfo(e)); } return 0L; } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index eeb8f26c5b59..cc8777a8e854 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -1614,7 +1614,7 @@ bool OQueryController::doSaveAsDoc(sal_Bool _bSaveAs) { ::dbtools::SQLExceptionInfo aInfo(e); showError(aInfo); - // an error occured so we clear the statement + // an error occurred so we clear the statement sTranslatedStmt = ::rtl::OUString(); } } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index b345ecaa4a07..cb26447c96d3 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -319,7 +319,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_ } catch(Exception&) { - OSL_ENSURE(0,"ORelationTableView::RemoveConnection: Something other than SQLException occured!"); + OSL_ENSURE(0,"ORelationTableView::RemoveConnection: Something other than SQLException occurred!"); } return false; } diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 0061bac5fed3..c90c0638548f 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -1147,7 +1147,7 @@ void OTableController::alterColumns() xAppend->appendByDescriptor(xNewColumn); } catch(const SQLException&) - { // an error occured so we try to reactivate the old one + { // an error occurred so we try to reactivate the old one xAppend->appendByDescriptor(xColumn); throw; } diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx index 2091f941838d..d93f9d3bd6c9 100644 --- a/dbaccess/source/ui/uno/copytablewizard.cxx +++ b/dbaccess/source/ui/uno/copytablewizard.cxx @@ -328,7 +328,7 @@ namespace dbaui const Reference< XPropertySet >& _rxDestTable ); - /** processes an error which occured during copying + /** processes an error which occurred during copying First, all listeners are ask. If a listener tells to cancel or continue copying, this is reported to the method's caller. If a listener tells to ask the user, this is done, and the user's decision is @@ -1112,7 +1112,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r { SQLContext aError; aError.Context = *this; - aError.Message = String( ModuleRes( STR_ERROR_OCCURED_WHILE_COPYING ) ); + aError.Message = String( ModuleRes( STR_ERROR_OCCURRED_WHILE_COPYING ) ); ::dbtools::SQLExceptionInfo aInfo( _rEvent.Error ); if ( aInfo.isValid() ) diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index 09d6ef37ac11..90beac1b797e 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -124,7 +124,7 @@ namespace dbaui SUPPLY_DOCUMENTSAVE }; /** check if a given continuation sequence contains a given continuation type

- @return the index within _rContinuations of the first occurence of a continuation + @return the index within _rContinuations of the first occurrence of a continuation of the requested type, -1 of no such continuation exists */ sal_Int32 getContinuation( diff --git a/reportdesign/qa/complex/ReportDesignerTest.java b/reportdesign/qa/complex/ReportDesignerTest.java old mode 100755 new mode 100644 index cf03362cfa17..aeb57169d533 --- a/reportdesign/qa/complex/ReportDesignerTest.java +++ b/reportdesign/qa/complex/ReportDesignerTest.java @@ -537,7 +537,7 @@ public class ReportDesignerTest extends ComplexTestCase { catch (com.sun.star.util.CloseVetoException e) { log.println("ERROR: CloseVetoException caught"); - log.println("CloseVetoException occured Can't close document."); + log.println("CloseVetoException occurred Can't close document."); log.println("Message: " + e.getMessage()); } } diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 716996232dbc..07ac2ec1263c 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -1854,7 +1854,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue { if ( i == nLastOpenMode ) throw lang::WrappedTargetException( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An error occured while creating the document storage." ) ), + ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An error occurred while creating the document storage." ) ), // TODO: resource *this, ::cppu::getCaughtException() diff --git a/reportdesign/source/core/misc/conditionalexpression.cxx b/reportdesign/source/core/misc/conditionalexpression.cxx index 0804c1814487..cd942b522c30 100644 --- a/reportdesign/source/core/misc/conditionalexpression.cxx +++ b/reportdesign/source/core/misc/conditionalexpression.cxx @@ -104,16 +104,16 @@ namespace rptui sal_Int32 nLHSIndex( sMatchExpression.indexOf( sLHSPattern ) ); sal_Int32 nRHSIndex( sMatchExpression.indexOf( sRHSPattern ) ); - // now we should have at most one occurance of $1 and $2, resp. + // now we should have at most one occurrence of $1 and $2, resp. OSL_ENSURE( sMatchExpression.indexOf( sLHSPattern, nLHSIndex + 1 ) == -1, - "ConditionalExpression::matchExpression: unsupported pattern (more than one LHS occurance)!" ); + "ConditionalExpression::matchExpression: unsupported pattern (more than one LHS occurrence)!" ); OSL_ENSURE( sMatchExpression.indexOf( sRHSPattern, nRHSIndex + 1 ) == -1, - "ConditionalExpression::matchExpression: unsupported pattern (more than one RHS occurance)!" ); + "ConditionalExpression::matchExpression: unsupported pattern (more than one RHS occurrence)!" ); // Also, an LHS must be present, and precede the RHS (if present) OSL_ENSURE( ( nLHSIndex != -1 ) && ( ( nLHSIndex < nRHSIndex ) || ( nRHSIndex == -1 ) ), "ConditionalExpression::matchExpression: no LHS, or an RHS preceeding the LHS - this is not supported!" ); - // up to the occurance of the LHS (which must exist, see above), the two expressions + // up to the occurrence of the LHS (which must exist, see above), the two expressions // must be identical if ( _rExpression.getLength() < nLHSIndex ) return false; @@ -123,7 +123,7 @@ namespace rptui // the left-most expression parts do not match return false; - // after the occurance of the RHS (or the LHS, if there is no RHS), the two expressions + // after the occurrence of the RHS (or the LHS, if there is no RHS), the two expressions // must be identical, too bool bHaveRHS( nRHSIndex != -1 ); sal_Int32 nRightMostIndex( bHaveRHS ? nRHSIndex : nLHSIndex ); diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 492eb8d345a6..1676aa21ae59 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -889,7 +889,7 @@ SdrObject* isOver(const Rectangle& _rRect, SdrPage& _rPage, SdrView& _rView, boo return pOverlappedObj; } // ----------------------------------------------------------------------------- -bool checkArrayForOccurance(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int _nListLength) +bool checkArrayForOccurrence(SdrObject* _pObjToCheck, SdrUnoObj* _pIgnore[], int _nListLength) { for(int i=0;i<_nListLength;i++) { @@ -910,7 +910,7 @@ SdrObject* isOver(const Rectangle& _rRect,SdrPage& _rPage,SdrView& _rView,bool _ while( !pOverlappedObj && (pObjIter = aIter.Next()) != NULL ) { - if (checkArrayForOccurance(pObjIter, _pIgnoreList, _nIgnoreListLength)) + if (checkArrayForOccurrence(pObjIter, _pIgnoreList, _nIgnoreListLength)) { continue; } diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index e27a806740e4..0662ed460cac 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1084,7 +1084,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi // Create drag lines over all viewable Views // Therefore we need to identify the marked objects // and create temporary objects on all other views at the same position - // relative to its occurance. + // relative to its occurrence. OSL_TRACE("BegDragObj createInvisible Objects\n" ); int nViewCount = 0; diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index 82f0af585963..cdb35b45f4df 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -562,7 +562,7 @@ void PropBrw::Update( OSectionView* pNewView ) } catch ( Exception& ) { - DBG_ERROR( "PropBrw::Update: Exception occured!" ); + DBG_ERROR( "PropBrw::Update: Exception occurred!" ); } } //---------------------------------------------------------------------------- @@ -584,7 +584,7 @@ void PropBrw::Update( const uno::Reference< uno::XInterface>& _xReportComponent) } catch ( Exception& ) { - DBG_ERROR( "PropBrw::Update: Exception occured!" ); + DBG_ERROR( "PropBrw::Update: Exception occurred!" ); } } } -- cgit v1.2.3 From fd28f6300e08b3c167c8b79c0eba5352ea9f7e12 Mon Sep 17 00:00:00 2001 From: Michael Koch Date: Fri, 21 Jan 2011 02:51:08 +0100 Subject: removed newlines --- .../source/ui/relationdesign/RelationTableView.cxx | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index cb26447c96d3..c05c1a3a2d18 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -28,33 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" - #include "RelationTableView.hxx" - - #include "JoinExchange.hxx" - - #include - - #include "browserids.hxx" - - #include - - #include - - #include - - #include - - #include - #include #include #include -- cgit v1.2.3 From f6ccb8354a350fce31f8c6c7d04b86d5c0a126d1 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Sat, 12 Mar 2011 12:04:35 +0100 Subject: Move OSL_ENSURE(0,...) to OSL_FAIL(...) --- dbaccess/source/core/api/CacheSet.cxx | 6 +++--- dbaccess/source/core/api/HelperCollections.cxx | 2 +- dbaccess/source/core/api/KeySet.cxx | 8 ++++---- dbaccess/source/core/api/RowSet.cxx | 2 +- dbaccess/source/core/api/RowSetBase.cxx | 10 +++++----- dbaccess/source/core/api/RowSetCache.cxx | 8 ++++---- dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 6 +++--- dbaccess/source/core/api/TableDeco.cxx | 4 ++-- dbaccess/source/core/api/tablecontainer.cxx | 2 +- dbaccess/source/core/dataaccess/documentdefinition.cxx | 4 ++-- dbaccess/source/filter/migration/cfgimport.cxx | 6 +++--- dbaccess/source/filter/xml/xmlConnectionData.cxx | 2 +- dbaccess/source/filter/xml/xmlExport.cxx | 6 +++--- dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 2 +- dbaccess/source/filter/xml/xmlQuery.cxx | 2 +- dbaccess/source/filter/xml/xmlTable.cxx | 4 ++-- dbaccess/source/ui/app/AppController.cxx | 8 ++++---- dbaccess/source/ui/app/AppControllerGen.cxx | 2 +- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 8 ++++---- dbaccess/source/ui/browser/brwctrlr.cxx | 2 +- dbaccess/source/ui/browser/sbagrid.cxx | 6 +++--- dbaccess/source/ui/browser/unodatbr.cxx | 4 ++-- dbaccess/source/ui/control/FieldDescControl.cxx | 2 +- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 2 +- dbaccess/source/ui/dlg/dbwiz.cxx | 2 +- dbaccess/source/ui/dlg/queryfilter.cxx | 2 +- dbaccess/source/ui/misc/DExport.cxx | 2 +- dbaccess/source/ui/misc/RowSetDrop.cxx | 2 +- dbaccess/source/ui/misc/TokenWriter.cxx | 2 +- dbaccess/source/ui/misc/UITools.cxx | 16 ++++++++-------- dbaccess/source/ui/querydesign/JoinController.cxx | 2 +- dbaccess/source/ui/querydesign/QueryTableView.cxx | 4 ++-- dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 6 +++--- dbaccess/source/ui/querydesign/TableWindow.cxx | 4 ++-- dbaccess/source/ui/querydesign/querycontroller.cxx | 6 +++--- dbaccess/source/ui/relationdesign/RelationTableView.cxx | 4 ++-- dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 +- dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 2 +- reportdesign/source/core/api/FixedLine.cxx | 2 +- reportdesign/source/core/api/ReportDefinition.cxx | 6 +++--- reportdesign/source/core/sdr/PropertyForward.cxx | 2 +- reportdesign/source/core/sdr/RptModel.cxx | 2 +- reportdesign/source/core/sdr/RptObject.cxx | 14 +++++++------- reportdesign/source/core/sdr/UndoActions.cxx | 4 ++-- reportdesign/source/filter/xml/xmlCell.cxx | 2 +- reportdesign/source/filter/xml/xmlComponent.cxx | 2 +- reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 2 +- reportdesign/source/filter/xml/xmlControlProperty.cxx | 2 +- reportdesign/source/filter/xml/xmlExport.cxx | 4 ++-- reportdesign/source/filter/xml/xmlFixedContent.cxx | 2 +- reportdesign/source/filter/xml/xmlFormatCondition.cxx | 2 +- reportdesign/source/filter/xml/xmlFormattedField.cxx | 2 +- reportdesign/source/filter/xml/xmlFunction.cxx | 4 ++-- reportdesign/source/filter/xml/xmlGroup.cxx | 4 ++-- reportdesign/source/filter/xml/xmlHelper.cxx | 2 +- reportdesign/source/filter/xml/xmlImage.cxx | 2 +- .../source/filter/xml/xmlImportDocumentHandler.cxx | 2 +- reportdesign/source/filter/xml/xmlReport.cxx | 2 +- reportdesign/source/filter/xml/xmlReportElement.cxx | 2 +- reportdesign/source/filter/xml/xmlReportElementBase.cxx | 2 +- reportdesign/source/filter/xml/xmlSection.cxx | 4 ++-- reportdesign/source/filter/xml/xmlStyleImport.cxx | 4 ++-- reportdesign/source/filter/xml/xmlSubDocument.cxx | 2 +- reportdesign/source/filter/xml/xmlTable.cxx | 6 +++--- reportdesign/source/ui/dlg/CondFormat.cxx | 2 +- reportdesign/source/ui/dlg/GroupsSorting.cxx | 10 +++++----- reportdesign/source/ui/dlg/dlgpage.cxx | 2 +- reportdesign/source/ui/inspection/GeometryHandler.cxx | 10 +++++----- reportdesign/source/ui/misc/Undo.cxx | 10 +++++----- reportdesign/source/ui/report/ReportController.cxx | 6 +++--- reportdesign/source/ui/report/ReportSection.cxx | 8 ++++---- reportdesign/source/ui/report/dlgedfac.cxx | 2 +- reportdesign/source/ui/report/propbrw.cxx | 2 +- 73 files changed, 150 insertions(+), 150 deletions(-) (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 88eafa3c7d3a..5224d80b7589 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -137,11 +137,11 @@ OCacheSet::~OCacheSet() } catch(Exception&) { - OSL_ENSURE(0,"Exception occurred"); + OSL_FAIL("Exception occurred"); } catch(...) { - OSL_ENSURE(0,"Unknown Exception occurred"); + OSL_FAIL("Unknown Exception occurred"); } DBG_DTOR(OCacheSet,NULL); @@ -676,7 +676,7 @@ bool OCacheSet::isResultSetChanged() const void OCacheSet::reset(const Reference< XResultSet>& /*_xDriverSet*/) { - OSL_ENSURE(0,"Illegal call!"); + OSL_FAIL("Illegal call!"); } void OCacheSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& /*io_aInsertRow*/,ORowSetValueVector::Vector& /*io_aRow*/,::std::vector& o_aChangedColumns) diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index 9bfc64370195..acc2d3ef337f 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -97,7 +97,7 @@ namespace dbaccess if(aIter != m_aColumns->get().end()) return connectivity::sdbcx::ObjectType(*aIter,UNO_QUERY); - OSL_ENSURE(0,"Column not found in collection!"); + OSL_FAIL("Column not found in collection!"); } return NULL; } diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 78eceea4dbcd..44f5ebc0c737 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -133,7 +133,7 @@ OKeySet::~OKeySet() } catch(...) { - OSL_ENSURE(0,"Unknown Exception occurred"); + OSL_FAIL("Unknown Exception occurred"); } m_xComposer = NULL; @@ -764,7 +764,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString } catch(Exception&) { - OSL_ENSURE(0,"Could not execute GeneratedKeys() stmt"); + OSL_FAIL("Could not execute GeneratedKeys() stmt"); } } @@ -823,7 +823,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString } catch(SQLException&) { - OSL_ENSURE(0,"Could not fetch with MAX() "); + OSL_FAIL("Could not fetch with MAX() "); } } } @@ -975,7 +975,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName)); if((_rDeleteRow->get())[aIter->second.nPosition].isNull()) { - OSL_ENSURE(0,"can a primary key be null"); + OSL_FAIL("can a primary key be null"); aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"))); } else diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 02e84ea2b932..750c03617890 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -230,7 +230,7 @@ ORowSet::~ORowSet() { if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose ) { - OSL_ENSURE(0, "Please check who doesn't dispose this component!"); + OSL_FAIL("Please check who doesn't dispose this component!"); osl_incrementInterlockedCount( &m_refCount ); dispose(); } diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 5a6816aae17e..2af2ef12587e 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -240,7 +240,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getValue" ); if ( m_bBeforeFirst || m_bAfterLast ) { - OSL_ENSURE(0,"ORowSetBase::getValue: Illegal call here (we're before first or after last)!"); + OSL_FAIL("ORowSetBase::getValue: Illegal call here (we're before first or after last)!"); ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf ); } @@ -382,7 +382,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS if ( m_bBeforeFirst || m_bAfterLast ) { - OSL_ENSURE(0,"ORowSetBase::getBinaryStream: Illegal call here (we're before first or after last)!"); + OSL_FAIL("ORowSetBase::getBinaryStream: Illegal call here (we're before first or after last)!"); ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf ); } @@ -478,9 +478,9 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx if(!bookmark.hasValue() || m_nResultSetType == ResultSetType::FORWARD_ONLY) { if(bookmark.hasValue()) - OSL_ENSURE(0,"MoveToBookmark is not possible when we are only forward"); + OSL_FAIL("MoveToBookmark is not possible when we are only forward"); else - OSL_ENSURE(0,"Bookmark is not valid"); + OSL_FAIL("Bookmark is not valid"); throwFunctionSequenceException(*m_pMySelf); } @@ -1285,7 +1285,7 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow) } catch(Exception&) { - OSL_ENSURE(0,"firePropertyChange: Exception"); + OSL_FAIL("firePropertyChange: Exception"); } OSL_TRACE("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); } diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 1b1a60090a25..671046009d15 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -847,7 +847,7 @@ sal_Bool ORowSetCache::moveWindow() } else { // normally this should never happen - OSL_ENSURE(0,"What the hell is happen here!"); + OSL_FAIL("What the hell is happen here!"); return sal_False; } } @@ -1228,7 +1228,7 @@ sal_Bool ORowSetCache::insertRow(::std::vector< Any >& o_aBookmarks) } else { - OSL_ENSURE(0,"There must be a bookmark after the row was inserted!"); + OSL_FAIL("There must be a bookmark after the row was inserted!"); } } return bRet; @@ -1317,7 +1317,7 @@ void ORowSetCache::cancelRowUpdates( ) m_bNew = m_bModified = sal_False; if(!m_nPosition) { - OSL_ENSURE(0,"cancelRowUpdates:Invalid positions pos == 0"); + OSL_FAIL("cancelRowUpdates:Invalid positions pos == 0"); ::dbtools::throwFunctionSequenceException(NULL); } @@ -1325,7 +1325,7 @@ void ORowSetCache::cancelRowUpdates( ) m_pCacheSet->fillValueRow(*m_aMatrixIter,m_nPosition); else { - OSL_ENSURE(0,"cancelRowUpdates couldn't position right with absolute"); + OSL_FAIL("cancelRowUpdates couldn't position right with absolute"); ::dbtools::throwFunctionSequenceException(NULL); } } diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 3a337481ffba..3374efa4f828 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1122,7 +1122,7 @@ sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica nPredicate = SQLFilterOperator::GREATER_EQUAL; break; default: - OSL_ENSURE(0,"Wrong NodeType!"); + OSL_FAIL("Wrong NodeType!"); } return nPredicate; } @@ -1793,7 +1793,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC switch(_ePart) { default: - OSL_ENSURE( 0, "OSingleSelectQueryComposer::getKeyWord: Invalid enum value!" ); + OSL_FAIL( "OSingleSelectQueryComposer::getKeyWord: Invalid enum value!" ); // no break, fallback to WHERE case Where: sKeyword = STR_WHERE; @@ -1831,7 +1831,7 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC F_tmp = TGetParseNode(&OSQLParseTreeIterator::getSimpleOrderTree); break; default: - OSL_ENSURE(0,"Invalid enum value!"); + OSL_FAIL("Invalid enum value!"); } ::rtl::OUString sRet = getStatementPart( F_tmp, _rIterator ); diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 40bf99774f95..d2b724f68a04 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -187,7 +187,7 @@ void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con switch(_nHandle) { case PROPERTY_ID_PRIVILEGES: - OSL_ENSURE(0,"Property is readonly!"); + OSL_FAIL("Property is readonly!"); case PROPERTY_ID_FILTER: case PROPERTY_ID_ORDER: case PROPERTY_ID_APPLYFILTER: @@ -326,7 +326,7 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c } break; default: - OSL_ENSURE(0,"Invalid Handle for table"); + OSL_FAIL("Invalid Handle for table"); } } diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 9c446a18ff1f..128595fea054 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -98,7 +98,7 @@ namespace } catch(Exception) { - OSL_ENSURE( 0, "lcl_isPropertySetDefaulted: Exception caught!" ); + OSL_FAIL( "lcl_isPropertySetDefaulted: Exception caught!" ); } } return ( pIter == pEnd ); diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 5e7cedb6bc83..7b5baa1d5f8e 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -1345,7 +1345,7 @@ sal_Bool ODocumentDefinition::save(sal_Bool _bApprove) } catch(Exception&) { - OSL_ENSURE(0,"ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!"); + OSL_FAIL("ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!"); } return sal_True; } @@ -1454,7 +1454,7 @@ sal_Bool ODocumentDefinition::saveAs() } catch(Exception&) { - OSL_ENSURE(0,"ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!"); + OSL_FAIL("ODocumentDefinition::save: caught an Exception (tried to let the InteractionHandler handle it)!"); } return sal_True; } diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx index 819c15ece69d..d3e7460f6518 100644 --- a/dbaccess/source/filter/migration/cfgimport.cxx +++ b/dbaccess/source/filter/migration/cfgimport.cxx @@ -489,7 +489,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const : } catch(Exception) { - OSL_ENSURE(0,"isDocumentReport: catched exception!"); + OSL_FAIL("isDocumentReport: catched exception!"); } return bReport; } @@ -549,7 +549,7 @@ void OCfgImport::createDataSource(const ::rtl::OUString& _sName) } catch(Exception&) { - OSL_ENSURE(0,"Exception: convert"); + OSL_FAIL("Exception: convert"); UCBContentHelper::Kill(sFileName); } } @@ -848,7 +848,7 @@ void SAL_CALL OCfgImport::endNode() } catch(Exception&) { - OSL_ENSURE(0,"convertLinks: Exception catched!"); + OSL_FAIL("convertLinks: Exception catched!"); } m_sBookmarkName = ::rtl::OUString(); m_sDocumentLocation = ::rtl::OUString(); diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index 25ec65a48c7b..3695f24c6590 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -99,7 +99,7 @@ SvXMLImportContext* OXMLConnectionData::CreateChildContext( if ( !m_bFoundOne ) { m_bFoundOne = true; - OSL_ENSURE(0,"Not supported yet!"); + OSL_FAIL("Not supported yet!"); } break; } diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index c02ac3918330..39cb22e01d15 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -1325,7 +1325,7 @@ void ODBExport::GetViewSettings(Sequence& aProps) } catch(Exception) { - OSL_ENSURE(0,"ODBExport::GetViewSettings: Exception catched!"); + OSL_FAIL("ODBExport::GetViewSettings: Exception catched!"); } } } @@ -1352,7 +1352,7 @@ void ODBExport::GetConfigurationSettings(Sequence& aProps) } catch(Exception) { - OSL_ENSURE(0,"Could not access layout information from the data source!"); + OSL_FAIL("Could not access layout information from the data source!"); } } } @@ -1383,7 +1383,7 @@ void ODBExport::GetConfigurationSettings(Sequence& aProps) GetMM100UnitConverter().convertNumber(aBuffer, getINT32(_rValue)); break; default: - OSL_ENSURE(0,"ODBExport::implConvertAny: Invalid type"); + OSL_FAIL("ODBExport::implConvertAny: Invalid type"); } return aBuffer.makeStringAndClear(); diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 24a3c39b65a8..4b3639d1300f 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -109,7 +109,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport } catch(Exception&) { - OSL_ENSURE(0,"OXMLHierarchyCollection::OXMLHierarchyCollection -> exception catched"); + OSL_FAIL("OXMLHierarchyCollection::OXMLHierarchyCollection -> exception catched"); } } } diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index 64bbc301a618..dd083f616e33 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -145,7 +145,7 @@ void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp ) } catch(Exception&) { - OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched"); + OSL_FAIL("OXMLTable::EndElement -> exception catched"); } } //---------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 9d95794e3ec0..21958d06a28e 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -186,7 +186,7 @@ void OXMLTable::setProperties(uno::Reference< XPropertySet > & _xProp ) } catch(Exception&) { - OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched"); + OSL_FAIL("OXMLTable::EndElement -> exception catched"); } } // ----------------------------------------------------------------------------- @@ -219,7 +219,7 @@ void OXMLTable::EndElement() } catch(Exception&) { - OSL_ENSURE(0,"OXMLQuery::EndElement -> exception catched"); + OSL_FAIL("OXMLQuery::EndElement -> exception catched"); } } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 699a4554c158..6bd3ec193b6f 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -336,7 +336,7 @@ OApplicationController::~OApplicationController() { if ( !rBHelper.bDisposed && !rBHelper.bInDispose ) { - OSL_ENSURE(0,"Please check who doesn't dispose this component!"); + OSL_FAIL("Please check who doesn't dispose this component!"); // increment ref count to prevent double call of Dtor osl_incrementInterlockedCount( &m_refCount ); dispose(); @@ -1276,7 +1276,7 @@ void OApplicationController::Execute(sal_uInt16 _nId, const Sequence< PropertyVa case ID_NEW_TABLE_DESIGN: break; default: - OSL_ENSURE(0,"illegal switch call!"); + OSL_FAIL("illegal switch call!"); } if ( bAutoPilot ) getContainer()->PostUserEvent( LINK( this, OApplicationController, OnCreateWithPilot ), reinterpret_cast< void* >( eType ) ); @@ -1697,7 +1697,7 @@ namespace case E_NONE: break; default: - OSL_ENSURE(0,"Invalid ElementType!"); + OSL_FAIL("Invalid ElementType!"); break; } return sToolbar; @@ -2340,7 +2340,7 @@ void OApplicationController::onDeleteEntry() nId = SID_DB_APP_REPORT_DELETE; break; default: - OSL_ENSURE(0,"Invalid ElementType!"); + OSL_FAIL("Invalid ElementType!"); break; } executeChecked(nId,Sequence()); diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 2642cbc12da0..2b29a33d2632 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -292,7 +292,7 @@ void OApplicationController::refreshTables() } catch(const Exception&) { - OSL_ENSURE(0,"Could not refresh tables!"); + OSL_FAIL("Could not refresh tables!"); } getContainer()->getDetailView()->clearPages(sal_False); diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 068464c7830f..138e2d42f8ec 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -254,7 +254,7 @@ OAppDetailPageHelper::~OAppDetailPageHelper() } catch(Exception) { - OSL_ENSURE(0,"Exception thrown while disposing preview frame!"); + OSL_FAIL("Exception thrown while disposing preview frame!"); } for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i) @@ -682,7 +682,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY ); break; default: - OSL_ENSURE(0,"Illegal call!"); + OSL_FAIL("Illegal call!"); } getElementIcons( _eType, nImageId ); @@ -859,7 +859,7 @@ void OAppDetailPageHelper::elementReplaced(ElementType _eType pEntry = lcl_findEntry(*pTreeView,_rOldName,pTreeView->First()); break; default: - OSL_ENSURE(0,"Invalid element type"); + OSL_FAIL("Invalid element type"); } OSL_ENSURE(pEntry,"Do you know that the name isn't existence!"); if ( pEntry ) @@ -944,7 +944,7 @@ void OAppDetailPageHelper::elementRemoved( ElementType _eType,const ::rtl::OUStr } break; default: - OSL_ENSURE(0,"Invalid element type"); + OSL_FAIL("Invalid element type"); } if ( !pTreeView->GetEntryCount() ) showPreview(NULL); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 80977b9a187a..da2acef4be09 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2023,7 +2023,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property } catch(Exception&) { - OSL_ENSURE(0,"Exception caught!"); + OSL_FAIL("Exception caught!"); } break; case SID_FM_DELETEROWS: diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 9e39ac173874..1489be5f92b0 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -951,7 +951,7 @@ void SbaGridControl::SetRowHeight() } catch(Exception&) { - OSL_ENSURE(0,"setPropertyValue: PROPERTY_ROW_HEIGHT throws a exception"); + OSL_FAIL("setPropertyValue: PROPERTY_ROW_HEIGHT throws a exception"); } } } @@ -1109,11 +1109,11 @@ Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos) xEmptyReturn.set(xCol->getPropertyValue(PROPERTY_BOUNDFIELD),UNO_QUERY); } else - OSL_ENSURE(0,"SbaGridControl::getField getColumns returns NULL or ModelPos is > than count!"); + OSL_FAIL("SbaGridControl::getField getColumns returns NULL or ModelPos is > than count!"); } catch(Exception&) { - OSL_ENSURE(0,"SbaGridControl::getField Exception occurred!"); + OSL_FAIL("SbaGridControl::getField Exception occurred!"); } return xEmptyReturn; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 72c1723180f2..f1e9e467dd45 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -250,7 +250,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser() DBG_DTOR(SbaTableQueryBrowser,NULL); if ( !rBHelper.bDisposed && !rBHelper.bInDispose ) { - OSL_ENSURE(0,"Please check who doesn't dispose this component!"); + OSL_FAIL("Please check who doesn't dispose this component!"); // increment ref count to prevent double call of Dtor osl_incrementInterlockedCount( &m_refCount ); dispose(); @@ -1895,7 +1895,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue } catch(DisposedException&) { - OSL_ENSURE(0,"Object already disposed!"); + OSL_FAIL("Object already disposed!"); } catch(Exception&) { diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index e9d903697dba..484126c82da9 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1424,7 +1424,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr ) break; default: - OSL_ENSURE(0,"Unknown type"); + OSL_FAIL("Unknown type"); } m_pPreviousType = pFieldType; } diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 6a067dbbfafc..6b102c394253 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -702,7 +702,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr } catch(Exception&) { - OSL_ENSURE(0,"IsReadOnly throws an exception!"); + OSL_FAIL("IsReadOnly throws an exception!"); } } diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 5624420c904f..4a35b421af0d 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -310,7 +310,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState) pPage = ODriversSettings::CreateUser(this,*m_pOutSet); break; default: - OSL_ENSURE(0,"Wrong state!"); + OSL_FAIL("Wrong state!"); break; } diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 70ab3cc8b51f..75ed025ac6df 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -753,7 +753,7 @@ IMPL_LINK( DlgFilterCrit, ListSelectHdl, ListBox *, pListBox ) } else { - OSL_ENSURE(0,"DlgFilterCrit::ListSelectHdl: Diese Column d�rfte garnicht vorhanden sein!"); + OSL_FAIL("DlgFilterCrit::ListSelectHdl: Diese Column d�rfte garnicht vorhanden sein!"); } } pComp->SelectEntryPos(0); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index b2cf2a0fb2d6..c31a2da8c9e0 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -560,7 +560,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl } break; default: - OSL_ENSURE(0,"ODatabaseExport: Unbekanntes Format"); + OSL_FAIL("ODatabaseExport: Unbekanntes Format"); } } } diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx index 70b127cc2ec6..c8a2664f3771 100644 --- a/dbaccess/source/ui/misc/RowSetDrop.cxx +++ b/dbaccess/source/ui/misc/RowSetDrop.cxx @@ -242,7 +242,7 @@ sal_Bool ORowSetImportExport::insertNewRow() aValue <<= m_xRow->getClob(*aIter); break; default: - OSL_ENSURE(0,"Unknown type"); + OSL_FAIL("Unknown type"); } if(m_xRow->wasNull()) m_xTargetRowUpdate->updateNull(i); diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index a736feb134f0..3f7daabd1674 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -627,7 +627,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou } catch (Exception&) { - OSL_ENSURE(0,"RTF WRITE!"); + OSL_FAIL("RTF WRITE!"); } (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL; diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 0a949d24703e..7dfb0152bf82 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -178,7 +178,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP SQLExceptionInfo aInfo; if ( !_xDataSource.is() ) { - OSL_ENSURE(0,"createConnection: coult not retrieve the data source!"); + OSL_FAIL("createConnection: coult not retrieve the data source!"); return aInfo; } @@ -192,7 +192,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP } catch(Exception&) { - OSL_ENSURE(0,"createConnection: error while retrieving data source properties!"); + OSL_FAIL("createConnection: error while retrieving data source properties!"); } @@ -203,7 +203,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP Reference xConnectionCompletion(_xDataSource, UNO_QUERY); if (!xConnectionCompletion.is()) { - OSL_ENSURE(0,"createConnection: missing an interface ... need an error message here!"); + OSL_FAIL("createConnection: missing an interface ... need an error message here!"); } else { // instantiate the default SDB interaction handler @@ -230,7 +230,7 @@ SQLExceptionInfo createConnection( const Reference< ::com::sun::star::beans::XP catch(SQLContext& e) { aInfo = SQLExceptionInfo(e); } catch(SQLWarning& e) { aInfo = SQLExceptionInfo(e); } catch(SQLException& e) { aInfo = SQLExceptionInfo(e); } - catch(Exception&) { OSL_ENSURE(0,"SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); } + catch(Exception&) { OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: could not connect - unknown exception!"); } return aInfo; } @@ -796,7 +796,7 @@ sal_Int32 mapTextAllign(const SvxCellHorJustify& _eAlignment) case SVX_HOR_JUSTIFY_CENTER: nAlignment = ::com::sun::star::awt::TextAlign::CENTER; break; case SVX_HOR_JUSTIFY_RIGHT: nAlignment = ::com::sun::star::awt::TextAlign::RIGHT; break; default: - OSL_ENSURE(0,"Invalid TextAlign!"); + OSL_FAIL("Invalid TextAlign!"); } return nAlignment; } @@ -810,7 +810,7 @@ SvxCellHorJustify mapTextJustify(const sal_Int32& _nAlignment) case ::com::sun::star::awt::TextAlign::CENTER : eJustify = SVX_HOR_JUSTIFY_CENTER; break; case ::com::sun::star::awt::TextAlign::RIGHT : eJustify = SVX_HOR_JUSTIFY_RIGHT; break; default: - OSL_ENSURE(0,"Invalid TextAlign!"); + OSL_FAIL("Invalid TextAlign!"); } return eJustify; } @@ -838,7 +838,7 @@ float ConvertFontWeight( ::FontWeight eWeight ) else if( eWeight == WEIGHT_BLACK ) return ::com::sun::star::awt::FontWeight::BLACK; - OSL_ENSURE(0, "Unknown FontWeigth" ); + OSL_FAIL("Unknown FontWeigth" ); return ::com::sun::star::awt::FontWeight::DONTKNOW; } // ----------------------------------------------------------------------------- @@ -865,7 +865,7 @@ float ConvertFontWidth( ::FontWidth eWidth ) else if( eWidth == WIDTH_ULTRA_EXPANDED ) return ::com::sun::star::awt::FontWidth::ULTRAEXPANDED; - OSL_ENSURE(0, "Unknown FontWidth" ); + OSL_FAIL("Unknown FontWidth" ); return ::com::sun::star::awt::FontWidth::DONTKNOW; } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 1cfa991c5b7e..0d5a8204b02d 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -464,7 +464,7 @@ TTableWindowData::value_type OJoinController::createTableWindowData(const ::rtl: OJoinDesignView* pView = getJoinView(); if( pView ) return pView->getTableView()->createTableWindowData(_sComposedName,_sTableName,_sWindowName); - OSL_ENSURE(0,"We should never ever reach this point!"); + OSL_FAIL("We should never ever reach this point!"); return TTableWindowData::value_type(); } diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index ece9f28458f9..b32242652983 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -212,7 +212,7 @@ namespace if(aFind.getLength()) pNewConnData->SetFieldIndex(JTCS_FROM,aFind[0]+1); else - OSL_ENSURE(0,"Column not found!"); + OSL_FAIL("Column not found!"); } // get the position inside the tabe Reference xRefColumns = _rDest.GetOriginalColumns(); @@ -222,7 +222,7 @@ namespace if(aFind.getLength()) pNewConnData->SetFieldIndex(JTCS_TO,aFind[0]+1); else - OSL_ENSURE(0,"Column not found!"); + OSL_FAIL("Column not found!"); } pNewConnData->AppendConnLine(*pIter,sRelatedColumn); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 726f4680c9a1..ae1ae932806b 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -336,7 +336,7 @@ void OSelectionBrowseBox::ColumnMoved( USHORT nColId,BOOL _bCreateUndo ) } } else - OSL_ENSURE(0,"Invalid column id!"); + OSL_FAIL("Invalid column id!"); } //------------------------------------------------------------------------------ void OSelectionBrowseBox::Init() @@ -387,7 +387,7 @@ void OSelectionBrowseBox::Init() } catch(const SQLException&) { - OSL_ENSURE(0,"Catched Exception when asking for database metadata options!"); + OSL_FAIL("Catched Exception when asking for database metadata options!"); m_nMaxColumns = 0; } } @@ -846,7 +846,7 @@ sal_Bool OSelectionBrowseBox::saveField(const String& _sFieldName,OTableFieldDes notifyFunctionFieldChanged(sOldLocalizedFunctionName,sLocalizedFunctionName,_bListAction, nColumnId); } else - OSL_ENSURE(0,"Unsupported function inserted!"); + OSL_FAIL("Unsupported function inserted!"); } else diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx index c40cd4e519a5..7eca4f2f9b5b 100644 --- a/dbaccess/source/ui/querydesign/TableWindow.cxx +++ b/dbaccess/source/ui/querydesign/TableWindow.cxx @@ -205,7 +205,7 @@ BOOL OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occurred!"); + OSL_FAIL("Exception occurred!"); } try { @@ -234,7 +234,7 @@ BOOL OTableWindow::FillListBox() } catch(Exception&) { - OSL_ENSURE(0,"Exception occurred!"); + OSL_FAIL("Exception occurred!"); } return TRUE; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 5e6ad7f9ab9a..fe761cc4ca4f 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -361,7 +361,7 @@ OQueryController::~OQueryController() DBG_DTOR(OQueryController,NULL); if ( !getBroadcastHelper().bDisposed && !getBroadcastHelper().bInDispose ) { - OSL_ENSURE(0,"Please check who doesn't dispose this component!"); + OSL_FAIL("Please check who doesn't dispose this component!"); // increment ref count to prevent double call of Dtor osl_incrementInterlockedCount( &m_refCount ); dispose(); @@ -1350,12 +1350,12 @@ void OQueryController::executeQuery() } else { - OSL_ENSURE(0,"Couldn't create a beamer window!"); + OSL_FAIL("Couldn't create a beamer window!"); } } catch(const Exception&) { - OSL_ENSURE(0,"Couldn't create a beamer window!"); + OSL_FAIL("Couldn't create a beamer window!"); } } } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index c05c1a3a2d18..e42211609361 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -234,7 +234,7 @@ void ORelationTableView::AddConnection(const OJoinExchangeData& jxdSource, const } catch(const Exception&) { - OSL_ENSURE(0,"ORelationTableView::AddConnection: Exception oocured!"); + OSL_FAIL("ORelationTableView::AddConnection: Exception oocured!"); } } } @@ -301,7 +301,7 @@ bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_ } catch(Exception&) { - OSL_ENSURE(0,"ORelationTableView::RemoveConnection: Something other than SQLException occurred!"); + OSL_FAIL("ORelationTableView::RemoveConnection: Something other than SQLException occurred!"); } return false; } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index e3c41b1846f7..6afad1cd9040 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -1305,7 +1305,7 @@ OFieldDescription* OTableEditorCtrl::GetFieldDescr( long nRow ) m_pRowList->size()); if( (nRow<0) || (sal::static_int_cast< unsigned long >(nRow)>=nListCount) ) { - OSL_ENSURE(0,"(nRow<0) || (nRow>=nListCount)"); + OSL_FAIL("(nRow<0) || (nRow>=nListCount)"); return NULL; } ::boost::shared_ptr pRow = (*m_pRowList)[ nRow ]; diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx index 4c3ef7d87cd4..e34436da74e6 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx @@ -201,7 +201,7 @@ void OTableRowView::copy() //------------------------------------------------------------------------------ void OTableRowView::paste() { - OSL_ENSURE(0,"OTableRowView::Paste : (pseudo-) abstract method called !"); + OSL_FAIL("OTableRowView::Paste : (pseudo-) abstract method called !"); } //------------------------------------------------------------------------------ diff --git a/reportdesign/source/core/api/FixedLine.cxx b/reportdesign/source/core/api/FixedLine.cxx index a409f13bdf43..6db745085f61 100644 --- a/reportdesign/source/core/api/FixedLine.cxx +++ b/reportdesign/source/core/api/FixedLine.cxx @@ -188,7 +188,7 @@ OFixedLine::OFixedLine(uno::Reference< uno::XComponentContext > const & _xContex } catch(uno::Exception&) { - OSL_ENSURE(0,"OFixedLine::OFixedLine: Exception caught!"); + OSL_FAIL("OFixedLine::OFixedLine: Exception caught!"); } osl_decrementInterlockedCount( &m_refCount ); } diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 7c0b013879bd..4bec3a6fa7c9 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -769,7 +769,7 @@ void OReportDefinition::init() } catch(uno::Exception) { - OSL_ENSURE(0,"Error!"); + OSL_FAIL("Error!"); } } // ----------------------------------------------------------------------------- @@ -1183,7 +1183,7 @@ void SAL_CALL OReportDefinition::setParent( const uno::Reference< uno::XInterfac // XCloneable uno::Reference< util::XCloneable > SAL_CALL OReportDefinition::createClone( ) throw (uno::RuntimeException) { - OSL_ENSURE(0,"Not yet implemented correctly"); + OSL_FAIL("Not yet implemented correctly"); uno::Reference< report::XReportComponent> xSource = this; uno::Reference< report::XReportDefinition> xSet(cloneObject(xSource,m_aProps->m_xFactory,SERVICE_REPORTDEFINITION),uno::UNO_QUERY_THROW); return xSet.get(); @@ -1600,7 +1600,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS } catch(uno::Exception) { - OSL_ENSURE(0,"Exception Caught: Could not commit report storage!"); + OSL_FAIL("Exception Caught: Could not commit report storage!"); throw io::IOException(); } diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx b/reportdesign/source/core/sdr/PropertyForward.cxx index 09d9b1037b3b..b645d3b3a812 100644 --- a/reportdesign/source/core/sdr/PropertyForward.cxx +++ b/reportdesign/source/core/sdr/PropertyForward.cxx @@ -164,7 +164,7 @@ void SAL_CALL OPropertyMediator::propertyChange( const PropertyChangeEvent& evt } catch(Exception&) { - OSL_ENSURE(0,"Exception catched!"); + OSL_FAIL("Exception catched!"); } m_bInChange = sal_False; } diff --git a/reportdesign/source/core/sdr/RptModel.cxx b/reportdesign/source/core/sdr/RptModel.cxx index 5fd634c61264..f2dab3fc8e12 100644 --- a/reportdesign/source/core/sdr/RptModel.cxx +++ b/reportdesign/source/core/sdr/RptModel.cxx @@ -93,7 +93,7 @@ void OReportModel::detachController() SdrPage* OReportModel::AllocPage(bool /*bMasterPage*/) { DBG_CHKTHIS( rpt_OReportModel, 0); - OSL_ENSURE(0,"Who called me!"); + OSL_FAIL("Who called me!"); return NULL; } diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index 9410c75019e6..573bce8980df 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -172,7 +172,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< report::XReportCompon pNewObj = OOle2Obj::Create( _xComponent,nType ); break; default: - OSL_ENSURE(0,"Unknown object id"); + OSL_FAIL("Unknown object id"); break; } @@ -205,7 +205,7 @@ namespace nTextAlign = style::ParagraphAdjust_RIGHT; break; default: - OSL_ENSURE(0,"Illegal text alignment value!"); + OSL_FAIL("Illegal text alignment value!"); break; } aRet <<= (style::ParagraphAdjust)nTextAlign; @@ -228,7 +228,7 @@ namespace nTextAlign = awt::TextAlign::RIGHT; break; default: - OSL_ENSURE(0,"Illegal text alignment value!"); + OSL_FAIL("Illegal text alignment value!"); break; } aRet <<= nTextAlign; @@ -396,7 +396,7 @@ void OObjectBase::EndListening(sal_Bool /*bRemoveListener*/) } catch(uno::Exception) { - OSL_ENSURE(0,"OObjectBase::EndListening: Exception caught!"); + OSL_FAIL("OObjectBase::EndListening: Exception caught!"); } } m_xPropertyChangeListener.clear(); @@ -532,7 +532,7 @@ sal_Int32 OCustomShape::GetStep() const { // get step property sal_Int32 nStep = 0; - OSL_ENSURE(0,"Who called me!"); + OSL_FAIL("Who called me!"); return nStep; } //---------------------------------------------------------------------------- @@ -718,7 +718,7 @@ sal_Int32 OUnoObject::GetStep() const DBG_CHKTHIS( rpt_OUnoObject,NULL); // get step property sal_Int32 nStep = 0; - OSL_ENSURE(0,"Who called me!"); + OSL_FAIL("Who called me!"); return nStep; } @@ -1013,7 +1013,7 @@ sal_Int32 OOle2Obj::GetStep() const DBG_CHKTHIS( rpt_OOle2Obj,NULL); // get step property sal_Int32 nStep = 0; - OSL_ENSURE(0,"Who called me!"); + OSL_FAIL("Who called me!"); return nStep; } diff --git a/reportdesign/source/core/sdr/UndoActions.cxx b/reportdesign/source/core/sdr/UndoActions.cxx index 737e43af74be..9a4d66740f17 100644 --- a/reportdesign/source/core/sdr/UndoActions.cxx +++ b/reportdesign/source/core/sdr/UndoActions.cxx @@ -224,7 +224,7 @@ void OUndoContainerAction::Undo() implReInsert(); break; default: - OSL_ENSURE(0,"Illegal case value"); + OSL_FAIL("Illegal case value"); break; } } @@ -252,7 +252,7 @@ void OUndoContainerAction::Redo() implReRemove(); break; default: - OSL_ENSURE(0,"Illegal case value"); + OSL_FAIL("Illegal case value"); break; } } diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx index f47f360c4687..868a73002315 100644 --- a/reportdesign/source/filter/xml/xmlCell.cxx +++ b/reportdesign/source/filter/xml/xmlCell.cxx @@ -245,7 +245,7 @@ void OXMLCell::EndElement() } catch(uno::Exception&) { - OSL_ENSURE(0,"OXMLCell::EndElement -> exception catched"); + OSL_FAIL("OXMLCell::EndElement -> exception catched"); } } } diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index dd1387db40da..aa8da4c42b62 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -98,7 +98,7 @@ OXMLComponent::OXMLComponent( ORptFilter& _rImport } catch(const Exception&) { - OSL_ENSURE(0,"Exception catched while putting props into report component!"); + OSL_FAIL("Exception catched while putting props into report component!"); } } } diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 16135095268a..56eb0c4eabb9 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -81,7 +81,7 @@ OXMLCondPrtExpr::OXMLCondPrtExpr( ORptFilter& _rImport, } catch(const Exception&) { - OSL_ENSURE(0,"Exception catched while putting Function props!"); + OSL_FAIL("Exception catched while putting Function props!"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index c156b7ffd58e..89fe02a0336a 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -165,7 +165,7 @@ void OXMLControlProperty::EndElement() } catch(const Exception&) { - OSL_ENSURE(0,"Unknown property found!"); + OSL_FAIL("Unknown property found!"); } } } diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 5794e46a9886..e79603a6294b 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -473,7 +473,7 @@ void ORptExport::exportFormatConditions(const Reference& _x } catch(uno::Exception&) { - OSL_ENSURE(0,"Can not access format condition!"); + OSL_FAIL("Can not access format condition!"); } } // ----------------------------------------------------------------------------- @@ -720,7 +720,7 @@ void ORptExport::exportReportComponentAutoStyles(const Reference& _xPr } catch(uno::Exception&) { - OSL_ENSURE(0,"Can not access format condition!"); + OSL_FAIL("Can not access format condition!"); } } } diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx index 9f3c7e5e3c8e..faec25209fbf 100644 --- a/reportdesign/source/filter/xml/xmlFixedContent.cxx +++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx @@ -106,7 +106,7 @@ void OXMLCharContent::InsertControlCharacter(sal_Int16 _nControl) m_pFixedContent->Characters(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\n"))); break; default: - OSL_ENSURE(0,"Not supported control character"); + OSL_FAIL("Not supported control character"); break; } } diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 6d70a78ec147..71b4f05f95be 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -95,7 +95,7 @@ OXMLFormatCondition::OXMLFormatCondition( ORptFilter& rImport, } catch(Exception&) { - OSL_ENSURE(0,"Exception catched while filling the report definition props"); + OSL_FAIL("Exception catched while filling the report definition props"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index 65fdbe1ee81f..73fd83dc474d 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -92,7 +92,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport, } catch(Exception&) { - OSL_ENSURE(0,"Exception catched while filling the report definition props"); + OSL_FAIL("Exception catched while filling the report definition props"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index fd0ede7b2244..998e40839bd2 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -101,7 +101,7 @@ OXMLFunction::OXMLFunction( ORptFilter& _rImport } catch(const Exception&) { - OSL_ENSURE(0,"Exception catched while putting Function props!"); + OSL_FAIL("Exception catched while putting Function props!"); } } } @@ -132,7 +132,7 @@ void OXMLFunction::EndElement() m_xFunction.clear(); }catch(uno::Exception&) { - OSL_ENSURE(0,"Exception catched!"); + OSL_FAIL("Exception catched!"); } } } diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index c5fad4d165cd..d2524371ae98 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -193,7 +193,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport } catch(const Exception&) { - OSL_ENSURE(0,"Exception catched while putting group props!"); + OSL_FAIL("Exception catched while putting group props!"); } } } @@ -271,7 +271,7 @@ void OXMLGroup::EndElement() m_xGroups->insertByIndex(0,uno::makeAny(m_xGroup)); }catch(uno::Exception&) { - OSL_ENSURE(0,"Exception catched!"); + OSL_FAIL("Exception catched!"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index c00b0cd579ea..8446bf6bdd5f 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -330,7 +330,7 @@ void OXMLHelper::copyStyleElements(const bool _bOld,const ::rtl::OUString& _sSty } catch(uno::Exception&) { - OSL_ENSURE(0,"OXMLHelper::copyStyleElements -> exception catched"); + OSL_FAIL("OXMLHelper::copyStyleElements -> exception catched"); } } } diff --git a/reportdesign/source/filter/xml/xmlImage.cxx b/reportdesign/source/filter/xml/xmlImage.cxx index ab7567214fdf..0e254e92eab2 100644 --- a/reportdesign/source/filter/xml/xmlImage.cxx +++ b/reportdesign/source/filter/xml/xmlImage.cxx @@ -114,7 +114,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport, } catch(Exception&) { - OSL_ENSURE(0,"Exception catched while filling the image props"); + OSL_FAIL("Exception catched while filling the image props"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index a0f883c8ad2a..c2dea15b7023 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -233,7 +233,7 @@ void SAL_CALL ImportDocumentHandler::startElement(const ::rtl::OUString & _sName } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception catched while filling the report definition props"); + OSL_FAIL("Exception catched while filling the report definition props"); } bExport = false; } diff --git a/reportdesign/source/filter/xml/xmlReport.cxx b/reportdesign/source/filter/xml/xmlReport.cxx index 6990c9144b20..3edb30acd555 100644 --- a/reportdesign/source/filter/xml/xmlReport.cxx +++ b/reportdesign/source/filter/xml/xmlReport.cxx @@ -111,7 +111,7 @@ OXMLReport::OXMLReport( ORptFilter& rImport, } catch(Exception&) { - OSL_ENSURE(0,"Exception catched while filling the report definition props"); + OSL_FAIL("Exception catched while filling the report definition props"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index 2ef2ad192423..6ed989c06dbb 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -85,7 +85,7 @@ OXMLReportElement::OXMLReportElement( ORptFilter& rImport, } catch(Exception&) { - OSL_ENSURE(0,"Exception catched while filling the report definition props"); + OSL_FAIL("Exception catched while filling the report definition props"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index 01de1e714bf9..0a86638028b9 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -108,7 +108,7 @@ void OXMLReportElementBase::EndElement() } catch(Exception&) { - OSL_ENSURE(0,"Exception caught while inserting a new control!"); + OSL_FAIL("Exception caught while inserting a new control!"); } } //---------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 098858190d28..5d19b6e9c202 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -102,13 +102,13 @@ OXMLSection::OXMLSection( ORptFilter& rImport, break; default: - OSL_ENSURE(0,"OXMLSection: Unknown attribute!"); + OSL_FAIL("OXMLSection: Unknown attribute!"); } } } catch(Exception&) { - OSL_ENSURE(0,"Exception catched while filling the section props"); + OSL_FAIL("Exception catched while filling the section props"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx index e93e7f37a3e9..eab257017a91 100644 --- a/reportdesign/source/filter/xml/xmlStyleImport.cxx +++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx @@ -311,7 +311,7 @@ SvXMLStyleContext *OReportStylesContext::CreateStyleStyleChildContext( xAttrList, *this, nFamily ); break; default: - OSL_ENSURE(0,"OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check."); + OSL_FAIL("OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check."); break; } } @@ -368,7 +368,7 @@ Reference < XNameContainer > xStyles = ((SvXMLImport *)&GetImport())->GetTextImport()->GetFrameStyles(); break; default: - OSL_ENSURE(0,"OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check."); + OSL_FAIL("OReportStylesContext::CreateStyleStyleChildContext: Unknown style family. PLease check."); break; } if( !xStyles.is() && sName.getLength() && GetOwnImport().GetModel().is() ) diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx b/reportdesign/source/filter/xml/xmlSubDocument.cxx index 63ed9b92f77e..847752adaeae 100644 --- a/reportdesign/source/filter/xml/xmlSubDocument.cxx +++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx @@ -144,7 +144,7 @@ void OXMLSubDocument::EndElement() } catch(uno::Exception&) { - OSL_ENSURE(0,"Can not access format condition!"); + OSL_FAIL("Can not access format condition!"); } } diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index 78ff08494a5e..92fbf0658867 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -122,7 +122,7 @@ OXMLTable::OXMLTable( ORptFilter& rImport } catch(Exception&) { - OSL_ENSURE(0,"Exception catched while filling the section props"); + OSL_FAIL("Exception catched while filling the section props"); } } // ----------------------------------------------------------------------------- @@ -269,7 +269,7 @@ void OXMLTable::EndElement() } catch(beans::PropertyVetoException) { - OSL_ENSURE(0,"Could not set the correct position or size!"); + OSL_FAIL("Could not set the correct position or size!"); } } } @@ -282,7 +282,7 @@ void OXMLTable::EndElement() } catch(Exception&) { - OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched"); + OSL_FAIL("OXMLTable::EndElement -> exception catched"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 898779094953..343d82b67b9d 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -394,7 +394,7 @@ namespace rptui } catch(Exception&) { - OSL_ENSURE(0,"Can not access format condition!"); + OSL_FAIL("Can not access format condition!"); } impl_conditionCountChanged(); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 09cf0e6eb14d..15b34d1ac91e 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -243,7 +243,7 @@ uno::Sequence OFieldExpressionControl::fillSelectedGroups() } catch(uno::Exception&) { - OSL_ENSURE(0,"Can not access group!"); + OSL_FAIL("Can not access group!"); } } if ( !vClipboardList.empty() ) @@ -514,7 +514,7 @@ BOOL OFieldExpressionControl::SaveModified(bool _bAppendRow) } catch(uno::Exception&) { - OSL_ENSURE(0,"OFieldExpressionControl::SaveModified: Exception caught!"); + OSL_FAIL("OFieldExpressionControl::SaveModified: Exception caught!"); } } @@ -545,7 +545,7 @@ String OFieldExpressionControl::GetCellText( long nRow, USHORT /*nColId*/ ) cons } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception caught while getting expression value from the group"); + OSL_FAIL("Exception caught while getting expression value from the group"); } } return sText; @@ -626,7 +626,7 @@ EditBrowseBox::RowStatus OFieldExpressionControl::GetRowStatus(long nRow) const } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception cathced while try to get a group!"); + OSL_FAIL("Exception cathced while try to get a group!"); } } return EditBrowseBox::CLEAN; @@ -1163,7 +1163,7 @@ sal_Int32 OGroupsSortingDialog::getColumnDataType(const ::rtl::OUString& _sColum } catch(uno::Exception&) { - OSL_ENSURE(0,"Eception caught while getting the type of a column"); + OSL_FAIL("Eception caught while getting the type of a column"); } return nDataType; diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx b/reportdesign/source/ui/dlg/dlgpage.cxx index ba82ca8f104b..99142605a24c 100644 --- a/reportdesign/source/ui/dlg/dlgpage.cxx +++ b/reportdesign/source/ui/dlg/dlgpage.cxx @@ -76,7 +76,7 @@ SfxTabDialog ( pParent, ModuleRes( _nPageId ), pAttr ), AddTabPage( RID_SVXPAGE_LINE,pFact->GetTabPageCreatorFunc( RID_SVXPAGE_LINE ), 0 ); break; default: - OSL_ENSURE(0,"Unknown page id"); + OSL_FAIL("Unknown page id"); } SvtCJKOptions aCJKOptions; diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index f816433b17f4..a3f2191c33c5 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -1706,7 +1706,7 @@ void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< ::rtl::OUString } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception caught!"); + OSL_FAIL("Exception caught!"); } } // ----------------------------------------------------------------------------- @@ -1738,7 +1738,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< ::rtl::OUString } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception caught!"); + OSL_FAIL("Exception caught!"); } } // ----------------------------------------------------------------------------- @@ -1856,7 +1856,7 @@ sal_Bool GeometryHandler::isDefaultFunction( const ::rtl::OUString& _sQuotedFunc } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception caught!"); + OSL_FAIL("Exception caught!"); } return bDefaultFunction; } @@ -1896,7 +1896,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception caught!"); + OSL_FAIL("Exception caught!"); } return bDefaultFunction; } @@ -1987,7 +1987,7 @@ void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception caught!"); + OSL_FAIL("Exception caught!"); } } // ----------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/misc/Undo.cxx b/reportdesign/source/ui/misc/Undo.cxx index 249bac85b1b0..949627285f93 100644 --- a/reportdesign/source/ui/misc/Undo.cxx +++ b/reportdesign/source/ui/misc/Undo.cxx @@ -91,7 +91,7 @@ namespace } catch(const uno::Exception&) { - OSL_ENSURE(0,"lcl_insertElements:Exception caught!"); + OSL_FAIL("lcl_insertElements:Exception caught!"); } } } @@ -111,7 +111,7 @@ namespace } catch(const uno::Exception&) { - OSL_ENSURE(0,"lcl_setValues:Exception caught!"); + OSL_FAIL("lcl_setValues:Exception caught!"); } } } @@ -156,7 +156,7 @@ OSectionUndo::~OSectionUndo() } catch(uno::Exception) { - OSL_ENSURE(0,"Exception caught!"); + OSL_FAIL("Exception caught!"); } } } @@ -359,7 +359,7 @@ void OGroupUndo::implReInsert( ) } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception catched while undoing remove group"); + OSL_FAIL("Exception catched while undoing remove group"); } } //---------------------------------------------------------------------------- @@ -371,7 +371,7 @@ void OGroupUndo::implReRemove( ) } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception catched while redoing remove group"); + OSL_FAIL("Exception catched while redoing remove group"); } } //---------------------------------------------------------------------------- diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 6259f195f4eb..822590c65d44 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -221,7 +221,7 @@ namespace aFontDescriptor.Underline = awt::FontUnderline::SINGLE - aFontDescriptor.Underline; break; default: - OSL_ENSURE(0,"Illegal value in default!"); + OSL_FAIL("Illegal value in default!"); break; } @@ -358,7 +358,7 @@ void OReportController::disposing() } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception caught while disposing row sets."); + OSL_FAIL("Exception caught while disposing row sets."); } m_xRowSet.clear(); m_xRowSetMediator.clear(); @@ -2209,7 +2209,7 @@ void SAL_CALL OReportController::elementReplaced( const ContainerEvent& /*_rEven { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); - OSL_ENSURE(0,"Not yet implemented!"); + OSL_FAIL("Not yet implemented!"); } // ----------------------------------------------------------------------------- void SAL_CALL OReportController::propertyChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException) diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index bf34f824f175..2a6b51578245 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -111,7 +111,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception catched!"); + OSL_FAIL("Exception catched!"); } m_pFunc.reset(new DlgEdFuncSelect( this )); @@ -315,7 +315,7 @@ void OReportSection::Paste(const uno::Sequence< beans::NamedValue >& _aAllreadyC } catch(uno::Exception&) { - OSL_ENSURE(0,"Exception caught while pasting a new object!"); + OSL_FAIL("Exception caught while pasting a new object!"); } if ( !_bForce ) break; @@ -391,7 +391,7 @@ void OReportSection::Copy(uno::Sequence< beans::NamedValue >& _rAllreadyCopiedOb } catch(uno::Exception&) { - OSL_ENSURE(0,"Can't copy report elements!"); + OSL_FAIL("Can't copy report elements!"); } } } @@ -604,7 +604,7 @@ void OReportSection::_propertyChanged(const beans::PropertyChangeEvent& _rEvent) } catch(uno::Exception) { - OSL_ENSURE(0,"Exception caught: OReportSection::_propertyChanged("); + OSL_FAIL("Exception caught: OReportSection::_propertyChanged("); } Resize(); diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index 1ca2e5cadbee..d5db6eb1d101 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -101,7 +101,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory ) pObjFactory->pNewObj = new OOle2Obj(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.chart2.ChartDocument")),OBJ_OLE2); break; default: - OSL_ENSURE(0,"Unknown object id"); + OSL_FAIL("Unknown object id"); break; } } diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx index fd4ecfbd5f65..358007d9b87d 100644 --- a/reportdesign/source/ui/report/propbrw.cxx +++ b/reportdesign/source/ui/report/propbrw.cxx @@ -408,7 +408,7 @@ void PropBrw::implSetNewObject( const uno::Sequence< Reference } else { - OSL_ENSURE(0,"Unknown service name!"); + OSL_FAIL("Unknown service name!"); nResId = RID_STR_CLASS_FORMATTEDFIELD; } -- cgit v1.2.3 From d9d7e9447495a47fa00e524c5c4ec58ae48e95b9 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 18 Apr 2011 14:46:56 +0200 Subject: gbuildize dbaccess --- dbaccess/AllLangResTarget_adabasui.mk | 48 ++++ dbaccess/AllLangResTarget_dba.mk | 48 ++++ dbaccess/AllLangResTarget_dbmm.mk | 47 ++++ dbaccess/AllLangResTarget_dbu.mk | 95 ++++++++ dbaccess/AllLangResTarget_sdbt.mk | 47 ++++ dbaccess/Executable_odbcconfig.mk | 38 +++ dbaccess/Library_adabasui.mk | 72 ++++++ dbaccess/Library_dba.mk | 156 ++++++++++++ dbaccess/Library_dbaxml.mk | 93 +++++++ dbaccess/Library_dbmm.mk | 77 ++++++ dbaccess/Library_dbu.mk | 312 ++++++++++++++++++++++++ dbaccess/Library_sdbt.mk | 67 +++++ dbaccess/Module_dbaccess.mk | 17 ++ dbaccess/Package_inc.mk | 41 ++++ dbaccess/Package_uiconfig.mk | 50 ++++ dbaccess/inc/makefile.mk | 47 ---- dbaccess/prj/makefile.mk | 40 +++ dbaccess/source/core/api/makefile.mk | 82 ------- dbaccess/source/core/dataaccess/makefile.mk | 69 ------ dbaccess/source/core/misc/makefile.mk | 60 ----- dbaccess/source/core/recovery/makefile.mk | 54 ---- dbaccess/source/core/resource/makefile.mk | 51 ---- dbaccess/source/ext/adabas/makefile.mk | 100 -------- dbaccess/source/ext/macromigration/makefile.mk | 109 --------- dbaccess/source/filter/xml/makefile.mk | 121 --------- dbaccess/source/filter/xml/xmlservices.cxx | 4 +- dbaccess/source/sdbtools/connection/makefile.mk | 49 ---- dbaccess/source/sdbtools/misc/makefile.mk | 47 ---- dbaccess/source/sdbtools/misc/sdbt_services.cxx | 4 +- dbaccess/source/sdbtools/resource/makefile.mk | 45 ---- dbaccess/source/shared/makefile.mk | 67 ----- dbaccess/source/ui/app/makefile.mk | 69 ------ dbaccess/source/ui/browser/makefile.mk | 71 ------ dbaccess/source/ui/control/makefile.mk | 78 ------ dbaccess/source/ui/dlg/makefile.mk | 154 ------------ dbaccess/source/ui/imagelists/makefile.mk | 49 ---- dbaccess/source/ui/inc/makefile.mk | 43 ---- dbaccess/source/ui/misc/makefile.mk | 88 ------- dbaccess/source/ui/querydesign/makefile.mk | 89 ------- dbaccess/source/ui/relationdesign/makefile.mk | 58 ----- dbaccess/source/ui/tabledesign/makefile.mk | 65 ----- dbaccess/source/ui/uno/makefile.mk | 76 ------ dbaccess/util/makefile.mk | 262 -------------------- dbaccess/win32/source/odbcconfig/makefile.mk | 54 ---- 44 files changed, 1252 insertions(+), 2061 deletions(-) create mode 100644 dbaccess/AllLangResTarget_adabasui.mk create mode 100644 dbaccess/AllLangResTarget_dba.mk create mode 100644 dbaccess/AllLangResTarget_dbmm.mk create mode 100644 dbaccess/AllLangResTarget_dbu.mk create mode 100644 dbaccess/AllLangResTarget_sdbt.mk create mode 100644 dbaccess/Executable_odbcconfig.mk create mode 100644 dbaccess/Library_adabasui.mk create mode 100644 dbaccess/Library_dba.mk create mode 100644 dbaccess/Library_dbaxml.mk create mode 100644 dbaccess/Library_dbmm.mk create mode 100644 dbaccess/Library_dbu.mk create mode 100644 dbaccess/Library_sdbt.mk create mode 100644 dbaccess/Package_inc.mk create mode 100644 dbaccess/Package_uiconfig.mk delete mode 100644 dbaccess/inc/makefile.mk create mode 100755 dbaccess/prj/makefile.mk delete mode 100644 dbaccess/source/core/api/makefile.mk delete mode 100644 dbaccess/source/core/dataaccess/makefile.mk delete mode 100644 dbaccess/source/core/misc/makefile.mk delete mode 100644 dbaccess/source/core/recovery/makefile.mk delete mode 100644 dbaccess/source/core/resource/makefile.mk delete mode 100644 dbaccess/source/ext/adabas/makefile.mk delete mode 100644 dbaccess/source/ext/macromigration/makefile.mk delete mode 100644 dbaccess/source/filter/xml/makefile.mk delete mode 100644 dbaccess/source/sdbtools/connection/makefile.mk delete mode 100644 dbaccess/source/sdbtools/misc/makefile.mk delete mode 100644 dbaccess/source/sdbtools/resource/makefile.mk delete mode 100644 dbaccess/source/shared/makefile.mk delete mode 100644 dbaccess/source/ui/app/makefile.mk delete mode 100644 dbaccess/source/ui/browser/makefile.mk delete mode 100644 dbaccess/source/ui/control/makefile.mk delete mode 100644 dbaccess/source/ui/dlg/makefile.mk delete mode 100644 dbaccess/source/ui/imagelists/makefile.mk delete mode 100644 dbaccess/source/ui/inc/makefile.mk delete mode 100644 dbaccess/source/ui/misc/makefile.mk delete mode 100644 dbaccess/source/ui/querydesign/makefile.mk delete mode 100644 dbaccess/source/ui/relationdesign/makefile.mk delete mode 100644 dbaccess/source/ui/tabledesign/makefile.mk delete mode 100644 dbaccess/source/ui/uno/makefile.mk delete mode 100644 dbaccess/util/makefile.mk delete mode 100644 dbaccess/win32/source/odbcconfig/makefile.mk (limited to 'dbaccess/source/ui/relationdesign') diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk new file mode 100644 index 000000000000..17ff9fc94efb --- /dev/null +++ b/dbaccess/AllLangResTarget_adabasui.mk @@ -0,0 +1,48 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,adabasui)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,adabasui,dbaccess)) + +$(eval $(call gb_AllLangResTarget_add_srs,adabasui,\ + dbaccess/adabasui \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/adabasui)) + +$(eval $(call gb_SrsTarget_set_include,dbaccess/adabasui,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc) \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,dbaccess/adabasui,\ + dbaccess/source/ext/adabas/AdabasNewDb.src \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk new file mode 100644 index 000000000000..7c2d73081e73 --- /dev/null +++ b/dbaccess/AllLangResTarget_dba.mk @@ -0,0 +1,48 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,dba)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,dba,dbaccess)) + +$(eval $(call gb_AllLangResTarget_add_srs,dba,\ + dbaccess/dba \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dba)) + +$(eval $(call gb_SrsTarget_set_include,dbaccess/dba,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,dbaccess/dba,\ + dbaccess/source/core/resource/strings.src \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk new file mode 100644 index 000000000000..6c233d015dea --- /dev/null +++ b/dbaccess/AllLangResTarget_dbmm.mk @@ -0,0 +1,47 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbmm)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,dbmm,dbaccess)) + +$(eval $(call gb_AllLangResTarget_add_srs,dbmm,\ + dbaccess/dbmm \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbmm)) + +$(eval $(call gb_SrsTarget_set_include,dbaccess/dbmm,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,dbaccess/dbmm,\ + dbaccess/source/ext/macromigration/macromigration.src \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk new file mode 100644 index 000000000000..fc7fbe1b8fdb --- /dev/null +++ b/dbaccess/AllLangResTarget_dbu.mk @@ -0,0 +1,95 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,dbu)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,dbu,dbaccess)) + +$(eval $(call gb_AllLangResTarget_add_srs,dbu,\ + dbaccess/dbu \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/dbu)) + +$(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\ + $$(INCLUDE) \ + -I$(WORKDIR)/inc/dbaccess \ + -I$(realpath $(SRCDIR)/dbaccess/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \ +)) + +$(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\ + dbaccess/source/ui/app/app.src \ + dbaccess/source/ui/browser/sbabrw.src \ + dbaccess/source/ui/browser/sbagrid.src \ + dbaccess/source/ui/control/TableGrantCtrl.src \ + dbaccess/source/ui/control/tabletree.src \ + dbaccess/source/ui/control/undosqledit.src \ + dbaccess/source/ui/dlg/AdabasStat.src \ + dbaccess/source/ui/dlg/admincontrols.src \ + dbaccess/source/ui/dlg/adtabdlg.src \ + dbaccess/source/ui/dlg/advancedsettings.src \ + dbaccess/source/ui/dlg/AutoControls.src \ + dbaccess/source/ui/dlg/CollectionView.src \ + dbaccess/source/ui/dlg/ConnectionPage.src \ + dbaccess/source/ui/dlg/dbadmin2.src \ + dbaccess/source/ui/dlg/dbadminsetup.src \ + dbaccess/source/ui/dlg/dbadmin.src \ + dbaccess/source/ui/dlg/dbfindex.src \ + dbaccess/source/ui/dlg/directsql.src \ + dbaccess/source/ui/dlg/dlgattr.src \ + dbaccess/source/ui/dlg/dlgsave.src \ + dbaccess/source/ui/dlg/dlgsize.src \ + dbaccess/source/ui/dlg/dsselect.src \ + dbaccess/source/ui/dlg/indexdialog.src \ + dbaccess/source/ui/dlg/paramdialog.src \ + dbaccess/source/ui/dlg/queryfilter.src \ + dbaccess/source/ui/dlg/queryorder.src \ + dbaccess/source/ui/dlg/RelationDlg.src \ + dbaccess/source/ui/dlg/sqlmessage.src \ + dbaccess/source/ui/dlg/textconnectionsettings.src \ + dbaccess/source/ui/dlg/UserAdminDlg.src \ + dbaccess/source/ui/dlg/UserAdmin.src \ + dbaccess/source/ui/imagelists/dbimagelists.src \ + dbaccess/source/ui/misc/dbumiscres.src \ + dbaccess/source/ui/misc/WizardPages.src \ + dbaccess/source/ui/querydesign/querydlg.src \ + dbaccess/source/ui/querydesign/query.src \ + dbaccess/source/ui/relationdesign/relation.src \ + dbaccess/source/ui/tabledesign/table.src \ + dbaccess/source/ui/uno/copytablewizard.src \ + dbaccess/source/ui/uno/dbinteraction.src \ +)) + +$(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\ + dbaccess/source/ui/dlg/AutoControls_tmpl.hrc \ + dbaccess/source/ui/inc/toolbox_tmpl.hrc \ +)) + +$(call gb_SrsTarget_get_target,dbaccess/dbu) :| $(OUTDIR)/inc/svx/globlmn.hrc + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk new file mode 100644 index 000000000000..208e188cda1c --- /dev/null +++ b/dbaccess/AllLangResTarget_sdbt.mk @@ -0,0 +1,47 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdbt)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,sdbt,dbaccess)) + +$(eval $(call gb_AllLangResTarget_add_srs,sdbt,\ + dbaccess/sdbt \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,dbaccess/sdbt)) + +$(eval $(call gb_SrsTarget_set_include,dbaccess/sdbt,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_SrsTarget_add_files,dbaccess/sdbt,\ + dbaccess/source/sdbtools/resource/sdbt_strings.src \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk new file mode 100644 index 000000000000..b6bdf3cb0657 --- /dev/null +++ b/dbaccess/Executable_odbcconfig.mk @@ -0,0 +1,38 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Executable_Executable,odbcconfig)) + +$(eval $(call gb_Executable_add_linked_libs,odbcconfig,\ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Executable_add_exception_objects,odbcconfig,\ + dbaccess/win32/source/odbcconfig/odbcconfig \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk new file mode 100644 index 000000000000..ee5ae6a71e62 --- /dev/null +++ b/dbaccess/Library_adabasui.mk @@ -0,0 +1,72 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,adabasui)) + +$(eval $(call gb_Library_add_precompiled_header,adabasui,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) + +$(eval $(call gb_Library_set_include,adabasui,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,adabasui,\ + $$(DEFS) \ + -DCOMPMOD_NAMESPACE=adabasui \ +)) + +$(eval $(call gb_Library_add_linked_libs,adabasui,\ + comphelper \ + cppu \ + cppuhelper \ + dbtools \ + sal \ + sfx \ + svl \ + svt \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,adabasui,dbaccess/source/ext/adabas/adabasui)) + +$(eval $(call gb_Library_add_exception_objects,adabasui,\ + dbaccess/source/ext/adabas/Acomponentmodule \ + dbaccess/source/ext/adabas/AdabasNewDb \ + dbaccess/source/ext/adabas/adabasuistrings \ + dbaccess/source/ext/adabas/ANewDb \ + dbaccess/source/ext/adabas/Aservices \ + dbaccess/source/ext/adabas/ASqlNameEdit \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk new file mode 100644 index 000000000000..fdd57547acd8 --- /dev/null +++ b/dbaccess/Library_dba.mk @@ -0,0 +1,156 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,dba)) + +$(eval $(call gb_Library_add_package_headers,dba,\ + dbaccess_inc \ +)) + +$(eval $(call gb_Library_add_precompiled_header,dba,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) + +$(eval $(call gb_Library_set_include,dba,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ + -I$(realpath $(SRCDIR)/dbaccess/source/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/source/core/inc) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,dba,\ + $$(DEFS) \ + -DOOO_DLLIMPLEMENTATION_DBA \ +)) + +$(eval $(call gb_Library_add_linked_libs,dba,\ + comphelper \ + cppu \ + cppuhelper \ + dbtools \ + fwe \ + i18nisolang1 \ + sal \ + salhelper \ + sb \ + sfx \ + svl \ + svt \ + tl \ + ucbhelper \ + utl \ + vcl \ + xo \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,dba,dbaccess/util/dba)) + +$(eval $(call gb_Library_add_exception_objects,dba,\ + dbaccess/source/core/api/BookmarkSet \ + dbaccess/source/core/api/CacheSet \ + dbaccess/source/core/api/callablestatement \ + dbaccess/source/core/api/CIndexes \ + dbaccess/source/core/api/column \ + dbaccess/source/core/api/columnsettings \ + dbaccess/source/core/api/CRowSetColumn \ + dbaccess/source/core/api/CRowSetDataColumn \ + dbaccess/source/core/api/datacolumn \ + dbaccess/source/core/api/datasettings \ + dbaccess/source/core/api/definitioncolumn \ + dbaccess/source/core/api/FilteredContainer \ + dbaccess/source/core/api/HelperCollections \ + dbaccess/source/core/api/KeySet \ + dbaccess/source/core/api/OptimisticSet \ + dbaccess/source/core/api/preparedstatement \ + dbaccess/source/core/api/PrivateRow \ + dbaccess/source/core/api/query \ + dbaccess/source/core/api/querycomposer \ + dbaccess/source/core/api/querycontainer \ + dbaccess/source/core/api/querydescriptor \ + dbaccess/source/core/api/resultcolumn \ + dbaccess/source/core/api/resultset \ + dbaccess/source/core/api/RowSet \ + dbaccess/source/core/api/RowSetBase \ + dbaccess/source/core/api/RowSetCache \ + dbaccess/source/core/api/RowSetCacheIterator \ + dbaccess/source/core/api/SingleSelectQueryComposer \ + dbaccess/source/core/api/statement \ + dbaccess/source/core/api/StaticSet \ + dbaccess/source/core/api/table \ + dbaccess/source/core/api/tablecontainer \ + dbaccess/source/core/api/TableDeco \ + dbaccess/source/core/api/View \ + dbaccess/source/core/api/viewcontainer \ + dbaccess/source/core/api/WrappedResultSet \ + dbaccess/source/core/dataaccess/bookmarkcontainer \ + dbaccess/source/core/dataaccess/commandcontainer \ + dbaccess/source/core/dataaccess/commanddefinition \ + dbaccess/source/core/dataaccess/ComponentDefinition \ + dbaccess/source/core/dataaccess/connection \ + dbaccess/source/core/dataaccess/ContentHelper \ + dbaccess/source/core/dataaccess/dataaccessdescriptor \ + dbaccess/source/core/dataaccess/databasecontext \ + dbaccess/source/core/dataaccess/databasedocument \ + dbaccess/source/core/dataaccess/databaseregistrations \ + dbaccess/source/core/dataaccess/datasource \ + dbaccess/source/core/dataaccess/definitioncontainer \ + dbaccess/source/core/dataaccess/documentcontainer \ + dbaccess/source/core/dataaccess/documentdefinition \ + dbaccess/source/core/dataaccess/documenteventexecutor \ + dbaccess/source/core/dataaccess/documenteventnotifier \ + dbaccess/source/core/dataaccess/documentevents \ + dbaccess/source/core/dataaccess/intercept \ + dbaccess/source/core/dataaccess/ModelImpl \ + dbaccess/source/core/dataaccess/myucp_datasupplier \ + dbaccess/source/core/dataaccess/myucp_resultset \ + dbaccess/source/core/dataaccess/SharedConnection \ + dbaccess/source/core/misc/apitools \ + dbaccess/source/core/misc/ContainerListener \ + dbaccess/source/core/misc/ContainerMediator \ + dbaccess/source/core/misc/DatabaseDataProvider \ + dbaccess/source/core/misc/dbastrings \ + dbaccess/source/core/misc/dsntypes \ + dbaccess/source/core/misc/module_dba \ + dbaccess/source/core/misc/objectnameapproval \ + dbaccess/source/core/misc/PropertyForward \ + dbaccess/source/core/misc/sdbcoretools \ + dbaccess/source/core/misc/services \ + dbaccess/source/core/misc/userinformation \ + dbaccess/source/core/misc/veto \ + dbaccess/source/core/recovery/dbdocrecovery \ + dbaccess/source/core/recovery/settingsimport \ + dbaccess/source/core/recovery/storagestream \ + dbaccess/source/core/recovery/storagetextstream \ + dbaccess/source/core/recovery/storagexmlstream \ + dbaccess/source/core/recovery/subcomponentloader \ + dbaccess/source/core/recovery/subcomponentrecovery \ + dbaccess/source/core/resource/core_resource \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk new file mode 100644 index 000000000000..e0a190898c24 --- /dev/null +++ b/dbaccess/Library_dbaxml.mk @@ -0,0 +1,93 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,dbaxml)) + +$(eval $(call gb_Library_add_precompiled_header,dbaxml,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) + +$(eval $(call gb_Library_set_include,dbaxml,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ + -I$(realpath $(SRCDIR)/dbaccess/source/inc) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,dbaxml,\ + comphelper \ + cppu \ + cppuhelper \ + dba \ + dbtools \ + sal \ + sfx \ + svl \ + tk \ + tl \ + utl \ + vcl \ + xo \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,dbaxml,dbaccess/source/filter/xml/dbaxml)) + +$(eval $(call gb_Library_add_exception_objects,dbaxml,\ + dbaccess/source/filter/xml/dbloader2 \ + dbaccess/source/filter/xml/xmlAutoStyle \ + dbaccess/source/filter/xml/xmlColumn \ + dbaccess/source/filter/xml/xmlComponent \ + dbaccess/source/filter/xml/xmlConnectionData \ + dbaccess/source/filter/xml/xmlConnectionResource \ + dbaccess/source/filter/xml/xmlDatabase \ + dbaccess/source/filter/xml/xmlDatabaseDescription \ + dbaccess/source/filter/xml/xmlDataSource \ + dbaccess/source/filter/xml/xmlDataSourceInfo \ + dbaccess/source/filter/xml/xmlDataSourceSetting \ + dbaccess/source/filter/xml/xmlDataSourceSettings \ + dbaccess/source/filter/xml/xmlDocuments \ + dbaccess/source/filter/xml/xmlExport \ + dbaccess/source/filter/xml/xmlFileBasedDatabase \ + dbaccess/source/filter/xml/xmlfilter \ + dbaccess/source/filter/xml/xmlHelper \ + dbaccess/source/filter/xml/xmlHierarchyCollection \ + dbaccess/source/filter/xml/xmlLogin \ + dbaccess/source/filter/xml/xmlQuery \ + dbaccess/source/filter/xml/xmlServerDatabase \ + dbaccess/source/filter/xml/xmlservices \ + dbaccess/source/filter/xml/xmlStyleImport \ + dbaccess/source/filter/xml/xmlTable \ + dbaccess/source/filter/xml/xmlTableFilterList \ + dbaccess/source/filter/xml/xmlTableFilterPattern \ + dbaccess/source/shared/flt_reghelper \ +)) + +$(eval $(call gb_Library_add_noexception_objects,dbaxml,\ + dbaccess/source/shared/xmlstrings \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk new file mode 100644 index 000000000000..db6b152b2d4f --- /dev/null +++ b/dbaccess/Library_dbmm.mk @@ -0,0 +1,77 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,dbmm)) + +$(eval $(call gb_Library_add_package_headers,dbmm,\ + dbaccess_inc \ +)) + +$(eval $(call gb_Library_add_precompiled_header,dbmm,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) + +$(eval $(call gb_Library_set_include,dbmm,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_add_linked_libs,dbmm,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + svl \ + svt \ + svxcore \ + svx \ + tl \ + ucbhelper \ + utl \ + vcl \ + xcr \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,dbmm,dbaccess/source/ext/macromigration/dbmm)) + +$(eval $(call gb_Library_add_exception_objects,dbmm,\ + dbaccess/source/ext/macromigration/dbmm_module \ + dbaccess/source/ext/macromigration/dbmm_services \ + dbaccess/source/ext/macromigration/dbmm_types \ + dbaccess/source/ext/macromigration/docinteraction \ + dbaccess/source/ext/macromigration/macromigrationdialog \ + dbaccess/source/ext/macromigration/macromigrationpages \ + dbaccess/source/ext/macromigration/macromigrationwizard \ + dbaccess/source/ext/macromigration/migrationengine \ + dbaccess/source/ext/macromigration/migrationlog \ + dbaccess/source/ext/macromigration/progresscapture \ + dbaccess/source/ext/macromigration/progressmixer \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk new file mode 100644 index 000000000000..105b1befe5d5 --- /dev/null +++ b/dbaccess/Library_dbu.mk @@ -0,0 +1,312 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,dbu)) + +$(eval $(call gb_Library_add_precompiled_header,dbu,$(SRCDIR)/chart2/inc/pch/precompiled_chart2)) + +$(eval $(call gb_Library_set_include,dbu,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/dbaccess/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/inc/pch) \ + -I$(realpath $(SRCDIR)/dbaccess/source/inc) \ + -I$(realpath $(SRCDIR)/dbaccess/source/ui/inc) \ + -I$(WORKDIR)/inc/dbaccess \ + -I$(OUTDIR)/inc \ + -I$(OUTDIR)/inc/offuh \ +)) + +$(eval $(call gb_Library_set_defs,dbu,\ + $$(DEFS) \ + -DDBACCESS_DLLIMPLEMENTATION \ + $(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \ +)) + +ifneq (,$(strip $(WINDOWS_VISTA_PSDK))) +ifeq (,$(strip $(PROF_EDITION))) +$(eval $(call gb_Library_set_defs,dbu,\ + $$(DEFS) \ + -DWINDOWS_VISTA_PSDK \ +)) +endif +endif + +ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h +$(eval $(call gb_Library_set_cflags,dbu,\ + $$(CFLAGS) \ + -fpermissive \ +)) +endif + +$(eval $(call gb_Library_add_linked_libs,dbu,\ + comphelper \ + cppu \ + cppuhelper \ + dba \ + dbtools \ + editeng \ + fwe \ + sal \ + salhelper \ + sfx \ + sot \ + svl \ + svt \ + svxcore \ + svx \ + tk \ + tl \ + ucbhelper \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) + +ifeq ($(GUI),WNT) +$(eval $(call gb_Library_add_linked_libs,dbu,\ + ole32 \ + oleaut32 \ + uuid \ +)) +endif + +$(eval $(call gb_Library_set_componentfile,dbu,dbaccess/util/dbu)) + +$(eval $(call gb_Library_add_exception_objects,dbu,\ + dbaccess/source/shared/dbu_reghelper \ + dbaccess/source/ui/app/AppController \ + dbaccess/source/ui/app/AppControllerDnD \ + dbaccess/source/ui/app/AppControllerGen \ + dbaccess/source/ui/app/AppDetailPageHelper \ + dbaccess/source/ui/app/AppDetailView \ + dbaccess/source/ui/app/AppIconControl \ + dbaccess/source/ui/app/AppSwapWindow \ + dbaccess/source/ui/app/AppTitleWindow \ + dbaccess/source/ui/app/AppView \ + dbaccess/source/ui/app/subcomponentmanager \ + dbaccess/source/ui/browser/AsyncronousLink \ + dbaccess/source/ui/browser/brwctrlr \ + dbaccess/source/ui/browser/brwview \ + dbaccess/source/ui/browser/dataview \ + dbaccess/source/ui/browser/dbexchange \ + dbaccess/source/ui/browser/dbloader \ + dbaccess/source/ui/browser/dbtreemodel \ + dbaccess/source/ui/browser/dbtreeview \ + dbaccess/source/ui/browser/dsbrowserDnD \ + dbaccess/source/ui/browser/dsEntriesNoExp \ + dbaccess/source/ui/browser/exsrcbrw \ + dbaccess/source/ui/browser/formadapter \ + dbaccess/source/ui/browser/genericcontroller \ + dbaccess/source/ui/browser/sbagrid \ + dbaccess/source/ui/browser/sbamultiplex \ + dbaccess/source/ui/browser/unodatbr \ + dbaccess/source/ui/control/charsetlistbox \ + dbaccess/source/ui/control/ColumnControlWindow \ + dbaccess/source/ui/control/curledit \ + dbaccess/source/ui/control/dbtreelistbox \ + dbaccess/source/ui/control/FieldDescControl \ + dbaccess/source/ui/control/listviewitems \ + dbaccess/source/ui/control/marktree \ + dbaccess/source/ui/control/opendoccontrols \ + dbaccess/source/ui/control/RelationControl \ + dbaccess/source/ui/control/sqledit \ + dbaccess/source/ui/control/SqlNameEdit \ + dbaccess/source/ui/control/statusbarontroller \ + dbaccess/source/ui/control/TableGrantCtrl \ + dbaccess/source/ui/control/tabletree \ + dbaccess/source/ui/control/toolboxcontroller \ + dbaccess/source/ui/control/undosqledit \ + dbaccess/source/ui/control/VertSplitView \ + dbaccess/source/ui/dlg/AdabasStat \ + dbaccess/source/ui/dlg/admincontrols \ + dbaccess/source/ui/dlg/adminpages \ + dbaccess/source/ui/dlg/adtabdlg \ + dbaccess/source/ui/dlg/advancedsettings \ + dbaccess/source/ui/dlg/CollectionView \ + dbaccess/source/ui/dlg/ConnectionHelper \ + dbaccess/source/ui/dlg/ConnectionPage \ + dbaccess/source/ui/dlg/ConnectionPageSetup \ + dbaccess/source/ui/dlg/dbadmin \ + dbaccess/source/ui/dlg/DbAdminImpl \ + dbaccess/source/ui/dlg/dbfindex \ + dbaccess/source/ui/dlg/DBSetupConnectionPages \ + dbaccess/source/ui/dlg/dbwiz \ + dbaccess/source/ui/dlg/dbwizsetup \ + dbaccess/source/ui/dlg/detailpages \ + dbaccess/source/ui/dlg/directsql \ + dbaccess/source/ui/dlg/dlgattr \ + dbaccess/source/ui/dlg/dlgsave \ + dbaccess/source/ui/dlg/dlgsize \ + dbaccess/source/ui/dlg/DriverSettings \ + dbaccess/source/ui/dlg/dsselect \ + dbaccess/source/ui/dlg/finteraction \ + dbaccess/source/ui/dlg/generalpage \ + dbaccess/source/ui/dlg/indexdialog \ + dbaccess/source/ui/dlg/indexfieldscontrol \ + dbaccess/source/ui/dlg/odbcconfig \ + dbaccess/source/ui/dlg/paramdialog \ + dbaccess/source/ui/dlg/queryfilter \ + dbaccess/source/ui/dlg/queryorder \ + dbaccess/source/ui/dlg/RelationDlg \ + dbaccess/source/ui/dlg/sqlmessage \ + dbaccess/source/ui/dlg/tablespage \ + dbaccess/source/ui/dlg/TablesSingleDlg \ + dbaccess/source/ui/dlg/TextConnectionHelper \ + dbaccess/source/ui/dlg/textconnectionsettings \ + dbaccess/source/ui/dlg/UserAdmin \ + dbaccess/source/ui/dlg/UserAdminDlg \ + dbaccess/source/ui/misc/asyncmodaldialog \ + dbaccess/source/ui/misc/charsets \ + dbaccess/source/ui/misc/controllerframe \ + dbaccess/source/ui/misc/databaseobjectview \ + dbaccess/source/ui/misc/datasourceconnector \ + dbaccess/source/ui/misc/dbaundomanager \ + dbaccess/source/ui/misc/dbsubcomponentcontroller \ + dbaccess/source/ui/misc/defaultobjectnamecheck \ + dbaccess/source/ui/misc/DExport \ + dbaccess/source/ui/misc/dsmeta \ + dbaccess/source/ui/misc/HtmlReader \ + dbaccess/source/ui/misc/imageprovider \ + dbaccess/source/ui/misc/indexcollection \ + dbaccess/source/ui/misc/linkeddocuments \ + dbaccess/source/ui/misc/moduledbu \ + dbaccess/source/ui/misc/propertysetitem \ + dbaccess/source/ui/misc/propertystorage \ + dbaccess/source/ui/misc/RowSetDrop \ + dbaccess/source/ui/misc/RtfReader \ + dbaccess/source/ui/misc/singledoccontroller \ + dbaccess/source/ui/misc/stringlistitem \ + dbaccess/source/ui/misc/TableCopyHelper \ + dbaccess/source/ui/misc/TokenWriter \ + dbaccess/source/ui/misc/ToolBoxHelper \ + dbaccess/source/ui/misc/uiservices \ + dbaccess/source/ui/misc/UITools \ + dbaccess/source/ui/misc/WColumnSelect \ + dbaccess/source/ui/misc/WCopyTable \ + dbaccess/source/ui/misc/WCPage \ + dbaccess/source/ui/misc/WExtendPages \ + dbaccess/source/ui/misc/WNameMatch \ + dbaccess/source/ui/misc/WTypeSelect \ + dbaccess/source/ui/querydesign/ConnectionLine \ + dbaccess/source/ui/querydesign/ConnectionLineAccess \ + dbaccess/source/ui/querydesign/JAccess \ + dbaccess/source/ui/querydesign/JoinController \ + dbaccess/source/ui/querydesign/JoinDesignView \ + dbaccess/source/ui/querydesign/JoinExchange \ + dbaccess/source/ui/querydesign/JoinTableView \ + dbaccess/source/ui/querydesign/QTableConnection \ + dbaccess/source/ui/querydesign/QTableConnectionData \ + dbaccess/source/ui/querydesign/QTableWindow \ + dbaccess/source/ui/querydesign/QTableWindowData \ + dbaccess/source/ui/querydesign/querycontainerwindow \ + dbaccess/source/ui/querydesign/querycontroller \ + dbaccess/source/ui/querydesign/QueryDesignView \ + dbaccess/source/ui/querydesign/querydlg \ + dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct \ + dbaccess/source/ui/querydesign/QueryTabConnUndoAction \ + dbaccess/source/ui/querydesign/QueryTableView \ + dbaccess/source/ui/querydesign/QueryTabWinUndoAct \ + dbaccess/source/ui/querydesign/QueryTextView \ + dbaccess/source/ui/querydesign/queryview \ + dbaccess/source/ui/querydesign/QueryViewSwitch \ + dbaccess/source/ui/querydesign/SelectionBrowseBox \ + dbaccess/source/ui/querydesign/TableConnection \ + dbaccess/source/ui/querydesign/TableConnectionData \ + dbaccess/source/ui/querydesign/TableFieldDescription \ + dbaccess/source/ui/querydesign/TableWindow \ + dbaccess/source/ui/querydesign/TableWindowAccess \ + dbaccess/source/ui/querydesign/TableWindowData \ + dbaccess/source/ui/querydesign/TableWindowListBox \ + dbaccess/source/ui/querydesign/TableWindowTitle \ + dbaccess/source/ui/relationdesign/RelationController \ + dbaccess/source/ui/relationdesign/RelationDesignView \ + dbaccess/source/ui/relationdesign/RelationTableView \ + dbaccess/source/ui/relationdesign/RTableConnection \ + dbaccess/source/ui/relationdesign/RTableConnectionData \ + dbaccess/source/ui/tabledesign/FieldDescGenWin \ + dbaccess/source/ui/tabledesign/FieldDescriptions \ + dbaccess/source/ui/tabledesign/TableController \ + dbaccess/source/ui/tabledesign/TableDesignControl \ + dbaccess/source/ui/tabledesign/TableDesignHelpBar \ + dbaccess/source/ui/tabledesign/TableDesignView \ + dbaccess/source/ui/tabledesign/TableFieldControl \ + dbaccess/source/ui/tabledesign/TableFieldDescWin \ + dbaccess/source/ui/tabledesign/TableRow \ + dbaccess/source/ui/tabledesign/TableRowExchange \ + dbaccess/source/ui/tabledesign/TableUndo \ + dbaccess/source/ui/tabledesign/TEditControl \ + dbaccess/source/ui/uno/admindlg \ + dbaccess/source/ui/uno/AdvancedSettingsDlg \ + dbaccess/source/ui/uno/ColumnControl \ + dbaccess/source/ui/uno/ColumnModel \ + dbaccess/source/ui/uno/ColumnPeer \ + dbaccess/source/ui/uno/composerdialogs \ + dbaccess/source/ui/uno/dbinteraction \ + dbaccess/source/ui/uno/DBTypeWizDlg \ + dbaccess/source/ui/uno/DBTypeWizDlgSetup \ + dbaccess/source/ui/uno/TableFilterDlg \ + dbaccess/source/ui/uno/textconnectionsettings_uno \ + dbaccess/source/ui/uno/unoadmin \ + dbaccess/source/ui/uno/unoDirectSql \ + dbaccess/source/ui/uno/unosqlmessage \ + dbaccess/source/ui/uno/UserSettingsDlg \ +)) + +$(eval $(call gb_Library_add_noexception_objects,dbu,\ + dbaccess/source/shared/dbustrings \ + dbaccess/source/ui/control/ScrollHelper \ + dbaccess/source/ui/dlg/optionalboolitem \ + dbaccess/source/ui/querydesign/ConnectionLineData \ + dbaccess/source/ui/querydesign/TableFieldInfo \ +)) + +ifeq ($(GUI),WNT) +ifneq (,$(strip $(WINDOWS_VISTA_PSDK))) +ifeq (,$(strip $(PROF_EDITION))) +dbu_DISABLE_ADO := $(true) +endif +endif +ifneq ($(dbu_DISABLE_ADO),$(true)) +$(eval $(call gb_Library_add_noexception_objects,dbu,\ + dbaccess/source/ui/dlg/adodatalinks \ +)) +endif +endif + +# workaround for issue http://qa.openoffice.org/issues/show_bug.cgi?id=102305 Linux specific +ifeq ($(COM),GCC) +$(eval $(call gb_Library_add_cxxobjects,dbu,\ + dbaccess/source/ui/uno/copytablewizard \ + , $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_COMPILERNOOPTFLAGS) \ +)) +else +$(eval $(call gb_Library_add_exception_objects,dbu,\ + dbaccess/source/ui/uno/copytablewizard \ +)) +endif + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk new file mode 100644 index 000000000000..5ade815c1136 --- /dev/null +++ b/dbaccess/Library_sdbt.mk @@ -0,0 +1,67 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,sdbt)) + +$(eval $(call gb_Library_add_package_headers,sdbt,\ + dbaccess_inc \ +)) + +$(eval $(call gb_Library_add_precompiled_header,sdbt,$(SRCDIR)/dbaccess/inc/pch/precompiled_dbaccess)) + +$(eval $(call gb_Library_set_include,sdbt,\ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,sdbt,\ + comphelper \ + cppu \ + cppuhelper \ + dbtools \ + sal \ + tl \ + utl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_set_componentfile,sdbt,dbaccess/util/sdbt)) + +$(eval $(call gb_Library_add_exception_objects,sdbt,\ + dbaccess/source/sdbtools/connection/connectiontools \ + dbaccess/source/sdbtools/connection/datasourcemetadata \ + dbaccess/source/sdbtools/connection/objectnames \ + dbaccess/source/sdbtools/connection/tablename \ + dbaccess/source/sdbtools/misc/module_sdbt \ + dbaccess/source/sdbtools/misc/sdbt_services \ +)) + +$(eval $(call gb_Library_add_noexception_objects,sdbt,\ + dbaccess/source/shared/sdbtstrings \ +)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk index df8996cba3a0..741f1af9518c 100644 --- a/dbaccess/Module_dbaccess.mk +++ b/dbaccess/Module_dbaccess.mk @@ -27,8 +27,25 @@ $(eval $(call gb_Module_Module,dbaccess)) +$(eval $(call gb_Module_add_targets,dbaccess,\ + AllLangResTarget_adabasui \ + AllLangResTarget_dba \ + AllLangResTarget_dbmm \ + AllLangResTarget_dbu \ + $(if $(filter WNT,$(GUI)),Executable_odbcconfig) \ + Library_adabasui \ + Library_dba \ + Library_dbaxml \ + Library_dbmm \ + Library_dbu \ + Package_inc \ + Package_uiconfig \ +)) + $(eval $(call gb_Module_add_subsequentcheck_targets,dbaccess,\ JunitTest_dbaccess_unoapi \ )) +$(call $(gb_Library_get_target,dbu)) :| $(call $(gb_SrsTemplateTarget_get_target,dbaccess/dbu)) + # vim: set noet ts=4 sw=4: diff --git a/dbaccess/Package_inc.mk b/dbaccess/Package_inc.mk new file mode 100644 index 000000000000..b949a319932d --- /dev/null +++ b/dbaccess/Package_inc.mk @@ -0,0 +1,41 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,dbaccess_inc,$(SRCDIR)/dbaccess/inc)) + +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/AsyncronousLink.hxx,AsyncronousLink.hxx)) +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/controllerframe.hxx,controllerframe.hxx)) +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/dataview.hxx,dataview.hxx)) +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/dbaccessdllapi.h,dbaccessdllapi.h)) +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/dbaundomanager.hxx,dbaundomanager.hxx)) +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/dbsubcomponentcontroller.hxx,dbsubcomponentcontroller.hxx)) +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/genericcontroller.hxx,genericcontroller.hxx)) +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/IController.hxx,IController.hxx)) +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/IReference.hxx,IReference.hxx)) +$(eval $(call gb_Package_Package_add_file,dbaccess_inc,inc/dbaccess/ToolBoxHelper.hxx,ToolBoxHelper.hxx)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/Package_uiconfig.mk b/dbaccess/Package_uiconfig.mk new file mode 100644 index 000000000000..17a4b5235860 --- /dev/null +++ b/dbaccess/Package_uiconfig.mk @@ -0,0 +1,50 @@ +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# David Tardon, Red Hat Inc. +# Portions created by the Initial Developer are Copyright (C) 2010 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,dbaccess_uiconfig,$(SRCDIR)/dbaccess/uiconfig)) + +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/menubar/menubar.xml,dbapp/menubar/menubar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/statusbar/statusbar.xml,dbapp/statusbar/statusbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/formobjectbar.xml,dbapp/toolbar/formobjectbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/queryobjectbar.xml,dbapp/toolbar/queryobjectbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/reportobjectbar.xml,dbapp/toolbar/reportobjectbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/tableobjectbar.xml,dbapp/toolbar/tableobjectbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbapp/toolbar/toolbar.xml,dbapp/toolbar/toolbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbbrowser/menubar/compat.xml,dbbrowser/menubar/compat.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbbrowser/toolbar/toolbar.xml,dbbrowser/toolbar/toolbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/menubar/menubar.xml,dbquery/menubar/menubar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/designobjectbar.xml,dbquery/toolbar/designobjectbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/sqlobjectbar.xml,dbquery/toolbar/sqlobjectbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbquery/toolbar/toolbar.xml,dbquery/toolbar/toolbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbrelation/menubar/menubar.xml,dbrelation/menubar/menubar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbrelation/toolbar/toolbar.xml,dbrelation/toolbar/toolbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtable/menubar/menubar.xml,dbtable/menubar/menubar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtable/toolbar/toolbar.xml,dbtable/toolbar/toolbar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtdata/menubar/menubar.xml,dbtdata/menubar/menubar.xml)) +$(eval $(call gb_Package_Package_add_file,dbaccess_uiconfig,xml/uiconfig/modules/dbtdata/toolbar/toolbar.xml,dbtdata/toolbar/toolbar.xml)) + +# vim: set noet ts=4 sw=4: diff --git a/dbaccess/inc/makefile.mk b/dbaccess/inc/makefile.mk deleted file mode 100644 index 5aa9bfe11018..000000000000 --- a/dbaccess/inc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=dbaccess -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/dbaccess/prj/makefile.mk b/dbaccess/prj/makefile.mk new file mode 100755 index 000000000000..e312a7ccab65 --- /dev/null +++ b/dbaccess/prj/makefile.mk @@ -0,0 +1,40 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +PRJ=.. +TARGET=prj + +.INCLUDE : settings.mk + +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF + +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/dbaccess/source/core/api/makefile.mk b/dbaccess/source/core/api/makefile.mk deleted file mode 100644 index 8ceda2fdb75f..000000000000 --- a/dbaccess/source/core/api/makefile.mk +++ /dev/null @@ -1,82 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=api - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/dba.pmk - -# --- Files ------------------------------------- -SLOFILES= \ - $(SLO)$/querydescriptor.obj \ - $(SLO)$/FilteredContainer.obj \ - $(SLO)$/TableDeco.obj \ - $(SLO)$/RowSetCacheIterator.obj \ - $(SLO)$/RowSet.obj \ - $(SLO)$/column.obj \ - $(SLO)$/RowSetBase.obj \ - $(SLO)$/CRowSetDataColumn.obj \ - $(SLO)$/CRowSetColumn.obj \ - $(SLO)$/querycomposer.obj \ - $(SLO)$/CIndexes.obj \ - $(SLO)$/BookmarkSet.obj \ - $(SLO)$/KeySet.obj \ - $(SLO)$/StaticSet.obj \ - $(SLO)$/CacheSet.obj \ - $(SLO)$/RowSetCache.obj \ - $(SLO)$/definitioncolumn.obj \ - $(SLO)$/resultcolumn.obj \ - $(SLO)$/datacolumn.obj \ - $(SLO)$/resultset.obj \ - $(SLO)$/statement.obj \ - $(SLO)$/preparedstatement.obj \ - $(SLO)$/callablestatement.obj \ - $(SLO)$/query.obj \ - $(SLO)$/querycontainer.obj \ - $(SLO)$/table.obj \ - $(SLO)$/viewcontainer.obj \ - $(SLO)$/tablecontainer.obj \ - $(SLO)$/SingleSelectQueryComposer.obj \ - $(SLO)$/HelperCollections.obj \ - $(SLO)$/datasettings.obj \ - $(SLO)$/View.obj \ - $(SLO)$/WrappedResultSet.obj \ - $(SLO)$/OptimisticSet.obj \ - $(SLO)$/PrivateRow.obj \ - $(SLO)$/columnsettings.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/dbaccess/source/core/dataaccess/makefile.mk b/dbaccess/source/core/dataaccess/makefile.mk deleted file mode 100644 index e37544b70bf7..000000000000 --- a/dbaccess/source/core/dataaccess/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=dataaccess - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/dba.pmk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/SharedConnection.obj \ - $(SLO)$/ContentHelper.obj \ - $(SLO)$/bookmarkcontainer.obj \ - $(SLO)$/definitioncontainer.obj \ - $(SLO)$/commanddefinition.obj \ - $(SLO)$/documentcontainer.obj \ - $(SLO)$/commandcontainer.obj \ - $(SLO)$/documentdefinition.obj \ - $(SLO)$/ComponentDefinition.obj \ - $(SLO)$/databasecontext.obj \ - $(SLO)$/connection.obj \ - $(SLO)$/datasource.obj \ - $(SLO)$/databaseregistrations.obj \ - $(SLO)$/intercept.obj \ - $(SLO)$/myucp_datasupplier.obj \ - $(SLO)$/myucp_resultset.obj \ - $(SLO)$/databasedocument.obj \ - $(SLO)$/dataaccessdescriptor.obj\ - $(SLO)$/ModelImpl.obj \ - $(SLO)$/documentevents.obj \ - $(SLO)$/documenteventexecutor.obj \ - $(SLO)$/documenteventnotifier.obj \ - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/dbaccess/source/core/misc/makefile.mk b/dbaccess/source/core/misc/makefile.mk deleted file mode 100644 index 3f41bbf80fe8..000000000000 --- a/dbaccess/source/core/misc/makefile.mk +++ /dev/null @@ -1,60 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=misc - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/dba.pmk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/sdbcoretools.obj \ - $(SLO)$/services.obj \ - $(SLO)$/PropertyForward.obj \ - $(SLO)$/ContainerMediator.obj \ - $(SLO)$/userinformation.obj \ - $(SLO)$/ContainerListener.obj \ - $(SLO)$/objectnameapproval.obj \ - $(SLO)$/DatabaseDataProvider.obj \ - $(SLO)$/module_dba.obj \ - $(SLO)$/dsntypes.obj \ - $(SLO)$/veto.obj \ - $(SLO)$/apitools.obj \ - $(SLO)$/dbastrings.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/dbaccess/source/core/recovery/makefile.mk b/dbaccess/source/core/recovery/makefile.mk deleted file mode 100644 index e92af230894a..000000000000 --- a/dbaccess/source/core/recovery/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2008 by Sun Microsystems, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=recovery - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/dba.pmk - -# --- Files ------------------------------------- - -SLOFILES= \ - $(SLO)$/dbdocrecovery.obj \ - $(SLO)$/subcomponentloader.obj \ - $(SLO)$/storagestream.obj \ - $(SLO)$/storagexmlstream.obj \ - $(SLO)$/storagetextstream.obj \ - $(SLO)$/subcomponentrecovery.obj \ - $(SLO)$/settingsimport.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/dbaccess/source/core/resource/makefile.mk b/dbaccess/source/core/resource/makefile.mk deleted file mode 100644 index 35a54c6cccdb..000000000000 --- a/dbaccess/source/core/resource/makefile.mk +++ /dev/null @@ -1,51 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=core_resource - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/dba.pmk - -# --- Files -------------------------------------------------------- - -SRS1NAME=core_strings -SRC1FILES= \ - strings.src \ - -EXCEPTIONSFILES= \ - $(SLO)$/core_resource.obj - -SLOFILES= $(EXCEPTIONSFILES) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/dbaccess/source/ext/adabas/makefile.mk b/dbaccess/source/ext/adabas/makefile.mk deleted file mode 100644 index 8dbbe7abc3ff..000000000000 --- a/dbaccess/source/ext/adabas/makefile.mk +++ /dev/null @@ -1,100 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=dbaccess -TARGET=adabasui -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ---------------------------------- -.INCLUDE : settings.mk - -# --- resource ----------------------------------------------------- -SRS1NAME=$(TARGET) -SRC1FILES = \ - AdabasNewDb.src - -# --- defines ------------------------------------------------------ -CDEFS+=-DCOMPMOD_NAMESPACE=adabasui - -# --- Files ------------------------------------- -SLOFILES=\ - $(SLO)$/ASqlNameEdit.obj \ - $(SLO)$/AdabasNewDb.obj \ - $(SLO)$/ANewDb.obj \ - $(SLO)$/adabasuistrings.obj \ - $(SLO)$/Aservices.obj \ - $(SLO)$/Acomponentmodule.obj - -# --- Library ----------------------------------- -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS=\ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(DBTOOLSLIB) \ - $(UNOTOOLSLIB) \ - $(SVTOOLLIB) \ - $(TOOLSLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(UCBHELPERLIB) \ - $(SFXLIB) \ - $(TKLIB) \ - $(COMPHELPERLIB) - -SHL1IMPLIB=i$(SHL1TARGET) - -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(SLB)$/$(TARGET).lib -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=$(TARGET).dxp -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -# --- .res file ---------------------------------------------------------- -RES1FILELIST=\ - $(SRS)$/$(SRS1NAME).srs - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES=$(RES1FILELIST) - - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/adabasui.component - -$(MISC)/adabasui.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - adabasui.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt adabasui.component diff --git a/dbaccess/source/ext/macromigration/makefile.mk b/dbaccess/source/ext/macromigration/makefile.mk deleted file mode 100644 index b71330f17ef5..000000000000 --- a/dbaccess/source/ext/macromigration/makefile.mk +++ /dev/null @@ -1,109 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=dbmm -USE_DEFFILE=TRUE - -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -# ... resource files ............................ - -SRS1NAME=$(TARGET) -SRC1FILES = \ - macromigration.src - -# ... object files ............................ -SLOFILES= $(SLO)$/macromigrationwizard.obj \ - $(SLO)$/macromigrationdialog.obj \ - $(SLO)$/macromigrationpages.obj \ - $(SLO)$/dbmm_module.obj \ - $(SLO)$/dbmm_services.obj \ - $(SLO)$/migrationengine.obj \ - $(SLO)$/docinteraction.obj \ - $(SLO)$/progresscapture.obj \ - $(SLO)$/progressmixer.obj \ - $(SLO)$/migrationlog.obj \ - $(SLO)$/dbmm_types.obj \ - -# --- library ----------------------------------- - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(SALLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(VCLLIB) \ - $(SVXCORELIB) \ - $(SVXLIB) \ - $(UCBHELPERLIB) \ - $(XMLSCRIPTLIB) - -SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1IMPLIB= i$(TARGET) -SHL1DEPN= $(SHL1LIBS) -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME= $(SHL1TARGET) - -# --- .res files ------------------------------- - -RES1FILELIST=\ - $(SRS)$/$(TARGET).srs - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES=$(RES1FILELIST) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/dbmm.component - -$(MISC)/dbmm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - dbmm.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt dbmm.component diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk deleted file mode 100644 index 33ff074b8012..000000000000 --- a/dbaccess/source/filter/xml/makefile.mk +++ /dev/null @@ -1,121 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=dbaxml - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= $(SLO)$/xmlfilter.obj \ - $(SLO)$/dbloader2.obj \ - $(SLO)$/xmlDatabase.obj \ - $(SLO)$/xmlDataSource.obj \ - $(SLO)$/xmlTableFilterPattern.obj \ - $(SLO)$/xmlTableFilterList.obj \ - $(SLO)$/xmlDataSourceInfo.obj \ - $(SLO)$/xmlDataSourceSetting.obj \ - $(SLO)$/xmlDataSourceSettings.obj \ - $(SLO)$/xmlDocuments.obj \ - $(SLO)$/xmlComponent.obj \ - $(SLO)$/xmlHierarchyCollection.obj \ - $(SLO)$/xmlLogin.obj \ - $(SLO)$/xmlExport.obj \ - $(SLO)$/xmlQuery.obj \ - $(SLO)$/xmlTable.obj \ - $(SLO)$/xmlColumn.obj \ - $(SLO)$/xmlStyleImport.obj \ - $(SLO)$/xmlHelper.obj \ - $(SLO)$/xmlAutoStyle.obj \ - $(SLO)$/xmlConnectionData.obj \ - $(SLO)$/xmlDatabaseDescription.obj \ - $(SLO)$/xmlFileBasedDatabase.obj \ - $(SLO)$/xmlServerDatabase.obj \ - $(SLO)$/xmlConnectionResource.obj \ - $(SLO)$/xmlservices.obj - -# --- Library ----------------------------------- -LIB1TARGET=$(SLB)$/dba_flt.lib -LIB1FILES=\ - $(SLB)$/fltshared.lib \ - $(SLB)$/$(TARGET).lib - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS=\ - $(XMLOFFLIB) \ - $(VCLLIB) \ - $(TOOLSLIB) \ - $(TKLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SFXLIB) \ - $(SVLLIB) \ - $(DBTOOLSLIB) \ - $(UNOTOOLSLIB) \ - $(SO2LIB) \ - $(SALLIB) - -.IF "$(GUI)"=="OS2" -SHL1STDLIBS+= \ - idba.lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL1STDLIBS+= \ - -ldba$(DLLPOSTFIX) -.ELSE -SHL1STDLIBS+= \ - idba.lib -.ENDIF - - -SHL1DEPN= -SHL1LIBS=$(LIB1TARGET) -SHL1IMPLIB= i$(SHL1TARGET) -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/dbaxml.component - -$(MISC)/dbaxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - dbaxml.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt dbaxml.component diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index a70c1d9c4981..446930872ce0 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -69,7 +69,7 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml() //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** ) @@ -79,7 +79,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/source/sdbtools/connection/makefile.mk b/dbaccess/source/sdbtools/connection/makefile.mk deleted file mode 100644 index f8d43df01426..000000000000 --- a/dbaccess/source/sdbtools/connection/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=conntools - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- -SLOFILES= \ - $(SLO)$/connectiontools.obj \ - $(SLO)$/tablename.obj \ - $(SLO)$/objectnames.obj \ - $(SLO)$/datasourcemetadata.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/dbaccess/source/sdbtools/misc/makefile.mk b/dbaccess/source/sdbtools/misc/makefile.mk deleted file mode 100644 index 8c51fc7a8363..000000000000 --- a/dbaccess/source/sdbtools/misc/makefile.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=sdbtmisc - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- -SLOFILES= \ - $(SLO)$/sdbt_services.obj \ - $(SLO)$/module_sdbt.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index cc0847be8d60..3bef9a0b26b4 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -55,7 +55,7 @@ extern "C" void SAL_CALL sdbt_initializeModule() //--------------------------------------------------------------------------------------- -extern "C" void SAL_CALL component_getImplementationEnvironment( +extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char **ppEnvTypeName, uno_Environment ** ) @@ -65,7 +65,7 @@ extern "C" void SAL_CALL component_getImplementationEnvironment( } //--------------------------------------------------------------------------------------- -extern "C" void* SAL_CALL component_getFactory( +extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /*pRegistryKey*/) diff --git a/dbaccess/source/sdbtools/resource/makefile.mk b/dbaccess/source/sdbtools/resource/makefile.mk deleted file mode 100644 index 9b55104c983d..000000000000 --- a/dbaccess/source/sdbtools/resource/makefile.mk +++ /dev/null @@ -1,45 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=sdbt_resource - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=sdbt_strings -SRC1FILES= \ - sdbt_strings.src \ - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/dbaccess/source/shared/makefile.mk b/dbaccess/source/shared/makefile.mk deleted file mode 100644 index 7906623eb327..000000000000 --- a/dbaccess/source/shared/makefile.mk +++ /dev/null @@ -1,67 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -LIBTARGET=NO -TARGET=shared -LIB1TARGET=$(SLB)$/dbushared.lib -LIB2TARGET=$(SLB)$/fltshared.lib -LIB4TARGET=$(SLB)$/sdbtshared.lib - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Types ------------------------------------- - -# --- Files ------------------------------------- -EXCEPTIONSFILES= \ - $(SLO)$/dbu_reghelper.obj \ - $(SLO)$/flt_reghelper.obj - -SLOFILES= \ - $(EXCEPTIONSFILES) \ - $(SLO)$/xmlstrings.obj \ - $(SLO)$/dbustrings.obj - -LIB1OBJFILES= \ - $(SLO)$/dbu_reghelper.obj \ - $(SLO)$/dbustrings.obj - -LIB2OBJFILES= \ - $(SLO)$/flt_reghelper.obj \ - $(SLO)$/xmlstrings.obj - -LIB4OBJFILES= \ - $(SLO)$/sdbtstrings.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/dbaccess/source/ui/app/makefile.mk b/dbaccess/source/ui/app/makefile.mk deleted file mode 100644 index 658456f4135b..000000000000 --- a/dbaccess/source/ui/app/makefile.mk +++ /dev/null @@ -1,69 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=app - -# BMP_IN=$(PRJ)$/res - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk -# IMGLST_SRS=$(SRS)$/$(TARGET).srs -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES=\ - $(SLO)$/AppController.obj \ - $(SLO)$/AppControllerDnD.obj \ - $(SLO)$/AppControllerGen.obj \ - $(SLO)$/AppDetailPageHelper.obj \ - $(SLO)$/AppDetailView.obj \ - $(SLO)$/AppIconControl.obj \ - $(SLO)$/AppSwapWindow.obj \ - $(SLO)$/AppTitleWindow.obj \ - $(SLO)$/AppView.obj \ - $(SLO)$/subcomponentmanager.obj - - -SLOFILES =\ - $(EXCEPTIONSFILES) - -SRS1NAME=$(TARGET) -SRC1FILES = app.src - - -# --- Targets ------------------------------------------------------- - - -.INCLUDE : target.mk - -$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc - - diff --git a/dbaccess/source/ui/browser/makefile.mk b/dbaccess/source/ui/browser/makefile.mk deleted file mode 100644 index 4d0cbc8f8517..000000000000 --- a/dbaccess/source/ui/browser/makefile.mk +++ /dev/null @@ -1,71 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=browser - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES=\ - $(SLO)$/AsyncronousLink.obj \ - $(SLO)$/brwctrlr.obj \ - $(SLO)$/brwview.obj \ - $(SLO)$/dataview.obj \ - $(SLO)$/dbexchange.obj \ - $(SLO)$/dbloader.obj \ - $(SLO)$/dbtreemodel.obj \ - $(SLO)$/dbtreeview.obj \ - $(SLO)$/dsEntriesNoExp.obj \ - $(SLO)$/dsbrowserDnD.obj \ - $(SLO)$/exsrcbrw.obj \ - $(SLO)$/formadapter.obj \ - $(SLO)$/genericcontroller.obj \ - $(SLO)$/sbagrid.obj \ - $(SLO)$/sbamultiplex.obj \ - $(SLO)$/unodatbr.obj - -SLOFILES =\ - $(EXCEPTIONSFILES) - -SRS1NAME=$(TARGET) -SRC1FILES = sbabrw.src \ - sbagrid.src - -# --- Targets ------------------------------------------------------- - - -.INCLUDE : target.mk - -$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc - - diff --git a/dbaccess/source/ui/control/makefile.mk b/dbaccess/source/ui/control/makefile.mk deleted file mode 100644 index 913a4752e544..000000000000 --- a/dbaccess/source/ui/control/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=uicontrols - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files ------------------------------------- - -# ... resource files ............................ - -SRS1NAME=$(TARGET) -SRC1FILES = \ - TableGrantCtrl.src \ - undosqledit.src \ - tabletree.src - -# ... exception files ......................... - -EXCEPTIONSFILES=\ - $(SLO)$/ColumnControlWindow.obj \ - $(SLO)$/FieldDescControl.obj \ - $(SLO)$/RelationControl.obj \ - $(SLO)$/SqlNameEdit.obj \ - $(SLO)$/TableGrantCtrl.obj \ - $(SLO)$/VertSplitView.obj \ - $(SLO)$/charsetlistbox.obj \ - $(SLO)$/curledit.obj \ - $(SLO)$/dbtreelistbox.obj \ - $(SLO)$/listviewitems.obj \ - $(SLO)$/marktree.obj \ - $(SLO)$/opendoccontrols.obj \ - $(SLO)$/sqledit.obj \ - $(SLO)$/statusbarontroller.obj \ - $(SLO)$/tabletree.obj \ - $(SLO)$/toolboxcontroller.obj \ - $(SLO)$/undosqledit.obj - -# ... object files ............................ - -SLOFILES= \ - $(EXCEPTIONSFILES) \ - $(SLO)$/ScrollHelper.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/dbaccess/source/ui/dlg/makefile.mk b/dbaccess/source/ui/dlg/makefile.mk deleted file mode 100644 index 8fa615d28a52..000000000000 --- a/dbaccess/source/ui/dlg/makefile.mk +++ /dev/null @@ -1,154 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=uidlg - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -.IF "$(SYSTEM_ODBC_HEADERS)" == "YES" -CFLAGS+=-DSYSTEM_ODBC_HEADERS -.ENDIF - -.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" -CDEFS+=-DWINDOWS_VISTA_PSDK -.ENDIF - -.IF "$(GUI)$(COM)"=="WNTGCC" # for adoint.h -CFLAGS+=-fpermissive -.ENDIF - -# --- Files ------------------------------------- - -# ... resource files ............................ - - -LOCALIZE_ME=AutoControls_tmpl.hrc - -SRS1NAME=$(TARGET) -SRC1FILES = \ - AutoControls.src \ - ConnectionPage.src \ - UserAdmin.src \ - admincontrols.src \ - directsql.src \ - AdabasStat.src \ - indexdialog.src \ - RelationDlg.src \ - adtabdlg.src \ - dlgsave.src \ - queryorder.src \ - queryfilter.src \ - paramdialog.src \ - dsselect.src \ - dbadmin.src \ - dbadmin2.src \ - dbadminsetup.src \ - dbfindex.src \ - dlgsize.src \ - CollectionView.src \ - dlgattr.src \ - advancedsettings.src\ - UserAdminDlg.src \ - sqlmessage.src \ - textconnectionsettings.src - - -# ... object files ............................ -EXCEPTIONSFILES= \ - $(SLO)$/AdabasStat.obj \ - $(SLO)$/CollectionView.obj \ - $(SLO)$/ConnectionHelper.obj \ - $(SLO)$/ConnectionPage.obj \ - $(SLO)$/ConnectionPageSetup.obj \ - $(SLO)$/DBSetupConnectionPages.obj \ - $(SLO)$/DbAdminImpl.obj \ - $(SLO)$/DriverSettings.obj \ - $(SLO)$/RelationDlg.obj \ - $(SLO)$/TablesSingleDlg.obj \ - $(SLO)$/TextConnectionHelper.obj \ - $(SLO)$/UserAdmin.obj \ - $(SLO)$/UserAdminDlg.obj \ - $(SLO)$/admincontrols.obj \ - $(SLO)$/adminpages.obj \ - $(SLO)$/adtabdlg.obj \ - $(SLO)$/advancedsettings.obj \ - $(SLO)$/dbadmin.obj \ - $(SLO)$/dbfindex.obj \ - $(SLO)$/dbwiz.obj \ - $(SLO)$/dbwizsetup.obj \ - $(SLO)$/detailpages.obj \ - $(SLO)$/directsql.obj \ - $(SLO)$/dlgattr.obj \ - $(SLO)$/dlgsave.obj \ - $(SLO)$/dlgsize.obj \ - $(SLO)$/dsselect.obj \ - $(SLO)$/finteraction.obj \ - $(SLO)$/generalpage.obj \ - $(SLO)$/indexdialog.obj \ - $(SLO)$/indexfieldscontrol.obj \ - $(SLO)$/odbcconfig.obj \ - $(SLO)$/paramdialog.obj \ - $(SLO)$/queryfilter.obj \ - $(SLO)$/queryorder.obj \ - $(SLO)$/sqlmessage.obj \ - $(SLO)$/tablespage.obj \ - $(SLO)$/textconnectionsettings.obj - -SLOFILES= \ - $(EXCEPTIONSFILES) \ - $(SLO)$/optionalboolitem.obj - -.IF "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" -DISABLE_ADO=TRUE -.ENDIF # "$(WINDOWS_VISTA_PSDK)"!="" && "$(PROF_EDITION)"=="" - -.IF "$(GUI)"=="WNT" && "$(DISABLE_ADO)"=="" -SLOFILES+= $(SLO)$/adodatalinks.obj -.ENDIF - -# --- Targets ---------------------------------- -.INCLUDE : target.mk - -$(SLO)$/ConnectionHelper.obj : $(LOCALIZE_ME_DEST) - -$(SLO)$/ConnectionPageSetup.obj : $(LOCALIZE_ME_DEST) - -$(SLO)$/DBSetupConnectionPages.obj : $(LOCALIZE_ME_DEST) - -$(SLO)$/TextConnectionHelper.obj : $(LOCALIZE_ME_DEST) - -$(SLO)$/detailpages.obj : $(LOCALIZE_ME_DEST) - -$(SLO)$/tablespage.obj : $(LOCALIZE_ME_DEST) - -$(SLO)$/ConnectionPage.obj : $(LOCALIZE_ME_DEST) diff --git a/dbaccess/source/ui/imagelists/makefile.mk b/dbaccess/source/ui/imagelists/makefile.mk deleted file mode 100644 index 3620f6329889..000000000000 --- a/dbaccess/source/ui/imagelists/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJNAME=dbaccess -TARGET=uiimglst - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk -IMGLST_SRS=$(SRS)$/$(TARGET).srs -# --- Files ------------------------------------- - -# ... resource files ............................ - -SRS1NAME=$(TARGET) -SRC1FILES=dbimagelists.src - -# ... object files ............................ -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - - diff --git a/dbaccess/source/ui/inc/makefile.mk b/dbaccess/source/ui/inc/makefile.mk deleted file mode 100644 index 5e1454d57f61..000000000000 --- a/dbaccess/source/ui/inc/makefile.mk +++ /dev/null @@ -1,43 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=dbaccess -TARGET=dba_uiinc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -LOCALIZE_ME=toolbox_tmpl.hrc - -.INCLUDE : target.mk - diff --git a/dbaccess/source/ui/misc/makefile.mk b/dbaccess/source/ui/misc/makefile.mk deleted file mode 100644 index 534d90e3995c..000000000000 --- a/dbaccess/source/ui/misc/makefile.mk +++ /dev/null @@ -1,88 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=../../.. -PRJINC=$(PRJ)/source -PRJNAME=dbaccess -TARGET=uimisc - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)/util/makefile.pmk - -# --- Files ------------------------------------- - -# ... resource files ............................ - -SRS1NAME=$(TARGET) -SRC1FILES = \ - dbumiscres.src \ - WizardPages.src - -# ... object files ............................ - -SLOFILES= \ - $(SLO)/asyncmodaldialog.obj \ - $(SLO)/imageprovider.obj \ - $(SLO)/singledoccontroller.obj \ - $(SLO)/dbsubcomponentcontroller.obj \ - $(SLO)/datasourceconnector.obj \ - $(SLO)/linkeddocuments.obj \ - $(SLO)/indexcollection.obj \ - $(SLO)/UITools.obj \ - $(SLO)/WCPage.obj \ - $(SLO)/WCopyTable.obj \ - $(SLO)/WTypeSelect.obj \ - $(SLO)/TokenWriter.obj \ - $(SLO)/HtmlReader.obj \ - $(SLO)/RtfReader.obj \ - $(SLO)/propertysetitem.obj \ - $(SLO)/databaseobjectview.obj \ - $(SLO)/DExport.obj \ - $(SLO)/uiservices.obj \ - $(SLO)/RowSetDrop.obj \ - $(SLO)/TableCopyHelper.obj \ - $(SLO)/moduledbu.obj \ - $(SLO)/WColumnSelect.obj \ - $(SLO)/WExtendPages.obj \ - $(SLO)/WNameMatch.obj \ - $(SLO)/ToolBoxHelper.obj \ - $(SLO)/stringlistitem.obj \ - $(SLO)/charsets.obj \ - $(SLO)/defaultobjectnamecheck.obj \ - $(SLO)/dsmeta.obj \ - $(SLO)/controllerframe.obj \ - $(SLO)/propertystorage.obj \ - $(SLO)/dbaundomanager.obj \ - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - diff --git a/dbaccess/source/ui/querydesign/makefile.mk b/dbaccess/source/ui/querydesign/makefile.mk deleted file mode 100644 index a4a39c36a79c..000000000000 --- a/dbaccess/source/ui/querydesign/makefile.mk +++ /dev/null @@ -1,89 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=querydesign - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -EXCEPTIONSFILES =\ - $(SLO)$/ConnectionLine.obj \ - $(SLO)$/ConnectionLineAccess.obj \ - $(SLO)$/JAccess.obj \ - $(SLO)$/JoinController.obj \ - $(SLO)$/JoinDesignView.obj \ - $(SLO)$/JoinExchange.obj \ - $(SLO)$/JoinTableView.obj \ - $(SLO)$/QTableConnection.obj \ - $(SLO)$/QTableConnectionData.obj \ - $(SLO)$/QTableWindow.obj \ - $(SLO)$/QTableWindowData.obj \ - $(SLO)$/QueryDesignView.obj \ - $(SLO)$/QueryMoveTabWinUndoAct.obj \ - $(SLO)$/QueryTabConnUndoAction.obj \ - $(SLO)$/QueryTabWinUndoAct.obj \ - $(SLO)$/QueryTableView.obj \ - $(SLO)$/QueryTextView.obj \ - $(SLO)$/QueryViewSwitch.obj \ - $(SLO)$/SelectionBrowseBox.obj \ - $(SLO)$/TableConnection.obj \ - $(SLO)$/TableConnectionData.obj \ - $(SLO)$/TableFieldDescription.obj \ - $(SLO)$/TableWindow.obj \ - $(SLO)$/TableWindowAccess.obj \ - $(SLO)$/TableWindowData.obj \ - $(SLO)$/TableWindowListBox.obj \ - $(SLO)$/TableWindowTitle.obj \ - $(SLO)$/querycontainerwindow.obj \ - $(SLO)$/querycontroller.obj \ - $(SLO)$/querydlg.obj \ - $(SLO)$/queryview.obj - -SLOFILES =\ - $(EXCEPTIONSFILES) \ - $(SLO)$/ConnectionLineData.obj \ - $(SLO)$/TableFieldInfo.obj - -SRS1NAME=$(TARGET) -SRC1FILES = query.src \ - querydlg.src \ - -# --- Targets ------------------------------------------------------- - - -.INCLUDE : target.mk - -$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc - - diff --git a/dbaccess/source/ui/relationdesign/makefile.mk b/dbaccess/source/ui/relationdesign/makefile.mk deleted file mode 100644 index cdaaa8722013..000000000000 --- a/dbaccess/source/ui/relationdesign/makefile.mk +++ /dev/null @@ -1,58 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=relationdesign - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/RTableConnection.obj \ - $(SLO)$/RTableConnectionData.obj \ - $(SLO)$/RelationTableView.obj \ - $(SLO)$/RelationDesignView.obj \ - $(SLO)$/RelationController.obj - -SRS1NAME=$(TARGET) -SRC1FILES = relation.src - -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc - - diff --git a/dbaccess/source/ui/tabledesign/makefile.mk b/dbaccess/source/ui/tabledesign/makefile.mk deleted file mode 100644 index 5e52041ecd29..000000000000 --- a/dbaccess/source/ui/tabledesign/makefile.mk +++ /dev/null @@ -1,65 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=tabledesign - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files -------------------------------------------------------- - -SLOFILES =\ - $(SLO)$/TableDesignControl.obj \ - $(SLO)$/TableFieldDescWin.obj \ - $(SLO)$/TableController.obj \ - $(SLO)$/TableDesignView.obj \ - $(SLO)$/TEditControl.obj \ - $(SLO)$/TableFieldControl.obj \ - $(SLO)$/TableDesignHelpBar.obj \ - $(SLO)$/FieldDescGenWin.obj \ - $(SLO)$/FieldDescriptions.obj \ - $(SLO)$/TableRow.obj \ - $(SLO)$/TableRowExchange.obj \ - $(SLO)$/TableUndo.obj - - -SRS1NAME=$(TARGET) -SRC1FILES = table.src - -# --- Targets ------------------------------------------------------- - - -.INCLUDE : target.mk - -$(SRS)$/$(TARGET).srs: $(SOLARINCDIR)$/svx$/globlmn.hrc diff --git a/dbaccess/source/ui/uno/makefile.mk b/dbaccess/source/ui/uno/makefile.mk deleted file mode 100644 index 987e67241d43..000000000000 --- a/dbaccess/source/ui/uno/makefile.mk +++ /dev/null @@ -1,76 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************ - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=uiuno - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Files ------------------------------------- - -# ... resource files ............................ - -SRS1NAME=$(TARGET) -SRC1FILES = \ - dbinteraction.src \ - copytablewizard.src - -# ... object files ............................ -# workaround for issue http://qa.openoffice.org/issues/show_bug.cgi?id=102305 Linux specific -.IF "$(COM)" == "GCC" -NOOPTFILES=\ - $(SLO)$/copytablewizard.obj -.ENDIF - -SLOFILES= \ - $(SLO)$/copytablewizard.obj \ - $(SLO)$/composerdialogs.obj \ - $(SLO)$/unosqlmessage.obj \ - $(SLO)$/unoadmin.obj \ - $(SLO)$/admindlg.obj \ - $(SLO)$/TableFilterDlg.obj \ - $(SLO)$/AdvancedSettingsDlg.obj \ - $(SLO)$/unoDirectSql.obj \ - $(SLO)$/DBTypeWizDlg.obj \ - $(SLO)$/DBTypeWizDlgSetup.obj \ - $(SLO)$/UserSettingsDlg.obj \ - $(SLO)$/ColumnModel.obj \ - $(SLO)$/ColumnControl.obj \ - $(SLO)$/ColumnPeer.obj \ - $(SLO)$/dbinteraction.obj \ - $(SLO)$/textconnectionsettings_uno.obj - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk deleted file mode 100644 index 3202f0ba5fa0..000000000000 --- a/dbaccess/util/makefile.mk +++ /dev/null @@ -1,262 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. -PRJNAME=dbaccess -TARGET=dba -TARGET2=dbu -TARGET3=sdbt -USE_DEFFILE=TRUE -GEN_HID=TRUE -GEN_HID_OTHER=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -LDUMP=ldump2.exe - -# --- database core (dba) ----------------------------------- -.IF "$(L10N_framework)"=="" -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1FILES=\ - $(SLB)$/api.lib \ - $(SLB)$/dataaccess.lib \ - $(SLB)$/recovery.lib \ - $(SLB)$/misc.lib \ - $(SLB)$/core_resource.lib - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS= \ - $(SVTOOLLIB) \ - $(VCLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(DBTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(UCBHELPERLIB) \ - $(SVLLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SFXLIB) \ - $(BASICLIB) \ - $(FWELIB) \ - $(SALHELPERLIB) \ - $(XMLOFFLIB) - -SHL1DEPN= -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(LIB1TARGET) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) -DEFLIB1NAME=$(TARGET) -DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt \ - $(SLB)$/$(TARGET).lib -SHL1USE_EXPORTS=name - -.ENDIF -# --- .res file ---------------------------------------------------------- - -RES1FILELIST=\ - $(SRS)$/core_strings.srs - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES=$(RES1FILELIST) - -# --- database ui (dbu) ----------------------------------- -.IF "$(L10N_framework)"=="" - -LIB2TARGET=$(SLB)$/$(TARGET2).lib -LIB2FILES=\ - $(SLB)$/relationdesign.lib \ - $(SLB)$/tabledesign.lib \ - $(SLB)$/querydesign.lib \ - $(SLB)$/uimisc.lib \ - $(SLB)$/uidlg.lib \ - $(SLB)$/dbushared.lib \ - $(SLB)$/browser.lib \ - $(SLB)$/uiuno.lib \ - $(SLB)$/app.lib \ - $(SLB)$/uicontrols.lib - -SHL2TARGET=$(TARGET2)$(DLLPOSTFIX) - -SHL2STDLIBS= \ - $(SVXCORELIB) \ - $(SVXLIB) \ - $(SFXLIB) \ - $(SVTOOLLIB) \ - $(FWELIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(DBTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SO2LIB) \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(EDITENGLIB) - -.IF "$(GUI)"=="OS2" -SHL2STDLIBS+= $(LB)$/i$(TARGET).lib -SHL2DEPN=$(LB)$/i$(TARGET).lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL2STDLIBS+= \ - -l$(TARGET)$(DLLPOSTFIX) -SHL2DEPN=$(SHL1TARGETN) -.ELSE -SHL2STDLIBS+= \ - $(LB)$/i$(TARGET).lib -SHL2DEPN=$(LB)$/i$(TARGET).lib -.ENDIF - -SHL2IMPLIB=i$(TARGET2) -SHL2LIBS=$(LIB2TARGET) -SHL2DEF=$(MISC)$/$(SHL2TARGET).def -DEF2NAME=$(SHL2TARGET) -DEFLIB2NAME=$(TARGET2) -DEF2DEPN= $(MISC)$/$(SHL2TARGET).flt \ - $(SLB)$/$(TARGET2).lib -SHL2USE_EXPORTS=name - -ALL: \ - $(LIB1TARGET) \ - $(LIB2TARGET) \ - ALLTAR - -.ENDIF -# --- .res file ---------------------------------------------------------- - -RES2FILELIST=\ - $(SRS)$/uidlg.srs \ - $(SRS)$/app.srs \ - $(SRS)$/uicontrols.srs \ - $(SRS)$/browser.srs \ - $(SRS)$/uiuno.srs \ - $(SRS)$/querydesign.srs \ - $(SRS)$/tabledesign.srs \ - $(SRS)$/relationdesign.srs \ - $(SRS)$/uiimglst.srs \ - $(SRS)$/uimisc.srs - -.IF "$(GUI)"=="WNT" -#needed by $(SLO)$/adodatalinks.obj -SHL2STDLIBS+= $(OLE32LIB) \ - $(OLEAUT32LIB) \ - $(UUIDLIB) -.ENDIF - -RESLIB2NAME=$(TARGET2) -RESLIB2IMAGES=$(PRJ)$/res -RESLIB2SRSFILES=$(RES2FILELIST) - -# --- database tools (sdbt) ----------------------------------- -.IF "$(L10N_framework)"=="" -LIB3TARGET=$(SLB)$/$(TARGET3).lib -LIB3FILES=\ - $(SLB)$/conntools.lib \ - $(SLB)$/sdbtmisc.lib \ - $(SLB)$/sdbtshared.lib - -SHL3TARGET=$(TARGET3)$(DLLPOSTFIX) - -SHL3STDLIBS= \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(COMPHELPERLIB) \ - $(TOOLSLIB) \ - $(DBTOOLSLIB) \ - $(SALLIB) - -SHL3LIBS=$(LIB3TARGET) -SHL3DEF=$(MISC)$/$(SHL3TARGET).def -DEF3NAME=$(SHL3TARGET) -SHL3VERSIONMAP=$(SOLARENV)/src/component.map - -.END - -# --- .res file ---------------------------------------------------------- - -RES3FILELIST=\ - $(SRS)$/sdbt_strings.srs - -RESLIB3NAME=$(TARGET3) -RESLIB3IMAGES=$(PRJ)$/res -RESLIB3SRSFILES=$(RES3FILELIST) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk -.IF "$(depend)"=="" - -.IF "$(L10N_framework)"=="" - -$(MISC)$/$(SHL2TARGET).flt: makefile.mk - @echo ------------------------------ - @echo CLEAR_THE_FILE > $@ - @echo _TI >>$@ - @echo _real >>$@ - -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo CLEAR_THE_FILE > $@ - @echo _TI >>$@ - @echo _real >>$@ -.ENDIF - -.ENDIF - -ALLTAR : $(MISC)/dba.component $(MISC)/dbu.component $(MISC)/sdbt.component - -$(MISC)/dba.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - dba.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt dba.component - -$(MISC)/dbu.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - dbu.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt dbu.component - -$(MISC)/sdbt.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - sdbt.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL3TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt sdbt.component diff --git a/dbaccess/win32/source/odbcconfig/makefile.mk b/dbaccess/win32/source/odbcconfig/makefile.mk deleted file mode 100644 index 72d81e39541f..000000000000 --- a/dbaccess/win32/source/odbcconfig/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=dbaccess -TARGET=odbcconfig -LIBTARGET=NO -TARGETTYPE=GUI - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -OBJFILES= \ - $(OBJ)$/odbcconfig.obj - -# SQLManageDataSources wrapper -APP1TARGET=$(TARGET) -APP1NOSAL=TRUE -APP1OBJS = \ - $(OBJ)$/odbcconfig.obj - -# --- Targets ------------------------------------------------------ - - -.INCLUDE : target.mk - -- cgit v1.2.3