summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:03:11 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:03:11 +0200
commit3b74383b37a9504e632a4dfeb9929941c1febd87 (patch)
tree960b32cda2755f988d0d34e568f1019ad2bce0d2
parentaa20084bd041208841d5ad3ca50b1e963eb5986e (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit a62bc9e4ff6f4ec47300a12ab30e4a6beea0ba85 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:41 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 8bce2b8399c917989cf9072c61947b9854c4d353 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:20 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 7351e5dc8e24e51af5af5c17798f26e00626711c Author: Lionel Elie Mamane <lionel@mamane.lu> Date: Sat Jan 15 05:39:40 2011 +0100 i#116187: report left/right page margin setting ignored on Unix 64 bit (cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a) reportdesign/source/ui/report/ReportController.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit aa3b692805e5581d6f770f5a59b3563423dd3f9d Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:24:43 2011 -0500 Remove the Registration... menu item which we don't want. (fdo#33112) dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit e97e6fd2a34584fbf1c974e6663f7e2b06a83d49 Author: Noel Power <noel.power@novell.com> Date: Wed Jan 12 11:09:51 2011 +0000 fix for fdo#32742# reportdesign/source/ui/inspection/metadata.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 9673a66350edf8bdb3a9af74df7eb3ed0cd7042f Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit 8f7887da80732abf15538fe4efe8571ad32e8715 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: base_libreoffice-3.3.1.1 split repo tag: base_libreoffice-3.3.1.2
-rw-r--r--dbaccess/inc/AsyncronousLink.hxx6
-rw-r--r--dbaccess/inc/IController.hxx32
-rw-r--r--dbaccess/inc/IEnvironment.hxx2
-rw-r--r--dbaccess/inc/IReference.hxx4
-rw-r--r--dbaccess/inc/ToolBoxHelper.hxx22
-rw-r--r--dbaccess/inc/controllerframe.hxx2
-rw-r--r--dbaccess/inc/dataview.hxx18
-rw-r--r--dbaccess/inc/dbaccess_helpid.hrc794
-rw-r--r--dbaccess/inc/dbaccess_slotid.hrc132
-rw-r--r--dbaccess/inc/dbaccessdllapi.h8
-rw-r--r--dbaccess/inc/genericcontroller.hxx78
-rw-r--r--dbaccess/inc/pch/precompiled_dbaccess.cxx2
-rw-r--r--dbaccess/inc/pch/precompiled_dbaccess.hxx2
-rw-r--r--dbaccess/inc/singledoccontroller.hxx30
-rw-r--r--dbaccess/prj/dbu.xml2
-rw-r--r--dbaccess/qa/complex/dbaccess/ApplicationController.java2
-rw-r--r--dbaccess/qa/complex/dbaccess/Beamer.java4
-rw-r--r--dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java2
-rwxr-xr-xdbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java2
-rwxr-xr-xdbaccess/qa/complex/dbaccess/CopyTableWizard.java6
-rw-r--r--dbaccess/qa/complex/dbaccess/DataSource.java2
-rwxr-xr-xdbaccess/qa/complex/dbaccess/DatabaseApplication.java2
-rw-r--r--dbaccess/qa/complex/dbaccess/DatabaseDocument.java2
-rw-r--r--dbaccess/qa/complex/dbaccess/FileHelper.java2
-rw-r--r--dbaccess/qa/complex/dbaccess/Parser.java2
-rw-r--r--dbaccess/qa/complex/dbaccess/PropertyBag.java2
-rw-r--r--dbaccess/qa/complex/dbaccess/Query.java2
-rw-r--r--dbaccess/qa/complex/dbaccess/QueryInQuery.java2
-rw-r--r--dbaccess/qa/complex/dbaccess/RowSet.java2
-rw-r--r--dbaccess/qa/complex/dbaccess/RowSetEventListener.java8
-rwxr-xr-xdbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java10
-rw-r--r--dbaccess/qa/complex/dbaccess/TestCase.java4
-rw-r--r--dbaccess/qa/complex/dbaccess/UISettings.java2
-rw-r--r--dbaccess/source/core/api/BookmarkSet.cxx6
-rw-r--r--dbaccess/source/core/api/CIndexColumn.hxx14
-rw-r--r--dbaccess/source/core/api/CRowSetColumn.cxx2
-rw-r--r--dbaccess/source/core/api/CRowSetColumn.hxx2
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.cxx8
-rw-r--r--dbaccess/source/core/api/CRowSetDataColumn.hxx10
-rw-r--r--dbaccess/source/core/api/CacheSet.cxx18
-rw-r--r--dbaccess/source/core/api/CacheSet.hxx24
-rw-r--r--dbaccess/source/core/api/FilteredContainer.cxx24
-rw-r--r--dbaccess/source/core/api/HelperCollections.hxx6
-rw-r--r--dbaccess/source/core/api/KeySet.cxx46
-rw-r--r--dbaccess/source/core/api/KeySet.hxx26
-rw-r--r--dbaccess/source/core/api/OptimisticSet.cxx10
-rw-r--r--dbaccess/source/core/api/OptimisticSet.hxx10
-rw-r--r--dbaccess/source/core/api/RowSet.cxx216
-rw-r--r--dbaccess/source/core/api/RowSet.hxx150
-rw-r--r--dbaccess/source/core/api/RowSetBase.cxx54
-rw-r--r--dbaccess/source/core/api/RowSetBase.hxx84
-rw-r--r--dbaccess/source/core/api/RowSetCache.cxx136
-rw-r--r--dbaccess/source/core/api/RowSetCache.hxx64
-rw-r--r--dbaccess/source/core/api/RowSetCacheIterator.cxx4
-rw-r--r--dbaccess/source/core/api/RowSetCacheIterator.hxx16
-rw-r--r--dbaccess/source/core/api/RowSetRow.hxx12
-rw-r--r--dbaccess/source/core/api/SingleSelectQueryComposer.cxx92
-rw-r--r--dbaccess/source/core/api/StaticSet.cxx10
-rw-r--r--dbaccess/source/core/api/StaticSet.hxx4
-rw-r--r--dbaccess/source/core/api/TableDeco.cxx26
-rw-r--r--dbaccess/source/core/api/WrappedResultSet.cxx4
-rw-r--r--dbaccess/source/core/api/column.cxx10
-rw-r--r--dbaccess/source/core/api/datacolumn.hxx6
-rw-r--r--dbaccess/source/core/api/datasettings.cxx34
-rw-r--r--dbaccess/source/core/api/definitioncolumn.cxx14
-rw-r--r--dbaccess/source/core/api/query.cxx8
-rw-r--r--dbaccess/source/core/api/query.hxx26
-rw-r--r--dbaccess/source/core/api/querycontainer.cxx22
-rw-r--r--dbaccess/source/core/api/querydescriptor.cxx2
-rw-r--r--dbaccess/source/core/api/querydescriptor.hxx24
-rw-r--r--dbaccess/source/core/api/resultcolumn.cxx44
-rw-r--r--dbaccess/source/core/api/resultcolumn.hxx4
-rw-r--r--dbaccess/source/core/api/resultset.cxx14
-rw-r--r--dbaccess/source/core/api/resultset.hxx20
-rw-r--r--dbaccess/source/core/api/statement.cxx16
-rw-r--r--dbaccess/source/core/api/table.cxx38
-rw-r--r--dbaccess/source/core/api/tablecontainer.cxx30
-rw-r--r--dbaccess/source/core/api/viewcontainer.cxx10
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/ComponentDefinition.hxx14
-rw-r--r--dbaccess/source/core/dataaccess/ContentHelper.cxx12
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.cxx2
-rw-r--r--dbaccess/source/core/dataaccess/ModelImpl.hxx44
-rw-r--r--dbaccess/source/core/dataaccess/SharedConnection.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/SharedConnection.hxx6
-rw-r--r--dbaccess/source/core/dataaccess/bookmarkcontainer.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/bookmarkcontainer.hxx50
-rw-r--r--dbaccess/source/core/dataaccess/commandcontainer.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/commandcontainer.hxx6
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/commanddefinition.hxx10
-rw-r--r--dbaccess/source/core/dataaccess/connection.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/connection.hxx26
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.cxx18
-rw-r--r--dbaccess/source/core/dataaccess/databasecontext.hxx28
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.cxx6
-rw-r--r--dbaccess/source/core/dataaccess/databasedocument.hxx32
-rw-r--r--dbaccess/source/core/dataaccess/datasource.cxx60
-rw-r--r--dbaccess/source/core/dataaccess/datasource.hxx6
-rw-r--r--dbaccess/source/core/dataaccess/definitioncontainer.cxx14
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.cxx8
-rw-r--r--dbaccess/source/core/dataaccess/documentcontainer.hxx22
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.cxx18
-rw-r--r--dbaccess/source/core/dataaccess/documentdefinition.hxx24
-rw-r--r--dbaccess/source/core/dataaccess/documenteventnotifier.cxx4
-rw-r--r--dbaccess/source/core/dataaccess/intercept.cxx42
-rw-r--r--dbaccess/source/core/dataaccess/intercept.hxx4
-rw-r--r--dbaccess/source/core/dataaccess/myucp_datasupplier.cxx26
-rw-r--r--dbaccess/source/core/dataaccess/myucp_resultset.cxx4
-rw-r--r--dbaccess/source/core/inc/ContainerListener.hxx2
-rw-r--r--dbaccess/source/core/inc/ContainerMediator.hxx8
-rw-r--r--dbaccess/source/core/inc/ContentHelper.hxx54
-rw-r--r--dbaccess/source/core/inc/DatabaseDataProvider.hxx6
-rw-r--r--dbaccess/source/core/inc/FilteredContainer.hxx22
-rw-r--r--dbaccess/source/core/inc/PropertyForward.hxx10
-rw-r--r--dbaccess/source/core/inc/RefreshListener.hxx2
-rw-r--r--dbaccess/source/core/inc/SingleSelectQueryComposer.hxx64
-rw-r--r--dbaccess/source/core/inc/TableDeco.hxx24
-rw-r--r--dbaccess/source/core/inc/column.hxx32
-rw-r--r--dbaccess/source/core/inc/columnsettings.hxx18
-rw-r--r--dbaccess/source/core/inc/commandbase.hxx14
-rw-r--r--dbaccess/source/core/inc/core_resource.hrc110
-rw-r--r--dbaccess/source/core/inc/core_resource.hxx14
-rw-r--r--dbaccess/source/core/inc/datasettings.hxx36
-rw-r--r--dbaccess/source/core/inc/dbamiscres.hrc46
-rw-r--r--dbaccess/source/core/inc/definitioncolumn.hxx40
-rw-r--r--dbaccess/source/core/inc/definitioncontainer.hxx66
-rw-r--r--dbaccess/source/core/inc/preparedstatement.hxx2
-rw-r--r--dbaccess/source/core/inc/querycomposer.hxx12
-rw-r--r--dbaccess/source/core/inc/querycontainer.hxx12
-rw-r--r--dbaccess/source/core/inc/sdbcoretools.hxx2
-rw-r--r--dbaccess/source/core/inc/statement.hxx8
-rw-r--r--dbaccess/source/core/inc/table.hxx36
-rw-r--r--dbaccess/source/core/inc/tablecontainer.hxx22
-rw-r--r--dbaccess/source/core/inc/userinformation.hxx4
-rw-r--r--dbaccess/source/core/inc/viewcontainer.hxx16
-rw-r--r--dbaccess/source/core/misc/ContainerListener.cxx14
-rw-r--r--dbaccess/source/core/misc/ContainerMediator.cxx20
-rw-r--r--dbaccess/source/core/misc/DatabaseDataProvider.cxx12
-rw-r--r--dbaccess/source/core/misc/PropertyForward.cxx10
-rw-r--r--dbaccess/source/core/misc/apitools.cxx4
-rw-r--r--dbaccess/source/core/misc/dbastrings.cxx2
-rw-r--r--dbaccess/source/core/misc/dsntypes.cxx36
-rw-r--r--dbaccess/source/core/misc/module_dba.cxx2
-rw-r--r--dbaccess/source/core/misc/objectnameapproval.cxx2
-rw-r--r--dbaccess/source/core/misc/sdbcoretools.cxx4
-rw-r--r--dbaccess/source/core/misc/services.cxx8
-rw-r--r--dbaccess/source/core/misc/userinformation.cxx2
-rw-r--r--dbaccess/source/core/misc/veto.cxx4
-rw-r--r--dbaccess/source/core/recovery/dbdocrecovery.cxx2
-rw-r--r--dbaccess/source/core/recovery/settingsimport.cxx2
-rw-r--r--dbaccess/source/core/recovery/settingsimport.hxx2
-rw-r--r--dbaccess/source/core/recovery/storagestream.cxx2
-rw-r--r--dbaccess/source/core/recovery/storagestream.hxx2
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.cxx2
-rw-r--r--dbaccess/source/core/recovery/storagetextstream.hxx2
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.cxx2
-rw-r--r--dbaccess/source/core/recovery/storagexmlstream.hxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponentloader.cxx8
-rw-r--r--dbaccess/source/core/recovery/subcomponentloader.hxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.cxx16
-rw-r--r--dbaccess/source/core/recovery/subcomponentrecovery.hxx2
-rw-r--r--dbaccess/source/core/recovery/subcomponents.hxx2
-rw-r--r--dbaccess/source/core/resource/core_resource.cxx6
-rw-r--r--dbaccess/source/core/resource/strings.src4
-rw-r--r--dbaccess/source/ext/adabas/ANewDb.cxx30
-rw-r--r--dbaccess/source/ext/adabas/ANewDb.hxx18
-rw-r--r--dbaccess/source/ext/adabas/ASQLNameEdit.hxx4
-rw-r--r--dbaccess/source/ext/adabas/ASqlNameEdit.cxx10
-rw-r--r--dbaccess/source/ext/adabas/Acomponentmodule.cxx70
-rw-r--r--dbaccess/source/ext/adabas/Acomponentmodule.hxx52
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.cxx98
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.hrc72
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.hxx136
-rw-r--r--dbaccess/source/ext/adabas/AdabasNewDb.src186
-rw-r--r--dbaccess/source/ext/adabas/Aservices.cxx10
-rw-r--r--dbaccess/source/ext/adabas/Astringconstants.cxx2
-rw-r--r--dbaccess/source/ext/adabas/Astringconstants.hrc16
-rw-r--r--dbaccess/source/ext/adabas/adabasui_resource.hrc72
-rw-r--r--dbaccess/source/ext/adabas/adabasuistrings.cxx2
-rw-r--r--dbaccess/source/ext/adabas/adabasuistrings.hrc2
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_global.hrc10
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_module.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_module.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_services.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_types.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/dbmm_types.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/docinteraction.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/docinteraction.hxx4
-rw-r--r--dbaccess/source/ext/macromigration/macromigration.hrc2
-rw-r--r--dbaccess/source/ext/macromigration/macromigration.src6
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.cxx4
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationdialog.hxx4
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.cxx4
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationpages.hxx4
-rw-r--r--dbaccess/source/ext/macromigration/macromigrationwizard.cxx6
-rw-r--r--dbaccess/source/ext/macromigration/migrationengine.cxx4
-rw-r--r--dbaccess/source/ext/macromigration/migrationengine.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/migrationerror.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/migrationlog.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/migrationlog.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/migrationprogress.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/progresscapture.cxx10
-rw-r--r--dbaccess/source/ext/macromigration/progresscapture.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/progressmixer.cxx2
-rw-r--r--dbaccess/source/ext/macromigration/progressmixer.hxx2
-rw-r--r--dbaccess/source/ext/macromigration/rangeprogressbar.hxx2
-rw-r--r--dbaccess/source/filter/migration/cfgimport.cxx70
-rw-r--r--dbaccess/source/filter/migration/cfgimport.hxx116
-rw-r--r--dbaccess/source/filter/migration/cfgservices.cxx10
-rw-r--r--dbaccess/source/filter/xml/dbloader2.cxx34
-rw-r--r--dbaccess/source/filter/xml/xmlAutoStyle.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlAutoStyle.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlColumn.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlColumn.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlComponent.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlComponent.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionData.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionData.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionResource.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlConnectionResource.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSource.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDataSource.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceInfo.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceInfo.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSetting.cxx44
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSetting.hxx6
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSettings.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDataSourceSettings.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDatabase.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDatabase.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDatabaseDescription.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlDatabaseDescription.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlDocuments.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlDocuments.hxx6
-rw-r--r--dbaccess/source/filter/xml/xmlEnums.hxx40
-rw-r--r--dbaccess/source/filter/xml/xmlExport.cxx28
-rw-r--r--dbaccess/source/filter/xml/xmlExport.hxx102
-rw-r--r--dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlHelper.cxx136
-rw-r--r--dbaccess/source/filter/xml/xmlHelper.hxx18
-rw-r--r--dbaccess/source/filter/xml/xmlHierarchyCollection.cxx14
-rw-r--r--dbaccess/source/filter/xml/xmlHierarchyCollection.hxx8
-rw-r--r--dbaccess/source/filter/xml/xmlLogin.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlLogin.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlQuery.cxx6
-rw-r--r--dbaccess/source/filter/xml/xmlQuery.hxx4
-rw-r--r--dbaccess/source/filter/xml/xmlServerDatabase.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlServerDatabase.hxx2
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlStyleImport.hxx20
-rw-r--r--dbaccess/source/filter/xml/xmlTable.cxx12
-rw-r--r--dbaccess/source/filter/xml/xmlTable.hxx14
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterList.cxx4
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterList.hxx6
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterPattern.cxx2
-rw-r--r--dbaccess/source/filter/xml/xmlTableFilterPattern.hxx8
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.cxx210
-rw-r--r--dbaccess/source/filter/xml/xmlfilter.hxx52
-rw-r--r--dbaccess/source/filter/xml/xmlservices.cxx10
-rw-r--r--dbaccess/source/inc/OAuthenticationContinuation.hxx4
-rw-r--r--dbaccess/source/inc/apitools.hxx488
-rw-r--r--dbaccess/source/inc/cfg_reghelper.hxx2
-rw-r--r--dbaccess/source/inc/cfgstrings.hrc2
-rw-r--r--dbaccess/source/inc/constasciistring.hxx10
-rw-r--r--dbaccess/source/inc/dbadllapi.hxx2
-rw-r--r--dbaccess/source/inc/dbastrings.hrc4
-rw-r--r--dbaccess/source/inc/dbu_reghelper.hxx2
-rw-r--r--dbaccess/source/inc/dbustrings.hrc4
-rw-r--r--dbaccess/source/inc/dsntypes.hxx42
-rw-r--r--dbaccess/source/inc/flt_reghelper.hxx2
-rw-r--r--dbaccess/source/inc/registrationhelper.hxx34
-rw-r--r--dbaccess/source/inc/sdbtstrings.hrc2
-rw-r--r--dbaccess/source/inc/stringconstants.hrc254
-rw-r--r--dbaccess/source/inc/xmlstrings.hrc2
-rw-r--r--dbaccess/source/sdbtools/connection/connectiondependent.hxx4
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.cxx16
-rw-r--r--dbaccess/source/sdbtools/connection/connectiontools.hxx2
-rw-r--r--dbaccess/source/sdbtools/connection/datasourcemetadata.cxx2
-rw-r--r--dbaccess/source/sdbtools/connection/datasourcemetadata.hxx2
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.cxx12
-rw-r--r--dbaccess/source/sdbtools/connection/objectnames.hxx2
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.cxx24
-rw-r--r--dbaccess/source/sdbtools/connection/tablename.hxx2
-rw-r--r--dbaccess/source/sdbtools/inc/module_sdbt.hxx2
-rw-r--r--dbaccess/source/sdbtools/inc/sdbt_resource.hrc4
-rw-r--r--dbaccess/source/sdbtools/misc/module_sdbt.cxx2
-rw-r--r--dbaccess/source/sdbtools/misc/sdbt_services.cxx10
-rw-r--r--dbaccess/source/sdbtools/resource/sdbt_strings.src2
-rw-r--r--dbaccess/source/shared/cfg_reghelper.cxx2
-rw-r--r--dbaccess/source/shared/cfgstrings.cxx4
-rw-r--r--dbaccess/source/shared/dbu_reghelper.cxx2
-rw-r--r--dbaccess/source/shared/dbustrings.cxx12
-rw-r--r--dbaccess/source/shared/flt_reghelper.cxx2
-rw-r--r--dbaccess/source/shared/registrationhelper.cxx34
-rw-r--r--dbaccess/source/shared/sdbtstrings.cxx2
-rw-r--r--dbaccess/source/shared/xmlstrings.cxx2
-rw-r--r--dbaccess/source/ui/app/AppController.cxx48
-rw-r--r--dbaccess/source/ui/app/AppController.hxx114
-rw-r--r--dbaccess/source/ui/app/AppControllerDnD.cxx20
-rw-r--r--dbaccess/source/ui/app/AppControllerGen.cxx8
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.cxx2
-rw-r--r--dbaccess/source/ui/app/AppDetailPageHelper.hxx124
-rw-r--r--dbaccess/source/ui/app/AppDetailView.cxx58
-rw-r--r--dbaccess/source/ui/app/AppDetailView.hxx88
-rw-r--r--dbaccess/source/ui/app/AppIconControl.cxx10
-rw-r--r--dbaccess/source/ui/app/AppIconControl.hxx16
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.cxx10
-rw-r--r--dbaccess/source/ui/app/AppSwapWindow.hxx32
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.cxx24
-rw-r--r--dbaccess/source/ui/app/AppTitleWindow.hxx22
-rw-r--r--dbaccess/source/ui/app/AppView.cxx12
-rw-r--r--dbaccess/source/ui/app/AppView.hxx82
-rw-r--r--dbaccess/source/ui/app/IApplicationController.hxx8
-rw-r--r--dbaccess/source/ui/app/app.src4
-rw-r--r--dbaccess/source/ui/app/dbu_app.hrc70
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.cxx2
-rw-r--r--dbaccess/source/ui/app/subcomponentmanager.hxx2
-rw-r--r--dbaccess/source/ui/browser/AsyncronousLink.cxx2
-rw-r--r--dbaccess/source/ui/browser/bcommon.src2
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx154
-rw-r--r--dbaccess/source/ui/browser/brwview.cxx38
-rw-r--r--dbaccess/source/ui/browser/dataview.cxx12
-rw-r--r--dbaccess/source/ui/browser/dbexchange.cxx26
-rw-r--r--dbaccess/source/ui/browser/dbloader.cxx36
-rw-r--r--dbaccess/source/ui/browser/dbtreemodel.cxx2
-rw-r--r--dbaccess/source/ui/browser/dbtreemodel.hxx14
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.cxx12
-rw-r--r--dbaccess/source/ui/browser/dbtreeview.hxx18
-rw-r--r--dbaccess/source/ui/browser/dsEntriesNoExp.cxx14
-rw-r--r--dbaccess/source/ui/browser/dsbrowserDnD.cxx26
-rw-r--r--dbaccess/source/ui/browser/exsrcbrw.cxx40
-rw-r--r--dbaccess/source/ui/browser/formadapter.cxx10
-rw-r--r--dbaccess/source/ui/browser/genericcontroller.cxx48
-rw-r--r--dbaccess/source/ui/browser/sbabrw.src60
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx204
-rw-r--r--dbaccess/source/ui/browser/sbagrid.src2
-rw-r--r--dbaccess/source/ui/browser/sbamultiplex.cxx4
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx236
-rw-r--r--dbaccess/source/ui/control/ColumnControlWindow.cxx12
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx98
-rw-r--r--dbaccess/source/ui/control/RelationControl.cxx88
-rw-r--r--dbaccess/source/ui/control/ScrollHelper.cxx6
-rw-r--r--dbaccess/source/ui/control/SqlNameEdit.cxx12
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.cxx46
-rw-r--r--dbaccess/source/ui/control/TableGrantCtrl.src2
-rw-r--r--dbaccess/source/ui/control/VertSplitView.cxx38
-rw-r--r--dbaccess/source/ui/control/charsetlistbox.cxx2
-rw-r--r--dbaccess/source/ui/control/curledit.cxx8
-rw-r--r--dbaccess/source/ui/control/dbtreelistbox.cxx24
-rw-r--r--dbaccess/source/ui/control/listviewitems.cxx4
-rw-r--r--dbaccess/source/ui/control/marktree.cxx14
-rw-r--r--dbaccess/source/ui/control/opendoccontrols.cxx2
-rw-r--r--dbaccess/source/ui/control/sqledit.cxx4
-rw-r--r--dbaccess/source/ui/control/statusbarontroller.cxx2
-rw-r--r--dbaccess/source/ui/control/tabletree.cxx10
-rw-r--r--dbaccess/source/ui/control/tabletree.hrc6
-rw-r--r--dbaccess/source/ui/control/tabletree.src2
-rw-r--r--dbaccess/source/ui/control/toolboxcontroller.cxx4
-rw-r--r--dbaccess/source/ui/control/undosqledit.cxx2
-rw-r--r--dbaccess/source/ui/control/undosqledit.src2
-rw-r--r--dbaccess/source/ui/dlg/AdabasPage.hrc24
-rw-r--r--dbaccess/source/ui/dlg/AdabasStat.cxx38
-rw-r--r--dbaccess/source/ui/dlg/AdabasStat.hrc28
-rw-r--r--dbaccess/source/ui/dlg/AdabasStat.hxx34
-rw-r--r--dbaccess/source/ui/dlg/AdabasStat.src112
-rw-r--r--dbaccess/source/ui/dlg/AutoControls.src4
-rw-r--r--dbaccess/source/ui/dlg/AutoControls_tmpl.hrc160
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.cxx28
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.hrc24
-rw-r--r--dbaccess/source/ui/dlg/CollectionView.src40
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx44
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.hxx56
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx6
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hrc2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hxx34
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.src2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.cxx28
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.hxx30
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx72
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx86
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.cxx80
-rw-r--r--dbaccess/source/ui/dlg/DbAdminImpl.hxx56
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.cxx2
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.hxx34
-rw-r--r--dbaccess/source/ui/dlg/ExtensionNotPresent.cxx24
-rw-r--r--dbaccess/source/ui/dlg/ExtensionNotPresent.hrc24
-rw-r--r--dbaccess/source/ui/dlg/ExtensionNotPresent.src12
-rw-r--r--dbaccess/source/ui/dlg/RelationDlg.cxx20
-rw-r--r--dbaccess/source/ui/dlg/RelationDlg.hrc22
-rw-r--r--dbaccess/source/ui/dlg/RelationDlg.src6
-rw-r--r--dbaccess/source/ui/dlg/TablesSingleDlg.cxx4
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.cxx58
-rw-r--r--dbaccess/source/ui/dlg/TextConnectionHelper.hxx40
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx64
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hrc42
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hxx40
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.src92
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.cxx6
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.hrc4
-rw-r--r--dbaccess/source/ui/dlg/UserAdminDlg.src8
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.cxx22
-rwxr-xr-xdbaccess/source/ui/dlg/admincontrols.hrc2
-rw-r--r--dbaccess/source/ui/dlg/admincontrols.hxx10
-rwxr-xr-xdbaccess/source/ui/dlg/admincontrols.src12
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx12
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx78
-rw-r--r--dbaccess/source/ui/dlg/adodatalinks.cxx40
-rw-r--r--dbaccess/source/ui/dlg/adodatalinks.hxx2
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.cxx22
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.hrc12
-rw-r--r--dbaccess/source/ui/dlg/adtabdlg.src2
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx6
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hrc42
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hxx6
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.src30
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.cxx20
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.hrc10
-rw-r--r--dbaccess/source/ui/dlg/dbadmin.src116
-rw-r--r--dbaccess/source/ui/dlg/dbadmin2.src24
-rw-r--r--dbaccess/source/ui/dlg/dbadminsetup.hrc86
-rw-r--r--dbaccess/source/ui/dlg/dbadminsetup.src26
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx52
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.hrc18
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.hxx52
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.src10
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx22
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx18
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx136
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx200
-rw-r--r--dbaccess/source/ui/dlg/directsql.cxx28
-rw-r--r--dbaccess/source/ui/dlg/directsql.hrc24
-rw-r--r--dbaccess/source/ui/dlg/directsql.src22
-rw-r--r--dbaccess/source/ui/dlg/dlgattr.cxx4
-rw-r--r--dbaccess/source/ui/dlg/dlgattr.src2
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.cxx62
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.hrc32
-rw-r--r--dbaccess/source/ui/dlg/dlgsave.src14
-rw-r--r--dbaccess/source/ui/dlg/dlgsize.cxx14
-rw-r--r--dbaccess/source/ui/dlg/dlgsize.hrc14
-rw-r--r--dbaccess/source/ui/dlg/dlgsize.src6
-rw-r--r--dbaccess/source/ui/dlg/dsnItem.hxx12
-rw-r--r--dbaccess/source/ui/dlg/dsselect.cxx28
-rw-r--r--dbaccess/source/ui/dlg/dsselect.hrc20
-rw-r--r--dbaccess/source/ui/dlg/dsselect.hxx26
-rw-r--r--dbaccess/source/ui/dlg/dsselect.src4
-rw-r--r--dbaccess/source/ui/dlg/finteraction.cxx4
-rw-r--r--dbaccess/source/ui/dlg/finteraction.hxx14
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx30
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx54
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx84
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.hrc22
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.src14
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx30
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.cxx40
-rw-r--r--dbaccess/source/ui/dlg/odbcconfig.hxx24
-rw-r--r--dbaccess/source/ui/dlg/optionalboolitem.cxx2
-rw-r--r--dbaccess/source/ui/dlg/optionalboolitem.hxx6
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.cxx70
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.hrc24
-rw-r--r--dbaccess/source/ui/dlg/paramdialog.src6
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.cxx70
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.hrc44
-rw-r--r--dbaccess/source/ui/dlg/queryfilter.src14
-rw-r--r--dbaccess/source/ui/dlg/queryorder.cxx42
-rw-r--r--dbaccess/source/ui/dlg/queryorder.hrc32
-rw-r--r--dbaccess/source/ui/dlg/queryorder.src2
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.cxx34
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.hrc22
-rw-r--r--dbaccess/source/ui/dlg/sqlmessage.src2
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx48
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx34
-rw-r--r--dbaccess/source/ui/dlg/textconnectionsettings.cxx2
-rw-r--r--dbaccess/source/ui/dlg/textconnectionsettings.src2
-rw-r--r--dbaccess/source/ui/imagelists/dbimagelists.src2
-rw-r--r--dbaccess/source/ui/inc/AccessibleBaseIFace.hxx14
-rw-r--r--dbaccess/source/ui/inc/AppElementType.hxx18
-rw-r--r--dbaccess/source/ui/inc/CollectionView.hxx40
-rw-r--r--dbaccess/source/ui/inc/ColumnControlWindow.hxx38
-rw-r--r--dbaccess/source/ui/inc/ConnectionLine.hxx48
-rw-r--r--dbaccess/source/ui/inc/ConnectionLineAccess.hxx12
-rw-r--r--dbaccess/source/ui/inc/ConnectionLineData.hxx30
-rw-r--r--dbaccess/source/ui/inc/DExport.hxx98
-rw-r--r--dbaccess/source/ui/inc/ExtensionNotPresent.hxx12
-rw-r--r--dbaccess/source/ui/inc/FieldControls.hxx26
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx218
-rw-r--r--dbaccess/source/ui/inc/FieldDescriptions.hxx106
-rw-r--r--dbaccess/source/ui/inc/GeneralUndo.hxx8
-rw-r--r--dbaccess/source/ui/inc/HtmlReader.hxx30
-rw-r--r--dbaccess/source/ui/inc/IClipBoardTest.hxx16
-rw-r--r--dbaccess/source/ui/inc/IItemSetHelper.hxx6
-rw-r--r--dbaccess/source/ui/inc/IUpdateHelper.hxx2
-rw-r--r--dbaccess/source/ui/inc/JAccess.hxx16
-rw-r--r--dbaccess/source/ui/inc/JoinController.hxx32
-rw-r--r--dbaccess/source/ui/inc/JoinDesignView.hxx12
-rw-r--r--dbaccess/source/ui/inc/JoinExchange.hxx22
-rw-r--r--dbaccess/source/ui/inc/JoinTableView.hxx126
-rw-r--r--dbaccess/source/ui/inc/QEnumTypes.hxx40
-rw-r--r--dbaccess/source/ui/inc/QueryDesignView.hxx28
-rw-r--r--dbaccess/source/ui/inc/QueryTableView.hxx26
-rw-r--r--dbaccess/source/ui/inc/QueryTextView.hxx6
-rw-r--r--dbaccess/source/ui/inc/QueryViewSwitch.hxx18
-rw-r--r--dbaccess/source/ui/inc/RTableConnectionData.hxx38
-rw-r--r--dbaccess/source/ui/inc/RefFunctor.hxx10
-rw-r--r--dbaccess/source/ui/inc/RelControliFace.hxx6
-rw-r--r--dbaccess/source/ui/inc/RelationControl.hrc2
-rw-r--r--dbaccess/source/ui/inc/RelationControl.hxx32
-rw-r--r--dbaccess/source/ui/inc/RelationController.hxx22
-rw-r--r--dbaccess/source/ui/inc/RelationDesignView.hxx6
-rw-r--r--dbaccess/source/ui/inc/RelationDlg.hxx26
-rw-r--r--dbaccess/source/ui/inc/RelationTableView.hxx10
-rw-r--r--dbaccess/source/ui/inc/RtfReader.hxx18
-rw-r--r--dbaccess/source/ui/inc/ScrollHelper.hxx14
-rw-r--r--dbaccess/source/ui/inc/SqlNameEdit.hxx28
-rw-r--r--dbaccess/source/ui/inc/TableConnection.hxx36
-rw-r--r--dbaccess/source/ui/inc/TableConnectionData.hxx18
-rw-r--r--dbaccess/source/ui/inc/TableController.hxx92
-rw-r--r--dbaccess/source/ui/inc/TableCopyHelper.hxx58
-rw-r--r--dbaccess/source/ui/inc/TableDesignControl.hxx40
-rw-r--r--dbaccess/source/ui/inc/TableDesignHelpBar.hxx8
-rw-r--r--dbaccess/source/ui/inc/TableDesignView.hxx36
-rw-r--r--dbaccess/source/ui/inc/TableFieldDescription.hxx152
-rw-r--r--dbaccess/source/ui/inc/TableGrantCtrl.hxx30
-rw-r--r--dbaccess/source/ui/inc/TableRow.hxx22
-rw-r--r--dbaccess/source/ui/inc/TableRowExchange.hxx10
-rw-r--r--dbaccess/source/ui/inc/TableWindow.hxx106
-rw-r--r--dbaccess/source/ui/inc/TableWindowAccess.hxx14
-rw-r--r--dbaccess/source/ui/inc/TableWindowData.hxx46
-rw-r--r--dbaccess/source/ui/inc/TableWindowListBox.hxx36
-rw-r--r--dbaccess/source/ui/inc/TableWindowTitle.hxx4
-rw-r--r--dbaccess/source/ui/inc/TablesSingleDlg.hxx20
-rw-r--r--dbaccess/source/ui/inc/TokenWriter.hxx92
-rw-r--r--dbaccess/source/ui/inc/TypeInfo.hxx130
-rw-r--r--dbaccess/source/ui/inc/UITools.hxx160
-rw-r--r--dbaccess/source/ui/inc/UserAdminDlg.hxx16
-rw-r--r--dbaccess/source/ui/inc/VertSplitView.hxx10
-rw-r--r--dbaccess/source/ui/inc/WCPage.hxx46
-rw-r--r--dbaccess/source/ui/inc/WColumnSelect.hxx36
-rw-r--r--dbaccess/source/ui/inc/WCopyTable.hxx136
-rw-r--r--dbaccess/source/ui/inc/WExtendPages.hxx8
-rw-r--r--dbaccess/source/ui/inc/WNameMatch.hxx28
-rw-r--r--dbaccess/source/ui/inc/WTabPage.hxx16
-rw-r--r--dbaccess/source/ui/inc/WTypeSelect.hxx66
-rw-r--r--dbaccess/source/ui/inc/adtabdlg.hxx10
-rw-r--r--dbaccess/source/ui/inc/advancedsettingsdlg.hxx10
-rw-r--r--dbaccess/source/ui/inc/asyncmodaldialog.hxx2
-rw-r--r--dbaccess/source/ui/inc/browserids.hxx140
-rw-r--r--dbaccess/source/ui/inc/brwctrlr.hxx108
-rw-r--r--dbaccess/source/ui/inc/brwview.hxx34
-rw-r--r--dbaccess/source/ui/inc/callbacks.hxx12
-rw-r--r--dbaccess/source/ui/inc/charsetlistbox.hxx4
-rw-r--r--dbaccess/source/ui/inc/charsets.hxx38
-rw-r--r--dbaccess/source/ui/inc/commontypes.hxx6
-rw-r--r--dbaccess/source/ui/inc/curledit.hxx26
-rw-r--r--dbaccess/source/ui/inc/databaseobjectview.hxx12
-rw-r--r--dbaccess/source/ui/inc/datasourceconnector.hxx10
-rw-r--r--dbaccess/source/ui/inc/datasourcemap.hxx98
-rw-r--r--dbaccess/source/ui/inc/dbadmin.hxx34
-rw-r--r--dbaccess/source/ui/inc/dbexchange.hxx24
-rw-r--r--dbaccess/source/ui/inc/dbtreelistbox.hxx100
-rw-r--r--dbaccess/source/ui/inc/dbu_brw.hrc42
-rw-r--r--dbaccess/source/ui/inc/dbu_control.hrc30
-rw-r--r--dbaccess/source/ui/inc/dbu_dlg.hrc132
-rw-r--r--dbaccess/source/ui/inc/dbu_misc.hrc26
-rw-r--r--dbaccess/source/ui/inc/dbu_qry.hrc90
-rw-r--r--dbaccess/source/ui/inc/dbu_rel.hrc16
-rw-r--r--dbaccess/source/ui/inc/dbu_resource.hrc510
-rw-r--r--dbaccess/source/ui/inc/dbu_tbl.hrc102
-rw-r--r--dbaccess/source/ui/inc/dbu_uno.hrc10
-rw-r--r--dbaccess/source/ui/inc/dbwiz.hxx38
-rw-r--r--dbaccess/source/ui/inc/dbwizsetup.hxx36
-rw-r--r--dbaccess/source/ui/inc/defaultobjectnamecheck.hxx2
-rw-r--r--dbaccess/source/ui/inc/directsql.hxx54
-rw-r--r--dbaccess/source/ui/inc/dlgattr.hrc10
-rw-r--r--dbaccess/source/ui/inc/dlgattr.hxx4
-rw-r--r--dbaccess/source/ui/inc/dlgsave.hxx18
-rw-r--r--dbaccess/source/ui/inc/dlgsize.hxx20
-rw-r--r--dbaccess/source/ui/inc/dsitems.hxx106
-rw-r--r--dbaccess/source/ui/inc/dsmeta.hxx2
-rw-r--r--dbaccess/source/ui/inc/exsrcbrw.hxx14
-rw-r--r--dbaccess/source/ui/inc/formadapter.hxx128
-rw-r--r--dbaccess/source/ui/inc/imageprovider.hxx2
-rw-r--r--dbaccess/source/ui/inc/indexcollection.hxx16
-rw-r--r--dbaccess/source/ui/inc/indexdialog.hxx48
-rw-r--r--dbaccess/source/ui/inc/indexes.hxx38
-rw-r--r--dbaccess/source/ui/inc/indexfieldscontrol.hxx32
-rw-r--r--dbaccess/source/ui/inc/linkeddocuments.hxx12
-rw-r--r--dbaccess/source/ui/inc/listviewitems.hxx12
-rw-r--r--dbaccess/source/ui/inc/localresaccess.hxx4
-rw-r--r--dbaccess/source/ui/inc/marktree.hxx14
-rw-r--r--dbaccess/source/ui/inc/moduledbu.hxx22
-rw-r--r--dbaccess/source/ui/inc/objectnamecheck.hxx4
-rw-r--r--dbaccess/source/ui/inc/opendoccontrols.hxx2
-rw-r--r--dbaccess/source/ui/inc/paramdialog.hxx26
-rw-r--r--dbaccess/source/ui/inc/propertysetitem.hxx10
-rw-r--r--dbaccess/source/ui/inc/propertystorage.hxx2
-rw-r--r--dbaccess/source/ui/inc/querycontainerwindow.hxx52
-rw-r--r--dbaccess/source/ui/inc/querycontroller.hxx82
-rw-r--r--dbaccess/source/ui/inc/queryfilter.hxx70
-rw-r--r--dbaccess/source/ui/inc/queryorder.hxx54
-rw-r--r--dbaccess/source/ui/inc/queryview.hxx14
-rw-r--r--dbaccess/source/ui/inc/sbagrid.hrc74
-rw-r--r--dbaccess/source/ui/inc/sbagrid.hxx68
-rw-r--r--dbaccess/source/ui/inc/sbamultiplex.hxx450
-rw-r--r--dbaccess/source/ui/inc/sqledit.hxx20
-rw-r--r--dbaccess/source/ui/inc/sqlmessage.hxx18
-rw-r--r--dbaccess/source/ui/inc/statusbarontroller.hxx4
-rw-r--r--dbaccess/source/ui/inc/stringlistitem.hxx12
-rw-r--r--dbaccess/source/ui/inc/tabletree.hxx40
-rw-r--r--dbaccess/source/ui/inc/textconnectionsettings.hxx4
-rw-r--r--dbaccess/source/ui/inc/toolbox_tmpl.hrc48
-rw-r--r--dbaccess/source/ui/inc/toolboxcontroller.hxx10
-rw-r--r--dbaccess/source/ui/inc/undosqledit.hxx10
-rw-r--r--dbaccess/source/ui/inc/unoadmin.hxx16
-rw-r--r--dbaccess/source/ui/inc/unodatbr.hxx104
-rw-r--r--dbaccess/source/ui/inc/unosqlmessage.hxx8
-rw-r--r--dbaccess/source/ui/misc/DExport.cxx84
-rw-r--r--dbaccess/source/ui/misc/HtmlReader.cxx52
-rw-r--r--dbaccess/source/ui/misc/ModuleHelper.cxx4
-rw-r--r--dbaccess/source/ui/misc/RowSetDrop.cxx22
-rw-r--r--dbaccess/source/ui/misc/RtfReader.cxx28
-rw-r--r--dbaccess/source/ui/misc/TableCopyHelper.cxx26
-rw-r--r--dbaccess/source/ui/misc/TokenWriter.cxx166
-rw-r--r--dbaccess/source/ui/misc/ToolBoxHelper.cxx22
-rw-r--r--dbaccess/source/ui/misc/UITools.cxx188
-rw-r--r--dbaccess/source/ui/misc/UpdateHelperImpl.hxx6
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx62
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx28
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx48
-rw-r--r--dbaccess/source/ui/misc/WExtendPages.cxx2
-rw-r--r--dbaccess/source/ui/misc/WNameMatch.cxx68
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx22
-rw-r--r--dbaccess/source/ui/misc/WizardPages.hrc56
-rw-r--r--dbaccess/source/ui/misc/WizardPages.src214
-rw-r--r--dbaccess/source/ui/misc/asyncmodaldialog.cxx2
-rw-r--r--dbaccess/source/ui/misc/charsets.cxx8
-rw-r--r--dbaccess/source/ui/misc/controllerframe.cxx16
-rw-r--r--dbaccess/source/ui/misc/databaseobjectview.cxx10
-rw-r--r--dbaccess/source/ui/misc/datasourceconnector.cxx6
-rw-r--r--dbaccess/source/ui/misc/dbumiscres.hrc54
-rw-r--r--dbaccess/source/ui/misc/dbumiscres.src6
-rw-r--r--dbaccess/source/ui/misc/defaultobjectnamecheck.cxx2
-rw-r--r--dbaccess/source/ui/misc/dsmeta.cxx4
-rw-r--r--dbaccess/source/ui/misc/imageprovider.cxx2
-rw-r--r--dbaccess/source/ui/misc/indexcollection.cxx24
-rw-r--r--dbaccess/source/ui/misc/linkeddocuments.cxx38
-rw-r--r--dbaccess/source/ui/misc/moduledbu.cxx24
-rw-r--r--dbaccess/source/ui/misc/propertysetitem.cxx4
-rw-r--r--dbaccess/source/ui/misc/propertystorage.cxx2
-rw-r--r--dbaccess/source/ui/misc/singledoccontroller.cxx44
-rw-r--r--dbaccess/source/ui/misc/stringlistitem.cxx4
-rw-r--r--dbaccess/source/ui/misc/uiservices.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionData.hxx14
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLine.cxx60
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/ConnectionLineData.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/JAccess.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/JoinController.cxx10
-rw-r--r--dbaccess/source/ui/querydesign/JoinDesignView.cxx8
-rw-r--r--dbaccess/source/ui/querydesign/JoinExchange.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/JoinTableView.cxx72
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnection.cxx8
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnection.hxx10
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnectionData.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/QTableConnectionData.hxx30
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindow.hxx40
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindowData.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QTableWindowData.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/Query.hrc6
-rw-r--r--dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx38
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx4
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx318
-rw-r--r--dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx10
-rw-r--r--dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx12
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx92
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx6
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx10
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx28
-rw-r--r--dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx16
-rw-r--r--dbaccess/source/ui/querydesign/QueryTableView.cxx90
-rw-r--r--dbaccess/source/ui/querydesign/QueryTextView.cxx6
-rw-r--r--dbaccess/source/ui/querydesign/QueryViewSwitch.cxx30
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx246
-rw-r--r--dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx340
-rw-r--r--dbaccess/source/ui/querydesign/TableConnection.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/TableConnectionData.cxx12
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldDescription.cxx28
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldInfo.cxx2
-rw-r--r--dbaccess/source/ui/querydesign/TableFieldInfo.hxx14
-rw-r--r--dbaccess/source/ui/querydesign/TableWindow.cxx46
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowAccess.cxx16
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowData.cxx4
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowListBox.cxx28
-rw-r--r--dbaccess/source/ui/querydesign/TableWindowTitle.cxx14
-rw-r--r--dbaccess/source/ui/querydesign/query.src2
-rw-r--r--dbaccess/source/ui/querydesign/querycontainerwindow.cxx24
-rw-r--r--dbaccess/source/ui/querydesign/querycontroller.cxx36
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.cxx38
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.hrc16
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.hxx32
-rw-r--r--dbaccess/source/ui/querydesign/querydlg.src8
-rw-r--r--dbaccess/source/ui/querydesign/queryview.cxx2
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnection.cxx8
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnection.hxx4
-rw-r--r--dbaccess/source/ui/relationdesign/RTableConnectionData.cxx34
-rw-r--r--dbaccess/source/ui/relationdesign/RTableWindow.hxx8
-rw-r--r--dbaccess/source/ui/relationdesign/RelationController.cxx64
-rw-r--r--dbaccess/source/ui/relationdesign/RelationDesignView.cxx8
-rw-r--r--dbaccess/source/ui/relationdesign/RelationTableView.cxx30
-rw-r--r--dbaccess/source/ui/relationdesign/relation.src2
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx8
-rw-r--r--dbaccess/source/ui/tabledesign/FieldDescriptions.cxx50
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.cxx96
-rw-r--r--dbaccess/source/ui/tabledesign/TEditControl.hxx82
-rw-r--r--dbaccess/source/ui/tabledesign/TableController.cxx242
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignControl.cxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx4
-rw-r--r--dbaccess/source/ui/tabledesign/TableDesignView.cxx32
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.cxx8
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.hxx28
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx72
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx18
-rw-r--r--dbaccess/source/ui/tabledesign/TableRow.cxx16
-rw-r--r--dbaccess/source/ui/tabledesign/TableRowExchange.cxx2
-rw-r--r--dbaccess/source/ui/tabledesign/TableUndo.cxx12
-rw-r--r--dbaccess/source/ui/tabledesign/TableUndo.hxx58
-rw-r--r--dbaccess/source/ui/tabledesign/table.src14
-rw-r--r--dbaccess/source/ui/uno/AdabasSettingsDlg.cxx6
-rw-r--r--dbaccess/source/ui/uno/AdabasSettingsDlg.hxx6
-rw-r--r--dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx8
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.cxx10
-rw-r--r--dbaccess/source/ui/uno/ColumnControl.hxx8
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.cxx16
-rw-r--r--dbaccess/source/ui/uno/ColumnModel.hxx30
-rw-r--r--dbaccess/source/ui/uno/ColumnPeer.cxx20
-rw-r--r--dbaccess/source/ui/uno/ColumnPeer.hxx8
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.cxx6
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlg.hxx6
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx8
-rw-r--r--dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx6
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.cxx6
-rw-r--r--dbaccess/source/ui/uno/TableFilterDlg.hxx6
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.cxx6
-rw-r--r--dbaccess/source/ui/uno/UserSettingsDlg.hxx6
-rw-r--r--dbaccess/source/ui/uno/admindlg.cxx8
-rw-r--r--dbaccess/source/ui/uno/admindlg.hxx6
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.cxx16
-rw-r--r--dbaccess/source/ui/uno/composerdialogs.hxx2
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.cxx16
-rw-r--r--dbaccess/source/ui/uno/copytablewizard.src2
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.cxx8
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.hxx18
-rw-r--r--dbaccess/source/ui/uno/dbinteraction.src2
-rw-r--r--dbaccess/source/ui/uno/textconnectionsettings_uno.cxx8
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.cxx10
-rw-r--r--dbaccess/source/ui/uno/unoDirectSql.hxx10
-rw-r--r--dbaccess/source/ui/uno/unoadmin.cxx6
-rw-r--r--dbaccess/source/ui/uno/unosqlmessage.cxx6
-rw-r--r--dbaccess/uiconfig/dbapp/toolbar/toolbar.xml2
-rw-r--r--dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml4
-rw-r--r--dbaccess/uiconfig/dbtdata/menubar/menubar.xml1
-rw-r--r--dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml4
-rw-r--r--dbaccess/util/hidother.src778
-rw-r--r--dbaccess/win32/source/odbcconfig/odbcconfig.cxx4
-rw-r--r--reportdesign/inc/ModuleHelper.hxx22
-rw-r--r--reportdesign/inc/PropertyForward.hxx22
-rw-r--r--reportdesign/inc/ReportDefinition.hxx26
-rw-r--r--reportdesign/inc/ReportHelperDefines.hxx4
-rw-r--r--reportdesign/inc/ReportVisitor.hxx4
-rw-r--r--reportdesign/inc/RptDef.hxx10
-rw-r--r--reportdesign/inc/RptModel.hxx8
-rw-r--r--reportdesign/inc/RptObject.hxx46
-rw-r--r--reportdesign/inc/RptPage.hxx12
-rw-r--r--reportdesign/inc/RptResId.hrc386
-rw-r--r--reportdesign/inc/UndoActions.hxx48
-rw-r--r--reportdesign/inc/UndoEnv.hxx14
-rw-r--r--reportdesign/inc/conditionalexpression.hxx2
-rw-r--r--reportdesign/inc/dllapi.h8
-rw-r--r--reportdesign/inc/helpids.hrc158
-rw-r--r--reportdesign/inc/pch/precompiled_reportdesign.cxx2
-rw-r--r--reportdesign/inc/pch/precompiled_reportdesign.hxx2
-rw-r--r--reportdesign/inc/reportformula.hxx2
-rw-r--r--reportdesign/inc/rptui_slotid.hrc300
-rwxr-xr-xreportdesign/qa/complex/ReportDesignerTest.java122
-rw-r--r--reportdesign/source/core/api/FixedLine.cxx44
-rw-r--r--reportdesign/source/core/api/FixedText.cxx10
-rw-r--r--reportdesign/source/core/api/FormatCondition.cxx10
-rw-r--r--reportdesign/source/core/api/FormattedField.cxx12
-rw-r--r--reportdesign/source/core/api/Function.cxx10
-rw-r--r--reportdesign/source/core/api/Functions.cxx18
-rw-r--r--reportdesign/source/core/api/Group.cxx22
-rw-r--r--reportdesign/source/core/api/Groups.cxx22
-rw-r--r--reportdesign/source/core/api/ImageControl.cxx100
-rw-r--r--reportdesign/source/core/api/ReportComponent.cxx2
-rw-r--r--reportdesign/source/core/api/ReportControlModel.cxx2
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx394
-rw-r--r--reportdesign/source/core/api/ReportEngineJFree.cxx2
-rw-r--r--reportdesign/source/core/api/ReportVisitor.cxx4
-rw-r--r--reportdesign/source/core/api/Section.cxx26
-rw-r--r--reportdesign/source/core/api/Shape.cxx22
-rw-r--r--reportdesign/source/core/api/Tools.cxx2
-rw-r--r--reportdesign/source/core/api/services.cxx6
-rw-r--r--reportdesign/source/core/inc/FixedLine.hxx32
-rw-r--r--reportdesign/source/core/inc/FixedText.hxx20
-rw-r--r--reportdesign/source/core/inc/FormatCondition.hxx22
-rw-r--r--reportdesign/source/core/inc/FormattedField.hxx24
-rw-r--r--reportdesign/source/core/inc/Function.hxx18
-rw-r--r--reportdesign/source/core/inc/Functions.hxx26
-rw-r--r--reportdesign/source/core/inc/Group.hxx34
-rw-r--r--reportdesign/source/core/inc/Groups.hxx28
-rw-r--r--reportdesign/source/core/inc/ImageControl.hxx22
-rw-r--r--reportdesign/source/core/inc/ReportComponent.hxx28
-rw-r--r--reportdesign/source/core/inc/ReportControlModel.hxx58
-rw-r--r--reportdesign/source/core/inc/ReportDrawPage.hxx2
-rw-r--r--reportdesign/source/core/inc/ReportEngineJFree.hxx26
-rw-r--r--reportdesign/source/core/inc/ReportHelperImpl.hxx2
-rw-r--r--reportdesign/source/core/inc/ReportUndoFactory.hxx6
-rw-r--r--reportdesign/source/core/inc/RptObjectListener.hxx6
-rw-r--r--reportdesign/source/core/inc/Section.hxx62
-rw-r--r--reportdesign/source/core/inc/Shape.hxx16
-rw-r--r--reportdesign/source/core/inc/Tools.hxx4
-rw-r--r--reportdesign/source/core/inc/conditionupdater.hxx2
-rw-r--r--reportdesign/source/core/inc/core_resource.hrc36
-rw-r--r--reportdesign/source/core/inc/core_resource.hxx4
-rw-r--r--reportdesign/source/core/misc/conditionalexpression.cxx2
-rw-r--r--reportdesign/source/core/misc/conditionupdater.cxx2
-rw-r--r--reportdesign/source/core/misc/reportformula.cxx10
-rw-r--r--reportdesign/source/core/resource/core_resource.cxx6
-rw-r--r--reportdesign/source/core/resource/strings.src2
-rw-r--r--reportdesign/source/core/sdr/ModuleHelper.cxx22
-rw-r--r--reportdesign/source/core/sdr/PropertyForward.cxx14
-rw-r--r--reportdesign/source/core/sdr/ReportDrawPage.cxx4
-rw-r--r--reportdesign/source/core/sdr/ReportUndoFactory.cxx10
-rw-r--r--reportdesign/source/core/sdr/RptModel.cxx8
-rw-r--r--reportdesign/source/core/sdr/RptObject.cxx74
-rw-r--r--reportdesign/source/core/sdr/RptObjectListener.cxx6
-rw-r--r--reportdesign/source/core/sdr/RptPage.cxx28
-rw-r--r--reportdesign/source/core/sdr/UndoActions.cxx20
-rw-r--r--reportdesign/source/core/sdr/UndoEnv.cxx34
-rw-r--r--reportdesign/source/core/sdr/formatnormalizer.cxx8
-rw-r--r--reportdesign/source/core/sdr/formatnormalizer.hxx2
-rw-r--r--reportdesign/source/filter/xml/dbloader2.cxx4
-rw-r--r--reportdesign/source/filter/xml/dbloader2.hxx8
-rw-r--r--reportdesign/source/filter/xml/xmlAutoStyle.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlAutoStyle.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlCell.cxx18
-rw-r--r--reportdesign/source/filter/xml/xmlCell.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlColumn.cxx12
-rw-r--r--reportdesign/source/filter/xml/xmlColumn.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlComponent.cxx16
-rw-r--r--reportdesign/source/filter/xml/xmlComponent.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlCondPrtExpr.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlCondPrtExpr.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.cxx66
-rw-r--r--reportdesign/source/filter/xml/xmlControlProperty.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlEnums.hxx66
-rw-r--r--reportdesign/source/filter/xml/xmlExport.cxx96
-rw-r--r--reportdesign/source/filter/xml/xmlExport.hxx94
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlFixedContent.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFormatCondition.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlFormatCondition.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlFormattedField.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlFunction.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlFunction.hxx10
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx18
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.hxx8
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.cxx234
-rw-r--r--reportdesign/source/filter/xml/xmlHelper.hxx28
-rw-r--r--reportdesign/source/filter/xml/xmlImage.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImage.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx24
-rw-r--r--reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlMasterFields.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlMasterFields.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlPropertyHandler.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlPropertyHandler.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlReport.cxx16
-rw-r--r--reportdesign/source/filter/xml/xmlReport.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.cxx6
-rw-r--r--reportdesign/source/filter/xml/xmlReportElement.hxx4
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.cxx4
-rw-r--r--reportdesign/source/filter/xml/xmlReportElementBase.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlRow.cxx16
-rw-r--r--reportdesign/source/filter/xml/xmlRow.hxx2
-rw-r--r--reportdesign/source/filter/xml/xmlSection.cxx8
-rw-r--r--reportdesign/source/filter/xml/xmlSection.hxx8
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.cxx10
-rw-r--r--reportdesign/source/filter/xml/xmlStyleImport.hxx20
-rw-r--r--reportdesign/source/filter/xml/xmlSubDocument.cxx16
-rw-r--r--reportdesign/source/filter/xml/xmlSubDocument.hxx6
-rw-r--r--reportdesign/source/filter/xml/xmlTable.cxx12
-rw-r--r--reportdesign/source/filter/xml/xmlTable.hxx10
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx244
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.hxx70
-rw-r--r--reportdesign/source/filter/xml/xmlservices.cxx4
-rw-r--r--reportdesign/source/inc/GroupProperties.hxx18
-rw-r--r--reportdesign/source/inc/constasciistring.hxx10
-rw-r--r--reportdesign/source/inc/corestrings.hrc2
-rw-r--r--reportdesign/source/inc/stringconstants.hrc268
-rw-r--r--reportdesign/source/inc/uistrings.hrc44
-rw-r--r--reportdesign/source/inc/xmlstrings.hrc2
-rw-r--r--reportdesign/source/shared/corestrings.cxx2
-rw-r--r--reportdesign/source/shared/stringconstants.cxx334
-rw-r--r--reportdesign/source/shared/uistrings.cxx36
-rw-r--r--reportdesign/source/shared/xmlstrings.cxx20
-rw-r--r--reportdesign/source/ui/dlg/AddField.cxx24
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.cxx22
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.hrc4
-rw-r--r--reportdesign/source/ui/dlg/CondFormat.src10
-rw-r--r--reportdesign/source/ui/dlg/Condition.cxx2
-rw-r--r--reportdesign/source/ui/dlg/Condition.hxx6
-rw-r--r--reportdesign/source/ui/dlg/DateTime.cxx30
-rw-r--r--reportdesign/source/ui/dlg/DateTime.hrc42
-rw-r--r--reportdesign/source/ui/dlg/DateTime.src12
-rw-r--r--reportdesign/source/ui/dlg/Formula.cxx16
-rw-r--r--reportdesign/source/ui/dlg/GroupExchange.cxx2
-rw-r--r--reportdesign/source/ui/dlg/GroupExchange.hxx8
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.cxx72
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.hrc76
-rw-r--r--reportdesign/source/ui/dlg/GroupsSorting.src106
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx64
-rw-r--r--reportdesign/source/ui/dlg/Navigator.src12
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.cxx14
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.hrc54
-rw-r--r--reportdesign/source/ui/dlg/PageNumber.src18
-rw-r--r--reportdesign/source/ui/dlg/dlgpage.cxx28
-rw-r--r--reportdesign/source/ui/dlg/dlgpage.src10
-rw-r--r--reportdesign/source/ui/inc/AddField.hxx18
-rw-r--r--reportdesign/source/ui/inc/ColorChanger.hxx4
-rw-r--r--reportdesign/source/ui/inc/ColorListener.hxx30
-rw-r--r--reportdesign/source/ui/inc/ColumnInfo.hxx6
-rw-r--r--reportdesign/source/ui/inc/CondFormat.hxx2
-rw-r--r--reportdesign/source/ui/inc/DataProviderHandler.hxx4
-rw-r--r--reportdesign/source/ui/inc/DateTime.hxx36
-rw-r--r--reportdesign/source/ui/inc/DefaultInspection.hxx2
-rw-r--r--reportdesign/source/ui/inc/DesignView.hxx98
-rw-r--r--reportdesign/source/ui/inc/EndMarker.hxx4
-rw-r--r--reportdesign/source/ui/inc/FixedTextColor.hxx2
-rw-r--r--reportdesign/source/ui/inc/FormattedFieldBeautifier.hxx2
-rw-r--r--reportdesign/source/ui/inc/Formula.hxx8
-rw-r--r--reportdesign/source/ui/inc/FunctionHelper.hxx2
-rw-r--r--reportdesign/source/ui/inc/GeometryHandler.hxx18
-rw-r--r--reportdesign/source/ui/inc/GroupsSorting.hxx94
-rw-r--r--reportdesign/source/ui/inc/IReportControllerObserver.hxx6
-rw-r--r--reportdesign/source/ui/inc/InsertFunctions.hxx4
-rw-r--r--reportdesign/source/ui/inc/MarkedSection.hxx6
-rw-r--r--reportdesign/source/ui/inc/Navigator.hxx6
-rw-r--r--reportdesign/source/ui/inc/PageNumber.hxx38
-rw-r--r--reportdesign/source/ui/inc/ReportComponentHandler.hxx4
-rw-r--r--reportdesign/source/ui/inc/ReportController.hxx106
-rw-r--r--reportdesign/source/ui/inc/ReportControllerObserver.hxx14
-rw-r--r--reportdesign/source/ui/inc/ReportDefines.hxx8
-rw-r--r--reportdesign/source/ui/inc/ReportRuler.hxx12
-rw-r--r--reportdesign/source/ui/inc/ReportSection.hxx80
-rw-r--r--reportdesign/source/ui/inc/ReportWindow.hxx82
-rw-r--r--reportdesign/source/ui/inc/ScrollHelper.hxx86
-rw-r--r--reportdesign/source/ui/inc/SectionView.hxx10
-rw-r--r--reportdesign/source/ui/inc/SectionWindow.hxx36
-rw-r--r--reportdesign/source/ui/inc/StartMarker.hxx34
-rw-r--r--reportdesign/source/ui/inc/UITools.hxx36
-rw-r--r--reportdesign/source/ui/inc/Undo.hxx48
-rw-r--r--reportdesign/source/ui/inc/ViewsWindow.hxx68
-rw-r--r--reportdesign/source/ui/inc/dlgedclip.hxx18
-rw-r--r--reportdesign/source/ui/inc/dlgedfac.hxx2
-rw-r--r--reportdesign/source/ui/inc/dlgedfunc.hxx18
-rw-r--r--reportdesign/source/ui/inc/dlgpage.hxx4
-rw-r--r--reportdesign/source/ui/inc/metadata.hxx32
-rw-r--r--reportdesign/source/ui/inc/propbrw.hxx22
-rw-r--r--reportdesign/source/ui/inc/statusbarcontroller.hxx22
-rw-r--r--reportdesign/source/ui/inc/toolboxcontroller.hxx10
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx16
-rw-r--r--reportdesign/source/ui/inspection/DefaultInspection.cxx18
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx112
-rw-r--r--reportdesign/source/ui/inspection/ReportComponentHandler.cxx4
-rw-r--r--reportdesign/source/ui/inspection/inspection.src18
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx24
-rw-r--r--reportdesign/source/ui/misc/ColorListener.cxx18
-rw-r--r--reportdesign/source/ui/misc/FunctionHelper.cxx14
-rw-r--r--reportdesign/source/ui/misc/UITools.cxx14
-rw-r--r--reportdesign/source/ui/misc/Undo.cxx20
-rw-r--r--reportdesign/source/ui/misc/rptuiservices.cxx4
-rw-r--r--reportdesign/source/ui/misc/statusbarcontroller.cxx10
-rw-r--r--reportdesign/source/ui/misc/toolboxcontroller.cxx6
-rw-r--r--reportdesign/source/ui/report/DesignView.cxx16
-rw-r--r--reportdesign/source/ui/report/EndMarker.cxx8
-rw-r--r--reportdesign/source/ui/report/FixedTextColor.cxx40
-rw-r--r--reportdesign/source/ui/report/FormattedFieldBeautifier.cxx18
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx564
-rw-r--r--reportdesign/source/ui/report/ReportControllerObserver.cxx46
-rw-r--r--reportdesign/source/ui/report/ReportRuler.cxx6
-rw-r--r--reportdesign/source/ui/report/ReportSection.cxx48
-rw-r--r--reportdesign/source/ui/report/ReportWindow.cxx66
-rw-r--r--reportdesign/source/ui/report/ScrollHelper.cxx38
-rw-r--r--reportdesign/source/ui/report/SectionView.cxx12
-rw-r--r--reportdesign/source/ui/report/SectionWindow.cxx36
-rw-r--r--reportdesign/source/ui/report/StartMarker.cxx26
-rw-r--r--reportdesign/source/ui/report/ViewsWindow.cxx150
-rw-r--r--reportdesign/source/ui/report/dlgedclip.cxx4
-rw-r--r--reportdesign/source/ui/report/dlgedfac.cxx10
-rw-r--r--reportdesign/source/ui/report/dlgedfunc.cxx258
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx24
-rw-r--r--reportdesign/source/ui/report/report.src40
-rw-r--r--reportdesign/uiconfig/dbreport/toolbar/arrowshapes.xml22
-rw-r--r--reportdesign/uiconfig/dbreport/toolbar/basicshapes.xml14
-rw-r--r--reportdesign/uiconfig/dbreport/toolbar/flowchartshapes.xml26
-rw-r--r--reportdesign/uiconfig/dbreport/toolbar/reportcontrols.xml2
-rw-r--r--reportdesign/uiconfig/dbreport/toolbar/symbolshapes.xml6
-rw-r--r--reportdesign/util/hidother.src90
1017 files changed, 16174 insertions, 16175 deletions
diff --git a/dbaccess/inc/AsyncronousLink.hxx b/dbaccess/inc/AsyncronousLink.hxx
index 93faab850163..36334a8684d3 100644
--- a/dbaccess/inc/AsyncronousLink.hxx
+++ b/dbaccess/inc/AsyncronousLink.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -50,11 +50,11 @@ namespace dbaui
protected:
::osl::Mutex m_aEventSafety;
::osl::Mutex m_aDestructionSafety;
- ULONG m_nEventId;
+ ULONG m_nEventId;
public:
/** constructs the object
- @param _rHandler The link to be called asyncronously
+ @param _rHandler The link to be called asyncronously
*/
OAsyncronousLink( const Link& _rHandler );
virtual ~OAsyncronousLink();
diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx
index 962782ea5e18..81a358175c88 100644
--- a/dbaccess/inc/IController.hxx
+++ b/dbaccess/inc/IController.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -52,43 +52,43 @@ namespace dbaui
{
public:
/** executes the given command without checking if it is allowed
- @param _rCommand the URL of the command
+ @param _rCommand the URL of the command
*/
virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0;
/** executes the given command only when it is allowed
- @param _rCommand
+ @param _rCommand
the URL of the command
*/
virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0;
/** executes the given command without checking if it is allowed
- @param _nCommandId
- the id of the command URL
+ @param _nCommandId
+ the id of the command URL
*/
virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0;
/** executes the given command only when it is allowed
- @param _nCommandId
- the id of the command URL
+ @param _nCommandId
+ the id of the command URL
*/
virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0;
/** checks if the given Command is enabled
- @param _nCommandId
- the id of the command URL
-
- @return
+ @param _nCommandId
+ the id of the command URL
+
+ @return
<TRUE/> if the command is allowed, otherwise <FALSE/>.
*/
virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const = 0;
/** checks if the given Command is enabled
- @param _rCompleteCommandURL
+ @param _rCompleteCommandURL
the URL of the command
-
- @return
+
+ @return
<TRUE/> if the command is allowed, otherwise <FALSE/>.
*/
virtual sal_Bool isCommandEnabled( const ::rtl::OUString& _rCompleteCommandURL ) const = 0;
@@ -108,13 +108,13 @@ namespace dbaui
registerCommandURL( const ::rtl::OUString& _rCompleteCommandURL ) = 0;
/** notifyHiContrastChanged will be called when the hicontrast mode changed.
- @param _bHiContrast
+ @param _bHiContrast
<TRUE/> when in hicontrast mode.
*/
virtual void notifyHiContrastChanged() = 0;
/** checks if the selected data source is read only
- @return
+ @return
<TRUE/> if read only, otherwise <FALSE/>
*/
virtual sal_Bool isDataSourceReadOnly() const = 0;
diff --git a/dbaccess/inc/IEnvironment.hxx b/dbaccess/inc/IEnvironment.hxx
index 64ad54844912..3033623e76c2 100644
--- a/dbaccess/inc/IEnvironment.hxx
+++ b/dbaccess/inc/IEnvironment.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/inc/IReference.hxx b/dbaccess/inc/IReference.hxx
index 01534f6063e0..bd2e45927bd1 100644
--- a/dbaccess/inc/IReference.hxx
+++ b/dbaccess/inc/IReference.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -41,6 +41,6 @@ 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 e95e40a0f4a1..49d41b74959e 100644
--- a/dbaccess/inc/ToolBoxHelper.hxx
+++ b/dbaccess/inc/ToolBoxHelper.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -43,41 +43,41 @@ namespace dbaui
{
class DBACCESS_DLLPUBLIC OToolBoxHelper
{
- sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode
- sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps
- ToolBox* m_pToolBox; // our toolbox (may be NULL)
+ sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode
+ sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps
+ ToolBox* m_pToolBox; // our toolbox (may be NULL)
public:
OToolBoxHelper();
virtual ~OToolBoxHelper();
/** will be called when the controls need to be resized.
- @param _rDiff
+ @param _rDiff
Contains the difference of the old and new toolbox size.
*/
virtual void resizeControls(const Size& _rDiff) = 0;
/** will be called when the image list is needed.
- @param _eSymbolsSize
+ @param _eSymbolsSize
<svtools/imgdef.hxx>
- @param _bHiContast
+ @param _bHiContast
<TRUE/> when in high contrast mode.
*/
virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const = 0;
/** only the member will be set, derived classes can overload this function and do what need to be done.
- @param _pTB
+ @param _pTB
The new ToolBox.
@attention
Must be called after a FreeResource() call.
*/
- virtual void setToolBox(ToolBox* _pTB);
+ virtual void setToolBox(ToolBox* _pTB);
- inline ToolBox* getToolBox() const { return m_pToolBox; }
+ inline ToolBox* getToolBox() const { return m_pToolBox; }
/** checks if the toolbox needs a new imagelist.
*/
void checkImageList();
-
+
inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; }
protected:
DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*);
diff --git a/dbaccess/inc/controllerframe.hxx b/dbaccess/inc/controllerframe.hxx
index 19daaebb3d69..7fb7bd7c3895 100644
--- a/dbaccess/inc/controllerframe.hxx
+++ b/dbaccess/inc/controllerframe.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/inc/dataview.hxx b/dbaccess/inc/dataview.hxx
index e3026f15ce56..ac3e56211426 100644
--- a/dbaccess/inc/dataview.hxx
+++ b/dbaccess/inc/dataview.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -40,19 +40,19 @@ class SvtMiscOptions;
namespace dbaui
{
class IController;
- class DBACCESS_DLLPUBLIC ODataView : public Window
+ class DBACCESS_DLLPUBLIC ODataView : public Window
{
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the service factory to work with
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the service factory to work with
protected:
- IController& m_rController; // the controller in where we resides in
- FixedLine* m_pSeparator; // our separator above the toolbox (may be NULL)
+ IController& m_rController; // the controller in where we resides in
+ FixedLine* m_pSeparator; // our separator above the toolbox (may be NULL)
::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel;
public:
- ODataView( Window* pParent,
+ ODataView( Window* pParent,
IController& _rController,
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ,
WinBits nStyle = 0 );
virtual ~ODataView();
@@ -71,8 +71,8 @@ namespace dbaui
*/
virtual void resizeControls(const Size& /*_rDiff*/) { Resize(); }
- void enableSeparator( const sal_Bool _bEnable = sal_True );
- sal_Bool isSeparatorEnabled() const { return NULL != m_pSeparator; }
+ void enableSeparator( const sal_Bool _bEnable = sal_True );
+ sal_Bool isSeparatorEnabled() const { return NULL != m_pSeparator; }
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xServiceFactory;}
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index 22d1ceb11368..0dcf6d624a00 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -29,324 +29,324 @@
#define _DBA_DBACCESS_HELPID_HRC_
#ifndef _SOLAR_HRC
-#include <svl/solar.hrc> // HID_DBACCESS_START
+#include <svl/solar.hrc> // HID_DBACCESS_START
#endif
-#define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9)
-
-#define HID_DLG_FILTERCRIT (HID_DBACCESS_START + 15)
-#define HID_DLG_ORDERCRIT (HID_DBACCESS_START + 16)
-
-#define HID_DATABROWSE_HEADER (HID_DBACCESS_START + 17)
-#define HID_CTL_TABBROWSER (HID_DBACCESS_START + 18)
-#define UID_DATABROWSE_DATAWINDOW (HID_DBACCESS_START + 19)
-#define HID_CTL_TREEVIEW (HID_DBACCESS_START + 20)
-#define UID_CTL_CONTENT (HID_DBACCESS_START + 21)
-#define HID_TLB_TABBROWSER (HID_DBACCESS_START + 22)
-#define HID_TLB_TREELISTBOX (HID_DBACCESS_START + 23)
-#define HID_DSADMIN_DIALOG (HID_DBACCESS_START + 24)
-
-
-#define HID_DSADMIN_TABCONTROL (HID_DBACCESS_START + 27)
-#define HID_DSADMIN_PAGE_GENERAL (HID_DBACCESS_START + 28)
-#define HID_DSADMIN_PAGE_DBASE (HID_DBACCESS_START + 29)
-#define HID_DSADMIN_PAGE_JDBC (HID_DBACCESS_START + 30)
-#define HID_DSADMIN_PAGE_ODBC (HID_DBACCESS_START + 31)
-#define HID_DSADMIN_PAGE_ADABAS (HID_DBACCESS_START + 32)
-#define HID_DSADMIN_PAGE_TEXT (HID_DBACCESS_START + 33)
-#define HID_DSADMIN_TABLE_SUBSCRIPTION (HID_DBACCESS_START + 34)
-#define HID_DSADMIN_DSACTIONS_NEWDS (HID_DBACCESS_START + 35)
-#define HID_DSADMIN_DSACTIONS_DELETEDS (HID_DBACCESS_START + 36)
-#define HID_DSADMIN_DSACTIONS_RESTOREDS (HID_DBACCESS_START + 37)
-#define HID_DSADMIN_DSNAME (HID_DBACCESS_START + 38)
-#define HID_DSADMIN_DSTYPE (HID_DBACCESS_START + 39)
-#define HID_DSADMIN_URL_GENERAL (HID_DBACCESS_START + 40)
-#define HID_DSADMIN_BROWSECONN (HID_DBACCESS_START + 41)
-#define HID_DSADMIN_LOGINTIMEOUT_NUMBER (HID_DBACCESS_START + 42)
-#define HID_DSADMIN_LOGINTIMEOUT_UNIT (HID_DBACCESS_START + 43)
-#define HID_DSADMIN_SHOWDELETED (HID_DBACCESS_START + 44)
-#define HID_DSADMIN_ALLOWLONG (HID_DBACCESS_START + 45)
-#define HID_DSADMIN_DBASE_INDICIES (HID_DBACCESS_START + 46)
-#define HID_DSADMIN_DRIVERCLASS (HID_DBACCESS_START + 47)
-#define HID_DSADMIN_ODBC_OPTIONS (HID_DBACCESS_START + 48)
-#define HID_DSADMIN_TEXT_HEADER (HID_DBACCESS_START + 49)
-#define HID_DSADMIN_FIELD_SEPARATOR (HID_DBACCESS_START + 50)
-#define HID_DSADMIN_TEXT_SEPARATOR (HID_DBACCESS_START + 51)
-#define HID_DSADMIN_DECIMAL_SEPARATOR (HID_DBACCESS_START + 52)
-#define HID_DSADMIN_THOUSANDS_SEPARATOR (HID_DBACCESS_START + 53)
-#define HID_DSADMIN_EXTENSION (HID_DBACCESS_START + 54)
-#define HID_DSADMIN_ALL_TABLES (HID_DBACCESS_START + 55)
-#define HID_DSADMIN_NO_TABLES (HID_DBACCESS_START + 56)
-#define HID_DSADMIN_SELECT_TABLES (HID_DBACCESS_START + 57)
-#define HID_DSADMIN_TABLE_SELECTOR (HID_DBACCESS_START + 58)
-#define HID_DSADMIN_SUPPRESS_VERSIONCL (HID_DBACCESS_START + 59)
-
-#define HID_GENERIC_SQL_ERROR (HID_DBACCESS_START + 60)
-
-#define HID_BROWSER_COLUMNFORMAT (HID_DBACCESS_START + 61)
-#define HID_BROWSER_COLUMNWIDTH (HID_DBACCESS_START + 62)
-#define HID_BROWSER_TABLEFORMAT (HID_DBACCESS_START + 63)
-#define HID_BROWSER_ROWHEIGHT (HID_DBACCESS_START + 64)
+#define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9)
+
+#define HID_DLG_FILTERCRIT (HID_DBACCESS_START + 15)
+#define HID_DLG_ORDERCRIT (HID_DBACCESS_START + 16)
+
+#define HID_DATABROWSE_HEADER (HID_DBACCESS_START + 17)
+#define HID_CTL_TABBROWSER (HID_DBACCESS_START + 18)
+#define UID_DATABROWSE_DATAWINDOW (HID_DBACCESS_START + 19)
+#define HID_CTL_TREEVIEW (HID_DBACCESS_START + 20)
+#define UID_CTL_CONTENT (HID_DBACCESS_START + 21)
+#define HID_TLB_TABBROWSER (HID_DBACCESS_START + 22)
+#define HID_TLB_TREELISTBOX (HID_DBACCESS_START + 23)
+#define HID_DSADMIN_DIALOG (HID_DBACCESS_START + 24)
+
+
+#define HID_DSADMIN_TABCONTROL (HID_DBACCESS_START + 27)
+#define HID_DSADMIN_PAGE_GENERAL (HID_DBACCESS_START + 28)
+#define HID_DSADMIN_PAGE_DBASE (HID_DBACCESS_START + 29)
+#define HID_DSADMIN_PAGE_JDBC (HID_DBACCESS_START + 30)
+#define HID_DSADMIN_PAGE_ODBC (HID_DBACCESS_START + 31)
+#define HID_DSADMIN_PAGE_ADABAS (HID_DBACCESS_START + 32)
+#define HID_DSADMIN_PAGE_TEXT (HID_DBACCESS_START + 33)
+#define HID_DSADMIN_TABLE_SUBSCRIPTION (HID_DBACCESS_START + 34)
+#define HID_DSADMIN_DSACTIONS_NEWDS (HID_DBACCESS_START + 35)
+#define HID_DSADMIN_DSACTIONS_DELETEDS (HID_DBACCESS_START + 36)
+#define HID_DSADMIN_DSACTIONS_RESTOREDS (HID_DBACCESS_START + 37)
+#define HID_DSADMIN_DSNAME (HID_DBACCESS_START + 38)
+#define HID_DSADMIN_DSTYPE (HID_DBACCESS_START + 39)
+#define HID_DSADMIN_URL_GENERAL (HID_DBACCESS_START + 40)
+#define HID_DSADMIN_BROWSECONN (HID_DBACCESS_START + 41)
+#define HID_DSADMIN_LOGINTIMEOUT_NUMBER (HID_DBACCESS_START + 42)
+#define HID_DSADMIN_LOGINTIMEOUT_UNIT (HID_DBACCESS_START + 43)
+#define HID_DSADMIN_SHOWDELETED (HID_DBACCESS_START + 44)
+#define HID_DSADMIN_ALLOWLONG (HID_DBACCESS_START + 45)
+#define HID_DSADMIN_DBASE_INDICIES (HID_DBACCESS_START + 46)
+#define HID_DSADMIN_DRIVERCLASS (HID_DBACCESS_START + 47)
+#define HID_DSADMIN_ODBC_OPTIONS (HID_DBACCESS_START + 48)
+#define HID_DSADMIN_TEXT_HEADER (HID_DBACCESS_START + 49)
+#define HID_DSADMIN_FIELD_SEPARATOR (HID_DBACCESS_START + 50)
+#define HID_DSADMIN_TEXT_SEPARATOR (HID_DBACCESS_START + 51)
+#define HID_DSADMIN_DECIMAL_SEPARATOR (HID_DBACCESS_START + 52)
+#define HID_DSADMIN_THOUSANDS_SEPARATOR (HID_DBACCESS_START + 53)
+#define HID_DSADMIN_EXTENSION (HID_DBACCESS_START + 54)
+#define HID_DSADMIN_ALL_TABLES (HID_DBACCESS_START + 55)
+#define HID_DSADMIN_NO_TABLES (HID_DBACCESS_START + 56)
+#define HID_DSADMIN_SELECT_TABLES (HID_DBACCESS_START + 57)
+#define HID_DSADMIN_TABLE_SELECTOR (HID_DBACCESS_START + 58)
+#define HID_DSADMIN_SUPPRESS_VERSIONCL (HID_DBACCESS_START + 59)
+
+#define HID_GENERIC_SQL_ERROR (HID_DBACCESS_START + 60)
+
+#define HID_BROWSER_COLUMNFORMAT (HID_DBACCESS_START + 61)
+#define HID_BROWSER_COLUMNWIDTH (HID_DBACCESS_START + 62)
+#define HID_BROWSER_TABLEFORMAT (HID_DBACCESS_START + 63)
+#define HID_BROWSER_ROWHEIGHT (HID_DBACCESS_START + 64)
#define HID_BROWSER_EDIT_DATABASE (HID_DBACCESS_START + 65)
-#define HID_BROWSER_CLOSECONN (HID_DBACCESS_START + 66)
-#define HID_BROWSER_REFRESHCONN (HID_DBACCESS_START + 67)
-
-#define HID_DLG_ROWHEIGHT (HID_DBACCESS_START + 68)
-#define HID_DLG_COLWIDTH (HID_DBACCESS_START + 69)
-
-
-#define HID_TLB_QUERYDESIGN (HID_DBACCESS_START + 70)
-#define HID_CTL_QRYSQLEDIT (HID_DBACCESS_START + 71)
-#define HID_DSADMIN_SPECIAL_MESSAGE (HID_DBACCESS_START + 72)
-
-#define HID_BROWSER_QUERY_CREATE_TEXT (HID_DBACCESS_START + 73)
-
-#define HID_DLG_ERROR (HID_DBACCESS_START + 74)
-#define HID_DLG_TEXT (HID_DBACCESS_START + 75)
-#define UID_SQLERROR_BUTTONMORE (HID_DBACCESS_START + 76)
-#define HID_DLG_SAVE_AS (HID_DBACCESS_START + 77)
-
-#define HID_BROWSER_QUERY_EDIT (HID_DBACCESS_START + 78)
-#define HID_BROWSER_QUERY_DELETE (HID_DBACCESS_START + 79)
-
-#define HID_DSADMIN_USER_ADO (HID_DBACCESS_START + 80)
-#define HID_DSADMIN_PWDREC_ADO (HID_DBACCESS_START + 81)
-#define HID_DSADMIN_CONNURL_ADOPAGE (HID_DBACCESS_START + 82)
-#define HID_DSADMIN_PAGE_ADO (HID_DBACCESS_START + 83)
-
-
-#define HID_JOINSH_ADDTAB_CLOSE (HID_DBACCESS_START + 84)
-#define HID_JOINSH_ADDTAB_TABLELIST (HID_DBACCESS_START + 85)
-#define HID_CTL_QRYDGNTAB (HID_DBACCESS_START + 86)
-#define HID_DLG_QRY_JOIN (HID_DBACCESS_START + 87)
-#define HID_DLG_QRY_JOINTYPE (HID_DBACCESS_START + 88)
-#define HID_JOINSH_ADDTAB_QUERYLIST (HID_DBACCESS_START + 89)
-#define HID_DLG_QRY_HELPTEXT (HID_DBACCESS_START + 92)
-
-#define HID_CTL_QRYDGNCRIT (HID_DBACCESS_START + 93)
-#define HID_QRYDGN_ROW_VISIBLE (HID_DBACCESS_START + 94)
-#define HID_QRYDGN_ROW_TABLE (HID_DBACCESS_START + 95)
-#define HID_QRYDGN_ROW_FIELD (HID_DBACCESS_START + 96)
-#define HID_QRYDGN_ROW_ORDER (HID_DBACCESS_START + 97)
-#define HID_QRYDGN_ROW_FUNCTION (HID_DBACCESS_START + 98)
-#define HID_QRYDGN_ROW_ALIAS (HID_DBACCESS_START + 99)
-#define HID_QRYDGN_ROW_CRIT (HID_DBACCESS_START + 100)
-
-#define HID_QUERY_FUNCTION (HID_DBACCESS_START + 101)
-#define HID_QUERY_TABLENAME (HID_DBACCESS_START + 102)
-#define HID_QUERY_ALIASNAME (HID_DBACCESS_START + 103)
-#define HID_QUERY_DISTINCT (HID_DBACCESS_START + 104)
-
-#define HID_BROWSER_QUERY_CREATE_DESIGN (HID_DBACCESS_START + 105)
-
-#define HID_DSADMIN_QUERIES (HID_DBACCESS_START + 106)
-#define HID_DSADMIN_QUERIES_NEW (HID_DBACCESS_START + 107)
-#define HID_DSADMIN_QUERIES_EDIT (HID_DBACCESS_START + 108)
-#define HID_DSADMIN_QUERIES_DELETE (HID_DBACCESS_START + 109)
-#define HID_DSADMIN_QUERYADMINISTRATION (HID_DBACCESS_START + 110)
-
-
-#define HID_TAB_DESIGN_TABLE_DESC (HID_DBACCESS_START + 111)
-#define HID_TAB_DESIGN_FIELDCONTROL (HID_DBACCESS_START + 112)
-#define HID_TABLE_DESIGN_HELP_WINDOW (HID_DBACCESS_START + 113)
-#define HID_TAB_DESIGN_DESCWIN (HID_DBACCESS_START + 114)
-#define HID_TAB_DESIGN_TABLE_PROPS (HID_DBACCESS_START + 115)
-#define HID_TABDESIGN_BACKGROUND (HID_DBACCESS_START + 116)
-#define HID_CTL_TABLEEDIT (HID_DBACCESS_START + 117)
-#define HID_TABDESIGN_NAMECELL (HID_DBACCESS_START + 118)
-#define HID_TABDESIGN_TYPECELL (HID_DBACCESS_START + 119)
-#define HID_TABDESIGN_COMMENTCELL (HID_DBACCESS_START + 120)
-#define SID_TABLEDESIGN_INSERTROWS (HID_DBACCESS_START + 121)
-#define SID_TABLEDESIGN_TABED_PRIMARYKEY (HID_DBACCESS_START + 122)
-#define HID_TLB_TABLEDESIGN (HID_DBACCESS_START + 123)
-#define HID_TAB_DESIGN_HELP_TEXT_FRAME (HID_DBACCESS_START + 124)
-#define HID_TABLE_DESIGN_TABPAGE_GENERAL (HID_DBACCESS_START + 125)
-#define HID_TAB_ENT_DEFAULT (HID_DBACCESS_START + 126)
-#define HID_TAB_ENT_FORMAT_SAMPLE (HID_DBACCESS_START + 127)
-#define HID_TAB_ENT_FORMAT (HID_DBACCESS_START + 128)
-#define HID_TAB_ENT_BOOL_DEFAULT (HID_DBACCESS_START + 129)
-#define HID_TAB_ENT_REQUIRED (HID_DBACCESS_START + 130)
-#define HID_TAB_ENT_AUTOINCREMENT (HID_DBACCESS_START + 131)
-#define HID_TAB_ENT_TEXT_LEN (HID_DBACCESS_START + 132)
-#define HID_TAB_ENT_TYPE (HID_DBACCESS_START + 133)
-#define HID_TAB_ENT_COLUMNNAME (HID_DBACCESS_START + 134)
-#define HID_TAB_ENT_NUMTYP (HID_DBACCESS_START + 135)
-#define HID_TAB_ENT_LEN (HID_DBACCESS_START + 136)
-#define HID_TAB_ENT_SCALE (HID_DBACCESS_START + 137)
-#define HID_BROWSER_TABLE_CREATE_DESIGN (HID_DBACCESS_START + 138)
-#define HID_BROWSER_TABLE_EDIT (HID_DBACCESS_START + 139)
-#define HID_BROWSER_TABLE_DELETE (HID_DBACCESS_START + 140)
-#define HID_SQLERROR_EXCHAIN_ERRORS (HID_DBACCESS_START + 141)
-#define HID_SQLERROR_EXCHAIN_TEXT (HID_DBACCESS_START + 142)
-#define HID_TAB_WIZ_COLUMN_SELECT (HID_DBACCESS_START + 146)
-#define HID_TAB_WIZ_TYPE_SELECT (HID_DBACCESS_START + 147)
-#define HID_TAB_NAMEMATCHING_COLS_AVAIL (HID_DBACCESS_START + 148)
-#define HID_TAB_NAMEMATCHING_COLS_ASSIGN (HID_DBACCESS_START + 149)
-#define HID_TAB_WIZ_COPYTABLE (HID_DBACCESS_START + 150)
-#define HID_TAB_WIZ_TABLENAME_EDIT (HID_DBACCESS_START + 151)
-#define HID_CTL_RELATIONTAB (HID_DBACCESS_START + 152)
-#define HID_TLB_RELATIONDESIGN (HID_DBACCESS_START + 153)
-#define HID_RELATIONDIALOG_LEFTFIELDCELL (HID_DBACCESS_START + 154)
-#define HID_RELATIONDIALOG_RIGHTFIELDCELL (HID_DBACCESS_START + 155)
-#define HID_RELDLG_KEYFIELDS (HID_DBACCESS_START + 156)
-#define HID_BROWSER_RELATION_DESIGN (HID_DBACCESS_START + 157)
-#define HID_TABLE_DESIGN_NO_CONNECTION (HID_DBACCESS_START + 158)
-#define HID_DSADMIN_CREATEDATABASE (HID_DBACCESS_START + 159)
-#define HID_BROWSER_COLUMNINFO (HID_DBACCESS_START + 160)
-#define HID_DSADMIN_USECATALOG (HID_DBACCESS_START + 161)
-#define HID_BROWSER_VIEW_CREATE_DESIGN (HID_DBACCESS_START + 162)
-#define HID_DSADMIN_DOCUMENTS (HID_DBACCESS_START + 166)
-#define HID_DSADMIN_DOCUMENTLINKS (HID_DBACCESS_START + 167)
-#define HID_DSADMIN_FILTER_EXPLANATION (HID_DBACCESS_START + 168)
-#define HID_CONFIRM_DROP_BUTTON_ALL (HID_DBACCESS_START + 169)
-#define HID_DSBROWSER_BOOKMARK_SELECTED (HID_DBACCESS_START + 170)
-#define HID_DSADMIN_TABLE_TOOLBOX (HID_DBACCESS_START + 171)
-#define HID_DSADMIN_QUERY_TOOLBOX (HID_DBACCESS_START + 172)
-#define HID_DSADMIN_BOOKMARK_TOOLBOX (HID_DBACCESS_START + 173)
-#define HID_DSADMIN_PAGE_LDAP (HID_DBACCESS_START + 174)
-#define HID_DSADMIN_LDAP_HOSTNAME (HID_DBACCESS_START + 175)
-#define HID_DSADMIN_LDAP_BASEDN (HID_DBACCESS_START + 176)
-#define HID_DSADMIN_LDAP_PORTNUMBER (HID_DBACCESS_START + 177)
-#define HID_DSBROWSER_BOOKMARKSELECTED (HID_DBACCESS_START + 178)
-#define HID_DSBROWSER_DISCONNECTING (HID_DBACCESS_START + 179)
-#define HID_TAB_PAGE_USERADMIN (HID_DBACCESS_START + 180)
-#define HID_TAB_PAGE_PBUSER (HID_DBACCESS_START + 181)
-#define HID_TAB_PAGE_PBCHGPWD (HID_DBACCESS_START + 182)
-#define HID_TAB_PAGE_PBUSERDELETE (HID_DBACCESS_START + 183)
-#define HID_TAB_PAGE_TBLGRANTS (HID_DBACCESS_START + 184)
-#define HID_TAB_PAGE_LBUSER (HID_DBACCESS_START + 185)
-#define HID_DSBROWSER_DIRECTSQL (HID_DBACCESS_START + 186)
-#define HID_DSADMIN_LDAP_ROWCOUNT (HID_DBACCESS_START + 187)
-#define HID_BROWSER_QUERY_EDITSQL (HID_DBACCESS_START + 189)
-#define HID_DSADMIN_PAGE_MOZILLA (HID_DBACCESS_START + 190)
-#define HID_DSADMIN_MOZILLA_PROFILE_NAME (HID_DBACCESS_START + 191)
-#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME (HID_DBACCESS_START + 192)
-#define HID_BROWSER_OPEN_DOCUMENT (HID_DBACCESS_START + 193)
-#define HID_BROWSER_EDIT_DOCUMENT (HID_DBACCESS_START + 194)
-#define HID_BROWSER_BEW_DOCUMENT (HID_DBACCESS_START + 195)
-#define HID_DLG_PASSWORD (HID_DBACCESS_START + 196)
-
-#define HID_DLGIDX_NEWINDEX (HID_DBACCESS_START + 197)
-#define HID_DLGIDX_DROPINDEX (HID_DBACCESS_START + 198)
-#define HID_DLGIDX_RENAMEINDEX (HID_DBACCESS_START + 199)
-#define HID_DLGIDX_SAVEINDEX (HID_DBACCESS_START + 200)
-#define HID_DLGIDX_RESETINDEX (HID_DBACCESS_START + 201)
-#define HID_DLGIDX_INDEXLIST (HID_DBACCESS_START + 202)
-#define UID_DLGINDEX_INDEXDETAILS_BACK (HID_DBACCESS_START + 203)
-#define UID_DLGINDEX_INDEXDETAILS_MAIN (HID_DBACCESS_START + 204)
-#define HID_DLGINDEX_INDEXDETAILS_FIELD (HID_DBACCESS_START + 205)
-#define HID_DLGINDEX_INDEXDETAILS_SORTORDER (HID_DBACCESS_START + 206)
-
-#define HID_DOCLINKEDIT_URL (HID_DBACCESS_START + 207)
-#define HID_QUERY_SQLMODE (HID_DBACCESS_START + 208)
-
-#define HID_BROWSER_REFRESH_REBUILDVIEW (HID_DBACCESS_START + 209)
-#define HID_BROWSER_RENAME_ENTRY (HID_DBACCESS_START + 210)
-
-#define HID_QUERY_EDIT_JOINCONNECTION (HID_DBACCESS_START + 211)
-
-#define HID_DLG_QRY_WINDOW_CONTROL (HID_DBACCESS_START + 212)
-#define HID_DLG_QRY_LEFT_TABLE (HID_DBACCESS_START + 213)
-#define HID_DLG_QRY_RIGHT_TABLE (HID_DBACCESS_START + 214)
-
-#define HID_DLG_REL_CASC_DEL (HID_DBACCESS_START + 215)
-#define HID_DLG_REL_NO_CASC_DEL (HID_DBACCESS_START + 216)
-#define HID_DLG_REL_CASC_DEL_NULL (HID_DBACCESS_START + 217)
-#define HID_DLG_REL_CASC_DEL_DEFAULT (HID_DBACCESS_START + 218)
-
-#define HID_DLG_REL_CASC_UPD (HID_DBACCESS_START + 219)
-#define HID_DLG_REL_NO_CASC_UPD (HID_DBACCESS_START + 220)
-#define HID_DLG_REL_CASC_UPD_NULL (HID_DBACCESS_START + 221)
-#define HID_DLG_REL_CASC_UPD_DEFAULT (HID_DBACCESS_START + 222)
-#define HID_BROWSER_SAVE_RECORD (HID_DBACCESS_START + 223)
-#define HID_BROWSER_UNDO_RECORD (HID_DBACCESS_START + 224)
-
-#define HID_DSADMIN_SQL92CHECK (HID_DBACCESS_START + 225)
-#define HID_DSADMIN_AUTOINCREMENTVALUE (HID_DBACCESS_START + 226)
-#define HID_DOCUMENT_CREATE_REPWIZ (HID_DBACCESS_START + 227)
-#define HID_TAB_AUTOINCREMENTVALUE (HID_DBACCESS_START + 228)
-#define HID_DSADMIN_RETRIEVE_AUTO (HID_DBACCESS_START + 229)
-#define HID_DSADMIN_AUTORETRIEVEENABLED (HID_DBACCESS_START + 230)
-
-#define HID_DSADMIN_PAGE_MYSQL_ODBC (HID_DBACCESS_START + 231)
-#define HID_TAB_PAGE_TABLEPRIVILEGES (HID_DBACCESS_START + 232)
-
-#define HID_DSADMIN_PAGE_USERDRIVER (HID_DBACCESS_START + 233)
-#define HID_DSADMIN_USER_DEFINED (HID_DBACCESS_START + 234)
-#define HID_DSADMIN_USERDEF_OPTIONS (HID_DBACCESS_START + 235)
-#define HID_DSADMIN_CHARSET_USERDEF (HID_DBACCESS_START + 236)
-#define HID_DSADMIN_USER_LDAP (HID_DBACCESS_START + 237)
-#define HID_DSADMIN_PWDREC_LDAP (HID_DBACCESS_START + 238)
-#define HID_DSADMIN_USESSL_LDAP (HID_DBACCESS_START + 239)
-#define HID_BROWSER_QUERY_WIZARD (HID_DBACCESS_START + 237)
-
-#define HID_DLG_RENAME (HID_DBACCESS_START + 237)
-
-#define HID_DSADMIN_PAGE_MYSQL_JDBC (HID_DBACCESS_START + 238)
-
-#define HID_DSADMIN_DBASE_PATH (HID_DBACCESS_START + 239)
-#define HID_DSADMIN_MYSQL_DATABASE (HID_DBACCESS_START + 240)
-#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE (HID_DBACCESS_START + 241)
-#define HID_DSADMIN_ODBC_DATASOURCE (HID_DBACCESS_START + 242)
-#define HID_DSADMIN_ADABAS_DATABASE (HID_DBACCESS_START + 243)
-#define HID_DSADMIN_MSACCESS_MDB_FILE (HID_DBACCESS_START + 244)
-#define HID_DSADMIN_PAGE_MSACCESS (HID_DBACCESS_START + 245)
-#define HID_DSADMIN_FLAT_PATH (HID_DBACCESS_START + 246)
-#define HID_DSADMIN_CALC_PATH (HID_DBACCESS_START + 247)
-#define HID_DSADMIN_ADVANCED (HID_DBACCESS_START + 248)
-#define HID_DSADMIN_BOOLEANCOMPARISON (HID_DBACCESS_START + 249)
-#define HID_DSADMIN_ORACLE_DATABASE (HID_DBACCESS_START + 250)
-
-#define UID_APP_VIEW (HID_DBACCESS_START + 251)
-#define HID_APP_TABLE_TREE (HID_DBACCESS_START + 252)
-#define HID_APP_FORM_TREE (HID_DBACCESS_START + 253)
-#define HID_APP_QUERY_TREE (HID_DBACCESS_START + 254)
-#define HID_APP_REPORT_TREE (HID_DBACCESS_START + 255)
-#define UID_APP_DETAIL_VIEW (HID_DBACCESS_START + 256)
-#define UID_APP_VIEW_VERT_SPLIT (HID_DBACCESS_START + 257)
-#define UID_APP_VIEW_BORDER_WIN (HID_DBACCESS_START + 258)
-#define HID_APP_CREATION_LIST (HID_DBACCESS_START + 259)
-#define UID_APP_SWAP_VIEW (HID_DBACCESS_START + 260)
-#define UID_DLG_TABLE_FILTER (HID_DBACCESS_START + 261)
-#define HID_APP_SWAP_ICONCONTROL (HID_DBACCESS_START + 262)
-
-#define HID_DSADMIN_APPENDTABLEALIAS (HID_DBACCESS_START + 263)
-#define HID_DSADMIN_PARAMETERNAMESUBST (HID_DBACCESS_START + 264)
-#define HID_DSADMIN_IGNOREDRIVER_PRIV (HID_DBACCESS_START + 265)
-#define HID_DSADMIN_HOSTNAME (HID_DBACCESS_START + 266)
-#define HID_DSADMIN_PORTNUMBER (HID_DBACCESS_START + 267)
-
-#define HID_APP_HELP_TEXT (HID_DBACCESS_START + 268)
-#define HID_EXPLORERDLG_COLLECTION (HID_DBACCESS_START + 269)
-#define UID_APP_DATABASE_VIEW (HID_DBACCESS_START + 270)
-#define UID_APP_TASKS_VIEW (HID_DBACCESS_START + 271)
-#define UID_APP_CONTAINER_VIEW (HID_DBACCESS_START + 272)
-#define UID_APP_TASKS_WINDOW (HID_DBACCESS_START + 273)
-#define HID_APP_DESCRIPTION_TEXT (HID_DBACCESS_START + 274)
-#define UID_APP_DETAILPAGE_HELPER (HID_DBACCESS_START + 275)
-#define HID_APP_VIEW_PREVIEW_CB (HID_DBACCESS_START + 276)
-#define HID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 277)
-#define HID_APP_VIEW_PREVIEW_2 (HID_DBACCESS_START + 278)
-#define HID_TABDESIGN_HELPTEXT (HID_DBACCESS_START + 279)
-#define UID_APP_VIEW_HORZ_SPLIT (HID_DBACCESS_START + 280)
-#define UID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 281)
-#define HID_APP_VIEW_PREVIEW_3 (HID_DBACCESS_START + 282)
-
-#define HID_DSADMIN_TYPE_DIALOG (HID_DBACCESS_START + 283)
-#define HID_DSADMIN_ENABLEOUTERJOIN (HID_DBACCESS_START + 284)
-#define HID_DSADMIN_ADABASADMIN (HID_DBACCESS_START + 285)
-#define HID_DSADMIN_USERADMIN (HID_DBACCESS_START + 286)
-
-#define HID_DBWIZ_PREVIOUS (HID_DBACCESS_START + 287)
-#define HID_DBWIZ_NEXT (HID_DBACCESS_START + 288)
-#define HID_DBWIZ_CANCEL (HID_DBACCESS_START + 289)
-#define HID_DBWIZ_FINISH (HID_DBACCESS_START + 290)
-#define UID_DBWIZ_HELP (HID_DBACCESS_START + 291)
-
-#define HID_DSADMIN_CATALOG (HID_DBACCESS_START + 292)
-#define HID_DSADMIN_SCHEMA (HID_DBACCESS_START + 293)
+#define HID_BROWSER_CLOSECONN (HID_DBACCESS_START + 66)
+#define HID_BROWSER_REFRESHCONN (HID_DBACCESS_START + 67)
+
+#define HID_DLG_ROWHEIGHT (HID_DBACCESS_START + 68)
+#define HID_DLG_COLWIDTH (HID_DBACCESS_START + 69)
+
+
+#define HID_TLB_QUERYDESIGN (HID_DBACCESS_START + 70)
+#define HID_CTL_QRYSQLEDIT (HID_DBACCESS_START + 71)
+#define HID_DSADMIN_SPECIAL_MESSAGE (HID_DBACCESS_START + 72)
+
+#define HID_BROWSER_QUERY_CREATE_TEXT (HID_DBACCESS_START + 73)
+
+#define HID_DLG_ERROR (HID_DBACCESS_START + 74)
+#define HID_DLG_TEXT (HID_DBACCESS_START + 75)
+#define UID_SQLERROR_BUTTONMORE (HID_DBACCESS_START + 76)
+#define HID_DLG_SAVE_AS (HID_DBACCESS_START + 77)
+
+#define HID_BROWSER_QUERY_EDIT (HID_DBACCESS_START + 78)
+#define HID_BROWSER_QUERY_DELETE (HID_DBACCESS_START + 79)
+
+#define HID_DSADMIN_USER_ADO (HID_DBACCESS_START + 80)
+#define HID_DSADMIN_PWDREC_ADO (HID_DBACCESS_START + 81)
+#define HID_DSADMIN_CONNURL_ADOPAGE (HID_DBACCESS_START + 82)
+#define HID_DSADMIN_PAGE_ADO (HID_DBACCESS_START + 83)
+
+
+#define HID_JOINSH_ADDTAB_CLOSE (HID_DBACCESS_START + 84)
+#define HID_JOINSH_ADDTAB_TABLELIST (HID_DBACCESS_START + 85)
+#define HID_CTL_QRYDGNTAB (HID_DBACCESS_START + 86)
+#define HID_DLG_QRY_JOIN (HID_DBACCESS_START + 87)
+#define HID_DLG_QRY_JOINTYPE (HID_DBACCESS_START + 88)
+#define HID_JOINSH_ADDTAB_QUERYLIST (HID_DBACCESS_START + 89)
+#define HID_DLG_QRY_HELPTEXT (HID_DBACCESS_START + 92)
+
+#define HID_CTL_QRYDGNCRIT (HID_DBACCESS_START + 93)
+#define HID_QRYDGN_ROW_VISIBLE (HID_DBACCESS_START + 94)
+#define HID_QRYDGN_ROW_TABLE (HID_DBACCESS_START + 95)
+#define HID_QRYDGN_ROW_FIELD (HID_DBACCESS_START + 96)
+#define HID_QRYDGN_ROW_ORDER (HID_DBACCESS_START + 97)
+#define HID_QRYDGN_ROW_FUNCTION (HID_DBACCESS_START + 98)
+#define HID_QRYDGN_ROW_ALIAS (HID_DBACCESS_START + 99)
+#define HID_QRYDGN_ROW_CRIT (HID_DBACCESS_START + 100)
+
+#define HID_QUERY_FUNCTION (HID_DBACCESS_START + 101)
+#define HID_QUERY_TABLENAME (HID_DBACCESS_START + 102)
+#define HID_QUERY_ALIASNAME (HID_DBACCESS_START + 103)
+#define HID_QUERY_DISTINCT (HID_DBACCESS_START + 104)
+
+#define HID_BROWSER_QUERY_CREATE_DESIGN (HID_DBACCESS_START + 105)
+
+#define HID_DSADMIN_QUERIES (HID_DBACCESS_START + 106)
+#define HID_DSADMIN_QUERIES_NEW (HID_DBACCESS_START + 107)
+#define HID_DSADMIN_QUERIES_EDIT (HID_DBACCESS_START + 108)
+#define HID_DSADMIN_QUERIES_DELETE (HID_DBACCESS_START + 109)
+#define HID_DSADMIN_QUERYADMINISTRATION (HID_DBACCESS_START + 110)
+
+
+#define HID_TAB_DESIGN_TABLE_DESC (HID_DBACCESS_START + 111)
+#define HID_TAB_DESIGN_FIELDCONTROL (HID_DBACCESS_START + 112)
+#define HID_TABLE_DESIGN_HELP_WINDOW (HID_DBACCESS_START + 113)
+#define HID_TAB_DESIGN_DESCWIN (HID_DBACCESS_START + 114)
+#define HID_TAB_DESIGN_TABLE_PROPS (HID_DBACCESS_START + 115)
+#define HID_TABDESIGN_BACKGROUND (HID_DBACCESS_START + 116)
+#define HID_CTL_TABLEEDIT (HID_DBACCESS_START + 117)
+#define HID_TABDESIGN_NAMECELL (HID_DBACCESS_START + 118)
+#define HID_TABDESIGN_TYPECELL (HID_DBACCESS_START + 119)
+#define HID_TABDESIGN_COMMENTCELL (HID_DBACCESS_START + 120)
+#define SID_TABLEDESIGN_INSERTROWS (HID_DBACCESS_START + 121)
+#define SID_TABLEDESIGN_TABED_PRIMARYKEY (HID_DBACCESS_START + 122)
+#define HID_TLB_TABLEDESIGN (HID_DBACCESS_START + 123)
+#define HID_TAB_DESIGN_HELP_TEXT_FRAME (HID_DBACCESS_START + 124)
+#define HID_TABLE_DESIGN_TABPAGE_GENERAL (HID_DBACCESS_START + 125)
+#define HID_TAB_ENT_DEFAULT (HID_DBACCESS_START + 126)
+#define HID_TAB_ENT_FORMAT_SAMPLE (HID_DBACCESS_START + 127)
+#define HID_TAB_ENT_FORMAT (HID_DBACCESS_START + 128)
+#define HID_TAB_ENT_BOOL_DEFAULT (HID_DBACCESS_START + 129)
+#define HID_TAB_ENT_REQUIRED (HID_DBACCESS_START + 130)
+#define HID_TAB_ENT_AUTOINCREMENT (HID_DBACCESS_START + 131)
+#define HID_TAB_ENT_TEXT_LEN (HID_DBACCESS_START + 132)
+#define HID_TAB_ENT_TYPE (HID_DBACCESS_START + 133)
+#define HID_TAB_ENT_COLUMNNAME (HID_DBACCESS_START + 134)
+#define HID_TAB_ENT_NUMTYP (HID_DBACCESS_START + 135)
+#define HID_TAB_ENT_LEN (HID_DBACCESS_START + 136)
+#define HID_TAB_ENT_SCALE (HID_DBACCESS_START + 137)
+#define HID_BROWSER_TABLE_CREATE_DESIGN (HID_DBACCESS_START + 138)
+#define HID_BROWSER_TABLE_EDIT (HID_DBACCESS_START + 139)
+#define HID_BROWSER_TABLE_DELETE (HID_DBACCESS_START + 140)
+#define HID_SQLERROR_EXCHAIN_ERRORS (HID_DBACCESS_START + 141)
+#define HID_SQLERROR_EXCHAIN_TEXT (HID_DBACCESS_START + 142)
+#define HID_TAB_WIZ_COLUMN_SELECT (HID_DBACCESS_START + 146)
+#define HID_TAB_WIZ_TYPE_SELECT (HID_DBACCESS_START + 147)
+#define HID_TAB_NAMEMATCHING_COLS_AVAIL (HID_DBACCESS_START + 148)
+#define HID_TAB_NAMEMATCHING_COLS_ASSIGN (HID_DBACCESS_START + 149)
+#define HID_TAB_WIZ_COPYTABLE (HID_DBACCESS_START + 150)
+#define HID_TAB_WIZ_TABLENAME_EDIT (HID_DBACCESS_START + 151)
+#define HID_CTL_RELATIONTAB (HID_DBACCESS_START + 152)
+#define HID_TLB_RELATIONDESIGN (HID_DBACCESS_START + 153)
+#define HID_RELATIONDIALOG_LEFTFIELDCELL (HID_DBACCESS_START + 154)
+#define HID_RELATIONDIALOG_RIGHTFIELDCELL (HID_DBACCESS_START + 155)
+#define HID_RELDLG_KEYFIELDS (HID_DBACCESS_START + 156)
+#define HID_BROWSER_RELATION_DESIGN (HID_DBACCESS_START + 157)
+#define HID_TABLE_DESIGN_NO_CONNECTION (HID_DBACCESS_START + 158)
+#define HID_DSADMIN_CREATEDATABASE (HID_DBACCESS_START + 159)
+#define HID_BROWSER_COLUMNINFO (HID_DBACCESS_START + 160)
+#define HID_DSADMIN_USECATALOG (HID_DBACCESS_START + 161)
+#define HID_BROWSER_VIEW_CREATE_DESIGN (HID_DBACCESS_START + 162)
+#define HID_DSADMIN_DOCUMENTS (HID_DBACCESS_START + 166)
+#define HID_DSADMIN_DOCUMENTLINKS (HID_DBACCESS_START + 167)
+#define HID_DSADMIN_FILTER_EXPLANATION (HID_DBACCESS_START + 168)
+#define HID_CONFIRM_DROP_BUTTON_ALL (HID_DBACCESS_START + 169)
+#define HID_DSBROWSER_BOOKMARK_SELECTED (HID_DBACCESS_START + 170)
+#define HID_DSADMIN_TABLE_TOOLBOX (HID_DBACCESS_START + 171)
+#define HID_DSADMIN_QUERY_TOOLBOX (HID_DBACCESS_START + 172)
+#define HID_DSADMIN_BOOKMARK_TOOLBOX (HID_DBACCESS_START + 173)
+#define HID_DSADMIN_PAGE_LDAP (HID_DBACCESS_START + 174)
+#define HID_DSADMIN_LDAP_HOSTNAME (HID_DBACCESS_START + 175)
+#define HID_DSADMIN_LDAP_BASEDN (HID_DBACCESS_START + 176)
+#define HID_DSADMIN_LDAP_PORTNUMBER (HID_DBACCESS_START + 177)
+#define HID_DSBROWSER_BOOKMARKSELECTED (HID_DBACCESS_START + 178)
+#define HID_DSBROWSER_DISCONNECTING (HID_DBACCESS_START + 179)
+#define HID_TAB_PAGE_USERADMIN (HID_DBACCESS_START + 180)
+#define HID_TAB_PAGE_PBUSER (HID_DBACCESS_START + 181)
+#define HID_TAB_PAGE_PBCHGPWD (HID_DBACCESS_START + 182)
+#define HID_TAB_PAGE_PBUSERDELETE (HID_DBACCESS_START + 183)
+#define HID_TAB_PAGE_TBLGRANTS (HID_DBACCESS_START + 184)
+#define HID_TAB_PAGE_LBUSER (HID_DBACCESS_START + 185)
+#define HID_DSBROWSER_DIRECTSQL (HID_DBACCESS_START + 186)
+#define HID_DSADMIN_LDAP_ROWCOUNT (HID_DBACCESS_START + 187)
+#define HID_BROWSER_QUERY_EDITSQL (HID_DBACCESS_START + 189)
+#define HID_DSADMIN_PAGE_MOZILLA (HID_DBACCESS_START + 190)
+#define HID_DSADMIN_MOZILLA_PROFILE_NAME (HID_DBACCESS_START + 191)
+#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME (HID_DBACCESS_START + 192)
+#define HID_BROWSER_OPEN_DOCUMENT (HID_DBACCESS_START + 193)
+#define HID_BROWSER_EDIT_DOCUMENT (HID_DBACCESS_START + 194)
+#define HID_BROWSER_BEW_DOCUMENT (HID_DBACCESS_START + 195)
+#define HID_DLG_PASSWORD (HID_DBACCESS_START + 196)
+
+#define HID_DLGIDX_NEWINDEX (HID_DBACCESS_START + 197)
+#define HID_DLGIDX_DROPINDEX (HID_DBACCESS_START + 198)
+#define HID_DLGIDX_RENAMEINDEX (HID_DBACCESS_START + 199)
+#define HID_DLGIDX_SAVEINDEX (HID_DBACCESS_START + 200)
+#define HID_DLGIDX_RESETINDEX (HID_DBACCESS_START + 201)
+#define HID_DLGIDX_INDEXLIST (HID_DBACCESS_START + 202)
+#define UID_DLGINDEX_INDEXDETAILS_BACK (HID_DBACCESS_START + 203)
+#define UID_DLGINDEX_INDEXDETAILS_MAIN (HID_DBACCESS_START + 204)
+#define HID_DLGINDEX_INDEXDETAILS_FIELD (HID_DBACCESS_START + 205)
+#define HID_DLGINDEX_INDEXDETAILS_SORTORDER (HID_DBACCESS_START + 206)
+
+#define HID_DOCLINKEDIT_URL (HID_DBACCESS_START + 207)
+#define HID_QUERY_SQLMODE (HID_DBACCESS_START + 208)
+
+#define HID_BROWSER_REFRESH_REBUILDVIEW (HID_DBACCESS_START + 209)
+#define HID_BROWSER_RENAME_ENTRY (HID_DBACCESS_START + 210)
+
+#define HID_QUERY_EDIT_JOINCONNECTION (HID_DBACCESS_START + 211)
+
+#define HID_DLG_QRY_WINDOW_CONTROL (HID_DBACCESS_START + 212)
+#define HID_DLG_QRY_LEFT_TABLE (HID_DBACCESS_START + 213)
+#define HID_DLG_QRY_RIGHT_TABLE (HID_DBACCESS_START + 214)
+
+#define HID_DLG_REL_CASC_DEL (HID_DBACCESS_START + 215)
+#define HID_DLG_REL_NO_CASC_DEL (HID_DBACCESS_START + 216)
+#define HID_DLG_REL_CASC_DEL_NULL (HID_DBACCESS_START + 217)
+#define HID_DLG_REL_CASC_DEL_DEFAULT (HID_DBACCESS_START + 218)
+
+#define HID_DLG_REL_CASC_UPD (HID_DBACCESS_START + 219)
+#define HID_DLG_REL_NO_CASC_UPD (HID_DBACCESS_START + 220)
+#define HID_DLG_REL_CASC_UPD_NULL (HID_DBACCESS_START + 221)
+#define HID_DLG_REL_CASC_UPD_DEFAULT (HID_DBACCESS_START + 222)
+#define HID_BROWSER_SAVE_RECORD (HID_DBACCESS_START + 223)
+#define HID_BROWSER_UNDO_RECORD (HID_DBACCESS_START + 224)
+
+#define HID_DSADMIN_SQL92CHECK (HID_DBACCESS_START + 225)
+#define HID_DSADMIN_AUTOINCREMENTVALUE (HID_DBACCESS_START + 226)
+#define HID_DOCUMENT_CREATE_REPWIZ (HID_DBACCESS_START + 227)
+#define HID_TAB_AUTOINCREMENTVALUE (HID_DBACCESS_START + 228)
+#define HID_DSADMIN_RETRIEVE_AUTO (HID_DBACCESS_START + 229)
+#define HID_DSADMIN_AUTORETRIEVEENABLED (HID_DBACCESS_START + 230)
+
+#define HID_DSADMIN_PAGE_MYSQL_ODBC (HID_DBACCESS_START + 231)
+#define HID_TAB_PAGE_TABLEPRIVILEGES (HID_DBACCESS_START + 232)
+
+#define HID_DSADMIN_PAGE_USERDRIVER (HID_DBACCESS_START + 233)
+#define HID_DSADMIN_USER_DEFINED (HID_DBACCESS_START + 234)
+#define HID_DSADMIN_USERDEF_OPTIONS (HID_DBACCESS_START + 235)
+#define HID_DSADMIN_CHARSET_USERDEF (HID_DBACCESS_START + 236)
+#define HID_DSADMIN_USER_LDAP (HID_DBACCESS_START + 237)
+#define HID_DSADMIN_PWDREC_LDAP (HID_DBACCESS_START + 238)
+#define HID_DSADMIN_USESSL_LDAP (HID_DBACCESS_START + 239)
+#define HID_BROWSER_QUERY_WIZARD (HID_DBACCESS_START + 237)
+
+#define HID_DLG_RENAME (HID_DBACCESS_START + 237)
+
+#define HID_DSADMIN_PAGE_MYSQL_JDBC (HID_DBACCESS_START + 238)
+
+#define HID_DSADMIN_DBASE_PATH (HID_DBACCESS_START + 239)
+#define HID_DSADMIN_MYSQL_DATABASE (HID_DBACCESS_START + 240)
+#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE (HID_DBACCESS_START + 241)
+#define HID_DSADMIN_ODBC_DATASOURCE (HID_DBACCESS_START + 242)
+#define HID_DSADMIN_ADABAS_DATABASE (HID_DBACCESS_START + 243)
+#define HID_DSADMIN_MSACCESS_MDB_FILE (HID_DBACCESS_START + 244)
+#define HID_DSADMIN_PAGE_MSACCESS (HID_DBACCESS_START + 245)
+#define HID_DSADMIN_FLAT_PATH (HID_DBACCESS_START + 246)
+#define HID_DSADMIN_CALC_PATH (HID_DBACCESS_START + 247)
+#define HID_DSADMIN_ADVANCED (HID_DBACCESS_START + 248)
+#define HID_DSADMIN_BOOLEANCOMPARISON (HID_DBACCESS_START + 249)
+#define HID_DSADMIN_ORACLE_DATABASE (HID_DBACCESS_START + 250)
+
+#define UID_APP_VIEW (HID_DBACCESS_START + 251)
+#define HID_APP_TABLE_TREE (HID_DBACCESS_START + 252)
+#define HID_APP_FORM_TREE (HID_DBACCESS_START + 253)
+#define HID_APP_QUERY_TREE (HID_DBACCESS_START + 254)
+#define HID_APP_REPORT_TREE (HID_DBACCESS_START + 255)
+#define UID_APP_DETAIL_VIEW (HID_DBACCESS_START + 256)
+#define UID_APP_VIEW_VERT_SPLIT (HID_DBACCESS_START + 257)
+#define UID_APP_VIEW_BORDER_WIN (HID_DBACCESS_START + 258)
+#define HID_APP_CREATION_LIST (HID_DBACCESS_START + 259)
+#define UID_APP_SWAP_VIEW (HID_DBACCESS_START + 260)
+#define UID_DLG_TABLE_FILTER (HID_DBACCESS_START + 261)
+#define HID_APP_SWAP_ICONCONTROL (HID_DBACCESS_START + 262)
+
+#define HID_DSADMIN_APPENDTABLEALIAS (HID_DBACCESS_START + 263)
+#define HID_DSADMIN_PARAMETERNAMESUBST (HID_DBACCESS_START + 264)
+#define HID_DSADMIN_IGNOREDRIVER_PRIV (HID_DBACCESS_START + 265)
+#define HID_DSADMIN_HOSTNAME (HID_DBACCESS_START + 266)
+#define HID_DSADMIN_PORTNUMBER (HID_DBACCESS_START + 267)
+
+#define HID_APP_HELP_TEXT (HID_DBACCESS_START + 268)
+#define HID_EXPLORERDLG_COLLECTION (HID_DBACCESS_START + 269)
+#define UID_APP_DATABASE_VIEW (HID_DBACCESS_START + 270)
+#define UID_APP_TASKS_VIEW (HID_DBACCESS_START + 271)
+#define UID_APP_CONTAINER_VIEW (HID_DBACCESS_START + 272)
+#define UID_APP_TASKS_WINDOW (HID_DBACCESS_START + 273)
+#define HID_APP_DESCRIPTION_TEXT (HID_DBACCESS_START + 274)
+#define UID_APP_DETAILPAGE_HELPER (HID_DBACCESS_START + 275)
+#define HID_APP_VIEW_PREVIEW_CB (HID_DBACCESS_START + 276)
+#define HID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 277)
+#define HID_APP_VIEW_PREVIEW_2 (HID_DBACCESS_START + 278)
+#define HID_TABDESIGN_HELPTEXT (HID_DBACCESS_START + 279)
+#define UID_APP_VIEW_HORZ_SPLIT (HID_DBACCESS_START + 280)
+#define UID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 281)
+#define HID_APP_VIEW_PREVIEW_3 (HID_DBACCESS_START + 282)
+
+#define HID_DSADMIN_TYPE_DIALOG (HID_DBACCESS_START + 283)
+#define HID_DSADMIN_ENABLEOUTERJOIN (HID_DBACCESS_START + 284)
+#define HID_DSADMIN_ADABASADMIN (HID_DBACCESS_START + 285)
+#define HID_DSADMIN_USERADMIN (HID_DBACCESS_START + 286)
+
+#define HID_DBWIZ_PREVIOUS (HID_DBACCESS_START + 287)
+#define HID_DBWIZ_NEXT (HID_DBACCESS_START + 288)
+#define HID_DBWIZ_CANCEL (HID_DBACCESS_START + 289)
+#define HID_DBWIZ_FINISH (HID_DBACCESS_START + 290)
+#define UID_DBWIZ_HELP (HID_DBACCESS_START + 291)
+
+#define HID_DSADMIN_CATALOG (HID_DBACCESS_START + 292)
+#define HID_DSADMIN_SCHEMA (HID_DBACCESS_START + 293)
#define HID_DSADMIN_IGNOREINDEXAPPENDIX (HID_DBACCESS_START + 294)
-#define HID_DSADMIN_DOSLINEENDS (HID_DBACCESS_START + 295)
+#define HID_DSADMIN_DOSLINEENDS (HID_DBACCESS_START + 295)
#define HID_BROWSER_ADMINISTRATE (HID_DBACCESS_START + 296)
@@ -354,116 +354,116 @@
#define HID_DSADMIN_CHECK_REQUIRED_FIELDS (HID_DBACCESS_START + 298)
#define HID_DSADMIN_ESCAPE_DATETIME (HID_DBACCESS_START + 299)
-#define HID_PAGE_DBWIZARD_GENERALPAGE (HID_DBACCESS_START + 300)
-#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE (HID_DBACCESS_START + 301)
-#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE (HID_DBACCESS_START + 302)
+#define HID_PAGE_DBWIZARD_GENERALPAGE (HID_DBACCESS_START + 300)
+#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE (HID_DBACCESS_START + 301)
+#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE (HID_DBACCESS_START + 302)
-#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION (HID_DBACCESS_START + 304)
-#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION (HID_DBACCESS_START + 305)
+#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION (HID_DBACCESS_START + 304)
+#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION (HID_DBACCESS_START + 305)
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES (HID_DBACCESS_START + 307)
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES (HID_DBACCESS_START + 308)
-#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES (HID_DBACCESS_START + 309)
-#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION (HID_DBACCESS_START + 310)
+#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES (HID_DBACCESS_START + 307)
+#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES (HID_DBACCESS_START + 308)
+#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES (HID_DBACCESS_START + 309)
+#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION (HID_DBACCESS_START + 310)
-#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE (HID_DBACCESS_START + 311)
-#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE (HID_DBACCESS_START + 312)
-#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR (HID_DBACCESS_START + 313)
-#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR (HID_DBACCESS_START + 314)
-#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR (HID_DBACCESS_START + 315)
-#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR (HID_DBACCESS_START + 316)
+#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE (HID_DBACCESS_START + 311)
+#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE (HID_DBACCESS_START + 312)
+#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR (HID_DBACCESS_START + 313)
+#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR (HID_DBACCESS_START + 314)
+#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR (HID_DBACCESS_START + 315)
+#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR (HID_DBACCESS_START + 316)
-#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION (HID_DBACCESS_START + 317)
-#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION (HID_DBACCESS_START + 318)
+#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION (HID_DBACCESS_START + 317)
+#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION (HID_DBACCESS_START + 318)
-#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER (HID_DBACCESS_START + 319)
-#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN (HID_DBACCESS_START + 320)
-#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER (HID_DBACCESS_START + 321)
-#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL (HID_DBACCESS_START + 322)
-#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION (HID_DBACCESS_START + 323)
+#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER (HID_DBACCESS_START + 319)
+#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN (HID_DBACCESS_START + 320)
+#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER (HID_DBACCESS_START + 321)
+#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL (HID_DBACCESS_START + 322)
+#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION (HID_DBACCESS_START + 323)
-#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME (HID_DBACCESS_START + 326)
-#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME (HID_DBACCESS_START + 327)
+#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME (HID_DBACCESS_START + 326)
+#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME (HID_DBACCESS_START + 327)
-#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC (HID_DBACCESS_START + 329)
-#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC (HID_DBACCESS_START + 330)
+#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC (HID_DBACCESS_START + 329)
+#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC (HID_DBACCESS_START + 330)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME (HID_DBACCESS_START + 333)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER (HID_DBACCESS_START + 334)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT (HID_DBACCESS_START + 335)
-#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS (HID_DBACCESS_START + 336)
-#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS (HID_DBACCESS_START + 337)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME (HID_DBACCESS_START + 333)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER (HID_DBACCESS_START + 334)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT (HID_DBACCESS_START + 335)
+#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS (HID_DBACCESS_START + 336)
+#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS (HID_DBACCESS_START + 337)
-#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL (HID_DBACCESS_START + 340)
-#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL (HID_DBACCESS_START + 341)
+#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL (HID_DBACCESS_START + 340)
+#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL (HID_DBACCESS_START + 341)
-#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS (HID_DBACCESS_START + 342)
-#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS (HID_DBACCESS_START + 343)
+#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS (HID_DBACCESS_START + 342)
+#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS (HID_DBACCESS_START + 343)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME (HID_DBACCESS_START + 344)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER (HID_DBACCESS_START + 345)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT (HID_DBACCESS_START + 346)
-#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS (HID_DBACCESS_START + 347)
-#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS (HID_DBACCESS_START + 348)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME (HID_DBACCESS_START + 344)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER (HID_DBACCESS_START + 345)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT (HID_DBACCESS_START + 346)
+#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS (HID_DBACCESS_START + 347)
+#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS (HID_DBACCESS_START + 348)
-#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL (HID_DBACCESS_START + 349)
-#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL (HID_DBACCESS_START + 350)
-#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION (HID_DBACCESS_START + 351)
+#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL (HID_DBACCESS_START + 349)
+#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL (HID_DBACCESS_START + 350)
+#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION (HID_DBACCESS_START + 351)
-#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 355)
-#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 356)
+#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 355)
+#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 356)
-#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH (HID_DBACCESS_START + 359)
-#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH (HID_DBACCESS_START + 360)
-#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED (HID_DBACCESS_START + 361)
+#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH (HID_DBACCESS_START + 359)
+#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH (HID_DBACCESS_START + 360)
+#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED (HID_DBACCESS_START + 361)
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED (HID_DBACCESS_START + 365)
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME (HID_DBACCESS_START + 366)
-#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION (HID_DBACCESS_START + 367)
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED (HID_DBACCESS_START + 365)
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME (HID_DBACCESS_START + 366)
+#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION (HID_DBACCESS_START + 367)
-#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE (HID_DBACCESS_START + 373)
+#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE (HID_DBACCESS_START + 373)
#define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE (HID_DBACCESS_START + 374)
-#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD (HID_DBACCESS_START + 375)
-#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS (HID_DBACCESS_START + 376)
+#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD (HID_DBACCESS_START + 375)
+#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS (HID_DBACCESS_START + 376)
-#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE (HID_DBACCESS_START + 377)
-#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE (HID_DBACCESS_START + 378)
+#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE (HID_DBACCESS_START + 377)
+#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE (HID_DBACCESS_START + 378)
#define HID_INDEX_DIALOG_ACTION_TB (HID_DBACCESS_START + 379)
-#define HID_DLG_DATABASE_WIZARD (HID_DBACCESS_START + 380)
+#define HID_DLG_DATABASE_WIZARD (HID_DBACCESS_START + 380)
-#define HID_EXTENSION_NOT_PRESENT_DLG ( HID_DBACCESS_START + 381)
-#define HID_DLG_QRY_JOIN_CONTROL ( HID_DBACCESS_START + 382)
-#define HID_DSADMIN_IGNORECURRENCY ( HID_DBACCESS_START + 383)
+#define HID_EXTENSION_NOT_PRESENT_DLG ( HID_DBACCESS_START + 381)
+#define HID_DLG_QRY_JOIN_CONTROL ( HID_DBACCESS_START + 382)
+#define HID_DSADMIN_IGNORECURRENCY ( HID_DBACCESS_START + 383)
#define HID_MACRO_MIGRATION_BACKUP_LOCATION ( HID_DBACCESS_START + 384)
#define HID_DSADMIN_PRIMARY_KEY_SUPPORT ( HID_DBACCESS_START + 385)
// this one below have hid in number space HID_SBA_START
-#define HID_DLG_ADABAS_NEWDB (HID_SBA_START + 0)
-#define HID_DLG_ADABAS_DBNAME (HID_SBA_START + 1)
-#define HID_DLG_ADABAS_SYSUSR (HID_SBA_START + 2)
-#define HID_DLG_ADABAS_SYSPWD (HID_SBA_START + 3)
-#define HID_DLG_ADABAS_CONUSR (HID_SBA_START + 4)
-#define HID_DLG_ADABAS_CONPWD (HID_SBA_START + 5)
-#define HID_DLG_ADABAS_DATADEVSPACE_SIZE (HID_SBA_START + 6)
-#define HID_DLG_ADABAS_CACHE_SIZE (HID_SBA_START + 7)
-#define HID_DLG_ADABAS_USR (HID_SBA_START + 8)
-#define HID_DLG_ADABAS_DOMAINPWD (HID_SBA_START + 9)
-#define HID_DLG_ADABAS_RESTORE (HID_SBA_START + 10)
-#define HID_DLG_ADABAS_PBRESTORE (HID_SBA_START + 11)
-#define HID_DLG_ADABAS_SYSDEVSPACE (HID_SBA_START + 12)
-#define HID_DLG_ADABAS_PBSYSDEVSPACE (HID_SBA_START + 13)
-#define HID_DLG_ADABAS_TRANSACTIONLOG (HID_SBA_START + 14)
-#define HID_DLG_ADABAS_PBTRANSACTIONLOG (HID_SBA_START + 15)
-#define HID_DLG_ADABAS_DATADEVSPACE (HID_SBA_START + 16)
-#define HID_DLG_ADABAS_PBDATADEVSPACE (HID_SBA_START + 18)
-#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE (HID_SBA_START + 19)
-#define HID_DLG_ADABAS_CON_PWD (HID_SBA_START + 20)
-#define HID_DLG_ADABAS_SYS_PWD (HID_SBA_START + 21)
-#define HID_DLG_ADABAS_DOMAIN_PWD (HID_SBA_START + 22)
+#define HID_DLG_ADABAS_NEWDB (HID_SBA_START + 0)
+#define HID_DLG_ADABAS_DBNAME (HID_SBA_START + 1)
+#define HID_DLG_ADABAS_SYSUSR (HID_SBA_START + 2)
+#define HID_DLG_ADABAS_SYSPWD (HID_SBA_START + 3)
+#define HID_DLG_ADABAS_CONUSR (HID_SBA_START + 4)
+#define HID_DLG_ADABAS_CONPWD (HID_SBA_START + 5)
+#define HID_DLG_ADABAS_DATADEVSPACE_SIZE (HID_SBA_START + 6)
+#define HID_DLG_ADABAS_CACHE_SIZE (HID_SBA_START + 7)
+#define HID_DLG_ADABAS_USR (HID_SBA_START + 8)
+#define HID_DLG_ADABAS_DOMAINPWD (HID_SBA_START + 9)
+#define HID_DLG_ADABAS_RESTORE (HID_SBA_START + 10)
+#define HID_DLG_ADABAS_PBRESTORE (HID_SBA_START + 11)
+#define HID_DLG_ADABAS_SYSDEVSPACE (HID_SBA_START + 12)
+#define HID_DLG_ADABAS_PBSYSDEVSPACE (HID_SBA_START + 13)
+#define HID_DLG_ADABAS_TRANSACTIONLOG (HID_SBA_START + 14)
+#define HID_DLG_ADABAS_PBTRANSACTIONLOG (HID_SBA_START + 15)
+#define HID_DLG_ADABAS_DATADEVSPACE (HID_SBA_START + 16)
+#define HID_DLG_ADABAS_PBDATADEVSPACE (HID_SBA_START + 18)
+#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE (HID_SBA_START + 19)
+#define HID_DLG_ADABAS_CON_PWD (HID_SBA_START + 20)
+#define HID_DLG_ADABAS_SYS_PWD (HID_SBA_START + 21)
+#define HID_DLG_ADABAS_DOMAIN_PWD (HID_SBA_START + 22)
//end of HID_SBA_START
// don't forget to update the file util/hidother.src
diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc
index c273a67edcbd..6ecd68d05f53 100644
--- a/dbaccess/inc/dbaccess_slotid.hrc
+++ b/dbaccess/inc/dbaccess_slotid.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -32,82 +32,82 @@
#include <sfx2/sfxsids.hrc>
#endif
-#define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 )
-#define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 )
-#define SID_DB_NEW ( SID_DBACCESS_START + 2 )
-#define SID_DB_APP_DISABLE_PREVIEW ( SID_DBACCESS_START + 3 )
-#define SID_DB_APP_DSCONNECTION_TYPE ( SID_DBACCESS_START + 4 )
-#define SID_DB_APP_DSADVANCED_SETTINGS ( SID_DBACCESS_START + 5 )
+#define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 )
+#define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 )
+#define SID_DB_NEW ( SID_DBACCESS_START + 2 )
+#define SID_DB_APP_DISABLE_PREVIEW ( SID_DBACCESS_START + 3 )
+#define SID_DB_APP_DSCONNECTION_TYPE ( SID_DBACCESS_START + 4 )
+#define SID_DB_APP_DSADVANCED_SETTINGS ( SID_DBACCESS_START + 5 )
// free
-#define SID_DB_APP_VIEW_DOCINFO_PREVIEW ( SID_DBACCESS_START + 7 )
-#define SID_DB_APP_VIEW_DOC_PREVIEW ( SID_DBACCESS_START + 8 )
-#define SID_DB_APP_VIEW_TABLES ( SID_DBACCESS_START + 9 )
-#define SID_DB_APP_VIEW_QUERIES ( SID_DBACCESS_START + 10 )
-#define SID_DB_APP_DSIMPORT ( SID_DBACCESS_START + 11 )
-#define SID_DB_APP_VIEW_FORMS ( SID_DBACCESS_START + 12 )
-#define SID_DB_APP_DSRELDESIGN ( SID_DBACCESS_START + 13 )
-#define SID_DB_APP_DSUSERADMIN ( SID_DBACCESS_START + 14 )
-#define SID_DB_APP_TABLEFILTER ( SID_DBACCESS_START + 15 )
-#define SID_DB_APP_CLOSECONNECTION ( SID_DBACCESS_START + 16 )
-#define SID_DB_APP_DSPROPS ( SID_DBACCESS_START + 17 )
-#define SID_DB_APP_DBADMIN ( SID_DBACCESS_START + 18 )
-#define SID_APP_NEW_REPORT_PRE_SEL ( SID_DBACCESS_START + 19 )
-#define SID_DB_APP_CONVERTTOVIEW ( SID_DBACCESS_START + 20 )
-#define SID_DB_APP_REFRESH_TABLES ( SID_DBACCESS_START + 21 )
-#define SID_DB_APP_VIEW_REPORTS ( SID_DBACCESS_START + 22 )
-#define SID_DB_APP_DSEXPORT ( SID_DBACCESS_START + 23 )
+#define SID_DB_APP_VIEW_DOCINFO_PREVIEW ( SID_DBACCESS_START + 7 )
+#define SID_DB_APP_VIEW_DOC_PREVIEW ( SID_DBACCESS_START + 8 )
+#define SID_DB_APP_VIEW_TABLES ( SID_DBACCESS_START + 9 )
+#define SID_DB_APP_VIEW_QUERIES ( SID_DBACCESS_START + 10 )
+#define SID_DB_APP_DSIMPORT ( SID_DBACCESS_START + 11 )
+#define SID_DB_APP_VIEW_FORMS ( SID_DBACCESS_START + 12 )
+#define SID_DB_APP_DSRELDESIGN ( SID_DBACCESS_START + 13 )
+#define SID_DB_APP_DSUSERADMIN ( SID_DBACCESS_START + 14 )
+#define SID_DB_APP_TABLEFILTER ( SID_DBACCESS_START + 15 )
+#define SID_DB_APP_CLOSECONNECTION ( SID_DBACCESS_START + 16 )
+#define SID_DB_APP_DSPROPS ( SID_DBACCESS_START + 17 )
+#define SID_DB_APP_DBADMIN ( SID_DBACCESS_START + 18 )
+#define SID_APP_NEW_REPORT_PRE_SEL ( SID_DBACCESS_START + 19 )
+#define SID_DB_APP_CONVERTTOVIEW ( SID_DBACCESS_START + 20 )
+#define SID_DB_APP_REFRESH_TABLES ( SID_DBACCESS_START + 21 )
+#define SID_DB_APP_VIEW_REPORTS ( SID_DBACCESS_START + 22 )
+#define SID_DB_APP_DSEXPORT ( SID_DBACCESS_START + 23 )
-#define SID_DB_APP_TABLE_DELETE ( SID_DBACCESS_START + 24 )
-#define SID_DB_APP_TABLE_RENAME ( SID_DBACCESS_START + 25 )
-#define SID_DB_APP_TABLE_EDIT ( SID_DBACCESS_START + 26 )
-#define SID_DB_APP_TABLE_OPEN ( SID_DBACCESS_START + 27 )
+#define SID_DB_APP_TABLE_DELETE ( SID_DBACCESS_START + 24 )
+#define SID_DB_APP_TABLE_RENAME ( SID_DBACCESS_START + 25 )
+#define SID_DB_APP_TABLE_EDIT ( SID_DBACCESS_START + 26 )
+#define SID_DB_APP_TABLE_OPEN ( SID_DBACCESS_START + 27 )
-#define SID_DB_APP_QUERY_DELETE ( SID_DBACCESS_START + 28 )
-#define SID_DB_APP_QUERY_RENAME ( SID_DBACCESS_START + 29 )
-#define SID_DB_APP_QUERY_EDIT ( SID_DBACCESS_START + 30 )
-#define SID_DB_APP_QUERY_OPEN ( SID_DBACCESS_START + 31 )
+#define SID_DB_APP_QUERY_DELETE ( SID_DBACCESS_START + 28 )
+#define SID_DB_APP_QUERY_RENAME ( SID_DBACCESS_START + 29 )
+#define SID_DB_APP_QUERY_EDIT ( SID_DBACCESS_START + 30 )
+#define SID_DB_APP_QUERY_OPEN ( SID_DBACCESS_START + 31 )
-#define SID_DB_APP_FORM_DELETE ( SID_DBACCESS_START + 32 )
-#define SID_DB_APP_FORM_RENAME ( SID_DBACCESS_START + 33 )
-#define SID_DB_APP_FORM_EDIT ( SID_DBACCESS_START + 34 )
-#define SID_DB_APP_FORM_OPEN ( SID_DBACCESS_START + 35 )
+#define SID_DB_APP_FORM_DELETE ( SID_DBACCESS_START + 32 )
+#define SID_DB_APP_FORM_RENAME ( SID_DBACCESS_START + 33 )
+#define SID_DB_APP_FORM_EDIT ( SID_DBACCESS_START + 34 )
+#define SID_DB_APP_FORM_OPEN ( SID_DBACCESS_START + 35 )
-#define SID_DB_APP_REPORT_DELETE ( SID_DBACCESS_START + 36 )
-#define SID_DB_APP_REPORT_RENAME ( SID_DBACCESS_START + 37 )
-#define SID_DB_APP_REPORT_EDIT ( SID_DBACCESS_START + 38 )
-#define SID_DB_APP_REPORT_OPEN ( SID_DBACCESS_START + 39 )
+#define SID_DB_APP_REPORT_DELETE ( SID_DBACCESS_START + 36 )
+#define SID_DB_APP_REPORT_RENAME ( SID_DBACCESS_START + 37 )
+#define SID_DB_APP_REPORT_EDIT ( SID_DBACCESS_START + 38 )
+#define SID_DB_APP_REPORT_OPEN ( SID_DBACCESS_START + 39 )
-#define SID_DB_APP_DELETE ( SID_DBACCESS_START + 40 )
-#define SID_DB_APP_RENAME ( SID_DBACCESS_START + 41 )
-#define SID_DB_APP_EDIT ( SID_DBACCESS_START + 42 )
-#define SID_DB_APP_OPEN ( SID_DBACCESS_START + 43 )
+#define SID_DB_APP_DELETE ( SID_DBACCESS_START + 40 )
+#define SID_DB_APP_RENAME ( SID_DBACCESS_START + 41 )
+#define SID_DB_APP_EDIT ( SID_DBACCESS_START + 42 )
+#define SID_DB_APP_OPEN ( SID_DBACCESS_START + 43 )
-#define SID_BROWSER_CLEAR_QUERY ( SID_DBACCESS_START + 44 )
-#define SID_RELATION_ADD_RELATION ( SID_DBACCESS_START + 45 )
-#define SID_QUERY_VIEW_FUNCTIONS ( SID_DBACCESS_START + 46 )
-#define SID_QUERY_VIEW_TABLES ( SID_DBACCESS_START + 47 )
-#define SID_QUERY_VIEW_ALIASES ( SID_DBACCESS_START + 48 )
-#define SID_QUERY_DISTINCT_VALUES ( SID_DBACCESS_START + 49 )
-#define SID_FORM_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 50 )
-#define SID_REPORT_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 51 )
-#define SID_DB_QUERY_PREVIEW ( SID_DBACCESS_START + 52 )
-#define SID_APP_NEW_FOLDER ( SID_DBACCESS_START + 53 )
-#define SID_APP_NEW_FORM ( SID_DBACCESS_START + 54 )
-#define SID_DB_APP_PASTE_SPECIAL ( SID_DBACCESS_START + 55 )
+#define SID_BROWSER_CLEAR_QUERY ( SID_DBACCESS_START + 44 )
+#define SID_RELATION_ADD_RELATION ( SID_DBACCESS_START + 45 )
+#define SID_QUERY_VIEW_FUNCTIONS ( SID_DBACCESS_START + 46 )
+#define SID_QUERY_VIEW_TABLES ( SID_DBACCESS_START + 47 )
+#define SID_QUERY_VIEW_ALIASES ( SID_DBACCESS_START + 48 )
+#define SID_QUERY_DISTINCT_VALUES ( SID_DBACCESS_START + 49 )
+#define SID_FORM_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 50 )
+#define SID_REPORT_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 51 )
+#define SID_DB_QUERY_PREVIEW ( SID_DBACCESS_START + 52 )
+#define SID_APP_NEW_FOLDER ( SID_DBACCESS_START + 53 )
+#define SID_APP_NEW_FORM ( SID_DBACCESS_START + 54 )
+#define SID_DB_APP_PASTE_SPECIAL ( SID_DBACCESS_START + 55 )
// status information
-#define SID_DB_APP_STATUS_TYPE ( SID_DBACCESS_START + 57 )
-#define SID_DB_APP_STATUS_DBNAME ( SID_DBACCESS_START + 58 )
-#define SID_DB_APP_STATUS_USERNAME ( SID_DBACCESS_START + 59 )
-#define SID_DB_APP_STATUS_HOSTNAME ( SID_DBACCESS_START + 60 )
+#define SID_DB_APP_STATUS_TYPE ( SID_DBACCESS_START + 57 )
+#define SID_DB_APP_STATUS_DBNAME ( SID_DBACCESS_START + 58 )
+#define SID_DB_APP_STATUS_USERNAME ( SID_DBACCESS_START + 59 )
+#define SID_DB_APP_STATUS_HOSTNAME ( SID_DBACCESS_START + 60 )
-#define SID_DB_APP_SENDREPORTASMAIL ( SID_DBACCESS_START + 61 )
-#define SID_DB_APP_SENDREPORTTOWRITER ( SID_DBACCESS_START + 62 )
-#define SID_DB_FORM_NEW_PILOT ( SID_DBACCESS_START + 63 )
-#define SID_DB_NEW_VIEW_SQL ( SID_DBACCESS_START + 64 )
-#define SID_APP_NEW_REPORT ( SID_DBACCESS_START + 65 )
+#define SID_DB_APP_SENDREPORTASMAIL ( SID_DBACCESS_START + 61 )
+#define SID_DB_APP_SENDREPORTTOWRITER ( SID_DBACCESS_START + 62 )
+#define SID_DB_FORM_NEW_PILOT ( SID_DBACCESS_START + 63 )
+#define SID_DB_NEW_VIEW_SQL ( SID_DBACCESS_START + 64 )
+#define SID_APP_NEW_REPORT ( SID_DBACCESS_START + 65 )
-#define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 )
+#define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 )
#endif // _DBACCESS_SLOTID_HRC_
diff --git a/dbaccess/inc/dbaccessdllapi.h b/dbaccess/inc/dbaccessdllapi.h
index 7365d0c4c84f..5b28a894fe22 100644
--- a/dbaccess/inc/dbaccessdllapi.h
+++ b/dbaccess/inc/dbaccessdllapi.h
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -28,18 +28,18 @@
#ifndef INCLUDED_DBACCESSDLLAPI_H
#define INCLUDED_DBACCESSDLLAPI_H
-
+
#ifndef _SAL_TYPES_H_
#include "sal/types.h"
#endif
-
+
#if defined(DBACCESS_DLLIMPLEMENTATION)
#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
#else
#define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
#endif
#define DBACCESS_DLLPRIVATE SAL_DLLPRIVATE
-
+
#endif /* INCLUDED_DBACCESSDLLAPI_H */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx
index 510e554e93f6..d31229fbc04f 100644
--- a/dbaccess/inc/genericcontroller.hxx
+++ b/dbaccess/inc/genericcontroller.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -132,7 +132,7 @@ namespace dbaui
*/
struct FeatureState
{
- sal_Bool bEnabled;
+ sal_Bool bEnabled;
optional< bool > bChecked;
optional< bool > bInvisible;
@@ -173,8 +173,8 @@ namespace dbaui
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >
xListener;
- sal_Int32 nId;
- sal_Bool bForceBroadcast;
+ sal_Int32 nId;
+ sal_Bool bForceBroadcast;
};
// ....................................................................
@@ -214,15 +214,15 @@ namespace dbaui
,public IController
{
private:
- SupportedFeatures m_aSupportedFeatures;
+ SupportedFeatures m_aSupportedFeatures;
::comphelper::NamedValueCollection
m_aInitParameters;
::std::auto_ptr< OGenericUnoController_Data >
m_pData;
- ODataView* m_pView; // our (VCL) "main window"
+ ODataView* m_pView; // our (VCL) "main window"
-#ifdef DBG_UTIL
+#ifdef DBG_UTIL
bool m_bDescribingSupportedFeatures;
#endif
@@ -231,8 +231,8 @@ namespace dbaui
// attributes
struct DispatchTarget
{
- ::com::sun::star::util::URL aURL;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener;
+ ::com::sun::star::util::URL aURL;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener;
DispatchTarget() { }
DispatchTarget(const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xRef) : aURL(rURL), xListener(xRef) { }
@@ -243,32 +243,32 @@ namespace dbaui
FeatureListeners m_aFeaturesToInvalidate;
- ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque
- StateCache m_aStateCache; // save the current status of feature state
- Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes
- OAsyncronousLink m_aAsyncInvalidateAll;
- OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed
+ ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque
+ StateCache m_aStateCache; // save the current status of feature state
+ Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes
+ OAsyncronousLink m_aAsyncInvalidateAll;
+ OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory;
+ ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory;
ControllerFrame m_aCurrentFrame;
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; // for intercepting dispatches
- ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; // dito
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDatabaseContext;
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; // for intercepting dispatches
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; // dito
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDatabaseContext;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > m_xTitleHelper;
- sal_Bool m_bPreview;
- sal_Bool m_bReadOnly;
-
- sal_Bool m_bCurrentlyModified : 1;
- sal_Bool m_bExternalTitle : 1;
+ sal_Bool m_bPreview;
+ sal_Bool m_bReadOnly;
+ sal_Bool m_bCurrentlyModified : 1;
+ sal_Bool m_bExternalTitle : 1;
+
// ----------------------------------------------------------------
// attribute access
- ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); }
- ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; }
+ ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); }
+ ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; }
// ----------------------------------------------------------------
// methods
@@ -278,13 +278,13 @@ namespace dbaui
/** open the help agent for the given help id.
- @param _nHelpId
+ @param _nHelpId
The help id to dispatch.
*/
void openHelpAgent(sal_Int32 _nHelpId);
/** open the help agent for the given help url.
- @param _pHelpStringURL
+ @param _pHelpStringURL
The help url to dispatch.
*/
void openHelpAgent( const rtl::OUString& _suHelpStringURL );
@@ -300,22 +300,22 @@ namespace dbaui
void closeTask();
// if getMenu returns a non empty string than this will be dispatched at the frame
- virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame);
+ virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame);
/** called when our menu has been loaded into our frame, can be used to load sub toolbars
@param _xLayoutManager
The layout manager.
*/
- virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager);
+ virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager);
// all the features which should be handled by this class
- virtual void describeSupportedFeatures();
+ virtual void describeSupportedFeatures();
// state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot.
- virtual FeatureState GetState(sal_uInt16 nId) const;
+ virtual FeatureState GetState(sal_uInt16 nId) const;
// execute a feature
- virtual void Execute(sal_uInt16 nId , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs);
+ virtual void Execute(sal_uInt16 nId , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs);
/** describes a feature supported by the controller
@@ -337,7 +337,7 @@ namespace dbaui
);
/** returns <TRUE/> if the feature is supported, otherwise <FALSE/>
- @param _nId
+ @param _nId
The ID of the feature.
*/
sal_Bool isFeatureSupported( sal_Int32 _nId );
@@ -435,7 +435,7 @@ namespace dbaui
virtual sal_Bool Construct(Window* pParent);
/** get the layout manager
- @param _xFrame
+ @param _xFrame
The frame to ask for the layout manager.
@return
The layout manager of the frame, can be <NULL/> if the frame isn't initialized.
@@ -483,9 +483,9 @@ namespace dbaui
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame(void) throw( ::com::sun::star::uno::RuntimeException );
// ::com::sun::star::frame::XDispatch
- virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::frame::XDispatchProviderInterceptor
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException);
@@ -504,7 +504,7 @@ namespace dbaui
virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::frame::XFrameActionListener
- virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
+ virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException );
// lang::XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/inc/pch/precompiled_dbaccess.cxx b/dbaccess/inc/pch/precompiled_dbaccess.cxx
index 0fe2c43d1189..a5a4e8af7fa8 100644
--- a/dbaccess/inc/pch/precompiled_dbaccess.cxx
+++ b/dbaccess/inc/pch/precompiled_dbaccess.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx
index daa7a324ab60..dc926527e617 100644
--- a/dbaccess/inc/pch/precompiled_dbaccess.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx
index 75e146ec2a05..7b61d7fad3db 100644
--- a/dbaccess/inc/singledoccontroller.hxx
+++ b/dbaccess/inc/singledoccontroller.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -74,22 +74,22 @@ namespace dbaui
::std::auto_ptr<OSingleDocumentControllerImpl> m_pImpl;
protected:
- SfxUndoManager m_aUndoManager;
+ SfxUndoManager m_aUndoManager;
private:
/** forces usage of a connection which we do not own
<p>To be used from within XInitialization::initialize, resp. impl_initialize, only.</p>
*/
- void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn );
+ void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn );
protected:
// OGenericUnoController - initialization
virtual void impl_initialize();
// state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot.
- virtual FeatureState GetState(sal_uInt16 nId) const;
+ virtual FeatureState GetState(sal_uInt16 nId) const;
// execute a feature
- virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs);
+ virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const;
@@ -98,8 +98,8 @@ namespace dbaui
public:
- sal_Bool isReadOnly() const;
- sal_Bool isEditable() const;
+ sal_Bool isReadOnly() const;
+ sal_Bool isEditable() const;
void setEditable(sal_Bool _bEditable);
// need for undo's and redo's
@@ -107,13 +107,13 @@ namespace dbaui
/** addUndoActionAndInvalidate adds an undo action to the undoManager,
additionally invalidates the UNDO and REDO slot
- @param pAction the undo action to add
+ @param pAction the undo action to add
*/
void addUndoActionAndInvalidate(SfxUndoAction *pAction);
// ----------------------------------------------------------------
// asking for connection-related stuff
-
- sal_Bool isConnected() const;
+
+ sal_Bool isConnected() const;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >
getMetaData( ) const;
@@ -123,7 +123,7 @@ namespace dbaui
::rtl::OUString getDataSourceName() const;
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >&
getDataSource() const;
- sal_Bool haveDataSource() const;
+ sal_Bool haveDataSource() const;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
getDatabaseDocument() const;
@@ -171,7 +171,7 @@ namespace dbaui
/** returns the number formatter
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const;
+ ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const;
// ::com::sun::star::frame::XController
virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException );
@@ -197,7 +197,7 @@ namespace dbaui
virtual void disconnect();
virtual void reconnect( sal_Bool _bUI );
- sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); }
+ sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); }
/** called when our connection is beeing disposed
<p>The default implementation does a reconnect</p>
@@ -215,7 +215,7 @@ namespace dbaui
virtual void SAL_CALL disposing();
// XInterface
- virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException);
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException);
@@ -228,7 +228,7 @@ namespace dbaui
};
//........................................................................
-} // namespace dbaui
+} // namespace dbaui
//........................................................................
#endif // DBAUI_SINGLEDOCCONTROLLER_HXX
diff --git a/dbaccess/prj/dbu.xml b/dbaccess/prj/dbu.xml
index 2acdaf9c75a6..097fa06244aa 100644
--- a/dbaccess/prj/dbu.xml
+++ b/dbaccess/prj/dbu.xml
@@ -110,7 +110,7 @@
<status value="final"/>
<supported-service>com.sun.star.accessibility.Accessible</supported-service>
<supported-service>com.sun.star.accessibility.AccessibleContext</supported-service>
- </component-description>
+ </component-description>
<component-description>
<author>Ocke Janssen</author>
<name>com.sun.star.comp.dbu.OColumnControl</name>
diff --git a/dbaccess/qa/complex/dbaccess/ApplicationController.java b/dbaccess/qa/complex/dbaccess/ApplicationController.java
index 4c964e82dc06..33a62821a2b8 100644
--- a/dbaccess/qa/complex/dbaccess/ApplicationController.java
+++ b/dbaccess/qa/complex/dbaccess/ApplicationController.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/Beamer.java b/dbaccess/qa/complex/dbaccess/Beamer.java
index 909bf39d1707..797b5bca6cae 100644
--- a/dbaccess/qa/complex/dbaccess/Beamer.java
+++ b/dbaccess/qa/complex/dbaccess/Beamer.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -162,7 +162,7 @@ public class Beamer extends complexlib.ComplexTestCase
new PropertyValue("CommandType", 0, Integer.valueOf(CommandType.TABLE), PropertyState.DIRECT_VALUE),
new PropertyValue("Command", 0, "biblio", PropertyState.DIRECT_VALUE)
};
-
+
final XFrame beamer = frame.findFrame("_beamer", 0);
assure(beamer != null);
final XEnumerationAccess evtBc = (XEnumerationAccess) UnoRuntime.queryInterface(XEnumerationAccess.class, getORB().createInstance("com.sun.star.frame.GlobalEventBroadcaster"));
diff --git a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
index 3bba8fa45001..f9f65268ff9c 100644
--- a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
+++ b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java b/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java
index 53527e356f78..5967086df53b 100755
--- a/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java
+++ b/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
index 7c3db7f6020d..9bb102e28677 100755
--- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
+++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -100,7 +100,7 @@ public class CopyTableWizard extends CRMBasedTestCase
}
// --------------------------------------------------------------------------------------------------------
-
+
class CopyThread implements Runnable
{
@@ -141,7 +141,7 @@ public class CopyTableWizard extends CRMBasedTestCase
}
public void copyTableDbase() throws Exception, IOException, java.lang.Exception
- {
+ {
copyTable(source,dest);
}
public void copyTable(final DatabaseApplication sourceDb,final DatabaseApplication destDb) throws Exception, IOException, java.lang.Exception
diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java
index f74d5af8d8f0..69a9fdd82d60 100644
--- a/dbaccess/qa/complex/dbaccess/DataSource.java
+++ b/dbaccess/qa/complex/dbaccess/DataSource.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/DatabaseApplication.java b/dbaccess/qa/complex/dbaccess/DatabaseApplication.java
index d6bfa804eafa..b9aaac35c222 100755
--- a/dbaccess/qa/complex/dbaccess/DatabaseApplication.java
+++ b/dbaccess/qa/complex/dbaccess/DatabaseApplication.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java
index 02fb820f3fd4..20ae862075f9 100644
--- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java
+++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/FileHelper.java b/dbaccess/qa/complex/dbaccess/FileHelper.java
index f72dc0ff7ca3..f9c2b0a40f58 100644
--- a/dbaccess/qa/complex/dbaccess/FileHelper.java
+++ b/dbaccess/qa/complex/dbaccess/FileHelper.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/Parser.java b/dbaccess/qa/complex/dbaccess/Parser.java
index 2b1b9342edcb..9616a645af24 100644
--- a/dbaccess/qa/complex/dbaccess/Parser.java
+++ b/dbaccess/qa/complex/dbaccess/Parser.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/PropertyBag.java b/dbaccess/qa/complex/dbaccess/PropertyBag.java
index c686be886bba..911ac557e455 100644
--- a/dbaccess/qa/complex/dbaccess/PropertyBag.java
+++ b/dbaccess/qa/complex/dbaccess/PropertyBag.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/Query.java b/dbaccess/qa/complex/dbaccess/Query.java
index 81a651fd5696..d93d5c3377e6 100644
--- a/dbaccess/qa/complex/dbaccess/Query.java
+++ b/dbaccess/qa/complex/dbaccess/Query.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/QueryInQuery.java b/dbaccess/qa/complex/dbaccess/QueryInQuery.java
index 002d0395b791..cd25209347de 100644
--- a/dbaccess/qa/complex/dbaccess/QueryInQuery.java
+++ b/dbaccess/qa/complex/dbaccess/QueryInQuery.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java
index 5a13f6724d1f..ecf66e8306a2 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/qa/complex/dbaccess/RowSetEventListener.java b/dbaccess/qa/complex/dbaccess/RowSetEventListener.java
index c4569986a5d7..b0901d9790bb 100644
--- a/dbaccess/qa/complex/dbaccess/RowSetEventListener.java
+++ b/dbaccess/qa/complex/dbaccess/RowSetEventListener.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -43,11 +43,11 @@ public class RowSetEventListener implements XRowSetApproveListener,XRowSetListen
public static final int IS_MODIFIED = 5;
public static final int IS_NEW = 6;
public static final int ROW_COUNT = 7;
- public static final int IS_ROW_COUNT_FINAL = 8;
-
+ public static final int IS_ROW_COUNT_FINAL = 8;
+
int callPos = 1;
int calling [];
-
+
RowSetEventListener(){
calling = new int [9];
clearCalling();
diff --git a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
index bb3636100849..6eb0525b9ffa 100755
--- a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
+++ b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -128,7 +128,7 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
realValue.equals(_attributeValue));
log.println(" (results in " + (String) m_composer.getQuery() + ")");
}
-
+
/** tests setCommand of the composer
*/
public void testSetCommand()
@@ -140,11 +140,11 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
final String table = "SELECT * FROM \"customers\"";
m_composer.setCommand("customers",CommandType.TABLE);
assure("setCommand/getQuery TABLE inconsistent", m_composer.getQuery().equals(table));
-
+
m_database.getDatabase().getDataSource().createQuery("set command test", "SELECT * FROM \"orders for customer\" \"a\", \"customers\" \"b\" WHERE \"a\".\"Product Name\" = \"b\".\"Name\"");
m_composer.setCommand("set command test",CommandType.QUERY);
assure("setCommand/getQuery QUERY inconsistent", m_composer.getQuery().equals(m_database.getDatabase().getDataSource().getQueryDefinition("set command test").getCommand()));
-
+
final String sql = "SELECT * FROM \"orders for customer\" WHERE \"Product Name\" = 'test'";
m_composer.setCommand(sql,CommandType.COMMAND);
assure("setCommand/getQuery COMMAND inconsistent", m_composer.getQuery().equals(sql));
@@ -166,7 +166,7 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase
final String simpleQuery2 = "SELECT * FROM \"customers\" WHERE \"Name\" = 'oranges'";
m_composer.setElementaryQuery(simpleQuery2);
assure("setElementaryQuery/getQuery inconsistent", m_composer.getQuery().equals(simpleQuery2));
-
+
log.println("check setQuery");
final String simpleQuery = "SELECT * FROM \"customers\"";
m_composer.setQuery(simpleQuery);
diff --git a/dbaccess/qa/complex/dbaccess/TestCase.java b/dbaccess/qa/complex/dbaccess/TestCase.java
index b8dae3f6f350..c66efeb0af91 100644
--- a/dbaccess/qa/complex/dbaccess/TestCase.java
+++ b/dbaccess/qa/complex/dbaccess/TestCase.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
@@ -77,7 +77,7 @@ public abstract class TestCase extends complexlib.ComplexTestCase
// --------------------------------------------------------------------------------------------------------
/** returns the URL of a temporary file which can be used during the test.
- *
+ *
* The file will be deleted when the process exits
* @return the URL of a temporary file
*/
diff --git a/dbaccess/qa/complex/dbaccess/UISettings.java b/dbaccess/qa/complex/dbaccess/UISettings.java
index fc772b158f5f..6ae8fa5f0506 100644
--- a/dbaccess/qa/complex/dbaccess/UISettings.java
+++ b/dbaccess/qa/complex/dbaccess/UISettings.java
@@ -1,7 +1,7 @@
/*************************************************************************
*
* 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
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index 5a88c248befd..412c2d7bd28a 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -43,11 +43,11 @@ using namespace ::dbtools;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
-// using namespace ::com::sun::star::sdb;
+// using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-// using namespace ::cppu;
+// using namespace ::cppu;
using namespace ::osl;
void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter)
@@ -133,7 +133,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::updateRow" );
- // OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable);
+ // OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable);
Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
if(!xUpdRow.is())
::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this );
diff --git a/dbaccess/source/core/api/CIndexColumn.hxx b/dbaccess/source/core/api/CIndexColumn.hxx
index 2ac731919703..3bd08da3d7a6 100644
--- a/dbaccess/source/core/api/CIndexColumn.hxx
+++ b/dbaccess/source/core/api/CIndexColumn.hxx
@@ -38,18 +38,18 @@ namespace connectivity
class OIndexColumn : public OAdabasColumn
{
protected:
- sal_Bool m_IsAscending;
+ sal_Bool m_IsAscending;
public:
OIndexColumn();
- OIndexColumn( sal_Bool _IsAscending,
+ OIndexColumn( sal_Bool _IsAscending,
const ::rtl::OUString& _Name,
const ::rtl::OUString& _TypeName,
const ::rtl::OUString& _DefaultValue,
- sal_Int32 _IsNullable,
- sal_Int32 _Precision,
- sal_Int32 _Scale,
- sal_Int32 _Type,
- sal_Bool _IsAutoIncrement);
+ sal_Int32 _IsNullable,
+ sal_Int32 _Precision,
+ sal_Int32 _Scale,
+ sal_Int32 _Type,
+ sal_Bool _IsAutoIncrement);
virtual void construct();
};
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index 883ec1b7b1b2..41a5cd81c8ab 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star::beans;
namespace dbaccess
{
-ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos,
+ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos,
const Reference< XDatabaseMetaData >& _rxDBMeta, const ::rtl::OUString& _rDescription, const ::rtl::OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue )
:ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, _rDescription, i_sLabel,_rColumnValue )
{
diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx
index 2d6fe45a4006..f2c84a3b22ac 100644
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.hxx
@@ -41,7 +41,7 @@ namespace dbaccess
{
public:
- ORowSetColumn( const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData,
+ ORowSetColumn( const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData,
const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow,
sal_Int32 _nPos,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta,
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index c31cc17b6ec2..56e66d864db7 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -42,7 +42,7 @@ using namespace comphelper;
using namespace connectivity;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
-// using namespace ::com::sun::star::sdbcx;
+// using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
@@ -52,7 +52,7 @@ using namespace osl;
DBG_NAME(ORowSetDataColumn)
-ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& _xMetaData,
+ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& _xMetaData,
const Reference < XRow >& _xRow,
const Reference < XRowUpdate >& _xRowUpdate,
sal_Int32 _nPos,
@@ -256,10 +256,10 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName
void SAL_CALL ORowSetDataColumns::disposing(void)
{
- // clear_NoDispose();
+ // clear_NoDispose();
ORowSetDataColumns_BASE::disposing();
m_aColumns = NULL;
- // m_aColumns.clear();
+ // m_aColumns.clear();
}
void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector)
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index 8cf0aa5f2c95..477328ef88bc 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -41,17 +41,17 @@ namespace dbaccess
class ORowSetDataColumn;
typedef ::comphelper::OPropertyArrayUsageHelper<ORowSetDataColumn> ORowSetDataColumn_PROP;
- class ORowSetDataColumn : public ODataColumn,
+ class ORowSetDataColumn : public ODataColumn,
public OColumnSettings,
public ORowSetDataColumn_PROP
{
protected:
- ORowSetCacheIterator m_aColumnValue;
- ::com::sun::star::uno::Any m_aOldValue;
+ ORowSetCacheIterator m_aColumnValue;
+ ::com::sun::star::uno::Any m_aOldValue;
::rtl::OUString m_sLabel;
- ::rtl::OUString m_aDescription; // description
- ORowSetBase* m_pRowSet;
+ ::rtl::OUString m_aDescription; // description
+ ORowSetBase* m_pRowSet;
virtual ~ORowSetDataColumn();
public:
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 2ebed10c0479..56b045987ab3 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -61,12 +61,12 @@ using namespace connectivity;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
-// using namespace ::com::sun::star::sdb;
+// using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::io;
-// using namespace ::cppu;
+// using namespace ::cppu;
using namespace ::osl;
DBG_NAME(OCacheSet)
@@ -91,7 +91,7 @@ OCacheSet::OCacheSet()
return sQuote;
}
-void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/)
+void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::construct" );
OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet");
@@ -229,7 +229,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
if(xIndexSup.is())
xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY);
- // Reference<XColumnsSupplier>
+ // Reference<XColumnsSupplier>
Reference<XPropertySet> xIndexColsSup;
Reference<XNameAccess> xIndexColumns;
::std::vector< Reference<XNameAccess> > aAllIndexColumns;
@@ -238,7 +238,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
for(sal_Int32 j=0;j<xIndexes->getCount();++j)
{
xIndexColsSup.set(xIndexes->getByIndex(j),UNO_QUERY);
- if( xIndexColsSup.is()
+ if( xIndexColsSup.is()
&& comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE))
&& !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX))
)
@@ -251,7 +251,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,"));
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
- ::rtl::OUString aQuote = getIdentifierQuoteString();
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
sal_Int32 nCheckCount = 1; // index for the orginal values
sal_Int32 i = 1;
@@ -357,7 +357,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")));
// list all cloumns that should be set
- ::rtl::OUString aQuote = getIdentifierQuoteString();
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
// use keys and indexes for excat postioning
@@ -369,7 +369,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
if(xIndexSup.is())
xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY);
- // Reference<XColumnsSupplier>
+ // Reference<XColumnsSupplier>
Reference<XPropertySet> xIndexColsSup;
Reference<XNameAccess> xIndexColumns;
::std::vector< Reference<XNameAccess> > aAllIndexColumns;
@@ -378,7 +378,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
for(sal_Int32 j=0;j<xIndexes->getCount();++j)
{
xIndexColsSup.set(xIndexes->getByIndex(j),UNO_QUERY);
- if( xIndexColsSup.is()
+ if( xIndexColsSup.is()
&& comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE))
&& !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX))
)
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index 42f5d290edd5..078bdb83741d 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -52,19 +52,19 @@ namespace dbaccess
class OCacheSet : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRow>
{
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xDriverSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xDriverRow;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xSetMetaData;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xDriverSet;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xDriverRow;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xSetMetaData;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
- ::com::sun::star::uno::Sequence<sal_Bool> m_aNullable;
- ::com::sun::star::uno::Sequence<sal_Bool> m_aSignedFlags;
- ::com::sun::star::uno::Sequence<sal_Int32> m_aColumnTypes;
- ORowSetRow m_aInsertRow;
- ::rtl::OUString m_aComposedTableName;
- sal_Bool m_bInserted;
- sal_Bool m_bUpdated;
- sal_Bool m_bDeleted;
+ ::com::sun::star::uno::Sequence<sal_Bool> m_aNullable;
+ ::com::sun::star::uno::Sequence<sal_Bool> m_aSignedFlags;
+ ::com::sun::star::uno::Sequence<sal_Int32> m_aColumnTypes;
+ ORowSetRow m_aInsertRow;
+ ::rtl::OUString m_aComposedTableName;
+ sal_Bool m_bInserted;
+ sal_Bool m_bUpdated;
+ sal_Bool m_bDeleted;
OCacheSet();
virtual ~OCacheSet();
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 4befdc824b03..757e44a8d80b 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -65,7 +65,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
// for wildcard search : remove all table filters which are a wildcard expression and build a WilCard
// for them
::rtl::OUString* pTableFilters = _rTableFilter.getArray();
- ::rtl::OUString* pEnd = pTableFilters + _rTableFilter.getLength();
+ ::rtl::OUString* pEnd = pTableFilters + _rTableFilter.getLength();
sal_Int32 nShiftPos = 0;
for (sal_Int32 i=0; pEnd != pTableFilters; ++pTableFilters,++i)
{
@@ -98,8 +98,8 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
bool bFilterMatch = ::std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd;
// the table is allowed to "pass" if we had no filters at all or any of the non-wildcard filters matches
if (!bFilterMatch && !_rWCSearch.empty())
- { // or if one of the wildcrad expression matches
- for ( ::std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin();
+ { // or if one of the wildcrad expression matches
+ for ( ::std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin();
aLoop != _rWCSearch.end() && !bFilterMatch;
++aLoop
)
@@ -255,7 +255,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
::osl::Mutex& _rMutex,
const Reference< XConnection >& _xCon,
sal_Bool _bCase,
- IRefreshListener* _pRefreshListener,
+ IRefreshListener* _pRefreshListener,
::dbtools::IWarningsContainer* _pWarningsContainer
,oslInterlockedCount& _nInAppend)
:OCollection(_rParent,_bCase,_rMutex,::std::vector< ::rtl::OUString>())
@@ -311,7 +311,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
{
// build sorted versions of the filter sequences, so the visibility decision is faster
Sequence< ::rtl::OUString > aTableFilter(_rTableFilter);
- sal_Int32 nTableFilterLen = aTableFilter.getLength();
+ sal_Int32 nTableFilterLen = aTableFilter.getLength();
// for wildcard search : remove all table filters which are a wildcard expression and build a WilCard
// for them
@@ -371,9 +371,9 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
::rtl::OUString sCatalog, sSchema, sName, sType;
while ( xTables->next() )
{
- sCatalog = xCurrentRow->getString(1);
- sSchema = xCurrentRow->getString(2);
- sName = xCurrentRow->getString(3);
+ sCatalog = xCurrentRow->getString(1);
+ sSchema = xCurrentRow->getString(2);
+ sName = xCurrentRow->getString(3);
sType = xCurrentRow->getString(4);
aUnfilteredTables.push_back( TableInfo( sCatalog, sSchema, sName, sType ) );
@@ -401,11 +401,11 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
if ( m_xMasterContainer.is() )
removeMasterContainerListener();
- m_xMasterContainer = NULL;
- m_xMetaData = NULL;
+ m_xMasterContainer = NULL;
+ m_xMetaData = NULL;
m_pWarningsContainer = NULL;
- m_pRefreshListener = NULL;
- m_bConstructed = sal_False;
+ m_pRefreshListener = NULL;
+ m_bConstructed = sal_False;
}
void OFilteredContainer::impl_refresh() throw(RuntimeException)
diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
index f88024bc9b7a..ec24c9cbac15 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.hxx
@@ -53,7 +53,7 @@ namespace dbaccess
typedef connectivity::sdbcx::OCollection OPrivateColumns_Base;
class OPrivateColumns : public OPrivateColumns_Base
{
- ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns;
+ ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns;
protected:
virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
virtual void impl_refresh() throw(RuntimeException) {}
@@ -88,7 +88,7 @@ namespace dbaccess
//==========================================================================
class OPrivateTables : public OPrivateTables_BASE
{
- OSQLTables m_aTables;
+ OSQLTables m_aTables;
protected:
virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
virtual void impl_refresh() throw(RuntimeException) {}
@@ -97,7 +97,7 @@ namespace dbaccess
return NULL;
}
public:
- OPrivateTables( const OSQLTables& _rTables,
+ OPrivateTables( const OSQLTables& _rTables,
sal_Bool _bCase,
::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 0d4c3147efb6..17ec5dfacdba 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -89,7 +89,7 @@ namespace
for(sal_Int32 j = 0 ; j < nCount ; ++j)
{
xIndexColsSup.set(_xIndexes->getByIndex(j),UNO_QUERY);
- if( xIndexColsSup.is()
+ if( xIndexColsSup.is()
&& comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE))
&& !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX))
)
@@ -102,7 +102,7 @@ DBG_NAME(OKeySet)
OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
const Reference< XIndexAccess>& _xTableKeys,
- const ::rtl::OUString& _rUpdateTableName, // this can be the alias or the full qualified name
+ const ::rtl::OUString& _rUpdateTableName, // this can be the alias or the full qualified name
const Reference< XSingleSelectQueryAnalyzer >& _xComposer,
const ORowSetValueVector& _aParameterValueForCache)
:m_aParameterValueForCache(_aParameterValueForCache)
@@ -156,7 +156,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
{
// first ask the database itself for the best columns which can be used
Sequence< ::rtl::OUString> aBestColumnNames;
- Reference<XNameAccess> xKeyColumns = getPrimaryKeyColumns_throw(i_aTable);
+ Reference<XNameAccess> xKeyColumns = getPrimaryKeyColumns_throw(i_aTable);
if ( xKeyColumns.is() )
aBestColumnNames = xKeyColumns->getElementNames();
@@ -220,7 +220,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable,
::rtl::OUStringBuffer OKeySet::createKeyFilter()
{
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
- const ::rtl::OUString aQuote = getIdentifierQuoteString();
+ const ::rtl::OUString aQuote = getIdentifierQuoteString();
::rtl::OUStringBuffer aFilter;
static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM("."));
static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
@@ -246,13 +246,13 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
initColumns();
- Reference<XNameAccess> xKeyColumns = getKeyColumns();
+ Reference<XNameAccess> xKeyColumns = getKeyColumns();
Reference<XDatabaseMetaData> xMeta = m_xConnection->getMetaData();
Reference<XColumnsSupplier> xQueryColSup(m_xComposer,UNO_QUERY);
const Reference<XNameAccess> xQueryColumns = xQueryColSup->getColumns();
findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns,m_pKeyColumnNames);
- // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first
+ // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first
// without extra varaible to be set
m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair<sal_Int32,Reference<XRow> >(0,NULL))));
m_aKeyIter = m_aKeyMap.begin();
@@ -269,11 +269,11 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
if ( aSeq.getLength() > 1 ) // special handling for join
{
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
- const ::rtl::OUString aQuote = getIdentifierQuoteString();
+ const ::rtl::OUString aQuote = getIdentifierQuoteString();
static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM("."));
static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
for(;pIter != pEnd;++pIter)
{
if ( *pIter != m_sUpdateTableName )
@@ -401,7 +401,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows
aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")));
// list all cloumns that should be set
- const ::rtl::OUString aQuote = getIdentifierQuoteString();
+ const ::rtl::OUString aQuote = getIdentifierQuoteString();
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
static ::rtl::OUString aOr(RTL_CONSTASCII_USTRINGPARAM(" OR "));
static ::rtl::OUString aEqual(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
@@ -424,8 +424,8 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows
aCondition.setLength(aCondition.getLength()-5);
const ::rtl::OUString sCon( aCondition.makeStringAndClear() );
- const Any* pBegin = rows.getConstArray();
- const Any* pEnd = pBegin + rows.getLength();
+ const Any* pBegin = rows.getConstArray();
+ const Any* pEnd = pBegin + rows.getLength();
Sequence< Any > aKeys;
for(;pBegin != pEnd;++pBegin)
@@ -440,7 +440,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows
Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear()));
Reference< XParameters > xParameter(xPrep,UNO_QUERY);
- pBegin = rows.getConstArray();
+ pBegin = rows.getConstArray();
sal_Int32 i=1;
for(;pBegin != pEnd;++pBegin)
{
@@ -489,7 +489,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" SET ")));
// list all cloumns that should be set
static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM(" = ?,"));
- ::rtl::OUString aQuote = getIdentifierQuoteString();
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
@@ -950,7 +950,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")));
// list all cloumns that should be set
- ::rtl::OUString aQuote = getIdentifierQuoteString();
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
// use keys and indexes for excat postioning
@@ -961,7 +961,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
if ( xIndexSup.is() )
xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY);
- // Reference<XColumnsSupplier>
+ // Reference<XColumnsSupplier>
::std::vector< Reference<XNameAccess> > aAllIndexColumns;
lcl_fillIndexColumns(xIndexes,aAllIndexColumns);
@@ -1573,11 +1573,11 @@ void getColumnPositions(const Reference<XNameAccess>& _rxQueryColumns,
{
// get the real name of the columns
Sequence< ::rtl::OUString> aSelNames(_rxQueryColumns->getElementNames());
- const ::rtl::OUString* pSelIter = aSelNames.getConstArray();
- const ::rtl::OUString* pSelEnd = pSelIter + aSelNames.getLength();
+ const ::rtl::OUString* pSelIter = aSelNames.getConstArray();
+ const ::rtl::OUString* pSelEnd = pSelIter + aSelNames.getLength();
- const ::rtl::OUString* pTblColumnIter = _aColumnNames.getConstArray();
- const ::rtl::OUString* pTblColumnEnd = pTblColumnIter + _aColumnNames.getLength();
+ const ::rtl::OUString* pTblColumnIter = _aColumnNames.getConstArray();
+ const ::rtl::OUString* pTblColumnEnd = pTblColumnIter + _aColumnNames.getLength();
::comphelper::UStringMixLess aTmp(o_rColumnNames.key_comp());
@@ -1589,17 +1589,17 @@ void getColumnPositions(const Reference<XNameAccess>& _rxQueryColumns,
::rtl::OUString sRealName,sTableName;
OSL_ENSURE(xQueryColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME),"Property REALNAME not available!");
OSL_ENSURE(xQueryColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_TABLENAME),"Property TABLENAME not available!");
- xQueryColumnProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
- xQueryColumnProp->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
+ xQueryColumnProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
+ xQueryColumnProp->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
for(;pTblColumnIter != pTblColumnEnd;++pTblColumnIter)
{
if(bCase(sRealName,*pTblColumnIter) && bCase(_rsUpdateTableName,sTableName) && o_rColumnNames.find(*pTblColumnIter) == o_rColumnNames.end())
{
sal_Int32 nType = 0;
- xQueryColumnProp->getPropertyValue(PROPERTY_TYPE) >>= nType;
+ xQueryColumnProp->getPropertyValue(PROPERTY_TYPE) >>= nType;
sal_Int32 nScale = 0;
- xQueryColumnProp->getPropertyValue(PROPERTY_SCALE) >>= nScale;
+ xQueryColumnProp->getPropertyValue(PROPERTY_SCALE) >>= nScale;
::rtl::OUString sColumnDefault;
if ( xQueryColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_DEFAULTVALUE) )
xQueryColumnProp->getPropertyValue(PROPERTY_DEFAULTVALUE) >>= sColumnDefault;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 3ee20477f63a..a439fb22e1d1 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -85,10 +85,10 @@ namespace dbaccess
class OKeySet : public OCacheSet
{
protected:
- OKeySetMatrix m_aKeyMap;
- OKeySetMatrix::iterator m_aKeyIter;
+ OKeySetMatrix m_aKeyMap;
+ OKeySetMatrix::iterator m_aKeyIter;
- ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones
+ ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones
OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching
ORowSetValueVector m_aParameterValueForCache;
@@ -96,22 +96,22 @@ namespace dbaccess
::std::auto_ptr<SelectColumnsMetaData> m_pColumnNames; // contains all column names
::std::auto_ptr<SelectColumnsMetaData> m_pParameterNames; // contains all parameter names
::std::auto_ptr<SelectColumnsMetaData> m_pForeignColumnNames; // contains all column names of the rest
- connectivity::OSQLTable m_xTable; // reference to our table
+ connectivity::OSQLTable m_xTable; // reference to our table
::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xTableKeys;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer;
- ::rtl::OUString m_sUpdateTableName;
- ::std::vector< ::rtl::OUString > m_aFilterColumns;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer;
+ ::rtl::OUString m_sUpdateTableName;
+ ::std::vector< ::rtl::OUString > m_aFilterColumns;
sal_Bool m_bRowCountFinal;
/**
getComposedTableName return the composed table name for the query
- @param _sCatalog the catalogname may be empty
- @param _sSchema the schemaname may be empty
- @param _sTable the tablename
+ @param _sCatalog the catalogname may be empty
+ @param _sSchema the schemaname may be empty
+ @param _sTable the tablename
@return the composed name
*/
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 9433df191294..3609068d794b 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -140,7 +140,7 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::
m_pKeyColumnNames->insert(pKeyColumNames->begin(),pKeyColumNames->end());
}
- // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first
+ // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first
// without extra variable to be set
m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair<sal_Int32,Reference<XRow> >(0,NULL))));
m_aKeyIter = m_aKeyMap.begin();
@@ -188,7 +188,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
throw SQLException();
// list all cloumns that should be set
static ::rtl::OUString s_sPara(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
- ::rtl::OUString aQuote = getIdentifierQuoteString();
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
@@ -276,7 +276,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
TSQLStatements aParameter;
TSQLStatements aKeyConditions;
::std::map< ::rtl::OUString,bool > aResultSetChanged;
- ::rtl::OUString aQuote = getIdentifierQuoteString();
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
@@ -385,7 +385,7 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
static const ::rtl::OUString s_sAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
- ::rtl::OUString aQuote = getIdentifierQuoteString();
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
::rtl::OUString aColumnName;
::rtl::OUStringBuffer sKeyCondition,sIndexCondition;
::std::vector<sal_Int32> aIndexColumnPositions;
@@ -662,7 +662,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
TSQLStatements aSql;
TSQLStatements aKeyConditions;
::std::map< ::rtl::OUString,bool > aResultSetChanged;
- ::rtl::OUString aQuote = getIdentifierQuoteString();
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND "));
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
index 3dc4ad4f0e73..6fcefad8d1e6 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -48,8 +48,8 @@ namespace dbaccess
// is used when the source supports keys
class OptimisticSet : public OKeySet
{
- ::connectivity::OSQLParser m_aSqlParser;
- ::connectivity::OSQLParseTreeIterator m_aSqlIterator;
+ ::connectivity::OSQLParser m_aSqlParser;
+ ::connectivity::OSQLParseTreeIterator m_aSqlIterator;
::std::map<sal_Int32,sal_Int32> m_aJoinedColumns;
::std::map<sal_Int32,sal_Int32> m_aJoinedKeyColumns;
@@ -58,9 +58,9 @@ namespace dbaccess
/**
getComposedTableName return the composed table name for the query
- @param _sCatalog the catalogname may be empty
- @param _sSchema the schemaname may be empty
- @param _sTable the tablename
+ @param _sCatalog the catalogname may be empty
+ @param _sSchema the schemaname may be empty
+ @param _sTable the tablename
@return the composed name
*/
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index d035d1480648..6339b8df52f3 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -109,28 +109,28 @@ extern "C" void SAL_CALL createRegistryInfo_ORowSet()
static ::dba::OAutoRegistration< ORowSet > aAutoRegistration;
}
-#define NOTIFY_LISTERNERS_CHECK(_rListeners,T,method) \
+#define NOTIFY_LISTERNERS_CHECK(_rListeners,T,method) \
Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \
\
- const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \
+ const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \
const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \
\
- _rGuard.clear(); \
- sal_Bool bCheck = sal_True; \
- while( pxInt > pxIntBegin && bCheck ) \
- { \
- try \
- { \
- while( pxInt > pxIntBegin && bCheck ) \
- { \
- --pxInt; \
- bCheck = static_cast< T* >( pxInt->get() )->method(aEvt); \
- } \
- } \
- catch( RuntimeException& ) \
- { \
- } \
- } \
+ _rGuard.clear(); \
+ sal_Bool bCheck = sal_True; \
+ while( pxInt > pxIntBegin && bCheck ) \
+ { \
+ try \
+ { \
+ while( pxInt > pxIntBegin && bCheck ) \
+ { \
+ --pxInt; \
+ bCheck = static_cast< T* >( pxInt->get() )->method(aEvt); \
+ } \
+ } \
+ catch( RuntimeException& ) \
+ { \
+ } \
+ } \
_rGuard.reset();
@@ -175,52 +175,52 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::lang::XMultiServiceFactory
m_pMySelf = this;
m_aActiveConnection <<= m_xActiveConnection;
- sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT;
- sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT;
- sal_Int32 nBT = PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT;
+ sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT;
+ sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT;
+ sal_Int32 nBT = PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT;
m_aPrematureParamValues.get().resize( 0 );
// sdb.RowSet Properties
- registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
- registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType());
- registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType());
- registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType());
- registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType());
- registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(reinterpret_cast< Reference< XSingleSelectQueryComposer >* >(NULL)));
+ registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
+ registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType());
+ registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType());
+ registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType());
+ registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType());
+ registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(reinterpret_cast< Reference< XSingleSelectQueryComposer >* >(NULL)));
// sdbcx.ResultSet Properties
- registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType());
- registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType());
+ registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType());
+ registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType());
// sdbc.ResultSet Properties
- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
// sdbc.RowSet Properties
- registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL)));
- registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() );
- registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) );
- registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
-
- registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL)));
+ registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() );
+ registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) );
+ registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+
+ registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
// ???
registerProperty(PROPERTY_CHANGE_NOTIFICATION_ENABLED, PROPERTY_ID_PROPCHANGE_NOTIFY, PropertyAttribute::BOUND, &m_bPropChangeNotifyEnabled, ::getBooleanCppuType());
@@ -288,7 +288,7 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c
}
}
-// typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_Prop;
+// typedef ::comphelper::OPropertyArrayUsageHelper<ORowSet> ORowSet_Prop;
void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
{
switch(nHandle)
@@ -330,7 +330,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
setActiveConnection(xNewConnection, sal_False);
}
- m_bOwnConnection = sal_False;
+ m_bOwnConnection = sal_False;
m_bRebuildConnOnExecute = sal_False;
break;
@@ -361,7 +361,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const
// yes -> the next execute needs to rebuild our connection because of this new property
m_bRebuildConnOnExecute = sal_True;
else
- { // no -> drop our active connection (if we have one) as it doesn't correspond to this new property value anymore
+ { // no -> drop our active connection (if we have one) as it doesn't correspond to this new property value anymore
Reference< XConnection > xNewConn;
Any aNewConn;
aNewConn <<= xNewConn;
@@ -573,7 +573,7 @@ void ORowSet::freeResources( bool _bComplete )
// the columns must be disposed before the querycomposer is disposed because
// their owner can be the composer
TDataColumns().swap(m_aDataColumns);// clear and resize capacity
- m_xColumns = NULL;
+ m_xColumns = NULL;
if ( m_pColumns )
m_pColumns->disposing();
// dispose the composer to avoid that everbody knows that the querycomposer is eol
@@ -591,14 +591,14 @@ void ORowSet::freeResources( bool _bComplete )
impl_resetTables_nothrow();
- m_xStatement = NULL;
- m_xTypeMap = NULL;
+ m_xStatement = NULL;
+ m_xTypeMap = NULL;
- m_aBookmark = Any();
- m_bBeforeFirst = sal_True;
- m_bAfterLast = sal_False;
- m_bNew = sal_False;
- m_bModified = sal_False;
+ m_aBookmark = Any();
+ m_bBeforeFirst = sal_True;
+ m_bAfterLast = sal_False;
+ m_bNew = sal_False;
+ m_bModified = sal_False;
m_bLastKnownRowCountFinal = sal_False;
m_nLastKnownRowCount = 0;
if ( m_aOldRow.is() )
@@ -849,7 +849,7 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw
}
if (!::dbtools::implUpdateObject(this, columnIndex, aNewValue))
- { // there is no other updateXXX call which can handle the value in x
+ { // there is no other updateXXX call which can handle the value in x
ORowSetValueVector::Vector& rRow = ((*m_aCurrentRow)->get());
ORowSetNotifier aNotify(this,rRow);
m_pCache->updateObject(columnIndex,aNewValue,rRow,aNotify.getChangedColumns());
@@ -963,8 +963,8 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException)
if ( !aBookmarks.empty() )
aEvt.Bookmarks = Sequence<Any>(&(*aBookmarks.begin()),aBookmarks.size());
aEvt.Rows += aBookmarks.size();
- m_aBookmark = m_pCache->getBookmark();
- m_aCurrentRow = m_pCache->m_aMatrixIter;
+ m_aBookmark = m_pCache->getBookmark();
+ m_aCurrentRow = m_pCache->m_aMatrixIter;
if ( m_pCache->m_aMatrixIter != m_pCache->getEnd() && (*m_pCache->m_aMatrixIter).is() )
{
if ( m_pCache->isResultSetChanged() )
@@ -1072,8 +1072,8 @@ void ORowSet::implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( SQL
m_pCache->cancelRowUpdates();
- m_aBookmark = m_pCache->getBookmark();
- m_aCurrentRow = m_pCache->m_aMatrixIter;
+ m_aBookmark = m_pCache->getBookmark();
+ m_aCurrentRow = m_pCache->m_aMatrixIter;
m_aCurrentRow.setBookmark(m_aBookmark);
// notification order
@@ -1304,7 +1304,7 @@ const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex)
checkCache();
if ( m_pCache && isInsertRow() )
- return ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex];
+ return ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex];
return getValue(columnIndex);
}
@@ -1779,8 +1779,8 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
// do we need a new statement
if ( m_bCommandFacetsDirty )
{
- m_xStatement = NULL;
- m_xComposer = NULL;
+ m_xStatement = NULL;
+ m_xComposer = NULL;
Reference< XResultSet > xResultSet( impl_prepareAndExecute_throw() );
@@ -1804,14 +1804,14 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
m_pCache->m_nPrivileges = Privilege::SELECT;
}
m_pCache->setMaxRowSize(m_nFetchSize);
- m_aCurrentRow = m_pCache->createIterator(this);
+ m_aCurrentRow = m_pCache->createIterator(this);
m_aOldRow = m_pCache->registerOldRow();
}
// get the locale
- // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager();
+ // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager();
Locale aLocale = SvtSysLocale().GetLocaleData().getLocale();
- // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale;
+ // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale;
// get the numberformatTypes
OSL_ENSURE(m_xActiveConnection.is(),"No ActiveConnection");
@@ -1856,7 +1856,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
}
sName = sAlias;
}
- ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(),
+ ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(),
this,
this,
i+1,
@@ -1960,7 +1960,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
{
xColumn->getPropertyValue(PROPERTY_LABEL) >>= sParseLabel;
}
- ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(),
+ ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(),
this,
this,
i,
@@ -2366,9 +2366,9 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw()
}
::rtl::OUString aCatalog,aSchema,aTable;
- xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME) >>= aCatalog;
- xQuery->getPropertyValue(PROPERTY_UPDATE_SCHEMANAME) >>= aSchema;
- xQuery->getPropertyValue(PROPERTY_UPDATE_TABLENAME) >>= aTable;
+ xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME) >>= aCatalog;
+ xQuery->getPropertyValue(PROPERTY_UPDATE_SCHEMANAME) >>= aSchema;
+ xQuery->getPropertyValue(PROPERTY_UPDATE_TABLENAME) >>= aTable;
if(aTable.getLength())
m_aUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), aCatalog, aSchema, aTable, sal_False, ::dbtools::eInDataManipulation );
}
@@ -2584,7 +2584,7 @@ void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Refer
void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException)
{
if ( !::dbtools::implSetObject( this, parameterIndex, x ) )
- { // there is no other setXXX call which can handle the value in x
+ { // there is no other setXXX call which can handle the value in x
throw SQLException();
}
}
@@ -2739,16 +2739,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
{
DBG_CTOR(ORowSetClone, NULL);
- m_nResultSetType = rParent.m_nResultSetType;
+ m_nResultSetType = rParent.m_nResultSetType;
m_nResultSetConcurrency = ResultSetConcurrency::READ_ONLY;
- m_pMySelf = this;
- m_bClone = sal_True;
- m_bBeforeFirst = rParent.m_bBeforeFirst;
- m_bAfterLast = rParent.m_bAfterLast;
- m_pCache = rParent.m_pCache;
- m_aBookmark = rParent.m_aBookmark;
- m_aCurrentRow = m_pCache->createIterator(this);
- m_xNumberFormatTypes = rParent.m_xNumberFormatTypes;
+ m_pMySelf = this;
+ m_bClone = sal_True;
+ m_bBeforeFirst = rParent.m_bBeforeFirst;
+ m_bAfterLast = rParent.m_bAfterLast;
+ m_pCache = rParent.m_pCache;
+ m_aBookmark = rParent.m_aBookmark;
+ m_aCurrentRow = m_pCache->createIterator(this);
+ m_xNumberFormatTypes = rParent.m_xNumberFormatTypes;
m_aOldRow = m_pCache->registerOldRow();
@@ -2756,16 +2756,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
::std::vector< ::rtl::OUString> aNames;
::rtl::OUString aDescription;
- // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager();
- // Locale aLocale;
- // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale;
+ // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager();
+ // Locale aLocale;
+ // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale;
Locale aLocale = SvtSysLocale().GetLocaleData().getLocale();
if ( rParent.m_pColumns )
{
Sequence< ::rtl::OUString> aSeq = rParent.m_pColumns->getElementNames();
- const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ const ::rtl::OUString* pIter = aSeq.getConstArray();
+ const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
aColumns->get().reserve(aSeq.getLength()+1);
for(sal_Int32 i=1;pIter != pEnd ;++pIter,++i)
{
@@ -2776,7 +2776,7 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
::rtl::OUString sParseLabel;
xColumn->getPropertyValue(PROPERTY_LABEL) >>= sParseLabel;
- ORowSetColumn* pColumn = new ORowSetColumn( rParent.getMetaData(),
+ ORowSetColumn* pColumn = new ORowSetColumn( rParent.getMetaData(),
this,
i,
rParent.m_xActiveConnection->getMetaData(),
@@ -2807,16 +2807,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo
m_pColumns = new ORowSetDataColumns(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
aColumns,*this,m_aMutex,aNames);
- sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT;
+ sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT;
// sdb.RowSet Properties
- // registerProperty(PROPERTY_CURSORNAME, PROPERTY_ID_CURSORNAME, PropertyAttribute::READONLY, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
- registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
- registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
- registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType());
+ // registerProperty(PROPERTY_CURSORNAME, PROPERTY_ID_CURSORNAME, PropertyAttribute::READONLY, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL)));
+ registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL)));
+ registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)));
+ registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType());
}
ORowSetClone::~ORowSetClone()
@@ -2874,8 +2874,8 @@ void ORowSetClone::disposing()
MutexGuard aGuard( m_aMutex );
ORowSetBase::disposing();
- m_pParent = NULL;
- m_pMutex = &m_aMutex; // this must be done here because someone could hold a ref to us and try to do something
+ m_pParent = NULL;
+ m_pMutex = &m_aMutex; // this must be done here because someone could hold a ref to us and try to do something
OSubComponent::disposing();
}
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index b686bc65a0e5..5047acd9a775 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -60,38 +60,38 @@
namespace dbaccess
{
- typedef ::cppu::WeakAggComponentImplHelper12 < ::com::sun::star::sdb::XResultSetAccess
- , ::com::sun::star::sdb::XRowSetApproveBroadcaster
- , ::com::sun::star::sdb::XRowsChangeBroadcaster
- , ::com::sun::star::sdbcx::XDeleteRows
- , ::com::sun::star::sdbc::XParameters
- , ::com::sun::star::lang::XEventListener
- , ::com::sun::star::sdbc::XResultSetUpdate
- , ::com::sun::star::sdbc::XRowUpdate
- , ::com::sun::star::util::XCancellable
- , ::com::sun::star::sdb::XCompletedExecution
- , ::com::sun::star::sdb::XParametersSupplier
- , ::com::sun::star::sdbc::XWarningsSupplier
- > ORowSet_BASE1;
+ typedef ::cppu::WeakAggComponentImplHelper12 < ::com::sun::star::sdb::XResultSetAccess
+ , ::com::sun::star::sdb::XRowSetApproveBroadcaster
+ , ::com::sun::star::sdb::XRowsChangeBroadcaster
+ , ::com::sun::star::sdbcx::XDeleteRows
+ , ::com::sun::star::sdbc::XParameters
+ , ::com::sun::star::lang::XEventListener
+ , ::com::sun::star::sdbc::XResultSetUpdate
+ , ::com::sun::star::sdbc::XRowUpdate
+ , ::com::sun::star::util::XCancellable
+ , ::com::sun::star::sdb::XCompletedExecution
+ , ::com::sun::star::sdb::XParametersSupplier
+ , ::com::sun::star::sdbc::XWarningsSupplier
+ > ORowSet_BASE1;
class OTableContainer;
- class ORowSet : public comphelper::OBaseMutex
+ class ORowSet : public comphelper::OBaseMutex
, public ORowSet_BASE1
, public ORowSetBase
, public ::comphelper::OPropertyArrayUsageHelper<ORowSet>
{
friend class ORowSetClone;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOldConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection;
- ::com::sun::star::uno::Any m_aActiveConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTypeMap;
- ::com::sun::star::uno::Any m_aTypeMap;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; // the columns from a table or query
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOldConnection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection;
+ ::com::sun::star::uno::Any m_aActiveConnection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTypeMap;
+ ::com::sun::star::uno::Any m_aTypeMap;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; // the columns from a table or query
- connectivity::OWeakRefArray m_aClones;
+ connectivity::OWeakRefArray m_aClones;
/** our parameters as XPropertySet instances and ORowSetValue instances
*/
::dbtools::param::ParametersContainerRef m_pParameters;
@@ -103,49 +103,49 @@ namespace dbaccess
::std::bit_vector m_aParametersSet;
::std::bit_vector m_aReadOnlyDataColumns;
- ::cppu::OInterfaceContainerHelper m_aRowsetListeners;
- ::cppu::OInterfaceContainerHelper m_aApproveListeners;
- ::cppu::OInterfaceContainerHelper m_aRowsChangeListener;
+ ::cppu::OInterfaceContainerHelper m_aRowsetListeners;
+ ::cppu::OInterfaceContainerHelper m_aApproveListeners;
+ ::cppu::OInterfaceContainerHelper m_aRowsChangeListener;
::dbtools::WarningsContainer m_aWarnings;
- OTableContainer* m_pTables;
-
- rtl::OUString m_aCommand;
- rtl::OUString m_aDataSourceName;
- rtl::OUString m_aURL;
- rtl::OUString m_aUser;
- rtl::OUString m_aPassword;
- rtl::OUString m_aFilter;
- rtl::OUString m_aHavingClause;
- rtl::OUString m_aGroupBy;
- rtl::OUString m_aOrder;
- rtl::OUString m_aActiveCommand;
- rtl::OUString m_aCursorName;
- rtl::OUString m_aUpdateCatalogName; // is set by a query
- rtl::OUString m_aUpdateSchemaName; // is set by a query
- rtl::OUString m_aUpdateTableName; // is set by a query
-
- sal_Int32 m_nFetchDirection;
- sal_Int32 m_nFetchSize;
- sal_Int32 m_nMaxFieldSize;
- sal_Int32 m_nMaxRows;
- sal_Int32 m_nQueryTimeOut;
- sal_Int32 m_nCommandType;
- sal_Int32 m_nTransactionIsolation;
- sal_Int32 m_nPrivileges;
+ OTableContainer* m_pTables;
+
+ rtl::OUString m_aCommand;
+ rtl::OUString m_aDataSourceName;
+ rtl::OUString m_aURL;
+ rtl::OUString m_aUser;
+ rtl::OUString m_aPassword;
+ rtl::OUString m_aFilter;
+ rtl::OUString m_aHavingClause;
+ rtl::OUString m_aGroupBy;
+ rtl::OUString m_aOrder;
+ rtl::OUString m_aActiveCommand;
+ rtl::OUString m_aCursorName;
+ rtl::OUString m_aUpdateCatalogName; // is set by a query
+ rtl::OUString m_aUpdateSchemaName; // is set by a query
+ rtl::OUString m_aUpdateTableName; // is set by a query
+
+ sal_Int32 m_nFetchDirection;
+ sal_Int32 m_nFetchSize;
+ sal_Int32 m_nMaxFieldSize;
+ sal_Int32 m_nMaxRows;
+ sal_Int32 m_nQueryTimeOut;
+ sal_Int32 m_nCommandType;
+ sal_Int32 m_nTransactionIsolation;
+ sal_Int32 m_nPrivileges;
sal_Int32 m_nLastKnownRowCount;
oslInterlockedCount m_nInAppend;
sal_Bool m_bLastKnownRowCountFinal;
- sal_Bool m_bUseEscapeProcessing ;
- sal_Bool m_bApplyFilter ;
- sal_Bool m_bCommandFacetsDirty; // any of the facets which define the active command is dirty
- sal_Bool m_bModified ;
- sal_Bool m_bRebuildConnOnExecute ;
- sal_Bool m_bIsBookmarable ;
- sal_Bool m_bNew ;
- sal_Bool m_bCanUpdateInsertedRows;
- sal_Bool m_bOwnConnection;
+ sal_Bool m_bUseEscapeProcessing ;
+ sal_Bool m_bApplyFilter ;
+ sal_Bool m_bCommandFacetsDirty; // any of the facets which define the active command is dirty
+ sal_Bool m_bModified ;
+ sal_Bool m_bRebuildConnOnExecute ;
+ sal_Bool m_bIsBookmarable ;
+ sal_Bool m_bNew ;
+ sal_Bool m_bCanUpdateInsertedRows;
+ sal_Bool m_bOwnConnection;
sal_Bool m_bPropChangeNotifyEnabled;
private:
@@ -246,10 +246,10 @@ namespace dbaccess
virtual void notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard);
virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard);
- virtual void doCancelModification( );
- virtual sal_Bool isModification( );
- virtual sal_Bool isModified( );
- virtual sal_Bool isNew( );
+ virtual void doCancelModification( );
+ virtual sal_Bool isModification( );
+ virtual sal_Bool isModified( );
+ virtual sal_Bool isNew( );
virtual sal_Bool isPropertyChangeNotificationEnabled() const;
virtual ~ORowSet();
@@ -411,14 +411,14 @@ namespace dbaccess
protected:
/** implement the <method>execute</method>, without calling the approve listeners and without building a new
connection
- @param _rClearForNotification mutex to clear before doing the final notifications
+ @param _rClearForNotification mutex to clear before doing the final notifications
*/
- void execute_NoApprove_NoNewConn(::osl::ResettableMutexGuard& _rClearForNotification);
+ void execute_NoApprove_NoNewConn(::osl::ResettableMutexGuard& _rClearForNotification);
/** call the RowSetApproveListeners<p/>
throws an RowSetVetoException if one of the listeners vetoed
*/
- void approveExecution() throw (::com::sun::star::sdb::RowSetVetoException, ::com::sun::star::uno::RuntimeException);
+ void approveExecution() throw (::com::sun::star::sdb::RowSetVetoException, ::com::sun::star::uno::RuntimeException);
/// set m_xActiveConnection, fire a PropertyChangeEvent if necessary, do the event listener handling etc
void setActiveConnection( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxNewConn, sal_Bool _bFireEvent = sal_True );
@@ -473,17 +473,17 @@ namespace dbaccess
,public ::comphelper::OPropertyArrayUsageHelper < ORowSetClone >
{
protected:
- ORowSet* m_pParent;
- sal_Int32 m_nFetchDirection;
- sal_Int32 m_nFetchSize;
- sal_Bool m_bIsBookmarable;
+ ORowSet* m_pParent;
+ sal_Int32 m_nFetchDirection;
+ sal_Int32 m_nFetchSize;
+ sal_Bool m_bIsBookmarable;
protected:
// the clone can not insert anything
- virtual void doCancelModification( );
- virtual sal_Bool isModification( );
- virtual sal_Bool isModified( );
- virtual sal_Bool isNew( );
+ virtual void doCancelModification( );
+ virtual sal_Bool isModification( );
+ virtual sal_Bool isModified( );
+ virtual sal_Bool isNew( );
virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception);
public:
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index f27dc80b5a64..efb3320a5616 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -115,7 +115,7 @@ ORowSetBase::ORowSetBase( const ::comphelper::ComponentContext& _rContext, ::cpp
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::ORowSetBase" );
DBG_CTOR(ORowSetBase,NULL);
- sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT;
+ sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT;
sal_Int32 nInitialRowCountValue = 0;
sal_Bool bInitialRowCountFinalValue( sal_False );
@@ -254,7 +254,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
{
// currentrow is null when the clone moves the window
positionCache( MOVE_NONE_REFRESH_ONLY );
- m_aCurrentRow = m_pCache->m_aMatrixIter;
+ m_aCurrentRow = m_pCache->m_aMatrixIter;
OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getValue: we don't stand on a valid row! Row is null.");
bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is() );
@@ -395,7 +395,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS
if ( !bValidCurrentRow )
{
positionCache( MOVE_NONE_REFRESH_ONLY );
- m_aCurrentRow = m_pCache->m_aMatrixIter;
+ m_aCurrentRow = m_pCache->m_aMatrixIter;
OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getBinaryStream: we don't stand on a valid row! Row is null.");
bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is() );
@@ -844,7 +844,7 @@ void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException)
DBG_TRACE2("DBACCESS ORowSetBase::afterLast() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
}
-sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor,
+sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor,
::std::mem_fun_t<sal_Bool,ORowSetCache>& _aMovementFunctor)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::move" );
@@ -877,7 +877,7 @@ sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t<sal_Bool,ORowSetBase>&
setCurrentRow( bMoved, sal_True, aOldValues, aGuard );
}
else
- { // first goes wrong so there is no row
+ { // first goes wrong so there is no row
movementFailed();
}
@@ -1106,15 +1106,15 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::setCurrentRow" );
DBG_TRACE2("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
- m_bBeforeFirst = m_pCache->isBeforeFirst();
- m_bAfterLast = m_pCache->isAfterLast();
+ m_bBeforeFirst = m_pCache->isBeforeFirst();
+ m_bAfterLast = m_pCache->isAfterLast();
//m_pCache->resetInsertRow(sal_True);
if(!(m_bBeforeFirst || m_bAfterLast))
{
- m_aBookmark = m_pCache->getBookmark();
+ m_aBookmark = m_pCache->getBookmark();
OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!");
- m_aCurrentRow = m_pCache->m_aMatrixIter;
+ m_aCurrentRow = m_pCache->m_aMatrixIter;
OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is null!");
m_aCurrentRow.setBookmark(m_aBookmark);
OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd(),"Position of matrix iterator isn't valid!");
@@ -1129,7 +1129,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
sal_Int32 nNewRow = m_pCache->getRow();
#endif
OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new postion");
- m_aCurrentRow = m_pCache->m_aMatrixIter;
+ m_aCurrentRow = m_pCache->m_aMatrixIter;
OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
#if OSL_DEBUG_LEVEL > 0
ORowSetRow rRow = (*m_aCurrentRow);
@@ -1140,15 +1140,15 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
if ( _bMoved && m_aCurrentRow.isNull() )
{
positionCache( MOVE_NONE_REFRESH_ONLY );
- m_aCurrentRow = m_pCache->m_aMatrixIter;
+ m_aCurrentRow = m_pCache->m_aMatrixIter;
OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!");
}
}
else
{
m_aOldRow->clearRow();
- m_aCurrentRow = m_pCache->getEnd();
- m_aBookmark = Any();
+ m_aCurrentRow = m_pCache->getEnd();
+ m_aBookmark = Any();
m_aCurrentRow.setBookmark(m_aBookmark);
}
@@ -1401,10 +1401,10 @@ void ORowSetBase::movementFailed()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::movementFailed" );
DBG_TRACE2("DBACCESS ORowSetBase::movementFailed() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
m_aOldRow->clearRow();
- m_aCurrentRow = m_pCache->getEnd();
- m_bBeforeFirst = m_pCache->isBeforeFirst();
- m_bAfterLast = m_pCache->isAfterLast();
- m_aBookmark = Any();
+ m_aCurrentRow = m_pCache->getEnd();
+ m_bBeforeFirst = m_pCache->isBeforeFirst();
+ m_bAfterLast = m_pCache->isAfterLast();
+ m_aBookmark = Any();
m_aCurrentRow.setBookmark(m_aBookmark);
OSL_ENSURE(m_bBeforeFirst || m_bAfterLast,"BeforeFirst or AfterLast is wrong!");
DBG_TRACE2("DBACCESS ORowSetBase::movementFailed() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
@@ -1416,7 +1416,7 @@ ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew)
OSL_ENSURE(m_aOldRow.is(),"RowSetRowHElper isn't valid!");
ORowSetRow aOldValues;
if ( !_bWasNew && m_aOldRow->getRow().is() )
- aOldValues = new ORowSetValueVector( *(m_aOldRow->getRow())); // remember the old values
+ aOldValues = new ORowSetValueVector( *(m_aOldRow->getRow())); // remember the old values
return aOldValues;
}
@@ -1459,8 +1459,8 @@ void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos )
if ( compareBookmarks( _rBookmark, m_aBookmark ) == 0 )
{
m_aOldRow->clearRow();
- m_aCurrentRow = m_pCache->getEnd();
- m_aBookmark = Any();
+ m_aCurrentRow = m_pCache->getEnd();
+ m_aBookmark = Any();
m_aCurrentRow.setBookmark( m_aBookmark );
}
}
@@ -1496,8 +1496,8 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet )
OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This wil crash." );
// remember the "inserted" and "modified" state for later firing
- m_bWasNew = m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() );
- m_bWasModified = m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() );
+ m_bWasNew = m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() );
+ m_bWasModified = m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() );
// if the row set is on the insert row, then we need to cancel this
if ( m_pRowSet->isModification( ORowSetBase::GrantNotifierAccess() ) )
@@ -1530,13 +1530,13 @@ void ORowSetNotifier::fire()
// we're not interested in firing changes FALSE->TRUE, only TRUE->FALSE.
// (the former would be quite pathological, e.g. after a failed movement)
- if ( m_bWasModified
- && ( m_bWasModified != m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ) )
+ if ( m_bWasModified
+ && ( m_bWasModified != m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ) )
)
m_pRowSet->fireProperty( PROPERTY_ID_ISMODIFIED, sal_False, sal_True, ORowSetBase::GrantNotifierAccess() );
- if ( m_bWasNew
- && ( m_bWasNew != m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ) )
+ if ( m_bWasNew
+ && ( m_bWasNew != m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ) )
)
m_pRowSet->fireProperty( PROPERTY_ID_ISNEW, sal_False, sal_True, ORowSetBase::GrantNotifierAccess() );
@@ -1570,6 +1570,6 @@ void ORowSetNotifier::firePropertyChange()
m_pRowSet->fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False, ORowSetBase::GrantNotifierAccess());
}
}
-} // namespace dbaccess
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 58e2765d3aea..516d461123b3 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -64,7 +64,7 @@ namespace dbaccess
{
class OEmptyCollection;
- typedef ::cppu::ImplHelper10< ::com::sun::star::sdbcx::XRowLocate,
+ typedef ::cppu::ImplHelper10< ::com::sun::star::sdbcx::XRowLocate,
::com::sun::star::sdbc::XRow,
::com::sun::star::sdbc::XResultSetMetaDataSupplier,
::com::sun::star::sdbc::XWarningsSupplier,
@@ -85,38 +85,38 @@ namespace dbaccess
{
OModuleClient m_aModuleClient;
protected:
- typedef ::std::vector<ORowSetDataColumn*> TDataColumns;
- ::osl::Mutex* m_pMutex; // this the mutex form the rowset itself
- ::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes
+ typedef ::std::vector<ORowSetDataColumn*> TDataColumns;
+ ::osl::Mutex* m_pMutex; // this the mutex form the rowset itself
+ ::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes
// we need a extra mutex for columns to prevend deadlock when setting new values
// for a row
m_aColumnsMutex;
- ::com::sun::star::uno::Any m_aBookmark;
- ORowSetCacheIterator m_aCurrentRow; // contains the actual fetched row
- TORowSetOldRowHelperRef m_aOldRow;
- TDataColumns m_aDataColumns; // holds the columns as m_pColumns but know the implementation class
- connectivity::ORowSetValue m_aEmptyValue; // only for error case
+ ::com::sun::star::uno::Any m_aBookmark;
+ ORowSetCacheIterator m_aCurrentRow; // contains the actual fetched row
+ TORowSetOldRowHelperRef m_aOldRow;
+ TDataColumns m_aDataColumns; // holds the columns as m_pColumns but know the implementation class
+ connectivity::ORowSetValue m_aEmptyValue; // only for error case
- ::cppu::OWeakObject* m_pMySelf; // set by derived classes
- ORowSetCache* m_pCache; // the cache is used by the rowset and his clone (shared)
- ORowSetDataColumns* m_pColumns; // represent the select columns
- ::cppu::OBroadcastHelper& m_rBHelper; // must be set from the derived classes
+ ::cppu::OWeakObject* m_pMySelf; // set by derived classes
+ ORowSetCache* m_pCache; // the cache is used by the rowset and his clone (shared)
+ ORowSetDataColumns* m_pColumns; // represent the select columns
+ ::cppu::OBroadcastHelper& m_rBHelper; // must be set from the derived classes
// is used when the formatkey for database types is set
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes> m_xNumberFormatTypes;
- OEmptyCollection* m_pEmptyCollection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes> m_xNumberFormatTypes;
+ OEmptyCollection* m_pEmptyCollection;
::comphelper::ComponentContext m_aContext;
::connectivity::SQLError m_aErrors;
- sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull()
- sal_Int32 m_nDeletedPosition; // is set only when a row was deleted
- sal_Int32 m_nResultSetType; // fetch property
+ sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull()
+ sal_Int32 m_nDeletedPosition; // is set only when a row was deleted
+ sal_Int32 m_nResultSetType; // fetch property
sal_Int32 m_nResultSetConcurrency;
- sal_Bool m_bClone; // I'm clone or not
- sal_Bool m_bIgnoreResult ;
- sal_Bool m_bBeforeFirst : 1;
- sal_Bool m_bAfterLast : 1;
+ sal_Bool m_bClone; // I'm clone or not
+ sal_Bool m_bIgnoreResult ;
+ sal_Bool m_bBeforeFirst : 1;
+ sal_Bool m_bAfterLast : 1;
protected:
ORowSetBase(
@@ -141,14 +141,14 @@ namespace dbaccess
virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard);
// cancel the insertion, if necessary (means if we're on the insert row)
- virtual void doCancelModification( ) = 0;
+ virtual void doCancelModification( ) = 0;
// return <TRUE/> if and only if we're using the insert row (means: we're updating _or_ inserting)
- virtual sal_Bool isModification( ) = 0;
+ virtual sal_Bool isModification( ) = 0;
// return <TRUE/> if and only if the current row is modified
// TODO: isn't this the same as isModification?
- virtual sal_Bool isModified( ) = 0;
+ virtual sal_Bool isModified( ) = 0;
// return <TRUE/> if and only if the current row is the insert row
- virtual sal_Bool isNew( ) = 0;
+ virtual sal_Bool isNew( ) = 0;
// return <TRUE/> if the property change notification should be fired
// upon property change.
virtual sal_Bool isPropertyChangeNotificationEnabled() const;
@@ -202,14 +202,14 @@ namespace dbaccess
ORowSetRow getOldRow(sal_Bool _bWasNew);
/** move the cache the postion defined by the member functor
- @param _aCheckFunctor
+ @param _aCheckFunctor
Return <TRUE/> when we already stand on the row we want to.
- @param _aMovementFunctor
+ @param _aMovementFunctor
The mehtod used to move.
@return
<TRUE/> if movement was successful.
*/
- sal_Bool SAL_CALL move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor,
+ sal_Bool SAL_CALL move( ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor,
::std::mem_fun_t<sal_Bool,ORowSetCache>& _aMovementFunctor);
/** same meaning as isFirst. Only need by mem_fun
@@ -341,22 +341,22 @@ namespace dbaccess
struct GrantNotifierAccess { friend class ORowSetNotifier; private: GrantNotifierAccess () { } };
// cancel the insertion, if necessary (means if we're on the insert row)
- inline void doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); }
- inline sal_Bool isModification( const GrantNotifierAccess& ) { return isModification(); }
- inline sal_Bool isModified( const GrantNotifierAccess& ) { return isModified(); }
- inline sal_Bool isNew( const GrantNotifierAccess& ) { return isNew(); }
- inline sal_Bool isInsertRow() { return isNew() || isModified(); }
- inline void fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld, const GrantNotifierAccess& )
+ inline void doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); }
+ inline sal_Bool isModification( const GrantNotifierAccess& ) { return isModification(); }
+ inline sal_Bool isModified( const GrantNotifierAccess& ) { return isModified(); }
+ inline sal_Bool isNew( const GrantNotifierAccess& ) { return isNew(); }
+ inline sal_Bool isInsertRow() { return isNew() || isModified(); }
+ inline void fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld, const GrantNotifierAccess& )
{
fireProperty( _nProperty, _bNew, _bOld );
}
- inline void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& )
+ inline void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& )
{
firePropertyChange(_nPos,_rNewValue);
}
using ::comphelper::OPropertyStateContainer::getFastPropertyValue;
- ::osl::Mutex* getMutex() const { return m_pMutex; }
+ ::osl::Mutex* getMutex() const { return m_pMutex; }
};
// ========================================================================
@@ -369,14 +369,14 @@ namespace dbaccess
{
private:
::std::auto_ptr<ORowSetNotifierImpl> m_pImpl;
- ORowSetBase* m_pRowSet;
+ ORowSetBase* m_pRowSet;
// not aquired! This is not necessary because this class here is to be used on the stack within
// a method of ORowSetBase (or derivees)
- sal_Bool m_bWasNew;
- sal_Bool m_bWasModified;
+ sal_Bool m_bWasNew;
+ sal_Bool m_bWasModified;
#ifdef DBG_UTIL
- sal_Bool m_bNotifyCalled;
+ sal_Bool m_bNotifyCalled;
#endif
public:
@@ -403,7 +403,7 @@ namespace dbaccess
@see ORowSetBase::notifyCancelInsert
*/
- void fire();
+ void fire();
/** notifies value change events and notifies IsModified
@param i_aChangedColumns the index of the changed value columns
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 3710a0e0c108..6ff4fdaa584c 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* 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
@@ -86,8 +86,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer,
const ::comphelper::ComponentContext& _rContext,
const ::rtl::OUString& _rUpdateTableName,
- sal_Bool& _bModified,
- sal_Bool& _bNew,
+ sal_Bool& _bModified,
+ sal_Bool& _bNew,
const ORowSetValueVector& _aParameterValueForCache,
const ::rtl::OUString& i_sRowSetFilter)
:m_xSet(_xRs)
@@ -170,7 +170,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!");
Reference<XNameAccess> xTables = xTabSup->getTables();
Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames();
- if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet )
+ if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet )
{// here we have a join or union and nobody told us which table to update, so we update them all
m_nPrivileges = Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE;
OptimisticSet* pCursor = new OptimisticSet(m_aContext,xConnection,_xAnalyzer,_aParameterValueForCache);
@@ -279,8 +279,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
SelectColumnsMetaData aColumnNames(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers() ? true : false);
Reference<XColumnsSupplier> xColSup(_xAnalyzer,UNO_QUERY);
- Reference<XNameAccess> xSelColumns = xColSup->getColumns();
- Reference<XNameAccess> xColumns = m_aUpdateTable->getColumns();
+ Reference<XNameAccess> xSelColumns = xColSup->getColumns();
+ Reference<XNameAccess> xColumns = m_aUpdateTable->getColumns();
::dbaccess::getColumnPositions(xSelColumns,xColumns->getElementNames(),aUpdateTableName,aColumnNames);
// check privileges
@@ -288,8 +288,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
sal_Bool bNoInsert = sal_False;
Sequence< ::rtl::OUString> aNames(xColumns->getElementNames());
- const ::rtl::OUString* pIter = aNames.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aNames.getLength();
+ const ::rtl::OUString* pIter = aNames.getConstArray();
+ const ::rtl::OUString* pEnd = pIter + aNames.getLength();
for(;pIter != pEnd;++pIter)
{
Reference<XPropertySet> xColumn(xColumns->getByName(*pIter),UNO_QUERY);
@@ -362,9 +362,9 @@ ORowSetCache::~ORowSetCache()
m_pInsertMatrix->clear();
delete m_pInsertMatrix;
}
- m_xSet = WeakReference< XResultSet>();
- m_xMetaData = NULL;
- m_aUpdateTable = NULL;
+ m_xSet = WeakReference< XResultSet>();
+ m_xMetaData = NULL;
+ m_aUpdateTable = NULL;
DBG_DTOR(ORowSetCache,NULL);
}
@@ -383,7 +383,7 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize)
m_aMatrixEnd = m_pMatrix->end();
m_pInsertMatrix = new ORowSetMatrix(1); // a little bit overkill but ??? :-)
- m_aInsertRow = m_pInsertMatrix->end();
+ m_aInsertRow = m_pInsertMatrix->end();
}
else
{
@@ -416,7 +416,7 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize)
// now adjust their positions because a resize invalid all iterators
::std::vector<sal_Int32>::const_iterator aIter = aPositions.begin();
::std::map<sal_Int32,sal_Bool>::const_iterator aPosChangeIter = aCacheIterToChange.begin();
- for( aCacheIter = m_aCacheIterators.begin();
+ for( aCacheIter = m_aCacheIterators.begin();
aPosChangeIter != aCacheIterToChange.end();
++aPosChangeIter,++aCacheIter)
{
@@ -480,7 +480,7 @@ sal_Bool ORowSetCache::moveToBookmark( const Any& bookmark )
if ( m_pCacheSet->moveToBookmark(bookmark) )
{
m_bBeforeFirst = sal_False;
- m_nPosition = m_pCacheSet->getRow();
+ m_nPosition = m_pCacheSet->getRow();
checkPositionFlags();
@@ -512,7 +512,7 @@ sal_Bool ORowSetCache::moveRelativeToBookmark( const Any& bookmark, sal_Int32 ro
{
m_nPosition = m_pCacheSet->getRow() + rows;
absolute(m_nPosition);
- // for(sal_Int32 i=0;i<rows && m_aMatrixIter != m_pMatrix->end();++i,++m_aMatrixIter) ;
+ // for(sal_Int32 i=0;i<rows && m_aMatrixIter != m_pMatrix->end();++i,++m_aMatrixIter) ;
bRet = m_aMatrixIter != m_pMatrix->end() && (*m_aMatrixIter).is();
}
@@ -592,7 +592,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference
void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
,ORowSetValueVector::Vector& io_aRow
- ,::std::vector<sal_Int32>& o_ChangedColumns
+ ,::std::vector<sal_Int32>& o_ChangedColumns
)
{
checkUpdateConditions(columnIndex);
@@ -649,7 +649,7 @@ sal_Bool ORowSetCache::next( )
sal_Bool ORowSetCache::isBeforeFirst( )
{
- // return !m_nPosition;
+ // return !m_nPosition;
return m_bBeforeFirst;
}
@@ -668,7 +668,7 @@ sal_Bool ORowSetCache::isFirst( )
sal_Bool ORowSetCache::isLast( )
{
- // return m_bRowCountFinal ? (m_nPosition==m_nRowCount) : m_pCacheSet->isLast();
+ // return m_bRowCountFinal ? (m_nPosition==m_nRowCount) : m_pCacheSet->isLast();
return m_nPosition == m_nRowCount;
}
@@ -679,9 +679,9 @@ sal_Bool ORowSetCache::beforeFirst( )
if(!m_bBeforeFirst)
{
- m_bAfterLast = sal_False;
- m_nPosition = 0;
- m_bBeforeFirst = sal_True;
+ m_bAfterLast = sal_False;
+ m_nPosition = 0;
+ m_bBeforeFirst = sal_True;
m_pCacheSet->beforeFirst();
moveWindow();
m_aMatrixIter = m_pMatrix->end();
@@ -729,7 +729,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos
m_pCacheSet->fillValueRow(*aIter,i);
}
else
- { // there are no more rows found so we can fetch some before start
+ { // there are no more rows found so we can fetch some before start
if(!m_bRowCountFinal)
{
@@ -764,7 +764,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos
}
bCheck = m_pCacheSet->next();
}
- // m_nStartPos = _nNewStartPos;
+ // m_nStartPos = _nNewStartPos;
// we have to read one row forward to enshure that we know when we are on last row
// but only when we don't know it already
if(!m_bRowCountFinal)
@@ -788,17 +788,17 @@ sal_Bool ORowSetCache::moveWindow()
sal_Bool bRet = sal_True;
sal_Int32 nDiff = (sal_Int32)(m_nFetchSize*0.5 -0.5);
- sal_Int32 nNewStartPos = (m_nPosition - nDiff);
- // sal_Int32 nNewEndPos = (m_nPosition+m_nFetchSize*0.5);
- sal_Int32 nNewEndPos = nNewStartPos + m_nFetchSize;
+ sal_Int32 nNewStartPos = (m_nPosition - nDiff);
+ // sal_Int32 nNewEndPos = (m_nPosition+m_nFetchSize*0.5);
+ sal_Int32 nNewEndPos = nNewStartPos + m_nFetchSize;
if ( m_nPosition <= m_nStartPos )
- { // the window is behind the new start pos
+ { // the window is behind the new start pos
if(!m_nStartPos)
return sal_False;
// the new position should be the nPos - nFetchSize/2
if ( nNewEndPos > m_nStartPos )
- { // but the two regions are overlapping
+ { // but the two regions are overlapping
// fill the rows behind the new end
ORowSetMatrix::iterator aEnd; // the iterator we need for rotate
@@ -808,7 +808,7 @@ sal_Bool ORowSetCache::moveWindow()
if ( nNewStartPos < 1 )
{
bCheck = m_pCacheSet->first();
- // aEnd = m_pMatrix->begin() + (sal_Int32)(m_nFetchSize*0.5);
+ // aEnd = m_pMatrix->begin() + (sal_Int32)(m_nFetchSize*0.5);
OSL_ENSURE((nNewEndPos - m_nStartPos - nNewStartPos) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!");
aEnd = m_pMatrix->begin() + (nNewEndPos - m_nStartPos - nNewStartPos);
aIter = aEnd;
@@ -830,7 +830,7 @@ sal_Bool ORowSetCache::moveWindow()
::std::rotate(m_pMatrix->begin(),aEnd,m_pMatrix->end());
// now correct the iterator in our iterator vector
- // rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment
+ // rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment
ptrdiff_t nNewDist = aEnd - m_pMatrix->begin();
ptrdiff_t nOffSet = m_pMatrix->end() - aEnd;
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
@@ -899,10 +899,10 @@ sal_Bool ORowSetCache::moveWindow()
}
}
else if(m_nPosition > m_nStartPos)
- { // the new start pos is above the startpos of the window
+ { // the new start pos is above the startpos of the window
if(m_nPosition <= (m_nStartPos+m_nFetchSize))
- { // position in window
+ { // position in window
OSL_ENSURE((m_nPosition - m_nStartPos -1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!");
m_aMatrixIter = calcPosition();
if(!m_aMatrixIter->is())
@@ -933,7 +933,7 @@ sal_Bool ORowSetCache::moveWindow()
}
}
else if(nNewStartPos < (m_nStartPos+m_nFetchSize))
- { // position behind window but the region is overlapping
+ { // position behind window but the region is overlapping
// the rows from begin() to (begin + nNewStartPos - m_nStartPos) can be refilled with the new rows
// the rows behind this can be reused
ORowSetMatrix::iterator aIter = m_pMatrix->begin();
@@ -944,9 +944,9 @@ sal_Bool ORowSetCache::moveWindow()
sal_Bool bCheck = m_pCacheSet->absolute(nPos);
bCheck = fill(aIter,aEnd,nPos,bCheck); // refill the region wew don't need anymore
-// // we know that this is the current maximal rowcount here
-// if ( !m_bRowCountFinal && bCheck )
-// m_nRowCount = std::max(nPos,m_nRowCount);
+// // we know that this is the current maximal rowcount here
+// if ( !m_bRowCountFinal && bCheck )
+// m_nRowCount = std::max(nPos,m_nRowCount);
// we have to read one row forward to enshure that we know when we are on last row
// but only when we don't know it already
sal_Bool bOk = sal_True;
@@ -954,7 +954,7 @@ sal_Bool ORowSetCache::moveWindow()
bOk = m_pCacheSet->next();
// bind end to front
if(bCheck)
- { // rotate the end to the front
+ { // rotate the end to the front
::std::rotate(m_pMatrix->begin(),aIter,m_pMatrix->end());
// now correct the iterator in our iterator vector
rotateCacheIterator( (sal_Int16)( aIter - m_pMatrix->begin() ) );
@@ -963,30 +963,30 @@ sal_Bool ORowSetCache::moveWindow()
if(!bOk)
{
m_pCacheSet->previous(); // because we stand after the last row
- m_nRowCount = nPos; // here we have the row count
+ m_nRowCount = nPos; // here we have the row count
m_bRowCountFinal = sal_True;
}
else if(!m_bRowCountFinal)
m_nRowCount = std::max(++nPos,m_nRowCount);
}
else
- { // the end was reached before end() so we can set the start before nNewStartPos
+ { // the end was reached before end() so we can set the start before nNewStartPos
m_nStartPos += (aIter - m_pMatrix->begin());
- // m_nStartPos = (aIter - m_pMatrix->begin());
+ // m_nStartPos = (aIter - m_pMatrix->begin());
::std::rotate(m_pMatrix->begin(),aIter,m_pMatrix->end());
// now correct the iterator in our iterator vector
rotateCacheIterator( (sal_Int16)( aIter - m_pMatrix->begin() ) );
if ( !m_bRowCountFinal )
{
- m_pCacheSet->previous(); // because we stand after the last row
- m_nRowCount = std::max(m_nRowCount,--nPos); // here we have the row count
+ m_pCacheSet->previous(); // because we stand after the last row
+ m_nRowCount = std::max(m_nRowCount,--nPos); // here we have the row count
OSL_ENSURE(nPos == m_pCacheSet->getRow(),"nPos isn't valid!");
m_bRowCountFinal = sal_True;
}
// TODO check
- // m_nStartPos = (nNewStartPos+m_nRowCount) - m_nFetchSize ;
+ // m_nStartPos = (nNewStartPos+m_nRowCount) - m_nFetchSize ;
if(m_nStartPos < 0)
m_nStartPos = 0;
}
@@ -995,8 +995,8 @@ sal_Bool ORowSetCache::moveWindow()
{
aIter = m_pMatrix->begin();
- nPos = m_nStartPos;
- bCheck = m_pCacheSet->absolute(m_nStartPos);
+ nPos = m_nStartPos;
+ bCheck = m_pCacheSet->absolute(m_nStartPos);
for(; !aIter->is() && bCheck;++aIter)
{
OSL_ENSURE(aIter != m_pMatrix->end(),"Invalid iterator");
@@ -1029,10 +1029,10 @@ sal_Bool ORowSetCache::first( )
sal_Bool bRet = m_pCacheSet->first();
if(bRet)
{
- m_bBeforeFirst = m_bAfterLast = sal_False;
- m_nPosition = 1;
+ m_bBeforeFirst = m_bAfterLast = sal_False;
+ m_nPosition = 1;
moveWindow();
- m_aMatrixIter = m_pMatrix->begin();
+ m_aMatrixIter = m_pMatrix->begin();
}
else
{
@@ -1105,8 +1105,8 @@ sal_Bool ORowSetCache::absolute( sal_Int32 row )
}
else
{
- m_bBeforeFirst = sal_False;
- m_bAfterLast = m_nPosition > m_nRowCount;
+ m_bBeforeFirst = sal_False;
+ m_bAfterLast = m_nPosition > m_nRowCount;
moveWindow();
OSL_ENSURE(((m_nPosition - m_nStartPos) - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!");
m_aMatrixIter = calcPosition();
@@ -1119,7 +1119,7 @@ sal_Bool ORowSetCache::absolute( sal_Int32 row )
{
m_nPosition = row;
// the position flags
- m_bBeforeFirst = sal_False;
+ m_bBeforeFirst = sal_False;
checkPositionFlags();
if(!m_bAfterLast)
@@ -1260,13 +1260,13 @@ void ORowSetCache::resetInsertRow(sal_Bool _bClearInsertRow)
{
if ( _bClearInsertRow )
clearInsertRow();
- m_bNew = sal_False;
+ m_bNew = sal_False;
m_bModified = sal_False;
}
void ORowSetCache::cancelRowModification()
{
- // clear the insertrow references -> implies that the current row of the rowset changes as well
+ // clear the insertrow references -> implies that the current row of the rowset changes as well
ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin();
ORowSetCacheMap::iterator aCacheEnd = m_aCacheIterators.end();
for(;aCacheIter != aCacheEnd;++aCacheIter)
@@ -1290,7 +1290,7 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector
m_pCacheSet->updateRow(*_rUpdateRow,*m_aMatrixIter,m_aUpdateTable);
// refetch the whole row
(*m_aMatrixIter) = NULL;
-
+
if ( moveToBookmark(aBookmark) )
{
// update the cached values
@@ -1313,7 +1313,7 @@ bool ORowSetCache::deleteRow( )
if(isAfterLast() || isBeforeFirst())
throw SQLException(DBACORE_RESSTRING(RID_STR_NO_DELETEROW),NULL,SQLSTATE_GENERAL,1000,Any() );
- // m_pCacheSet->absolute(m_nPosition);
+ // m_pCacheSet->absolute(m_nPosition);
m_pCacheSet->deleteRow(*m_aMatrixIter,m_aUpdateTable);
if ( !m_pCacheSet->rowDeleted() )
return false;
@@ -1321,13 +1321,13 @@ bool ORowSetCache::deleteRow( )
--m_nRowCount;
OSL_ENSURE(((m_nPosition - m_nStartPos) - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!");
ORowSetMatrix::iterator aPos = calcPosition();
- (*aPos) = NULL;
+ (*aPos) = NULL;
ORowSetMatrix::iterator aEnd = m_pMatrix->end();
for(++aPos;aPos != aEnd && aPos->is();++aPos)
{
*(aPos-1) = *aPos;
- (*aPos) = NULL;
+ (*aPos) = NULL;
}
m_aMatrixIter = m_pMatrix->end();
@@ -1355,8 +1355,8 @@ void ORowSetCache::cancelRowUpdates( )
void ORowSetCache::moveToInsertRow( )
{
- m_bNew = sal_True;
- m_bUpdated = m_bAfterLast = sal_False;
+ m_bNew = sal_True;
+ m_bUpdated = m_bAfterLast = sal_False;
m_aInsertRow = m_pInsertMatrix->begin();
if(!m_aInsertRow->is())
@@ -1445,7 +1445,7 @@ void ORowSetCache::checkPositionFlags()
{
if(m_bRowCountFinal)
{
- m_bAfterLast = m_nPosition > m_nRowCount;
+ m_bAfterLast = m_nPosition > m_nRowCount;
if(m_bAfterLast)
m_nPosition = 0;//m_nRowCount;
}
@@ -1460,13 +1460,13 @@ void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex)
sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sUpdateTableName)
{
sal_Bool bOk = sal_False;
- if (pNode->count() == 3 && // Ausdruck is geklammert
+ if (pNode->count() == 3 && // Ausdruck is geklammert
SQL_ISPUNCTUATION(pNode->getChild(0),"(") &&
SQL_ISPUNCTUATION(pNode->getChild(2),")"))
{
bOk = checkInnerJoin(pNode->getChild(1),_xConnection,_sUpdateTableName);
}
- else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) && // AND/OR-Verknuepfung:
+ else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) && // AND/OR-Verknuepfung:
pNode->count() == 3)
{
// nur AND Verknüpfung zulassen
@@ -1515,15 +1515,15 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection,
OSQLParseNode* pJoin = pTableRefCommalist->getByRule(::connectivity::OSQLParseNode::qualified_join);
if(pJoin)
{ // we are only intereseted in qualified joins like RIGHT or LEFT
- OSQLParseNode* pJoinType = pJoin->getChild(1);
- OSQLParseNode* pOuterType = NULL;
+ OSQLParseNode* pJoinType = pJoin->getChild(1);
+ OSQLParseNode* pOuterType = NULL;
if(SQL_ISRULE(pJoinType,join_type) && pJoinType->count() == 2)
pOuterType = pJoinType->getChild(0);
else if(SQL_ISRULE(pJoinType,outer_join_type))
pOuterType = pJoinType;
- sal_Bool bCheck = sal_False;
- sal_Bool bLeftSide = sal_False;
+ sal_Bool bCheck = sal_False;
+ sal_Bool bLeftSide = sal_False;
if(pOuterType)
{ // found outer join
bLeftSide = SQL_ISTOKEN(pOuterType->getChild(0),LEFT);
@@ -1572,7 +1572,7 @@ void ORowSetCache::clearInsertRow()
}
}
-ORowSetMatrix::iterator ORowSetCache::calcPosition() const
+ORowSetMatrix::iterator ORowSetCache::calcPosition() const
{
sal_Int32 nValue = (m_nPosition - m_nStartPos) - 1;
CHECK_MATRIX_POS(nValue);
@@ -1666,7 +1666,7 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_
break;
}
}
-
+
if ( aIter == m_pMatrix->end() )
{
m_pCacheSet->fillMissingValues(io_aRow);
diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index dedf04ead36b..db9678c29824 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -70,45 +70,45 @@ namespace dbaccess
friend class ORowSetClone;
friend class ORowSetCacheIterator;
- typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows;
+ typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows;
::std::map<sal_Int32,sal_Int32> m_aKeyColumns;
//the set can be static, bookmarkable or keyset
- ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; // must be before m_aInsertRow
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xSet;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; // must be before m_aInsertRow
::comphelper::ComponentContext m_aContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xCacheSet;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xCacheSet;
- OCacheSet* m_pCacheSet; // is a bookmarkable, keyset or static resultset
- ORowSetMatrix* m_pMatrix; // represent the table struct
- ORowSetMatrix::iterator m_aMatrixIter; // represent a row of the table
- ORowSetMatrix::iterator m_aMatrixEnd; // present the row behind the last row of the table
- ORowSetCacheMap m_aCacheIterators;
- TOldRowSetRows m_aOldRows;
+ OCacheSet* m_pCacheSet; // is a bookmarkable, keyset or static resultset
+ ORowSetMatrix* m_pMatrix; // represent the table struct
+ ORowSetMatrix::iterator m_aMatrixIter; // represent a row of the table
+ ORowSetMatrix::iterator m_aMatrixEnd; // present the row behind the last row of the table
+ ORowSetCacheMap m_aCacheIterators;
+ TOldRowSetRows m_aOldRows;
- ORowSetMatrix* m_pInsertMatrix; // represent the rows which should be inserted normally this is only one
- ORowSetMatrix::iterator m_aInsertRow; // represent a insert row
+ ORowSetMatrix* m_pInsertMatrix; // represent the rows which should be inserted normally this is only one
+ ORowSetMatrix::iterator m_aInsertRow; // represent a insert row
- // ORowSetRow m_aInsertRow; // present the row that should be inserted
- sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull()
+ // ORowSetRow m_aInsertRow; // present the row that should be inserted
+ sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull()
- connectivity::OSQLTable m_aUpdateTable; // used for updates/deletes and inserts
+ connectivity::OSQLTable m_aUpdateTable; // used for updates/deletes and inserts
- sal_Int32 m_nFetchSize;
- sal_Int32 m_nRowCount;
- sal_Int32 m_nPrivileges;
- sal_Int32 m_nPosition; // 0 means beforefirst
+ sal_Int32 m_nFetchSize;
+ sal_Int32 m_nRowCount;
+ sal_Int32 m_nPrivileges;
+ sal_Int32 m_nPosition; // 0 means beforefirst
- sal_Int32 m_nStartPos; // start pos of the window zero based
- sal_Int32 m_nEndPos; // end pos of the window zero based
+ sal_Int32 m_nStartPos; // start pos of the window zero based
+ sal_Int32 m_nEndPos; // end pos of the window zero based
- sal_Bool m_bRowCountFinal ;
- sal_Bool m_bBeforeFirst ;
- sal_Bool m_bAfterLast ;
- sal_Bool m_bUpdated ;
- sal_Bool& m_bModified ; // points to the rowset member m_bModified
- sal_Bool& m_bNew ; // points to the rowset member m_bNew
+ sal_Bool m_bRowCountFinal ;
+ sal_Bool m_bBeforeFirst ;
+ sal_Bool m_bAfterLast ;
+ sal_Bool m_bUpdated ;
+ sal_Bool& m_bModified ; // points to the rowset member m_bModified
+ sal_Bool& m_bNew ; // points to the rowset member m_bNew
sal_Bool fill(ORowSetMatrix::iterator& _aIter,const ORowSetMatrix::iterator& _aEnd,sal_Int32& _nPos,sal_Bool _bCheck);
sal_Bool reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 nNewEndPos);
@@ -132,7 +132,7 @@ namespace dbaccess
// checks and set the flags isAfterLast isLast and position when afterlast is true
void checkPositionFlags();
void checkUpdateConditions(sal_Int32 columnIndex);
- sal_Bool checkJoin( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
+ sal_Bool checkJoin( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
const ::rtl::OUString& _sUpdateTableName);
sal_Bool checkInnerJoin(const ::connectivity::OSQLParseNode *pNode
@@ -140,8 +140,8 @@ namespace dbaccess
,const ::rtl::OUString& _sUpdateTableName);
// clears the insert row
- void clearInsertRow();
- ORowSetMatrix::iterator calcPosition() const;
+ void clearInsertRow();
+ ORowSetMatrix::iterator calcPosition() const;
protected:
ORowSetMatrix::iterator& getEnd() { return m_aMatrixEnd;}
@@ -152,8 +152,8 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xAnalyzer,
const ::comphelper::ComponentContext& _rContext,
const ::rtl::OUString& _rUpdateTableName,
- sal_Bool& _bModified,
- sal_Bool& _bNew,
+ sal_Bool& _bModified,
+ sal_Bool& _bNew,
const ORowSetValueVector& _aParameterValueForCache,
const ::rtl::OUString& i_sRowSetFilter);
~ORowSetCache();
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx
index 9f634d4bef0e..986a9bb5d7c1 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.cxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx
@@ -53,7 +53,7 @@ ORowSetCacheIterator& ORowSetCacheIterator::operator =(const ORowSetCacheIterato
return *this;
m_pCache = _rRH.m_pCache;
- m_aIter = _rRH.m_aIter;
+ m_aIter = _rRH.m_aIter;
m_pRowSet = _rRH.m_pRowSet;
return *this;
@@ -117,7 +117,7 @@ bool ORowSetCacheIterator::operator ==(const ORowSetMatrix::iterator& _rRH) cons
return m_aIter->second.aIterator == _rRH;
}
-void ORowSetCacheIterator::setBookmark(const ::com::sun::star::uno::Any& _rBookmark)
+void ORowSetCacheIterator::setBookmark(const ::com::sun::star::uno::Any& _rBookmark)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::setBookmark" );
m_aIter->second.aBookmark = _rBookmark;
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index e6be14baaeb8..1387635d44a9 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx
@@ -36,9 +36,9 @@ namespace dbaccess
class ORowSetBase;
typedef struct
{
- ORowSetMatrix::iterator aIterator;
- ::com::sun::star::uno::Any aBookmark;
- ORowSetBase* pRowSet;
+ ORowSetMatrix::iterator aIterator;
+ ::com::sun::star::uno::Any aBookmark;
+ ORowSetBase* pRowSet;
} ORowSetCacheIterator_Helper;
DECLARE_STL_STDKEY_MAP(sal_Int32,ORowSetCacheIterator_Helper,ORowSetCacheMap);
@@ -47,9 +47,9 @@ namespace dbaccess
class ORowSetCacheIterator
{
friend class ORowSetCache;
- ORowSetCacheMap::iterator m_aIter;
- ORowSetCache* m_pCache;
- ORowSetBase* m_pRowSet;
+ ORowSetCacheMap::iterator m_aIter;
+ ORowSetCache* m_pCache;
+ ORowSetBase* m_pRowSet;
protected:
ORowSetCacheIterator(const ORowSetCacheMap::iterator& _rIter,ORowSetCache* _pCache,ORowSetBase* _pRowSet)
: m_aIter(_rIter)
@@ -77,9 +77,9 @@ namespace dbaccess
bool operator !=(const ORowSetMatrix::iterator& _rRH) const;
bool operator ==(const ORowSetMatrix::iterator& _rRH) const;
- void setBookmark(const ::com::sun::star::uno::Any& _rBookmark);
+ void setBookmark(const ::com::sun::star::uno::Any& _rBookmark);
::com::sun::star::uno::Any getBookmark() const { return m_aIter->second.aBookmark; }
- ::osl::Mutex* getMutex() const;
+ ::osl::Mutex* getMutex() const;
ORowSetCacheMap::iterator getIter() const { return m_aIter; }
};
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 9dfb0eb6a80f..88e53ea5f647 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -35,14 +35,14 @@
namespace dbaccess
{
- typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector;
- typedef ::rtl::Reference< ORowSetValueVector > ORowSetRow;
- typedef ::std::vector< ORowSetRow > ORowSetMatrix;
+ typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector;
+ typedef ::rtl::Reference< ORowSetValueVector > ORowSetRow;
+ typedef ::std::vector< ORowSetRow > ORowSetMatrix;
class ORowSetOldRowHelper
{
- oslInterlockedCount m_refCount;
- ORowSetRow m_aRow;
+ oslInterlockedCount m_refCount;
+ ORowSetRow m_aRow;
ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH);
ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh);
@@ -67,7 +67,7 @@ namespace dbaccess
inline void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; }
};
- typedef ::rtl::Reference< ORowSetOldRowHelper > TORowSetOldRowHelperRef;
+ typedef ::rtl::Reference< ORowSetOldRowHelper > TORowSetOldRowHelperRef;
class ORowSetValueCompare
{
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index ec2ce273be59..1ab9fec8469f 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -90,19 +90,19 @@ namespace dbaccess {
namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode;
}
-#define STR_SELECT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT "))
-#define STR_FROM ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "))
-#define STR_WHERE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))
-#define STR_GROUP_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY "))
-#define STR_HAVING ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING "))
-#define STR_ORDER_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY "))
-#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND "))
-#define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" OR "))
-#define STR_LIKE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" LIKE "))
-#define STR_EQUAL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = "))
-#define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
-#define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))
-#define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))
+#define STR_SELECT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT "))
+#define STR_FROM ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM "))
+#define STR_WHERE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))
+#define STR_GROUP_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY "))
+#define STR_HAVING ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING "))
+#define STR_ORDER_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY "))
+#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND "))
+#define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" OR "))
+#define STR_LIKE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" LIKE "))
+#define STR_EQUAL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = "))
+#define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("("))
+#define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"))
+#define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","))
namespace
{
@@ -316,8 +316,8 @@ void SAL_CALL OSingleSelectQueryComposer::disposing(void)
resetIterator( m_aSqlIterator, true );
resetIterator( m_aAdditiveIterator, true );
- m_xConnectionTables = NULL;
- m_xConnection = NULL;
+ m_xConnectionTables = NULL;
+ m_xConnection = NULL;
clearCurrentCollections();
}
@@ -496,7 +496,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference<
}
::rtl::OUString aName,aNewName;
- column->getPropertyValue(PROPERTY_NAME) >>= aName;
+ column->getPropertyValue(PROPERTY_NAME) >>= aName;
if ( !m_xMetaData->supportsOrderByUnrelated() && m_aCurrentColumns[SelectColumns] && !m_aCurrentColumns[SelectColumns]->hasByName(aName))
{
@@ -507,7 +507,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference<
// filter anhaengen
// select ohne where und order by aufbauen
- ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString();
+ ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString();
if ( m_aCurrentColumns[SelectColumns]->hasByName(aName) )
{
Reference<XPropertySet> xColumn;
@@ -517,10 +517,10 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference<
OSL_ENSURE(xColumn->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))),"Property FUNCTION not available!");
::rtl::OUString sRealName,sTableName;
- xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
- xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
+ xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
+ xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
sal_Bool bFunction = sal_False;
- xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))) >>= bFunction;
+ xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))) >>= bFunction;
if ( sRealName == aName )
{
if ( bFunction )
@@ -766,7 +766,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
::std::vector< ::rtl::OUString> aNames;
::rtl::Reference< OSQLColumns> aSelectColumns;
sal_Bool bCase = sal_True;
- Reference< XNameAccess> xQueryColumns;
+ Reference< XNameAccess> xQueryColumns;
if ( m_nCommandType == CommandType::QUERY )
{
Reference<XColumnsSupplier> xSup(m_xConnectionQueries->getByName(m_sCommand),UNO_QUERY);
@@ -883,7 +883,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
if ( aFind != aSelectColumns->get().end() )
{
if ( aUsedSelectColumns.find( nFoundSelectColumnPos ) != aUsedSelectColumns.end() )
- { // we found a column name which exists twice
+ { // we found a column name which exists twice
// so we start after the first found
do
{
@@ -1042,9 +1042,9 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
::rtl::OUString aColumnName;
- // pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar()));
+ // pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar()));
pCondition->parseNodeToStr( aValue, m_xConnection, NULL );
- // pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar()));
+ // pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast<sal_Char>(m_sDecimalSep.toChar()));
pCondition->getChild(0)->parseNodeToStr( aColumnName, m_xConnection, NULL );
// don't display the column name
@@ -1245,7 +1245,7 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
// Kriterium
aItem.Handle = pCondition->getChild(1)->getNodeType();
- aValue = pCondition->getChild(1)->getTokenValue();
+ aValue = pCondition->getChild(1)->getTokenValue();
for(i=0;i< pRhs->count();i++)
pRhs->getChild(i)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) );
@@ -1304,14 +1304,14 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
if(m_pTables && m_pTables->getCount() > 1)
{
::rtl::OUString aCatalog,aSchema,aTable,aComposedName,aColumnName;
- column->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog;
- column->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema;
- column->getPropertyValue(PROPERTY_TABLENAME) >>= aTable;
- column->getPropertyValue(PROPERTY_NAME) >>= aColumnName;
+ column->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog;
+ column->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema;
+ column->getPropertyValue(PROPERTY_TABLENAME) >>= aTable;
+ column->getPropertyValue(PROPERTY_NAME) >>= aColumnName;
Sequence< ::rtl::OUString> aNames(m_pTables->getElementNames());
- const ::rtl::OUString* pBegin = aNames.getConstArray();
- const ::rtl::OUString* pEnd = pBegin + aNames.getLength();
+ const ::rtl::OUString* pBegin = aNames.getConstArray();
+ const ::rtl::OUString* pEnd = pBegin + aNames.getLength();
if(!aTable.getLength())
{ // we don't found a table name, now we must search every table for this column
@@ -1322,10 +1322,10 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
if(xColumnsSupp.is() && xColumnsSupp->getColumns()->hasByName(aColumnName))
{
-// Reference<XPropertySet> xTableProp(xColumnsSupp,UNO_QUERY);
-// xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog;
-// xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema;
-// xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable;
+// Reference<XPropertySet> xTableProp(xColumnsSupp,UNO_QUERY);
+// xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog;
+// xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema;
+// xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable;
aTable = *pBegin;
break;
}
@@ -1349,14 +1349,14 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
if(xTableProp.is())
{
::rtl::OUString aCatalog2,aSchema2,aTable2;
- xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog2;
- xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema2;
- xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable2;
+ xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog2;
+ xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema2;
+ xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable2;
if(aComp(aCatalog,aCatalog2) && aComp(aSchema,aSchema2) && aComp(aTable,aTable2))
{
- aCatalog = aCatalog2;
- aSchema = aSchema2;
- aTable = aTable2;
+ aCatalog = aCatalog2;
+ aSchema = aSchema2;
+ aTable = aTable2;
break;
}
}
@@ -1559,7 +1559,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
column->getPropertyValue(PROPERTY_VALUE) >>= aValue;
::rtl::OUStringBuffer aSQL;
- const ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString();
+ const ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString();
getColumns();
if ( m_aCurrentColumns[SelectColumns] && m_aCurrentColumns[SelectColumns]->hasByName(aName) )
@@ -1571,8 +1571,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
OSL_ENSURE(xColumn->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction"))),"Property AggregateFunctionnot available!");
::rtl::OUString sRealName,sTableName;
- xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
- xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
+ xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
+ xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
if(sTableName.indexOf('.',0) != -1)
{
::rtl::OUString aCatlog,aSchema,aTable;
@@ -1648,8 +1648,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
aSQL.appendAscii( "\'" );
}
aSQL.appendAscii( "0x" );
- const sal_Int8* pBegin = aSeq.getConstArray();
- const sal_Int8* pEnd = pBegin + aSeq.getLength();
+ const sal_Int8* pBegin = aSeq.getConstArray();
+ const sal_Int8* pEnd = pBegin + aSeq.getLength();
for(;pBegin != pEnd;++pBegin)
{
aSQL.append( (sal_Int32)*pBegin, 16 ).getStr();
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index 0093f673d2b9..1249dcfdbfaa 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -45,11 +45,11 @@ using namespace connectivity;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
-// using namespace ::com::sun::star::sdb;
+// using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-// using namespace ::cppu;
+// using namespace ::cppu;
using namespace ::osl;
void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/)
@@ -255,7 +255,7 @@ sal_Bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, Runt
}
if(row > (sal_Int32)m_aSet.size())
- m_aSetIter = m_aSet.end(); // check again
+ m_aSetIter = m_aSet.end(); // check again
else
m_aSetIter = m_aSet.begin() + row;
}
@@ -314,8 +314,8 @@ Sequence< sal_Int32 > SAL_CALL OStaticSet::deleteRows( const Sequence< Any >& ro
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::deleteRows" );
Sequence< sal_Int32 > aRet(rows.getLength());
- const Any* pBegin = rows.getConstArray();
- const Any* pEnd = pBegin + rows.getLength();
+ const Any* pBegin = rows.getConstArray();
+ const Any* pEnd = pBegin + rows.getLength();
for(sal_Int32 i=0;pBegin != pEnd; ++pBegin,++i)
{
deleteRow(*(m_aSet.begin() + comphelper::getINT32(*pBegin)),_xTable);
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index d69dfca465ec..8b895015937f 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -37,9 +37,9 @@ namespace dbaccess
// we use a snapshot
class OStaticSet : public OCacheSet
{
- ORowSetMatrix m_aSet;
+ ORowSetMatrix m_aSet;
ORowSetMatrix::iterator m_aSetIter;
- sal_Bool m_bEnd;
+ sal_Bool m_bEnd;
sal_Bool fetchRow();
void fillAllRows();
public:
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 4ed9dcdfcc65..7fed7d09cff3 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -120,9 +120,9 @@ void SAL_CALL ODBTableDecorator::disposing()
OTableDescriptor_BASE::disposing();
MutexGuard aGuard(m_aMutex);
- m_xTable = NULL;
- m_xMetaData = NULL;
- m_pTables = NULL;
+ m_xTable = NULL;
+ m_xMetaData = NULL;
+ m_pTables = NULL;
m_xColumnDefinitions = NULL;
m_xNumberFormats = NULL;
if ( m_pColumns )
@@ -401,7 +401,7 @@ Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(Runti
{
aRet = m_xTable->queryInterface(rType);
if(aRet.hasValue())
- { // now we know that our table supports this type so we return ourself
+ { // now we know that our table supports this type so we return ourself
aRet = OTableDescriptor_BASE::queryInterface(rType);
if(!aRet.hasValue())
aRet = ODataSettings::queryInterface(rType);
@@ -427,9 +427,9 @@ void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) thro
Reference<XRename> xRename(m_xTable,UNO_QUERY);
if(xRename.is())
{
-// ::rtl::OUString sOldName;
-// Reference<XPropertySet> xProp(m_xTable,UNO_QUERY);
-// xProp->getPropertyValue(PROPERTY_NAME) >>= sOldName;
+// ::rtl::OUString sOldName;
+// Reference<XPropertySet> xProp(m_xTable,UNO_QUERY);
+// xProp->getPropertyValue(PROPERTY_NAME) >>= sOldName;
xRename->rename(_rNewName);
}
else // not supported
@@ -553,9 +553,9 @@ void ODBTableDecorator::fillPrivileges() const
if ( m_nPrivileges == 0 ) // second chance
{
::rtl::OUString sCatalog,sSchema,sName;
- xProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog;
- xProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
- xProp->getPropertyValue(PROPERTY_NAME) >>= sName;
+ xProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog;
+ xProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
+ xProp->getPropertyValue(PROPERTY_NAME) >>= sName;
m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),sCatalog,sSchema, sName);
}
}
@@ -608,8 +608,8 @@ void ODBTableDecorator::refreshColumns()
if(xNames.is())
{
Sequence< ::rtl::OUString> aNames = xNames->getElementNames();
- const ::rtl::OUString* pIter = aNames.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aNames.getLength();
+ const ::rtl::OUString* pIter = aNames.getConstArray();
+ const ::rtl::OUString* pEnd = pIter + aNames.getLength();
for(;pIter != pEnd;++pIter)
aVector.push_back(*pIter);
}
@@ -625,7 +625,7 @@ void ODBTableDecorator::refreshColumns()
OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions, m_xConnection, OContainerMediator::eColumns );
m_xColumnMediator = pMediator;
pCol->setMediator( pMediator );
- m_pColumns = pCol;
+ m_pColumns = pCol;
}
else
m_pColumns->reFill(aVector);
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index b1bd9a71056e..3634b2853af9 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -46,11 +46,11 @@ using namespace ::dbtools;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::sdbc;
-// using namespace ::com::sun::star::sdb;
+// using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-// using namespace ::cppu;
+// using namespace ::cppu;
using namespace ::osl;
void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter)
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index 9afc4b370cac..73a397eba635 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -317,9 +317,9 @@ Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeExcepti
}
else if(!m_pTable || (m_pTable && !m_pTable->isNew()))
{
- if(!m_bAddColumn && rType == getCppuType( (Reference<XAppend>*)0))
+ if(!m_bAddColumn && rType == getCppuType( (Reference<XAppend>*)0))
return Any();
- if(!m_bDropColumn && rType == getCppuType( (Reference<XDrop>*)0))
+ if(!m_bDropColumn && rType == getCppuType( (Reference<XDrop>*)0))
return Any();
}
@@ -335,7 +335,7 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException)
sal_Int32 nSize = 0;
Type aAppendType = getCppuType( (Reference<XAppend>*)0);
- Type aDropType = getCppuType( (Reference<XDrop>*)0);
+ Type aDropType = getCppuType( (Reference<XDrop>*)0);
if(m_xDrvColumns.is())
{
Reference<XTypeProvider> xTypes(m_xDrvColumns,UNO_QUERY);
@@ -360,8 +360,8 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException)
nSize = ((m_pTable && m_pTable->isNew()) ? 0 :
((m_bDropColumn ?
(m_bAddColumn ? 0 : 1) : (m_bAddColumn ? 1 : 2))));
- bDropFound = (m_pTable && m_pTable->isNew()) || m_bDropColumn;
- bAppendFound = (m_pTable && m_pTable->isNew()) || m_bAddColumn;
+ bDropFound = (m_pTable && m_pTable->isNew()) || m_bDropColumn;
+ bAppendFound = (m_pTable && m_pTable->isNew()) || m_bAddColumn;
}
Sequence< Type > aTypes(::comphelper::concatSequences(OColumns_BASE::getTypes(),TXChild::getTypes()));
Sequence< Type > aRet(aTypes.getLength() - nSize);
diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx
index fce607807650..40a0a047ab34 100644
--- a/dbaccess/source/core/api/datacolumn.hxx
+++ b/dbaccess/source/core/api/datacolumn.hxx
@@ -45,12 +45,12 @@ namespace dbaccess
public ::com::sun::star::sdb::XColumnUpdate
{
protected:
- ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow > m_xRow;
- ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate;
+ ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow > m_xRow;
+ ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate;
virtual ~ODataColumn();
public:
- ODataColumn (const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData,
+ ODataColumn (const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData,
const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow,
const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate >& _xRowUpdate,
sal_Int32 _nPos,
diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx
index 134cd23a6956..085f99ecf7f1 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -93,22 +93,22 @@ void ODataSettings::registerPropertiesFor(ODataSettings_Base* _pItem)
registerProperty(PROPERTY_TEXTRELIEF, PROPERTY_ID_TEXTRELIEF, PropertyAttribute::BOUND,&_pItem->m_nFontRelief, ::getCppuType(&_pItem->m_nFontRelief));
- registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&_pItem->m_aFont.Name, ::getCppuType(&_pItem->m_aFont.Name));
- registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Height, ::getCppuType(&_pItem->m_aFont.Height));
- registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.Width, ::getCppuType(&_pItem->m_aFont.Width));
- registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&_pItem->m_aFont.StyleName, ::getCppuType(&_pItem->m_aFont.StyleName));
- registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&_pItem->m_aFont.Family, ::getCppuType(&_pItem->m_aFont.Family));
- registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&_pItem->m_aFont.CharSet, ::getCppuType(&_pItem->m_aFont.CharSet));
- registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&_pItem->m_aFont.Pitch, ::getCppuType(&_pItem->m_aFont.Pitch));
- registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.CharacterWidth, ::getCppuType(&_pItem->m_aFont.CharacterWidth));
- registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Weight, ::getCppuType(&_pItem->m_aFont.Weight));
- registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&_pItem->m_aFont.Slant, ::getCppuType(&_pItem->m_aFont.Slant));
- registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&_pItem->m_aFont.Underline, ::getCppuType(&_pItem->m_aFont.Underline));
- registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&_pItem->m_aFont.Strikeout, ::getCppuType(&_pItem->m_aFont.Strikeout));
- registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&_pItem->m_aFont.Orientation, ::getCppuType(&_pItem->m_aFont.Orientation));
- registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&_pItem->m_aFont.Kerning, ::getCppuType(&_pItem->m_aFont.Kerning));
- registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&_pItem->m_aFont.WordLineMode, ::getCppuType(&_pItem->m_aFont.WordLineMode));
- registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&_pItem->m_aFont.Type, ::getCppuType(&_pItem->m_aFont.Type));
+ registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&_pItem->m_aFont.Name, ::getCppuType(&_pItem->m_aFont.Name));
+ registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Height, ::getCppuType(&_pItem->m_aFont.Height));
+ registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.Width, ::getCppuType(&_pItem->m_aFont.Width));
+ registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&_pItem->m_aFont.StyleName, ::getCppuType(&_pItem->m_aFont.StyleName));
+ registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&_pItem->m_aFont.Family, ::getCppuType(&_pItem->m_aFont.Family));
+ registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&_pItem->m_aFont.CharSet, ::getCppuType(&_pItem->m_aFont.CharSet));
+ registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&_pItem->m_aFont.Pitch, ::getCppuType(&_pItem->m_aFont.Pitch));
+ registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.CharacterWidth, ::getCppuType(&_pItem->m_aFont.CharacterWidth));
+ registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Weight, ::getCppuType(&_pItem->m_aFont.Weight));
+ registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&_pItem->m_aFont.Slant, ::getCppuType(&_pItem->m_aFont.Slant));
+ registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&_pItem->m_aFont.Underline, ::getCppuType(&_pItem->m_aFont.Underline));
+ registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&_pItem->m_aFont.Strikeout, ::getCppuType(&_pItem->m_aFont.Strikeout));
+ registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&_pItem->m_aFont.Orientation, ::getCppuType(&_pItem->m_aFont.Orientation));
+ registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&_pItem->m_aFont.Kerning, ::getCppuType(&_pItem->m_aFont.Kerning));
+ registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&_pItem->m_aFont.WordLineMode, ::getCppuType(&_pItem->m_aFont.WordLineMode));
+ registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&_pItem->m_aFont.Type, ::getCppuType(&_pItem->m_aFont.Type));
}
ODataSettings::ODataSettings(OBroadcastHelper& _rBHelper,sal_Bool _bQuery)
@@ -219,5 +219,5 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau
}
}
-} // namespace dbaccess
+} // 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 46d5de5615ef..c38443c0a4bf 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -58,10 +58,10 @@ using namespace ::comphelper;
using namespace ::osl;
using namespace dbaccess;
-#define HAS_DESCRIPTION 0x00000001
-#define HAS_DEFAULTVALUE 0x00000002
-#define HAS_ROWVERSION 0x00000004
-#define HAS_AUTOINCREMENT_CREATION 0x00000008
+#define HAS_DESCRIPTION 0x00000001
+#define HAS_DEFAULTVALUE 0x00000002
+#define HAS_ROWVERSION 0x00000004
+#define HAS_AUTOINCREMENT_CREATION 0x00000008
//============================================================
//= OTableColumnDescriptor
@@ -477,9 +477,9 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa
DECL_PROP0_BOOL( ISAUTOINCREMENT );
DECL_PROP0_BOOL( ISCURRENCY );
DECL_PROP0( ISNULLABLE, sal_Int32 );
- DECL_PROP0( PRECISION, sal_Int32 );
- DECL_PROP0( SCALE, sal_Int32 );
- DECL_PROP0( TYPE, sal_Int32 );
+ DECL_PROP0( PRECISION, sal_Int32 );
+ DECL_PROP0( SCALE, sal_Int32 );
+ DECL_PROP0( TYPE, sal_Int32 );
DECL_PROP0( TYPENAME, ::rtl::OUString );
if ( nId & HAS_AUTOINCREMENT_CREATION )
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 30bd7b701d38..e4ec3ac83190 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -114,7 +114,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
}
m_xCommandDefinition->addPropertyChangeListener(::rtl::OUString(), this);
- // m_xCommandDefinition->addPropertyChangeListener(PROPERTY_NAME, this);
+ // m_xCommandDefinition->addPropertyChangeListener(PROPERTY_NAME, this);
m_xCommandPropInfo = m_xCommandDefinition->getPropertySetInfo();
}
DBG_ASSERT(m_xConnection.is(), "OQuery::OQuery : invalid connection !");
@@ -304,7 +304,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r
if (getInfoHelper().fillPropertyMembersByHandle(&sAggPropName,&nAttr,_nHandle) &&
m_xCommandPropInfo.is() &&
m_xCommandPropInfo->hasPropertyByName(sAggPropName))
- { // the base class holds the property values itself, but we have to forward this to our CommandDefinition
+ { // the base class holds the property values itself, but we have to forward this to our CommandDefinition
m_eDoingCurrently = SETTING_PROPERTIES;
OAutoActionReset(this);
@@ -316,7 +316,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r
}
}
-Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(RuntimeException)
+Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(RuntimeException)
{
return createPropertySetInfo( getInfoHelper() ) ;
}
@@ -379,5 +379,5 @@ void OQuery::registerProperties()
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseQuery" ) );
}
-} // namespace dbaccess
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx
index c3fff9cc3cdd..ca5eeb64ea0b 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -52,16 +52,16 @@ namespace dbaccess
//==========================================================================
//= OQuery - an object implementing the sdb.Query service
//==========================================================================
-typedef ::cppu::ImplHelper3 < ::com::sun::star::sdbcx::XDataDescriptorFactory,
+typedef ::cppu::ImplHelper3 < ::com::sun::star::sdbcx::XDataDescriptorFactory,
::com::sun::star::beans::XPropertyChangeListener,
::com::sun::star::sdbcx::XRename
- > OQuery_Base;
+ > OQuery_Base;
class OQuery;
class OColumn;
-typedef ::comphelper::OPropertyArrayUsageHelper< OQuery > OQuery_ArrayHelperBase;
+typedef ::comphelper::OPropertyArrayUsageHelper< OQuery > OQuery_ArrayHelperBase;
-class OQuery :public OContentHelper
+class OQuery :public OContentHelper
,public OQueryDescriptor_Base
,public OQuery_Base
,public OQuery_ArrayHelperBase
@@ -73,26 +73,26 @@ public:
typedef ::std::map< ::rtl::OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap;
protected:
-// TNameColumnMap m_aColumnMap; // contains all columnnames to columns
+// TNameColumnMap m_aColumnMap; // contains all columnnames to columns
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xCommandDefinition;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xCommandPropInfo;
::rtl::Reference< OContainerMediator > m_pColumnMediator;
::dbtools::IWarningsContainer* m_pWarnings;
- sal_Bool m_bCaseSensitiv : 1; // assume case sensitivity of the column names ?
+ sal_Bool m_bCaseSensitiv : 1; // assume case sensitivity of the column names ?
// possible actions on our "aggregate"
enum AGGREGATE_ACTION { NONE, SETTING_PROPERTIES, FLUSHING };
- AGGREGATE_ACTION m_eDoingCurrently;
+ AGGREGATE_ACTION m_eDoingCurrently;
// ------------------------------------------------------------------------
/** a class which automatically resets m_eDoingCurrently in it's destructor
*/
- class OAutoActionReset; // just for the following friend declaration
+ class OAutoActionReset; // just for the following friend declaration
friend class OAutoActionReset;
class OAutoActionReset
{
- OQuery* m_pActor;
+ OQuery* m_pActor;
public:
OAutoActionReset(OQuery* _pActor) : m_pActor(_pActor) { }
~OAutoActionReset() { m_pActor->m_eDoingCurrently = NONE; }
@@ -103,7 +103,7 @@ protected:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
- ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); }
+ ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); }
public:
OQuery(
@@ -144,8 +144,8 @@ public:
public:
// the caller is responsible for the lifetime!
- void setWarningsContainer( ::dbtools::IWarningsContainer* _pWarnings ) { m_pWarnings = _pWarnings; }
- ::dbtools::IWarningsContainer* getWarningsContainer( ) const { return m_pWarnings; }
+ void setWarningsContainer( ::dbtools::IWarningsContainer* _pWarnings ) { m_pWarnings = _pWarnings; }
+ ::dbtools::IWarningsContainer* getWarningsContainer( ) const { return m_pWarnings; }
// XRename
virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException);
@@ -165,7 +165,7 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREAPI_QUERY_HXX_
diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 12f83abf28fd..229ffa1914f5 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -92,7 +92,7 @@ OQueryContainer::OQueryContainer(
m_pCommandsListener = new OContainerListener( *this, m_aMutex );
m_pCommandsListener->acquire();
- Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY_THROW );
+ Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY_THROW );
xContainer->addContainerListener( m_pCommandsListener );
Reference< XContainerApproveBroadcaster > xContainerApprove( m_xCommandDefinitions, UNO_QUERY_THROW );
@@ -117,8 +117,8 @@ OQueryContainer::OQueryContainer(
OQueryContainer::~OQueryContainer()
{
DBG_DTOR(OQueryContainer, NULL);
- // dispose();
- // maybe we're already disposed, but this should be uncritical
+ // dispose();
+ // maybe we're already disposed, but this should be uncritical
}
IMPLEMENT_FORWARD_XINTERFACE2( OQueryContainer,ODefinitionContainer,OQueryContainer_Base)
@@ -135,7 +135,7 @@ void OQueryContainer::disposing()
if ( m_pCommandsListener )
{
- Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY );
+ Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY );
xContainer->removeContainerListener( m_pCommandsListener );
Reference< XContainerApproveBroadcaster > xContainerApprove( m_xCommandDefinitions, UNO_QUERY );
xContainerApprove->removeContainerApproveListener( m_pCommandsListener );
@@ -145,8 +145,8 @@ void OQueryContainer::disposing()
m_pCommandsListener = NULL;
}
- m_xCommandDefinitions = NULL;
- m_xConnection = NULL;
+ m_xCommandDefinitions = NULL;
+ m_xConnection = NULL;
}
// XServiceInfo
@@ -189,7 +189,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet
// insert the basic object into the definition container
{
- m_eDoingCurrently = INSERTING;
+ m_eDoingCurrently = INSERTING;
OAutoActionReset aAutoReset(this);
m_xCommandDefinitions->insertByName(sNewObjectName, makeAny(xCommandDefinitionPart));
}
@@ -316,7 +316,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const Contain
void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw(::com::sun::star::uno::RuntimeException)
{
if (_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinitions, UNO_QUERY).get())
- { // our "master container" (with the command definitions) is beeing disposed
+ { // our "master container" (with the command definitions) is beeing disposed
DBG_ERROR("OQueryContainer::disposing : nobody should dispose the CommandDefinition container before disposing my connection !");
dispose();
}
@@ -326,7 +326,7 @@ void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObj
// it's one of our documents ....
Documents::iterator aIter = m_aDocumentMap.begin();
Documents::iterator aEnd = m_aDocumentMap.end();
- for (;aIter != aEnd;++aIter )
+ for (;aIter != aEnd;++aIter )
{
if ( xSource == aIter->second.get() )
{
@@ -363,7 +363,7 @@ Reference< XContent > OQueryContainer::implCreateWrapper(const Reference< XConte
xReturn = pNewObject;
pNewObject->setWarningsContainer( m_pWarnings );
-// pNewObject->getColumns();
+// pNewObject->getColumns();
// Why? This is expensive. If you comment this in 'cause you really need it, be sure to run the
// QueryInQuery test in dbaccess/qa/complex/dbaccess ...
}
@@ -415,5 +415,5 @@ Sequence< ::rtl::OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(
return m_xCommandDefinitions->getElementNames();
}
-} // namespace dbaccess
+} // 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 b06a87abebcf..0fa808894d3c 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -128,7 +128,7 @@ Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo( )
DBG_NAME(OQueryDescriptor_Base);
-OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf)
+OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf)
:m_bColumnsOutOfDate(sal_True)
,m_rMutex(_rMutex)
{
diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx
index 391df07351bb..58349c90967a 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -55,7 +55,7 @@ namespace dbaccess
typedef ::cppu::ImplHelper3<
::com::sun::star::sdbcx::XColumnsSupplier,
::com::sun::star::lang::XUnoTunnel,
- ::com::sun::star::lang::XServiceInfo > OQueryDescriptor_BASE;
+ ::com::sun::star::lang::XServiceInfo > OQueryDescriptor_BASE;
class OQueryDescriptor_Base
:public OQueryDescriptor_BASE
@@ -64,24 +64,24 @@ class OQueryDescriptor_Base
,public ::connectivity::sdbcx::IRefreshableColumns
{
private:
- sal_Bool m_bColumnsOutOfDate : 1; // the columns have to be rebuild on the next getColumns ?
- ::osl::Mutex& m_rMutex;
+ sal_Bool m_bColumnsOutOfDate : 1; // the columns have to be rebuild on the next getColumns ?
+ ::osl::Mutex& m_rMutex;
protected:
- OColumns* m_pColumns; // our column descriptions
+ OColumns* m_pColumns; // our column descriptions
::rtl::OUString m_sElementName;
virtual ~OQueryDescriptor_Base();
- void setColumnsOutOfDate( sal_Bool _bOutOfDate = sal_True );
- sal_Bool isColumnsOutOfDate() const { return m_bColumnsOutOfDate; }
+ void setColumnsOutOfDate( sal_Bool _bOutOfDate = sal_True );
+ sal_Bool isColumnsOutOfDate() const { return m_bColumnsOutOfDate; }
- sal_Int32 getColumnCount() const { return m_pColumns ? m_pColumns->getCount() : 0; }
- void clearColumns( );
+ sal_Int32 getColumnCount() const { return m_pColumns ? m_pColumns->getCount() : 0; }
+ void clearColumns( );
- void implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn );
+ void implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn );
public:
- OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf);
+ OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf);
/** constructs the object with a UNO QueryDescriptor. If you use this ctor, the resulting object
won't have any column informations (the column container will be empty)
*/
@@ -102,7 +102,7 @@ public:
protected:
// IColumnFactory
- virtual OColumn* createColumn(const ::rtl::OUString& _rName) const;
+ virtual OColumn* createColumn(const ::rtl::OUString& _rName) const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor();
virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor );
virtual void columnDropped(const ::rtl::OUString& _sName);
@@ -152,7 +152,7 @@ public:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREAPI_QUERYDESCRIPTOR_HXX_
diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx
index 89db5a7942a9..9a185bebc473 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -157,27 +157,27 @@ void OResultColumn::disposing()
::cppu::IPropertyArrayHelper* OResultColumn::createArrayHelper( ) const
{
BEGIN_PROPERTY_HELPER(21)
- DECL_PROP1(CATALOGNAME, ::rtl::OUString, READONLY);
- DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY);
- DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY);
- DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY);
- DECL_PROP1_BOOL(ISCURRENCY, READONLY);
- DECL_PROP1_BOOL(ISDEFINITELYWRITABLE, READONLY);
- DECL_PROP1(ISNULLABLE, sal_Int32, READONLY);
- DECL_PROP1_BOOL(ISREADONLY, READONLY);
+ DECL_PROP1(CATALOGNAME, ::rtl::OUString, READONLY);
+ DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY);
+ DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY);
+ DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY);
+ DECL_PROP1_BOOL(ISCURRENCY, READONLY);
+ DECL_PROP1_BOOL(ISDEFINITELYWRITABLE, READONLY);
+ DECL_PROP1(ISNULLABLE, sal_Int32, READONLY);
+ DECL_PROP1_BOOL(ISREADONLY, READONLY);
DECL_PROP1_BOOL(ISROWVERSION, READONLY);
- DECL_PROP1_BOOL(ISSEARCHABLE, READONLY);
- DECL_PROP1_BOOL(ISSIGNED, READONLY);
- DECL_PROP1_BOOL(ISWRITABLE, READONLY);
- DECL_PROP1(LABEL, ::rtl::OUString, READONLY);
- DECL_PROP1(NAME, ::rtl::OUString, READONLY);
- DECL_PROP1(PRECISION, sal_Int32, READONLY);
- DECL_PROP1(SCALE, sal_Int32, READONLY);
- DECL_PROP1(SCHEMANAME, ::rtl::OUString, READONLY);
- DECL_PROP1(SERVICENAME, ::rtl::OUString, READONLY);
- DECL_PROP1(TABLENAME, ::rtl::OUString, READONLY);
- DECL_PROP1(TYPE, sal_Int32, READONLY);
- DECL_PROP1(TYPENAME, ::rtl::OUString, READONLY);
+ DECL_PROP1_BOOL(ISSEARCHABLE, READONLY);
+ DECL_PROP1_BOOL(ISSIGNED, READONLY);
+ DECL_PROP1_BOOL(ISWRITABLE, READONLY);
+ DECL_PROP1(LABEL, ::rtl::OUString, READONLY);
+ DECL_PROP1(NAME, ::rtl::OUString, READONLY);
+ DECL_PROP1(PRECISION, sal_Int32, READONLY);
+ DECL_PROP1(SCALE, sal_Int32, READONLY);
+ DECL_PROP1(SCHEMANAME, ::rtl::OUString, READONLY);
+ DECL_PROP1(SERVICENAME, ::rtl::OUString, READONLY);
+ DECL_PROP1(TABLENAME, ::rtl::OUString, READONLY);
+ DECL_PROP1(TYPE, sal_Int32, READONLY);
+ DECL_PROP1(TYPENAME, ::rtl::OUString, READONLY);
END_PROPERTY_HELPER();
}
@@ -302,12 +302,12 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
{
sal_Bool bVal = sal_False;
rValue.setValue(&bVal, getBooleanCppuType());
- } break;
+ } break;
case PROPERTY_ID_ISREADONLY:
{
sal_Bool bVal = sal_True;
rValue.setValue(&bVal, getBooleanCppuType());
- } break;
+ } break;
case PROPERTY_ID_SCALE:
case PROPERTY_ID_PRECISION:
case PROPERTY_ID_DISPLAYSIZE:
diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx
index a28854fcdf29..789a26f1c7c1 100644
--- a/dbaccess/source/core/api/resultcolumn.hxx
+++ b/dbaccess/source/core/api/resultcolumn.hxx
@@ -41,9 +41,9 @@ namespace dbaccess
public ::comphelper::OPropertyArrayUsageHelper < OResultColumn >
{
protected:
- ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData;
+ ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xDBMetaData;
- sal_Int32 m_nPos;
+ sal_Int32 m_nPos;
::com::sun::star::uno::Any m_aIsRowVersion;
mutable ::boost::optional< sal_Bool > m_isSigned;
mutable ::boost::optional< sal_Bool > m_isCurrency;
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index 6d0669b874e7..f495088bd69b 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -230,12 +230,12 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::createArrayHelper" );
BEGIN_PROPERTY_HELPER(6)
- DECL_PROP1(CURSORNAME, ::rtl::OUString, READONLY);
- DECL_PROP0(FETCHDIRECTION, sal_Int32);
- DECL_PROP0(FETCHSIZE, sal_Int32);
- DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY);
- DECL_PROP1(RESULTSETCONCURRENCY, sal_Int32, READONLY);
- DECL_PROP1(RESULTSETTYPE, sal_Int32, READONLY);
+ DECL_PROP1(CURSORNAME, ::rtl::OUString, READONLY);
+ DECL_PROP0(FETCHDIRECTION, sal_Int32);
+ DECL_PROP0(FETCHSIZE, sal_Int32);
+ DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY);
+ DECL_PROP1(RESULTSETCONCURRENCY, sal_Int32, READONLY);
+ DECL_PROP1(RESULTSETTYPE, sal_Int32, READONLY);
END_PROPERTY_HELPER();
}
@@ -282,7 +282,7 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
{
sal_Bool bVal = m_bIsBookmarkable;
rValue.setValue(&bVal, getBooleanCppuType());
- } break;
+ } break;
default:
{
// get the property name
diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx
index dfc750bf51be..9bca1b5c58da 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.hxx
@@ -70,24 +70,24 @@ namespace dbaccess
//************************************************************
// OResultSet
//************************************************************
- class OResultSet : public comphelper::OBaseMutex,
+ class OResultSet : public comphelper::OBaseMutex,
public OResultSetBase,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper < OResultSet >
{
protected:
- ONoWeakStatement m_aStatement;
+ ONoWeakStatement m_aStatement;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xDelegatorResultSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xDelegatorResultSetUpdate;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xDelegatorRow;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xDelegatorRowUpdate;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xDelegatorResultSet;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xDelegatorResultSetUpdate;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xDelegatorRow;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xDelegatorRowUpdate;
::dbtools::WarningsContainer m_aWarnings;
- OColumns* m_pColumns;
- sal_Int32 m_nResultSetType;
- sal_Int32 m_nResultSetConcurrency;
- sal_Bool m_bIsBookmarkable : 1;
+ OColumns* m_pColumns;
+ sal_Int32 m_nResultSetType;
+ sal_Int32 m_nResultSetConcurrency;
+ sal_Bool m_bIsBookmarkable : 1;
public:
OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResultSet,
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index ebdc129d8c20..1b33f28b547f 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -200,15 +200,15 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::createArrayHelper" );
BEGIN_PROPERTY_HELPER(10)
- DECL_PROP0(CURSORNAME, ::rtl::OUString);
+ DECL_PROP0(CURSORNAME, ::rtl::OUString);
DECL_PROP0_BOOL(ESCAPE_PROCESSING);
- DECL_PROP0(FETCHDIRECTION, sal_Int32);
- DECL_PROP0(FETCHSIZE, sal_Int32);
- DECL_PROP0(MAXFIELDSIZE, sal_Int32);
- DECL_PROP0(MAXROWS, sal_Int32);
- DECL_PROP0(QUERYTIMEOUT, sal_Int32);
- DECL_PROP0(RESULTSETCONCURRENCY, sal_Int32);
- DECL_PROP0(RESULTSETTYPE, sal_Int32);
+ DECL_PROP0(FETCHDIRECTION, sal_Int32);
+ DECL_PROP0(FETCHSIZE, sal_Int32);
+ DECL_PROP0(MAXFIELDSIZE, sal_Int32);
+ DECL_PROP0(MAXROWS, sal_Int32);
+ DECL_PROP0(QUERYTIMEOUT, sal_Int32);
+ DECL_PROP0(RESULTSETCONCURRENCY, sal_Int32);
+ DECL_PROP0(RESULTSETTYPE, sal_Int32);
DECL_PROP0_BOOL(USEBOOKMARKS);
END_PROPERTY_HELPER();
}
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 58194f3babfd..c25bdbec62ad 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -187,7 +187,7 @@ void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getFastPropertyValue" );
if ((PROPERTY_ID_PRIVILEGES == _nHandle) && (-1 == m_nPrivileges))
- { // somebody is asking for the privileges an we do not know them, yet
+ { // somebody is asking for the privileges an we do not know them, yet
const_cast<ODBTable*>(this)->m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),m_CatalogName,m_SchemaName, m_Name);
}
@@ -235,22 +235,22 @@ void ODBTable::construct()
registerProperty(PROPERTY_TEXTRELIEF, PROPERTY_ID_TEXTRELIEF, PropertyAttribute::BOUND,
&m_nFontRelief, ::getCppuType(&m_nFontRelief));
- registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&m_aFont.Name, ::getCppuType(&m_aFont.Name));
- registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&m_aFont.Height, ::getCppuType(&m_aFont.Height));
- registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&m_aFont.Width, ::getCppuType(&m_aFont.Width));
- registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&m_aFont.StyleName, ::getCppuType(&m_aFont.StyleName));
- registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&m_aFont.Family, ::getCppuType(&m_aFont.Family));
- registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&m_aFont.CharSet, ::getCppuType(&m_aFont.CharSet));
- registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&m_aFont.Pitch, ::getCppuType(&m_aFont.Pitch));
- registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&m_aFont.CharacterWidth, ::getCppuType(&m_aFont.CharacterWidth));
- registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&m_aFont.Weight, ::getCppuType(&m_aFont.Weight));
- registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&m_aFont.Slant, ::getCppuType(&m_aFont.Slant));
- registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&m_aFont.Underline, ::getCppuType(&m_aFont.Underline));
- registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&m_aFont.Strikeout, ::getCppuType(&m_aFont.Strikeout));
- registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&m_aFont.Orientation, ::getCppuType(&m_aFont.Orientation));
- registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&m_aFont.Kerning, ::getCppuType(&m_aFont.Kerning));
- registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&m_aFont.WordLineMode, ::getCppuType(&m_aFont.WordLineMode));
- registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&m_aFont.Type, ::getCppuType(&m_aFont.Type));
+ registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&m_aFont.Name, ::getCppuType(&m_aFont.Name));
+ registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&m_aFont.Height, ::getCppuType(&m_aFont.Height));
+ registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&m_aFont.Width, ::getCppuType(&m_aFont.Width));
+ registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&m_aFont.StyleName, ::getCppuType(&m_aFont.StyleName));
+ registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&m_aFont.Family, ::getCppuType(&m_aFont.Family));
+ registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&m_aFont.CharSet, ::getCppuType(&m_aFont.CharSet));
+ registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&m_aFont.Pitch, ::getCppuType(&m_aFont.Pitch));
+ registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&m_aFont.CharacterWidth, ::getCppuType(&m_aFont.CharacterWidth));
+ registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&m_aFont.Weight, ::getCppuType(&m_aFont.Weight));
+ registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&m_aFont.Slant, ::getCppuType(&m_aFont.Slant));
+ registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&m_aFont.Underline, ::getCppuType(&m_aFont.Underline));
+ registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&m_aFont.Strikeout, ::getCppuType(&m_aFont.Strikeout));
+ registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&m_aFont.Orientation, ::getCppuType(&m_aFont.Orientation));
+ registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&m_aFont.Kerning, ::getCppuType(&m_aFont.Kerning));
+ registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&m_aFont.WordLineMode, ::getCppuType(&m_aFont.WordLineMode));
+ registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&m_aFont.Type, ::getCppuType(&m_aFont.Type));
refreshColumns();
}
@@ -262,8 +262,8 @@ void ODBTable::construct()
describeProperties(aProps);
if(!_nId)
{
- Property* pIter = aProps.getArray();
- Property* pEnd = pIter + aProps.getLength();
+ Property* pIter = aProps.getArray();
+ Property* pEnd = pIter + aProps.getLength();
for(;pIter != pEnd;++pIter)
{
if (0 == pIter->Name.compareToAscii(PROPERTY_CATALOGNAME))
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 827fbf2cf465..4b86763db667 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -87,7 +87,7 @@ namespace
if ( xState.is() )
{
const ::rtl::OUString* pIter = _aNames.getConstArray();
- const ::rtl::OUString* pEnd = pIter + _aNames.getLength();
+ const ::rtl::OUString* pEnd = pIter + _aNames.getLength();
for(;pIter != pEnd;++pIter)
{
try
@@ -115,8 +115,8 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const Reference< XConnection >& _xCon,
sal_Bool _bCase,
- const Reference< XNameContainer >& _xTableDefinitions,
- IRefreshListener* _pRefreshListener,
+ const Reference< XNameContainer >& _xTableDefinitions,
+ IRefreshListener* _pRefreshListener,
::dbtools::IWarningsContainer* _pWarningsContainer
,oslInterlockedCount& _nInAppend)
:OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend)
@@ -130,7 +130,7 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent,
OTableContainer::~OTableContainer()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::OTableContainer" );
- // dispose();
+ // dispose();
DBG_DTOR(OTableContainer, NULL);
}
@@ -231,8 +231,8 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr
Reference< XRow > xRow(xRes,UNO_QUERY);
if(xRow.is())
{
- sType = xRow->getString(4);
- sDescription = xRow->getString(5);
+ sType = xRow->getString(4);
+ sDescription = xRow->getString(5);
}
}
::comphelper::disposeComponent(xRes);
@@ -346,7 +346,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons
Reference<XPropertySet> xProp = xFac->createDataDescriptor();
Sequence< ::rtl::OUString> aSeq = xNames->getElementNames();
const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
for(;pIter != pEnd;++pIter)
{
if ( !xColumnDefinitions->hasByName(*pIter) )
@@ -362,7 +362,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons
}
}
}
- const static ::rtl::OUString s_pTableProps[] = { ::rtl::OUString(PROPERTY_FILTER), ::rtl::OUString(PROPERTY_ORDER)
+ const static ::rtl::OUString s_pTableProps[] = { ::rtl::OUString(PROPERTY_FILTER), ::rtl::OUString(PROPERTY_ORDER)
, ::rtl::OUString(PROPERTY_APPLYFILTER), ::rtl::OUString(PROPERTY_FONT)
, ::rtl::OUString(PROPERTY_ROW_HEIGHT), ::rtl::OUString(PROPERTY_TEXTCOLOR)
, ::rtl::OUString(PROPERTY_TEXTLINECOLOR), ::rtl::OUString(PROPERTY_TEXTEMPHASIS)
@@ -393,15 +393,15 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement
if ( xTable.is() && m_xMetaData.is() )
{
if( m_xMetaData.is() && m_xMetaData->supportsCatalogsInTableDefinitions() )
- xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog;
+ xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog;
if( m_xMetaData.is() && m_xMetaData->supportsSchemasInTableDefinitions() )
- xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
- xTable->getPropertyValue(PROPERTY_NAME) >>= sTable;
+ xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
+ xTable->getPropertyValue(PROPERTY_NAME) >>= sTable;
sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions );
::rtl::OUString sType;
- xTable->getPropertyValue(PROPERTY_TYPE) >>= sType;
+ xTable->getPropertyValue(PROPERTY_TYPE) >>= sType;
bIsView = sType.equalsIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")));
}
@@ -469,8 +469,8 @@ void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) th
// create a new config entry
{
::rtl::OUString sOldComposedName,sNewComposedName;
- Event.ReplacedElement >>= sOldComposedName;
- Event.Accessor >>= sNewComposedName;
+ Event.ReplacedElement >>= sOldComposedName;
+ Event.Accessor >>= sNewComposedName;
renameObject(sOldComposedName,sNewComposedName);
}
@@ -481,7 +481,7 @@ void SAL_CALL OTableContainer::disposing()
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::disposing" );
OFilteredContainer::disposing();
// say our listeners goobye
- m_xTableDefinitions = NULL;
+ m_xTableDefinitions = NULL;
m_pTableMediator = NULL;
}
diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx
index 075bb806f095..465e451ace9b 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -78,7 +78,7 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent
,::osl::Mutex& _rMutex
,const Reference< XConnection >& _xCon
,sal_Bool _bCase
- ,IRefreshListener* _pRefreshListener
+ ,IRefreshListener* _pRefreshListener
,::dbtools::IWarningsContainer* _pWarningsContainer
,oslInterlockedCount& _nInAppend)
:OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend)
@@ -89,7 +89,7 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent
OViewContainer::~OViewContainer()
{
- // dispose();
+ // dispose();
DBG_DTOR(OViewContainer, NULL);
}
@@ -196,9 +196,9 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN
Reference<XPropertySet> xTable(getObject(_nPos),UNO_QUERY);
if ( xTable.is() )
{
- xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog;
- xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
- xTable->getPropertyValue(PROPERTY_NAME) >>= sTable;
+ xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog;
+ xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
+ xTable->getPropertyValue(PROPERTY_NAME) >>= sTable;
sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions );
}
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
index 24b4716159ed..df7a85434a91 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -62,7 +62,7 @@ namespace dbaccess
{
/// helper class for column property change events which holds the OComponentDefinition weak
-typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE;
+typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE;
class OColumnPropertyListener : public TColumnPropertyListener_BASE
{
OComponentDefinition* m_pComponent;
@@ -121,7 +121,7 @@ void OComponentDefinition::registerProperties()
}
OComponentDefinition::OComponentDefinition(const Reference< XMultiServiceFactory >& _xORB
- ,const Reference< XInterface >& _xParentContainer
+ ,const Reference< XInterface >& _xParentContainer
,const TContentPtr& _pImpl
,sal_Bool _bTable)
:OContentHelper(_xORB,_xParentContainer,_pImpl)
@@ -138,7 +138,7 @@ OComponentDefinition::~OComponentDefinition()
}
-OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer
+OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer
,const ::rtl::OUString& _rElementName
,const Reference< XMultiServiceFactory >& _xORB
,const TContentPtr& _pImpl
@@ -297,5 +297,5 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS
notifyDataSourceModified();
}
-} // namespace dbaccess
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 0eba07a61dd4..6da15cd19fbb 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -66,8 +66,8 @@ namespace dbaccess
Columns m_aColumns;
public:
- ::rtl::OUString m_sSchemaName;
- ::rtl::OUString m_sCatalogName;
+ ::rtl::OUString m_sSchemaName;
+ ::rtl::OUString m_sCatalogName;
public:
OComponentDefinition_Impl();
@@ -93,7 +93,7 @@ class OColumnPropertyListener;
//=========================================================================
//= OComponentDefinition - a database "document" which describes a query
//=========================================================================
-class OComponentDefinition :public OContentHelper
+class OComponentDefinition :public OContentHelper
,public ODataSettings
,public IColumnFactory
,public OComponentDefinition_BASE
@@ -105,7 +105,7 @@ protected:
::std::auto_ptr< OColumns > m_pColumns;
::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener>
m_xColumnPropertyListener;
- sal_Bool m_bTable;
+ sal_Bool m_bTable;
virtual ~OComponentDefinition();
virtual void SAL_CALL disposing();
@@ -113,7 +113,7 @@ protected:
protected:
OComponentDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer
+ ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer
,const TContentPtr& _pImpl
,sal_Bool _bTable = sal_True);
@@ -154,7 +154,7 @@ public:
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
// IColumnFactory
- virtual OColumn* createColumn(const ::rtl::OUString& _rName) const;
+ virtual OColumn* createColumn(const ::rtl::OUString& _rName) const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor();
virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor );
virtual void columnDropped(const ::rtl::OUString& _sName);
@@ -176,7 +176,7 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // DBA_COREDATAACESS_COMPONENTDEFINITION_HXX
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index fb6bf98877fc..da4e3c271a69 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -72,7 +72,7 @@ OContentHelper_Impl::~OContentHelper_Impl()
}
OContentHelper::OContentHelper(const Reference< XMultiServiceFactory >& _xORB
- ,const Reference< XInterface >& _xParentContainer
+ ,const Reference< XInterface >& _xParentContainer
,const TContentPtr& _pImpl)
: OContentHelper_COMPBASE(m_aMutex)
,m_aContentListeners(m_aMutex)
@@ -234,7 +234,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
Reference<XPropertySet> xProp(*this,UNO_QUERY);
if ( xProp.is() )
aRet <<= xProp->getPropertySetInfo();
- // aRet <<= getPropertySetInfo(); // TODO
+ // aRet <<= getPropertySetInfo(); // TODO
}
else
{
@@ -349,7 +349,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
PropertyChangeEvent aEvent;
aEvent.Source = static_cast< cppu::OWeakObject * >( this );
- aEvent.Further = sal_False;
+ aEvent.Further = sal_False;
aEvent.PropertyHandle = -1;
const PropertyValue* pValues = rValues.getConstArray();
@@ -433,7 +433,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
if ( nChanged > 0 )
{
// @@@ Save changes.
-// storeData();
+// storeData();
notifyDataSourceModified();
aGuard.clear();
@@ -638,7 +638,7 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN
Sequence< PropertyChangeEvent > aChanges( 1 );
aChanges[0].Source = static_cast< cppu::OWeakObject * >( this );
- aChanges[0].Further = sal_False;
+ aChanges[0].Further = sal_False;
aChanges[0].PropertyName = PROPERTY_NAME;
aChanges[0].PropertyHandle = PROPERTY_ID_NAME;
aChanges[0].OldValue <<= m_pImpl->m_aProps.aTitle;
@@ -669,5 +669,5 @@ void OContentHelper::notifyDataSourceModified()
::dbaccess::notifyDataSourceModified(m_xParentContainer,sal_True);
}
-} // namespace dbaccess
+} // 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 5d31055d2cc2..d3de75af3d53 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1431,5 +1431,5 @@ ModelDependentComponent::~ModelDependentComponent()
{
}
-} // namespace dbaccess
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index d18f820bff47..223654c38b85 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -192,8 +192,8 @@ public:
private:
OModuleClient m_aModuleClient;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource > m_xDataSource;
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel;
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource > m_xDataSource;
DocumentStorageAccess* m_pStorageAccess;
::comphelper::SharedMutex m_aMutex;
@@ -207,14 +207,14 @@ private:
SharedStorage m_xDocumentStorage;
::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListener;
- ODatabaseContext* m_pDBContext;
+ ODatabaseContext* m_pDBContext;
DocumentEventsData m_aDocumentEvents;
::comphelper::NamedValueCollection m_aMediaDescriptor;
/// the URL the document was loaded from
- ::rtl::OUString m_sDocFileLocation;
+ ::rtl::OUString m_sDocFileLocation;
- oslInterlockedCount m_refCount;
+ oslInterlockedCount m_refCount;
/// do we have any object (forms/reports) which contains macros?
::boost::optional< EmbeddedMacros > m_aEmbeddedMacros;
@@ -240,32 +240,32 @@ public:
const ::comphelper::ComponentContext m_aContext;
public:
- ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xCommandDefinitions;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xTableDefinitions;
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xCommandDefinitions;
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xTableDefinitions;
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >
m_xNumberFormatsSupplier;
- ::rtl::OUString m_sConnectURL;
- ::rtl::OUString m_sName; // transient, our creator has to tell us the title
- ::rtl::OUString m_sUser;
- ::rtl::OUString m_aPassword; // transient !
+ ::rtl::OUString m_sConnectURL;
+ ::rtl::OUString m_sName; // transient, our creator has to tell us the title
+ ::rtl::OUString m_sUser;
+ ::rtl::OUString m_aPassword; // transient !
::rtl::OUString m_sFailedPassword;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>
m_aLayoutInformation;
sal_Int32 m_nLoginTimeout;
- sal_Bool m_bReadOnly : 1;
- sal_Bool m_bPasswordRequired : 1;
- sal_Bool m_bSuppressVersionColumns : 1;
- sal_Bool m_bModified : 1;
- sal_Bool m_bDocumentReadOnly : 1;
+ sal_Bool m_bReadOnly : 1;
+ sal_Bool m_bPasswordRequired : 1;
+ sal_Bool m_bSuppressVersionColumns : 1;
+ sal_Bool m_bModified : 1;
+ sal_Bool m_bDocumentReadOnly : 1;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyAccess >
m_xSettings;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter;
- OSharedConnectionManager* m_pSharedConnectionManager;
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter;
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter;
+ OSharedConnectionManager* m_pSharedConnectionManager;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >
m_xSharedConnectionManager;
- sal_uInt16 m_nControllerLockCount;
+ sal_uInt16 m_nControllerLockCount;
void reset();
@@ -336,7 +336,7 @@ public:
stripLoadArguments( const ::comphelper::NamedValueCollection& _rArguments );
// other stuff
- void flushTables();
+ void flushTables();
// disposes all elements in m_aStorages, and clears it
void disposeStorages() SAL_THROW(());
@@ -636,7 +636,7 @@ public:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREDATAACCESS_DATALINK_HXX_
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx
index 6c18633de23e..eaa2628648f2 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
@@ -38,7 +38,7 @@ namespace dbaccess
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
-// using namespace ::com::sun::star::reflection;
+// using namespace ::com::sun::star::reflection;
using namespace connectivity;
DBG_NAME(OSharedConnection)
@@ -164,5 +164,5 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection
return m_xConnection->getTypeMap();
}
-} // namespace dbaccess
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index 5706d20ef5ae..4d21609d8d2c 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
@@ -54,9 +54,9 @@ namespace dbaccess
//=======================================================================================
typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::sdbc::XConnection
> OSharedConnection_BASE;
- typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2;
+ typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2;
- class OSharedConnection : public ::comphelper::OBaseMutex
+ class OSharedConnection : public ::comphelper::OBaseMutex
, public OSharedConnection_BASE
, public OSharedConnection_BASE2
{
@@ -137,7 +137,7 @@ namespace dbaccess
IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection );
#endif
-} // namespace dbaccess
+} // namespace dbaccess
#endif // DBA_CORE_SHARED_CONNECTION_HXX
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
index a7d17634a81d..9caf1a583dc7 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -286,7 +286,7 @@ Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) thr
Sequence< ::rtl::OUString > aNames(m_aBookmarks.size());
::rtl::OUString* pNames = aNames.getArray();
;
- for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin();
+ for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin();
aNameIter != m_aBookmarksIndexed.end();
++pNames, ++aNameIter
)
@@ -311,7 +311,7 @@ void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName)
// look for the name in the index access vector
MapString2StringIterator aMapPos = m_aBookmarks.end();
- for ( MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin();
+ for ( MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin();
aSearch != m_aBookmarksIndexed.end();
++aSearch
)
@@ -342,7 +342,7 @@ void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl::
MutexGuard aGuard(m_rMutex);
OSL_ENSURE(m_aBookmarks.find(_rName) == m_aBookmarks.end(),"Bookmark already known!");
- m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first);
+ m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first);
}
void OBookmarkContainer::implReplace(const ::rtl::OUString& _rName, const ::rtl::OUString& _rNewLink)
@@ -367,5 +367,5 @@ void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Pa
throw NoSupportException();
}
-} // namespace dbaccess
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
index b41c70ae75e3..648d5654d114 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
@@ -47,17 +47,17 @@ namespace dbaccess
{
//==========================================================================
-//= OBookmarkContainer - base class of collections of database definition
-//= documents
+//= OBookmarkContainer - base class of collections of database definition
+//= documents
//==========================================================================
-typedef ::cppu::WeakImplHelper6 <
+typedef ::cppu::WeakImplHelper6 <
::com::sun::star::container::XIndexAccess
- , ::com::sun::star::container::XNameContainer
- , ::com::sun::star::container::XEnumerationAccess
- , ::com::sun::star::container::XContainer
- , ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::container::XChild
- > OBookmarkContainer_Base;
+ , ::com::sun::star::container::XNameContainer
+ , ::com::sun::star::container::XEnumerationAccess
+ , ::com::sun::star::container::XContainer
+ , ::com::sun::star::lang::XServiceInfo
+ , ::com::sun::star::container::XChild
+ > OBookmarkContainer_Base;
class OBookmarkContainer
:public OBookmarkContainer_Base
@@ -66,21 +66,21 @@ protected:
DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString, MapString2String);
DECLARE_STL_VECTOR(MapString2StringIterator, MapIteratorVector);
- MapString2String m_aBookmarks; // the bookmarks itself
- MapIteratorVector m_aBookmarksIndexed; // for index access to the
+ MapString2String m_aBookmarks; // the bookmarks itself
+ MapIteratorVector m_aBookmarksIndexed; // for index access to the
protected:
- ::cppu::OWeakObject& m_rParent; // for the ref counting
+ ::cppu::OWeakObject& m_rParent; // for the ref counting
::cppu::OInterfaceContainerHelper
m_aContainerListeners;
- ::osl::Mutex& m_rMutex;
+ ::osl::Mutex& m_rMutex;
public:
/** constructs the container.<BR>
after the construction of the object the creator has to call <code>initialize</code>.
- @param _rParent the parent object which is used for ref counting
- @param _rMutex the parent's mutex object for access safety
+ @param _rParent the parent object which is used for ref counting
+ @param _rMutex the parent's mutex object for access safety
*/
OBookmarkContainer(
::cppu::OWeakObject& _rParent,
@@ -135,26 +135,26 @@ public:
/** tell the container to free all resources. After that it's in a state like after the construction, i.e.
you may call <code>initialize</code> again (maybe with another configuration node).
*/
- virtual void dispose();
+ virtual void dispose();
protected:
- /** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and
+ /** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and
not disposed (@see dispose)
- @param _bIntendWriteAccess determines whether or not the caller intends to modify the configuration.
+ @param _bIntendWriteAccess determines whether or not the caller intends to modify the configuration.
if sal_True and the configuration is readonly, a runtime exception with
a description string is thrown.
*/
- void checkValid(sal_Bool _bIntendWriteAccess) const throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::DisposedException);
+ void checkValid(sal_Bool _bIntendWriteAccess) const throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::DisposedException);
/** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e.
if there is such an object which is not already loaded, it won't be loaded now.
- @param _rName the object name to check
- @return sal_True if there already exists such an object
+ @param _rName the object name to check
+ @return sal_True if there already exists such an object
*/
- inline sal_Bool checkExistence(const ::rtl::OUString& _rName);
+ inline sal_Bool checkExistence(const ::rtl::OUString& _rName);
- void implAppend(
+ void implAppend(
const ::rtl::OUString& _rName,
const ::rtl::OUString& _rDocumentLocation
);
@@ -167,12 +167,12 @@ protected:
};
-inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName)
+inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName)
{
return m_aBookmarks.find(_rName) != m_aBookmarks.end();
}
-} // namespace dbaccess
+} // namespace dbaccess
#endif // _DBA_CORE_BOOKMARKCONTAINER_HXX_
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx
index 695b952ca2f4..3394cd0f0ca4 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -53,7 +53,7 @@ namespace dbaccess
DBG_NAME(OCommandContainer)
OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB
- ,const Reference< XInterface >& _xParentContainer
+ ,const Reference< XInterface >& _xParentContainer
,const TContentPtr& _pImpl
,sal_Bool _bTables
)
@@ -97,5 +97,5 @@ Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exc
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseCommandDefinitionContainer" ) );
}
-} // namespace dbaccess
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx
index e1ff6b34357c..a425d7795dbe 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx
@@ -44,7 +44,7 @@ namespace dbaccess
typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XSingleServiceFactory
> OCommandContainer_BASE;
-class OCommandContainer : public ODefinitionContainer
+class OCommandContainer : public ODefinitionContainer
,public OCommandContainer_BASE
{
sal_Bool m_bTables;
@@ -54,7 +54,7 @@ public:
*/
OCommandContainer(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer
+ ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer
,const TContentPtr& _pImpl
,sal_Bool _bTables
);
@@ -77,7 +77,7 @@ protected:
virtual ::rtl::OUString determineContentType() const;
};
-} // namespace dbaccess
+} // namespace dbaccess
#endif // _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx
index 8ab8abe30755..6cfd9231560f 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -98,7 +98,7 @@ OCommandDefinition::~OCommandDefinition()
DBG_DTOR(OCommandDefinition, NULL);
}
-OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer
+OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer
,const ::rtl::OUString& _rElementName
,const Reference< XMultiServiceFactory >& _xORB
,const TContentPtr& _pImpl)
@@ -163,5 +163,5 @@ void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw
}
}
-} // namespace dbaccess
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index 30f22948cb62..b823c08f86d2 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -56,13 +56,13 @@ namespace dbaccess
public:
};
-typedef ::cppu::ImplHelper1 < ::com::sun::star::sdbcx::XRename
- > OCommandDefinition_Base;
+typedef ::cppu::ImplHelper1 < ::com::sun::star::sdbcx::XRename
+ > OCommandDefinition_Base;
class OCommandDefinition;
typedef ::comphelper::OPropertyArrayUsageHelper< OCommandDefinition >
OCommandDefinition_PROP;
-class OCommandDefinition :public OComponentDefinition
+class OCommandDefinition :public OComponentDefinition
,public OCommandDefinition_Base
,public OCommandDefinition_PROP
{
@@ -70,7 +70,7 @@ protected:
virtual ~OCommandDefinition();
OCommandDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
- ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer
+ ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer
,const TContentPtr& _pImpl
);
@@ -114,7 +114,7 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 89840f11e2cb..490d0c47ffe0 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -560,7 +560,7 @@ Reference< XSQLQueryComposer > OConnection::createQueryComposer(void) throw( Ru
MutexGuard aGuard(m_aMutex);
checkDisposed();
- // Reference< XNumberFormatsSupplier > xSupplier = pParent->getNumberFormatsSupplier();
+ // Reference< XNumberFormatsSupplier > xSupplier = pParent->getNumberFormatsSupplier();
Reference< XSQLQueryComposer > xComposer( new OQueryComposer( this ) );
m_aComposers.push_back(WeakReferenceHelper(xComposer));
return xComposer;
@@ -588,11 +588,11 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
getMasterTables();
if (m_xMasterTables.is() && m_xMasterTables->getTables().is())
- { // yes -> wrap them
+ { // yes -> wrap them
m_pTables->construct(m_xMasterTables->getTables(),m_aTableFilter, m_aTableTypeFilter);
}
else
- { // no -> use an own container
+ { // no -> use an own container
m_pTables->construct(m_aTableFilter, m_aTableTypeFilter);
}
}
@@ -890,5 +890,5 @@ Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< X
return xReturn;
}
-} // namespace dbaccess
+} // namespace dbaccess
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 20488aa13e1c..2918d4f74192 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -86,7 +86,7 @@ class ODatabaseSource;
//==========================================================================
//= OConnection
//==========================================================================
-class OConnection :public ::comphelper::OBaseMutex
+class OConnection :public ::comphelper::OBaseMutex
,public OSubComponent
,public ::connectivity::OConnectionWrapper
,public OConnection_Base
@@ -95,16 +95,16 @@ class OConnection :public ::comphelper::OBaseMutex
protected:
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier >
m_xMasterTables; // just to avoid the recreation of the catalog
- OWeakRefArray m_aStatements;
+ OWeakRefArray m_aStatements;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
m_xQueries;
- OWeakRefArray m_aComposers;
+ OWeakRefArray m_aComposers;
// the filter as set on the parent data link at construction of the connection
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter;
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter;
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter;
::comphelper::ComponentContext m_aContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection;
::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XConnectionTools > m_xConnectionTools;
::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XTableUIProvider > m_xTableUIProvider;
@@ -114,13 +114,13 @@ protected:
TSupportServices m_aSupportServices;
- OTableContainer* m_pTables;
- OViewContainer* m_pViews;
+ OTableContainer* m_pTables;
+ OViewContainer* m_pViews;
::dbtools::WarningsContainer m_aWarnings;
oslInterlockedCount m_nInAppend;
- sal_Bool m_bSupportsViews; // true when the getTableTypes return "VIEW" as type
- sal_Bool m_bSupportsUsers;
- sal_Bool m_bSupportsGroups;
+ sal_Bool m_bSupportsViews; // true when the getTableTypes return "VIEW" as type
+ sal_Bool m_bSupportsUsers;
+ sal_Bool m_bSupportsGroups;
protected:
virtual ~OConnection();
@@ -216,7 +216,7 @@ public:
virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed);
protected:
- inline void checkDisposed() throw (::com::sun::star::lang::DisposedException)
+ inline void checkDisposed() throw (::com::sun::star::lang::DisposedException)
{
if ( rBHelper.bDisposed || !m_xConnection.is() )
throw ::com::sun::star::lang::DisposedException();
@@ -245,7 +245,7 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_CORE_CONNECTION_HXX_
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 16d578588f0d..6fcf10a307d1 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -178,7 +178,7 @@ namespace dbaccess
void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ ) throw (RuntimeException)
{
}
-
+
void SAL_CALL DatabaseDocumentLoader::disposing( const lang::EventObject& /*Source*/ ) throw (RuntimeException)
{
}
@@ -289,7 +289,7 @@ void ODatabaseContext::disposing()
// dispose the data sources
ObjectCache::iterator aEnd = m_aDatabaseObjects.end();
- for ( ObjectCache::iterator aIter = m_aDatabaseObjects.begin();
+ for ( ObjectCache::iterator aIter = m_aDatabaseObjects.begin();
aIter != aEnd;
++aIter
)
@@ -471,8 +471,8 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl
const Property* pProperties = aProperties.getConstArray();
for ( sal_Int32 i=0; i<aProperties.getLength(); ++i, ++pProperties )
{
- if ( ( ( pProperties->Attributes & PropertyAttribute::TRANSIENT) != 0 )
- && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 )
+ if ( ( ( pProperties->Attributes & PropertyAttribute::TRANSIENT) != 0 )
+ && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 )
)
{
// found such a property
@@ -643,19 +643,19 @@ Any ODatabaseContext::getByName(const rtl::OUString& _rName) throw( NoSuchElemen
return makeAny( xExistent );
}
catch (NoSuchElementException&)
- { // let these exceptions through
+ { // let these exceptions through
throw;
}
catch (WrappedTargetException&)
- { // let these exceptions through
+ { // let these exceptions through
throw;
}
catch (RuntimeException&)
- { // let these exceptions through
+ { // let these exceptions through
throw;
}
catch (Exception& e)
- { // exceptions other than the speciafied ones -> wrap
+ { // exceptions other than the speciafied ones -> wrap
Any aError = ::cppu::getCaughtException();
throw WrappedTargetException(_rName, *this, aError );
}
@@ -766,5 +766,5 @@ void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForD
_rBasicManager.SetGlobalUNOConstant( "ThisDatabaseDocument", makeAny( xDatabaseDocument ) );
}
-} // namespace dbacc