From 38d077596d93bb547b5b5d4209328787f53c5a20 Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen
Date: Tue, 23 Aug 2011 15:02:39 +0200
Subject: recreated tag OOO_BUILD_3_2_98_1 which had these commits: commit
79a72f2305cadc82947c92ba4fbba3fe5536b9ae (tag: refs/tags/OOO_BUILD_3_2_98_1)
Author: Petr Mladek Date: Wed Sep 15 19:03:23 2010
+0200
Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1)
commit da0499fda565b1f105c96b3a386670c0ad0a2c2b
Merge: 5eb7688 2ee0e40
Author: Jan Holesovsky
Date: Wed Sep 8 11:33:59 2010 +0200
Merge commit 'ooo/OOO330_m7'
commit 2ee0e40b14191b4933e87cd85cee82d9ace2c800 (tag: refs/tags/ooo/OOO330_m7)
Merge: 4022fd7 f391dff
Author: Kurt Zenker
Date: Fri Sep 3 14:39:55 2010 +0200
CWS-TOOLING: integrate CWS fs33a
commit f391dff52596dca6d1944f115a8e166ccea48f1f
Author: Ocke Janssen [oj]
Date: Thu Sep 2 10:54:17 2010 +0200
fs33a: #i113583# use the categorie column as well to build table
.../source/filter/xml/xmlExportDocumentHandler.cxx | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
commit 9bac46bf7bebcadfdbf4ee03a1e64650c950e036
Author: Ocke Janssen [oj]
Date: Wed Sep 1 13:09:46 2010 +0200
dba33h: #i114246# use correct table name
dbaccess/source/core/api/KeySet.cxx | 31 +++++++++++++++++++++++++------
dbaccess/source/core/api/KeySet.hxx | 1 -
2 files changed, 25 insertions(+), 7 deletions(-)
commit bf76cc893df69ecb3408e4fcf1321c171a039c57
Author: Frank Schoenheit [fs]
Date: Fri Aug 27 13:19:56 2010 +0200
fs33a: reverting the fix for i112671. No string changes allowed in this phase.
.../source/ext/macromigration/macromigration.src | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 5521d0e17eccd263a154ad11066f07e1575eb806
Author: Ocke Janssen [oj]
Date: Tue Aug 24 15:36:19 2010 +0200
fs33a: #i113631# use m_sUpdateTableName
dbaccess/source/core/api/KeySet.cxx | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
commit 8fe8d81132d3b307e318afc1720dafe4b8fc8b3f
Author: Ocke Janssen [oj]
Date: Tue Aug 24 15:00:36 2010 +0200
fs33a: #i113744# check length of value
dbaccess/source/core/api/KeySet.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 54b57355495353aadd18c1846dec503c3d474b05
Author: Ocke Janssen [oj]
Date: Tue Aug 24 14:32:12 2010 +0200
fs33a: #i113583# handle column names from complex descriptions
.../source/core/dataaccess/documentdefinition.cxx | 17 ++--
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 27 +++++-
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 95 ++++++++++++++++++--
.../source/filter/xml/xmlExportDocumentHandler.cxx | 28 +++++-
4 files changed, 143 insertions(+), 24 deletions(-)
commit adaa62d63307602bfb940d42a8ad7d960d3fc0b2
Merge: 2fbec17 4022fd7
Author: Frank Schoenheit [fs]
Date: Tue Aug 10 14:53:21 2010 +0200
merging in latest changes from OOO330(m3)
commit 2fbec17c655c59232ba4b9f3ea3665507ba99d53
Merge: 8c9b117 5c75695
Author: Frank Schoenheit [fs]
Date: Tue Jul 6 15:24:32 2010 +0200
Automated merge with ssh://hg@hg.services.openoffice.org/cws/unoawt2
commit 5c756956da3e5b218f63022430527bc3780afbcf
Author: Frank Schoenheit [fs]
Date: Wed Jun 23 13:31:43 2010 +0200
fs33a: #i112617# fixed typo (thanks sophie)
.../source/ext/macromigration/macromigration.src | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
dbaccess/inc/AsyncronousLink.hxx | 6 +-
dbaccess/inc/IController.hxx | 32 +-
dbaccess/inc/IEnvironment.hxx | 2 +-
dbaccess/inc/IReference.hxx | 4 +-
dbaccess/inc/ToolBoxHelper.hxx | 28 +-
dbaccess/inc/controllerframe.hxx | 2 +-
dbaccess/inc/dataview.hxx | 20 +-
dbaccess/inc/dbaccess_helpid.hrc | 794 ++++++++++-----------
dbaccess/inc/dbaccess_slotid.hrc | 132 ++--
dbaccess/inc/dbaccessdllapi.h | 8 +-
dbaccess/inc/genericcontroller.hxx | 78 +-
dbaccess/inc/pch/precompiled_dbaccess.cxx | 2 +-
dbaccess/inc/pch/precompiled_dbaccess.hxx | 2 +-
dbaccess/inc/singledoccontroller.hxx | 30 +-
dbaccess/prj/dbu.xml | 2 +-
.../qa/complex/dbaccess/ApplicationController.java | 2 +-
dbaccess/qa/complex/dbaccess/Beamer.java | 4 +-
dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java | 2 +-
.../dbaccess/CopyTableInterActionHandler.java | 2 +-
dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 6 +-
dbaccess/qa/complex/dbaccess/DataSource.java | 2 +-
.../qa/complex/dbaccess/DatabaseApplication.java | 2 +-
dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 2 +-
dbaccess/qa/complex/dbaccess/FileHelper.java | 2 +-
dbaccess/qa/complex/dbaccess/Parser.java | 2 +-
dbaccess/qa/complex/dbaccess/PropertyBag.java | 2 +-
dbaccess/qa/complex/dbaccess/Query.java | 2 +-
dbaccess/qa/complex/dbaccess/QueryInQuery.java | 2 +-
dbaccess/qa/complex/dbaccess/RowSet.java | 2 +-
.../qa/complex/dbaccess/RowSetEventListener.java | 8 +-
.../dbaccess/SingleSelectQueryComposer.java | 10 +-
dbaccess/qa/complex/dbaccess/TestCase.java | 4 +-
dbaccess/qa/complex/dbaccess/UISettings.java | 2 +-
dbaccess/source/core/api/BookmarkSet.cxx | 8 +-
dbaccess/source/core/api/BookmarkSet.hxx | 2 +-
dbaccess/source/core/api/CIndexColumn.hxx | 16 +-
dbaccess/source/core/api/CIndexes.cxx | 2 +-
dbaccess/source/core/api/CIndexes.hxx | 2 +-
dbaccess/source/core/api/CRowSetColumn.cxx | 6 +-
dbaccess/source/core/api/CRowSetColumn.hxx | 6 +-
dbaccess/source/core/api/CRowSetDataColumn.cxx | 10 +-
dbaccess/source/core/api/CRowSetDataColumn.hxx | 18 +-
dbaccess/source/core/api/CacheSet.cxx | 74 +-
dbaccess/source/core/api/CacheSet.hxx | 30 +-
dbaccess/source/core/api/FilteredContainer.cxx | 34 +-
dbaccess/source/core/api/HelperCollections.cxx | 2 +-
dbaccess/source/core/api/HelperCollections.hxx | 8 +-
dbaccess/source/core/api/KeySet.cxx | 133 ++--
dbaccess/source/core/api/KeySet.hxx | 41 +-
dbaccess/source/core/api/OptimisticSet.cxx | 30 +-
dbaccess/source/core/api/OptimisticSet.hxx | 26 +-
dbaccess/source/core/api/PrivateRow.cxx | 2 +-
dbaccess/source/core/api/PrivateRow.hxx | 2 +-
dbaccess/source/core/api/RowSet.cxx | 246 +++----
dbaccess/source/core/api/RowSet.hxx | 152 ++--
dbaccess/source/core/api/RowSetBase.cxx | 72 +-
dbaccess/source/core/api/RowSetBase.hxx | 94 +--
dbaccess/source/core/api/RowSetCache.cxx | 144 ++--
dbaccess/source/core/api/RowSetCache.hxx | 66 +-
dbaccess/source/core/api/RowSetCacheIterator.cxx | 8 +-
dbaccess/source/core/api/RowSetCacheIterator.hxx | 24 +-
dbaccess/source/core/api/RowSetRow.hxx | 24 +-
.../source/core/api/SingleSelectQueryComposer.cxx | 126 ++--
dbaccess/source/core/api/StaticSet.cxx | 18 +-
dbaccess/source/core/api/StaticSet.hxx | 6 +-
dbaccess/source/core/api/TableDeco.cxx | 140 ++--
dbaccess/source/core/api/View.cxx | 6 +-
dbaccess/source/core/api/WrappedResultSet.cxx | 6 +-
dbaccess/source/core/api/WrappedResultSet.hxx | 2 +-
dbaccess/source/core/api/callablestatement.cxx | 4 +-
dbaccess/source/core/api/column.cxx | 18 +-
dbaccess/source/core/api/columnsettings.cxx | 2 +-
dbaccess/source/core/api/datacolumn.cxx | 6 +-
dbaccess/source/core/api/datacolumn.hxx | 8 +-
dbaccess/source/core/api/datasettings.cxx | 40 +-
dbaccess/source/core/api/definitioncolumn.cxx | 18 +-
dbaccess/source/core/api/preparedstatement.cxx | 2 +-
dbaccess/source/core/api/query.cxx | 14 +-
dbaccess/source/core/api/query.hxx | 30 +-
dbaccess/source/core/api/querycomposer.cxx | 2 +-
dbaccess/source/core/api/querycontainer.cxx | 30 +-
dbaccess/source/core/api/querydescriptor.cxx | 10 +-
dbaccess/source/core/api/querydescriptor.hxx | 26 +-
dbaccess/source/core/api/resultcolumn.cxx | 48 +-
dbaccess/source/core/api/resultcolumn.hxx | 6 +-
dbaccess/source/core/api/resultset.cxx | 18 +-
dbaccess/source/core/api/resultset.hxx | 22 +-
dbaccess/source/core/api/statement.cxx | 20 +-
dbaccess/source/core/api/table.cxx | 66 +-
dbaccess/source/core/api/tablecontainer.cxx | 50 +-
dbaccess/source/core/api/viewcontainer.cxx | 16 +-
.../source/core/dataaccess/ComponentDefinition.cxx | 20 +-
.../source/core/dataaccess/ComponentDefinition.hxx | 22 +-
dbaccess/source/core/dataaccess/ContentHelper.cxx | 80 +--
dbaccess/source/core/dataaccess/ModelImpl.cxx | 6 +-
dbaccess/source/core/dataaccess/ModelImpl.hxx | 50 +-
.../source/core/dataaccess/SharedConnection.cxx | 38 +-
.../source/core/dataaccess/SharedConnection.hxx | 26 +-
.../source/core/dataaccess/bookmarkcontainer.cxx | 10 +-
.../source/core/dataaccess/bookmarkcontainer.hxx | 52 +-
.../source/core/dataaccess/commandcontainer.cxx | 8 +-
.../source/core/dataaccess/commandcontainer.hxx | 8 +-
.../source/core/dataaccess/commanddefinition.cxx | 8 +-
.../source/core/dataaccess/commanddefinition.hxx | 16 +-
dbaccess/source/core/dataaccess/connection.cxx | 10 +-
dbaccess/source/core/dataaccess/connection.hxx | 30 +-
.../core/dataaccess/dataaccessdescriptor.cxx | 2 +-
.../source/core/dataaccess/databasecontext.cxx | 18 +-
.../source/core/dataaccess/databasecontext.hxx | 32 +-
.../source/core/dataaccess/databasedocument.cxx | 8 +-
.../source/core/dataaccess/databasedocument.hxx | 40 +-
.../core/dataaccess/databaseregistrations.cxx | 14 +-
.../core/dataaccess/databaseregistrations.hxx | 2 +-
dbaccess/source/core/dataaccess/datasource.cxx | 64 +-
dbaccess/source/core/dataaccess/datasource.hxx | 8 +-
.../source/core/dataaccess/definitioncontainer.cxx | 16 +-
.../source/core/dataaccess/documentcontainer.cxx | 34 +-
.../source/core/dataaccess/documentcontainer.hxx | 28 +-
.../source/core/dataaccess/documentdefinition.cxx | 43 +-
.../source/core/dataaccess/documentdefinition.hxx | 26 +-
.../core/dataaccess/documenteventexecutor.cxx | 6 +-
.../core/dataaccess/documenteventexecutor.hxx | 2 +-
.../core/dataaccess/documenteventnotifier.cxx | 6 +-
.../core/dataaccess/documenteventnotifier.hxx | 2 +-
dbaccess/source/core/dataaccess/documentevents.cxx | 12 +-
dbaccess/source/core/dataaccess/documentevents.hxx | 2 +-
dbaccess/source/core/dataaccess/intercept.cxx | 50 +-
dbaccess/source/core/dataaccess/intercept.hxx | 86 +--
.../source/core/dataaccess/myucp_datasupplier.cxx | 36 +-
.../source/core/dataaccess/myucp_datasupplier.hxx | 2 +-
.../source/core/dataaccess/myucp_resultset.cxx | 6 +-
.../source/core/dataaccess/myucp_resultset.hxx | 2 +-
dbaccess/source/core/inc/ContainerListener.hxx | 6 +-
dbaccess/source/core/inc/ContainerMediator.hxx | 12 +-
dbaccess/source/core/inc/ContentHelper.hxx | 60 +-
dbaccess/source/core/inc/DatabaseDataProvider.hxx | 37 +-
dbaccess/source/core/inc/FilteredContainer.hxx | 26 +-
dbaccess/source/core/inc/PropertyForward.hxx | 12 +-
dbaccess/source/core/inc/RefreshListener.hxx | 6 +-
.../source/core/inc/SingleSelectQueryComposer.hxx | 66 +-
dbaccess/source/core/inc/TableDeco.hxx | 34 +-
dbaccess/source/core/inc/View.hxx | 2 +-
dbaccess/source/core/inc/callablestatement.hxx | 2 +-
dbaccess/source/core/inc/column.hxx | 36 +-
dbaccess/source/core/inc/columnsettings.hxx | 36 +-
dbaccess/source/core/inc/commandbase.hxx | 20 +-
dbaccess/source/core/inc/composertools.hxx | 2 +-
dbaccess/source/core/inc/containerapprove.hxx | 2 +-
dbaccess/source/core/inc/core_resource.hrc | 112 +--
dbaccess/source/core/inc/core_resource.hxx | 18 +-
dbaccess/source/core/inc/datasettings.hxx | 38 +-
dbaccess/source/core/inc/dbamiscres.hrc | 54 +-
dbaccess/source/core/inc/definitioncolumn.hxx | 42 +-
dbaccess/source/core/inc/definitioncontainer.hxx | 68 +-
dbaccess/source/core/inc/module_dba.hxx | 2 +-
dbaccess/source/core/inc/object.hxx | 2 +-
dbaccess/source/core/inc/objectnameapproval.hxx | 4 +-
dbaccess/source/core/inc/preparedstatement.hxx | 4 +-
dbaccess/source/core/inc/querycomposer.hxx | 14 +-
dbaccess/source/core/inc/querycontainer.hxx | 18 +-
.../source/core/inc/recovery/dbdocrecovery.hxx | 2 +-
dbaccess/source/core/inc/sdbcoretools.hxx | 4 +-
dbaccess/source/core/inc/statement.hxx | 12 +-
dbaccess/source/core/inc/table.hxx | 38 +-
dbaccess/source/core/inc/tablecontainer.hxx | 28 +-
dbaccess/source/core/inc/userinformation.hxx | 6 +-
dbaccess/source/core/inc/veto.hxx | 2 +-
dbaccess/source/core/inc/viewcontainer.hxx | 20 +-
dbaccess/source/core/misc/ContainerListener.cxx | 14 +-
dbaccess/source/core/misc/ContainerMediator.cxx | 20 +-
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 105 ++-
dbaccess/source/core/misc/PropertyForward.cxx | 10 +-
dbaccess/source/core/misc/apitools.cxx | 4 +-
dbaccess/source/core/misc/dbastrings.cxx | 2 +-
dbaccess/source/core/misc/dsntypes.cxx | 36 +-
dbaccess/source/core/misc/module_dba.cxx | 2 +-
dbaccess/source/core/misc/objectnameapproval.cxx | 2 +-
dbaccess/source/core/misc/sdbcoretools.cxx | 4 +-
dbaccess/source/core/misc/services.cxx | 8 +-
dbaccess/source/core/misc/userinformation.cxx | 2 +-
dbaccess/source/core/misc/veto.cxx | 4 +-
dbaccess/source/core/recovery/dbdocrecovery.cxx | 2 +-
dbaccess/source/core/recovery/settingsimport.cxx | 2 +-
dbaccess/source/core/recovery/settingsimport.hxx | 2 +-
dbaccess/source/core/recovery/storagestream.cxx | 2 +-
dbaccess/source/core/recovery/storagestream.hxx | 2 +-
.../source/core/recovery/storagetextstream.cxx | 2 +-
.../source/core/recovery/storagetextstream.hxx | 2 +-
dbaccess/source/core/recovery/storagexmlstream.cxx | 2 +-
dbaccess/source/core/recovery/storagexmlstream.hxx | 2 +-
.../source/core/recovery/subcomponentloader.cxx | 8 +-
.../source/core/recovery/subcomponentloader.hxx | 2 +-
.../source/core/recovery/subcomponentrecovery.cxx | 16 +-
.../source/core/recovery/subcomponentrecovery.hxx | 2 +-
dbaccess/source/core/recovery/subcomponents.hxx | 2 +-
dbaccess/source/core/resource/core_resource.cxx | 6 +-
dbaccess/source/core/resource/strings.src | 4 +-
dbaccess/source/ext/adabas/ANewDb.cxx | 30 +-
dbaccess/source/ext/adabas/ANewDb.hxx | 18 +-
dbaccess/source/ext/adabas/ASQLNameEdit.hxx | 6 +-
dbaccess/source/ext/adabas/ASqlNameEdit.cxx | 10 +-
dbaccess/source/ext/adabas/Acomponentmodule.cxx | 70 +-
dbaccess/source/ext/adabas/Acomponentmodule.hxx | 54 +-
dbaccess/source/ext/adabas/AdabasNewDb.cxx | 102 +--
dbaccess/source/ext/adabas/AdabasNewDb.hrc | 72 +-
dbaccess/source/ext/adabas/AdabasNewDb.hxx | 136 ++--
dbaccess/source/ext/adabas/AdabasNewDb.src | 186 ++---
dbaccess/source/ext/adabas/Aservices.cxx | 10 +-
dbaccess/source/ext/adabas/Astringconstants.cxx | 2 +-
dbaccess/source/ext/adabas/Astringconstants.hrc | 16 +-
dbaccess/source/ext/adabas/adabasui_resource.hrc | 72 +-
dbaccess/source/ext/adabas/adabasuistrings.cxx | 2 +-
dbaccess/source/ext/adabas/adabasuistrings.hrc | 2 +-
dbaccess/source/ext/macromigration/dbmm_global.hrc | 10 +-
dbaccess/source/ext/macromigration/dbmm_module.cxx | 2 +-
dbaccess/source/ext/macromigration/dbmm_module.hxx | 2 +-
.../source/ext/macromigration/dbmm_services.cxx | 2 +-
dbaccess/source/ext/macromigration/dbmm_types.cxx | 2 +-
dbaccess/source/ext/macromigration/dbmm_types.hxx | 2 +-
.../source/ext/macromigration/docinteraction.cxx | 2 +-
.../source/ext/macromigration/docinteraction.hxx | 4 +-
.../source/ext/macromigration/macromigration.hrc | 2 +-
.../source/ext/macromigration/macromigration.src | 6 +-
.../ext/macromigration/macromigrationdialog.cxx | 4 +-
.../ext/macromigration/macromigrationdialog.hxx | 4 +-
.../ext/macromigration/macromigrationpages.cxx | 4 +-
.../ext/macromigration/macromigrationpages.hxx | 4 +-
.../ext/macromigration/macromigrationwizard.cxx | 6 +-
.../source/ext/macromigration/migrationengine.cxx | 4 +-
.../source/ext/macromigration/migrationengine.hxx | 2 +-
.../source/ext/macromigration/migrationerror.hxx | 2 +-
.../source/ext/macromigration/migrationlog.cxx | 2 +-
.../source/ext/macromigration/migrationlog.hxx | 2 +-
.../ext/macromigration/migrationprogress.hxx | 2 +-
.../source/ext/macromigration/progresscapture.cxx | 10 +-
.../source/ext/macromigration/progresscapture.hxx | 2 +-
.../source/ext/macromigration/progressmixer.cxx | 2 +-
.../source/ext/macromigration/progressmixer.hxx | 2 +-
.../source/ext/macromigration/rangeprogressbar.hxx | 2 +-
dbaccess/source/filter/migration/cfgimport.cxx | 70 +-
dbaccess/source/filter/migration/cfgimport.hxx | 116 +--
dbaccess/source/filter/migration/cfgservices.cxx | 10 +-
dbaccess/source/filter/xml/dbloader2.cxx | 34 +-
dbaccess/source/filter/xml/xmlAutoStyle.cxx | 8 +-
dbaccess/source/filter/xml/xmlAutoStyle.hxx | 4 +-
dbaccess/source/filter/xml/xmlColumn.cxx | 6 +-
dbaccess/source/filter/xml/xmlColumn.hxx | 4 +-
dbaccess/source/filter/xml/xmlComponent.cxx | 2 +-
dbaccess/source/filter/xml/xmlComponent.hxx | 4 +-
dbaccess/source/filter/xml/xmlConnectionData.cxx | 4 +-
dbaccess/source/filter/xml/xmlConnectionData.hxx | 2 +-
.../source/filter/xml/xmlConnectionResource.cxx | 2 +-
.../source/filter/xml/xmlConnectionResource.hxx | 2 +-
dbaccess/source/filter/xml/xmlDataSource.cxx | 4 +-
dbaccess/source/filter/xml/xmlDataSource.hxx | 2 +-
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 4 +-
dbaccess/source/filter/xml/xmlDataSourceInfo.hxx | 2 +-
.../source/filter/xml/xmlDataSourceSetting.cxx | 44 +-
.../source/filter/xml/xmlDataSourceSetting.hxx | 6 +-
.../source/filter/xml/xmlDataSourceSettings.cxx | 4 +-
.../source/filter/xml/xmlDataSourceSettings.hxx | 2 +-
dbaccess/source/filter/xml/xmlDatabase.cxx | 4 +-
dbaccess/source/filter/xml/xmlDatabase.hxx | 2 +-
.../source/filter/xml/xmlDatabaseDescription.cxx | 4 +-
.../source/filter/xml/xmlDatabaseDescription.hxx | 2 +-
dbaccess/source/filter/xml/xmlDocuments.cxx | 6 +-
dbaccess/source/filter/xml/xmlDocuments.hxx | 6 +-
dbaccess/source/filter/xml/xmlEnums.hxx | 40 +-
dbaccess/source/filter/xml/xmlExport.cxx | 28 +-
dbaccess/source/filter/xml/xmlExport.hxx | 102 +--
.../source/filter/xml/xmlFileBasedDatabase.cxx | 2 +-
.../source/filter/xml/xmlFileBasedDatabase.hxx | 2 +-
dbaccess/source/filter/xml/xmlHelper.cxx | 136 ++--
dbaccess/source/filter/xml/xmlHelper.hxx | 18 +-
.../source/filter/xml/xmlHierarchyCollection.cxx | 14 +-
.../source/filter/xml/xmlHierarchyCollection.hxx | 8 +-
dbaccess/source/filter/xml/xmlLogin.cxx | 4 +-
dbaccess/source/filter/xml/xmlLogin.hxx | 2 +-
dbaccess/source/filter/xml/xmlQuery.cxx | 6 +-
dbaccess/source/filter/xml/xmlQuery.hxx | 4 +-
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 4 +-
dbaccess/source/filter/xml/xmlServerDatabase.hxx | 2 +-
dbaccess/source/filter/xml/xmlStyleImport.cxx | 4 +-
dbaccess/source/filter/xml/xmlStyleImport.hxx | 20 +-
dbaccess/source/filter/xml/xmlTable.cxx | 12 +-
dbaccess/source/filter/xml/xmlTable.hxx | 14 +-
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 4 +-
dbaccess/source/filter/xml/xmlTableFilterList.hxx | 6 +-
.../source/filter/xml/xmlTableFilterPattern.cxx | 2 +-
.../source/filter/xml/xmlTableFilterPattern.hxx | 8 +-
dbaccess/source/filter/xml/xmlfilter.cxx | 210 +++---
dbaccess/source/filter/xml/xmlfilter.hxx | 52 +-
dbaccess/source/filter/xml/xmlservices.cxx | 10 +-
.../source/inc/OAuthenticationContinuation.hxx | 4 +-
dbaccess/source/inc/apitools.hxx | 488 ++++++-------
dbaccess/source/inc/cfg_reghelper.hxx | 2 +-
dbaccess/source/inc/cfgstrings.hrc | 2 +-
dbaccess/source/inc/constasciistring.hxx | 10 +-
dbaccess/source/inc/dbadllapi.hxx | 2 +-
dbaccess/source/inc/dbastrings.hrc | 4 +-
dbaccess/source/inc/dbu_reghelper.hxx | 2 +-
dbaccess/source/inc/dbustrings.hrc | 4 +-
dbaccess/source/inc/dsntypes.hxx | 42 +-
dbaccess/source/inc/flt_reghelper.hxx | 2 +-
dbaccess/source/inc/registrationhelper.hxx | 34 +-
dbaccess/source/inc/sdbtstrings.hrc | 2 +-
dbaccess/source/inc/stringconstants.hrc | 254 +++----
dbaccess/source/inc/xmlstrings.hrc | 2 +-
.../sdbtools/connection/connectiondependent.hxx | 4 +-
.../source/sdbtools/connection/connectiontools.cxx | 16 +-
.../source/sdbtools/connection/connectiontools.hxx | 2 +-
.../sdbtools/connection/datasourcemetadata.cxx | 2 +-
.../sdbtools/connection/datasourcemetadata.hxx | 2 +-
.../source/sdbtools/connection/objectnames.cxx | 12 +-
.../source/sdbtools/connection/objectnames.hxx | 2 +-
dbaccess/source/sdbtools/connection/tablename.cxx | 24 +-
dbaccess/source/sdbtools/connection/tablename.hxx | 2 +-
dbaccess/source/sdbtools/inc/module_sdbt.hxx | 2 +-
dbaccess/source/sdbtools/inc/sdbt_resource.hrc | 4 +-
dbaccess/source/sdbtools/misc/module_sdbt.cxx | 2 +-
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 10 +-
dbaccess/source/sdbtools/resource/sdbt_strings.src | 2 +-
dbaccess/source/shared/cfg_reghelper.cxx | 2 +-
dbaccess/source/shared/cfgstrings.cxx | 4 +-
dbaccess/source/shared/dbu_reghelper.cxx | 2 +-
dbaccess/source/shared/dbustrings.cxx | 12 +-
dbaccess/source/shared/flt_reghelper.cxx | 2 +-
dbaccess/source/shared/registrationhelper.cxx | 34 +-
dbaccess/source/shared/sdbtstrings.cxx | 2 +-
dbaccess/source/shared/xmlstrings.cxx | 2 +-
dbaccess/source/ui/app/AppController.cxx | 48 +-
dbaccess/source/ui/app/AppController.hxx | 114 +--
dbaccess/source/ui/app/AppControllerDnD.cxx | 20 +-
dbaccess/source/ui/app/AppControllerGen.cxx | 18 +-
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 +-
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 124 ++--
dbaccess/source/ui/app/AppDetailView.cxx | 60 +-
dbaccess/source/ui/app/AppDetailView.hxx | 94 +--
dbaccess/source/ui/app/AppIconControl.cxx | 12 +-
dbaccess/source/ui/app/AppIconControl.hxx | 16 +-
dbaccess/source/ui/app/AppSwapWindow.cxx | 12 +-
dbaccess/source/ui/app/AppSwapWindow.hxx | 32 +-
dbaccess/source/ui/app/AppTitleWindow.cxx | 24 +-
dbaccess/source/ui/app/AppTitleWindow.hxx | 22 +-
dbaccess/source/ui/app/AppView.cxx | 12 +-
dbaccess/source/ui/app/AppView.hxx | 84 +--
dbaccess/source/ui/app/IApplicationController.hxx | 8 +-
dbaccess/source/ui/app/app.src | 4 +-
dbaccess/source/ui/app/dbu_app.hrc | 70 +-
dbaccess/source/ui/app/subcomponentmanager.cxx | 2 +-
dbaccess/source/ui/app/subcomponentmanager.hxx | 2 +-
dbaccess/source/ui/browser/AsyncronousLink.cxx | 4 +-
dbaccess/source/ui/browser/bcommon.src | 2 +-
dbaccess/source/ui/browser/brwctrlr.cxx | 154 ++--
dbaccess/source/ui/browser/brwview.cxx | 38 +-
dbaccess/source/ui/browser/dataview.cxx | 18 +-
dbaccess/source/ui/browser/dbexchange.cxx | 26 +-
dbaccess/source/ui/browser/dbloader.cxx | 36 +-
dbaccess/source/ui/browser/dbtreemodel.cxx | 2 +-
dbaccess/source/ui/browser/dbtreemodel.hxx | 14 +-
dbaccess/source/ui/browser/dbtreeview.cxx | 12 +-
dbaccess/source/ui/browser/dbtreeview.hxx | 18 +-
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 14 +-
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 26 +-
dbaccess/source/ui/browser/exsrcbrw.cxx | 40 +-
dbaccess/source/ui/browser/formadapter.cxx | 14 +-
dbaccess/source/ui/browser/genericcontroller.cxx | 48 +-
dbaccess/source/ui/browser/sbabrw.src | 60 +-
dbaccess/source/ui/browser/sbagrid.cxx | 206 +++---
dbaccess/source/ui/browser/sbagrid.src | 2 +-
dbaccess/source/ui/browser/sbamultiplex.cxx | 4 +-
dbaccess/source/ui/browser/unodatbr.cxx | 236 +++---
dbaccess/source/ui/control/ColumnControlWindow.cxx | 12 +-
dbaccess/source/ui/control/FieldDescControl.cxx | 98 +--
dbaccess/source/ui/control/RelationControl.cxx | 88 +--
dbaccess/source/ui/control/ScrollHelper.cxx | 6 +-
dbaccess/source/ui/control/SqlNameEdit.cxx | 12 +-
dbaccess/source/ui/control/TableGrantCtrl.cxx | 46 +-
dbaccess/source/ui/control/TableGrantCtrl.src | 2 +-
dbaccess/source/ui/control/VertSplitView.cxx | 38 +-
dbaccess/source/ui/control/charsetlistbox.cxx | 2 +-
dbaccess/source/ui/control/curledit.cxx | 8 +-
dbaccess/source/ui/control/dbtreelistbox.cxx | 26 +-
dbaccess/source/ui/control/listviewitems.cxx | 4 +-
dbaccess/source/ui/control/marktree.cxx | 14 +-
dbaccess/source/ui/control/opendoccontrols.cxx | 2 +-
dbaccess/source/ui/control/sqledit.cxx | 4 +-
dbaccess/source/ui/control/statusbarontroller.cxx | 2 +-
dbaccess/source/ui/control/tabletree.cxx | 10 +-
dbaccess/source/ui/control/tabletree.hrc | 6 +-
dbaccess/source/ui/control/tabletree.src | 2 +-
dbaccess/source/ui/control/toolboxcontroller.cxx | 4 +-
dbaccess/source/ui/control/undosqledit.cxx | 2 +-
dbaccess/source/ui/control/undosqledit.src | 2 +-
dbaccess/source/ui/dlg/AdabasPage.hrc | 24 +-
dbaccess/source/ui/dlg/AdabasStat.cxx | 38 +-
dbaccess/source/ui/dlg/AdabasStat.hrc | 28 +-
dbaccess/source/ui/dlg/AdabasStat.hxx | 34 +-
dbaccess/source/ui/dlg/AdabasStat.src | 112 +--
dbaccess/source/ui/dlg/AutoControls.src | 4 +-
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 160 ++---
dbaccess/source/ui/dlg/CollectionView.cxx | 28 +-
dbaccess/source/ui/dlg/CollectionView.hrc | 24 +-
dbaccess/source/ui/dlg/CollectionView.src | 40 +-
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 44 +-
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 56 +-
dbaccess/source/ui/dlg/ConnectionPage.cxx | 6 +-
dbaccess/source/ui/dlg/ConnectionPage.hrc | 2 +-
dbaccess/source/ui/dlg/ConnectionPage.hxx | 34 +-
dbaccess/source/ui/dlg/ConnectionPage.src | 2 +-
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 28 +-
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 32 +-
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 72 +-
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 86 +--
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 80 +--
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 56 +-
dbaccess/source/ui/dlg/DriverSettings.cxx | 2 +-
dbaccess/source/ui/dlg/DriverSettings.hxx | 34 +-
dbaccess/source/ui/dlg/ExtensionNotPresent.cxx | 24 +-
dbaccess/source/ui/dlg/ExtensionNotPresent.hrc | 24 +-
dbaccess/source/ui/dlg/ExtensionNotPresent.src | 12 +-
dbaccess/source/ui/dlg/RelationDlg.cxx | 20 +-
dbaccess/source/ui/dlg/RelationDlg.hrc | 22 +-
dbaccess/source/ui/dlg/RelationDlg.src | 6 +-
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 4 +-
dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 58 +-
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 40 +-
dbaccess/source/ui/dlg/UserAdmin.cxx | 64 +-
dbaccess/source/ui/dlg/UserAdmin.hrc | 42 +-
dbaccess/source/ui/dlg/UserAdmin.hxx | 40 +-
dbaccess/source/ui/dlg/UserAdmin.src | 92 +--
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 6 +-
dbaccess/source/ui/dlg/UserAdminDlg.hrc | 4 +-
dbaccess/source/ui/dlg/UserAdminDlg.src | 8 +-
dbaccess/source/ui/dlg/admincontrols.cxx | 22 +-
dbaccess/source/ui/dlg/admincontrols.hrc | 2 +-
dbaccess/source/ui/dlg/admincontrols.hxx | 10 +-
dbaccess/source/ui/dlg/admincontrols.src | 12 +-
dbaccess/source/ui/dlg/adminpages.cxx | 12 +-
dbaccess/source/ui/dlg/adminpages.hxx | 78 +-
dbaccess/source/ui/dlg/adodatalinks.cxx | 40 +-
dbaccess/source/ui/dlg/adodatalinks.hxx | 2 +-
dbaccess/source/ui/dlg/adtabdlg.cxx | 22 +-
dbaccess/source/ui/dlg/adtabdlg.hrc | 12 +-
dbaccess/source/ui/dlg/adtabdlg.src | 2 +-
dbaccess/source/ui/dlg/advancedsettings.cxx | 6 +-
dbaccess/source/ui/dlg/advancedsettings.hrc | 42 +-
dbaccess/source/ui/dlg/advancedsettings.hxx | 6 +-
dbaccess/source/ui/dlg/advancedsettings.src | 30 +-
dbaccess/source/ui/dlg/dbadmin.cxx | 20 +-
dbaccess/source/ui/dlg/dbadmin.hrc | 10 +-
dbaccess/source/ui/dlg/dbadmin.src | 116 +--
dbaccess/source/ui/dlg/dbadmin2.src | 24 +-
dbaccess/source/ui/dlg/dbadminsetup.hrc | 88 +--
dbaccess/source/ui/dlg/dbadminsetup.src | 26 +-
dbaccess/source/ui/dlg/dbfindex.cxx | 52 +-
dbaccess/source/ui/dlg/dbfindex.hrc | 18 +-
dbaccess/source/ui/dlg/dbfindex.hxx | 52 +-
dbaccess/source/ui/dlg/dbfindex.src | 10 +-
dbaccess/source/ui/dlg/dbwiz.cxx | 22 +-
dbaccess/source/ui/dlg/dbwizsetup.cxx | 20 +-
dbaccess/source/ui/dlg/detailpages.cxx | 136 ++--
dbaccess/source/ui/dlg/detailpages.hxx | 202 +++---
dbaccess/source/ui/dlg/directsql.cxx | 36 +-
dbaccess/source/ui/dlg/directsql.hrc | 24 +-
dbaccess/source/ui/dlg/directsql.src | 22 +-
dbaccess/source/ui/dlg/dlgattr.cxx | 10 +-
dbaccess/source/ui/dlg/dlgattr.src | 2 +-
dbaccess/source/ui/dlg/dlgsave.cxx | 64 +-
dbaccess/source/ui/dlg/dlgsave.hrc | 32 +-
dbaccess/source/ui/dlg/dlgsave.src | 14 +-
dbaccess/source/ui/dlg/dlgsize.cxx | 14 +-
dbaccess/source/ui/dlg/dlgsize.hrc | 14 +-
dbaccess/source/ui/dlg/dlgsize.src | 6 +-
dbaccess/source/ui/dlg/dsnItem.hxx | 12 +-
dbaccess/source/ui/dlg/dsselect.cxx | 30 +-
dbaccess/source/ui/dlg/dsselect.hrc | 20 +-
dbaccess/source/ui/dlg/dsselect.hxx | 26 +-
dbaccess/source/ui/dlg/dsselect.src | 4 +-
dbaccess/source/ui/dlg/finteraction.cxx | 4 +-
dbaccess/source/ui/dlg/finteraction.hxx | 16 +-
dbaccess/source/ui/dlg/generalpage.cxx | 30 +-
dbaccess/source/ui/dlg/generalpage.hxx | 54 +-
dbaccess/source/ui/dlg/indexdialog.cxx | 86 +--
dbaccess/source/ui/dlg/indexdialog.hrc | 22 +-
dbaccess/source/ui/dlg/indexdialog.src | 14 +-
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 30 +-
dbaccess/source/ui/dlg/odbcconfig.cxx | 40 +-
dbaccess/source/ui/dlg/odbcconfig.hxx | 24 +-
dbaccess/source/ui/dlg/optionalboolitem.cxx | 2 +-
dbaccess/source/ui/dlg/optionalboolitem.hxx | 6 +-
dbaccess/source/ui/dlg/paramdialog.cxx | 70 +-
dbaccess/source/ui/dlg/paramdialog.hrc | 24 +-
dbaccess/source/ui/dlg/paramdialog.src | 6 +-
dbaccess/source/ui/dlg/queryfilter.cxx | 70 +-
dbaccess/source/ui/dlg/queryfilter.hrc | 44 +-
dbaccess/source/ui/dlg/queryfilter.src | 14 +-
dbaccess/source/ui/dlg/queryorder.cxx | 42 +-
dbaccess/source/ui/dlg/queryorder.hrc | 32 +-
dbaccess/source/ui/dlg/queryorder.src | 2 +-
dbaccess/source/ui/dlg/sqlmessage.cxx | 34 +-
dbaccess/source/ui/dlg/sqlmessage.hrc | 22 +-
dbaccess/source/ui/dlg/sqlmessage.src | 2 +-
dbaccess/source/ui/dlg/tablespage.cxx | 72 +-
dbaccess/source/ui/dlg/tablespage.hxx | 34 +-
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 2 +-
dbaccess/source/ui/dlg/textconnectionsettings.src | 2 +-
dbaccess/source/ui/imagelists/dbimagelists.src | 2 +-
dbaccess/source/ui/inc/AccessibleBaseIFace.hxx | 16 +-
dbaccess/source/ui/inc/AppElementType.hxx | 18 +-
dbaccess/source/ui/inc/CollectionView.hxx | 40 +-
dbaccess/source/ui/inc/ColumnControlWindow.hxx | 38 +-
dbaccess/source/ui/inc/ConnectionLine.hxx | 48 +-
dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 12 +-
dbaccess/source/ui/inc/ConnectionLineData.hxx | 34 +-
dbaccess/source/ui/inc/DExport.hxx | 98 +--
dbaccess/source/ui/inc/ExtensionNotPresent.hxx | 12 +-
dbaccess/source/ui/inc/FieldControls.hxx | 32 +-
dbaccess/source/ui/inc/FieldDescControl.hxx | 220 +++---
dbaccess/source/ui/inc/FieldDescriptions.hxx | 112 +--
dbaccess/source/ui/inc/GeneralUndo.hxx | 10 +-
dbaccess/source/ui/inc/HtmlReader.hxx | 34 +-
dbaccess/source/ui/inc/IClipBoardTest.hxx | 16 +-
dbaccess/source/ui/inc/IItemSetHelper.hxx | 6 +-
dbaccess/source/ui/inc/IUpdateHelper.hxx | 2 +-
dbaccess/source/ui/inc/JAccess.hxx | 16 +-
dbaccess/source/ui/inc/JoinController.hxx | 32 +-
dbaccess/source/ui/inc/JoinDesignView.hxx | 12 +-
dbaccess/source/ui/inc/JoinExchange.hxx | 22 +-
dbaccess/source/ui/inc/JoinTableView.hxx | 126 ++--
dbaccess/source/ui/inc/QEnumTypes.hxx | 40 +-
dbaccess/source/ui/inc/QueryDesignView.hxx | 28 +-
dbaccess/source/ui/inc/QueryTableView.hxx | 26 +-
dbaccess/source/ui/inc/QueryTextView.hxx | 6 +-
dbaccess/source/ui/inc/QueryViewSwitch.hxx | 18 +-
dbaccess/source/ui/inc/RTableConnectionData.hxx | 38 +-
dbaccess/source/ui/inc/RefFunctor.hxx | 10 +-
dbaccess/source/ui/inc/RelControliFace.hxx | 6 +-
dbaccess/source/ui/inc/RelationControl.hrc | 2 +-
dbaccess/source/ui/inc/RelationControl.hxx | 32 +-
dbaccess/source/ui/inc/RelationController.hxx | 22 +-
dbaccess/source/ui/inc/RelationDesignView.hxx | 6 +-
dbaccess/source/ui/inc/RelationDlg.hxx | 26 +-
dbaccess/source/ui/inc/RelationTableView.hxx | 10 +-
dbaccess/source/ui/inc/RtfReader.hxx | 20 +-
dbaccess/source/ui/inc/ScrollHelper.hxx | 20 +-
dbaccess/source/ui/inc/SqlNameEdit.hxx | 30 +-
dbaccess/source/ui/inc/TableConnection.hxx | 40 +-
dbaccess/source/ui/inc/TableConnectionData.hxx | 18 +-
dbaccess/source/ui/inc/TableController.hxx | 92 +--
dbaccess/source/ui/inc/TableCopyHelper.hxx | 58 +-
dbaccess/source/ui/inc/TableDesignControl.hxx | 40 +-
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 12 +-
dbaccess/source/ui/inc/TableDesignView.hxx | 40 +-
dbaccess/source/ui/inc/TableFieldDescription.hxx | 152 ++--
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 30 +-
dbaccess/source/ui/inc/TableRow.hxx | 24 +-
dbaccess/source/ui/inc/TableRowExchange.hxx | 12 +-
dbaccess/source/ui/inc/TableWindow.hxx | 106 +--
dbaccess/source/ui/inc/TableWindowAccess.hxx | 14 +-
dbaccess/source/ui/inc/TableWindowData.hxx | 46 +-
dbaccess/source/ui/inc/TableWindowListBox.hxx | 36 +-
dbaccess/source/ui/inc/TableWindowTitle.hxx | 6 +-
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 20 +-
dbaccess/source/ui/inc/TokenWriter.hxx | 92 +--
dbaccess/source/ui/inc/TypeInfo.hxx | 130 ++--
dbaccess/source/ui/inc/UITools.hxx | 160 ++---
dbaccess/source/ui/inc/UserAdminDlg.hxx | 16 +-
dbaccess/source/ui/inc/VertSplitView.hxx | 12 +-
dbaccess/source/ui/inc/WCPage.hxx | 46 +-
dbaccess/source/ui/inc/WColumnSelect.hxx | 36 +-
dbaccess/source/ui/inc/WCopyTable.hxx | 136 ++--
dbaccess/source/ui/inc/WExtendPages.hxx | 8 +-
dbaccess/source/ui/inc/WNameMatch.hxx | 28 +-
dbaccess/source/ui/inc/WTabPage.hxx | 18 +-
dbaccess/source/ui/inc/WTypeSelect.hxx | 66 +-
dbaccess/source/ui/inc/adtabdlg.hxx | 10 +-
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 10 +-
dbaccess/source/ui/inc/asyncmodaldialog.hxx | 2 +-
dbaccess/source/ui/inc/browserids.hxx | 140 ++--
dbaccess/source/ui/inc/brwctrlr.hxx | 108 +--
dbaccess/source/ui/inc/brwview.hxx | 34 +-
dbaccess/source/ui/inc/callbacks.hxx | 12 +-
dbaccess/source/ui/inc/charsetlistbox.hxx | 4 +-
dbaccess/source/ui/inc/charsets.hxx | 38 +-
dbaccess/source/ui/inc/commontypes.hxx | 6 +-
dbaccess/source/ui/inc/curledit.hxx | 26 +-
dbaccess/source/ui/inc/databaseobjectview.hxx | 16 +-
dbaccess/source/ui/inc/datasourceconnector.hxx | 12 +-
dbaccess/source/ui/inc/datasourcemap.hxx | 100 +--
dbaccess/source/ui/inc/dbadmin.hxx | 34 +-
dbaccess/source/ui/inc/dbexchange.hxx | 28 +-
dbaccess/source/ui/inc/dbtreelistbox.hxx | 100 +--
dbaccess/source/ui/inc/dbu_brw.hrc | 42 +-
dbaccess/source/ui/inc/dbu_control.hrc | 30 +-
dbaccess/source/ui/inc/dbu_dlg.hrc | 132 ++--
dbaccess/source/ui/inc/dbu_misc.hrc | 26 +-
dbaccess/source/ui/inc/dbu_qry.hrc | 90 +--
dbaccess/source/ui/inc/dbu_rel.hrc | 16 +-
dbaccess/source/ui/inc/dbu_resource.hrc | 510 ++++++-------
dbaccess/source/ui/inc/dbu_tbl.hrc | 102 +--
dbaccess/source/ui/inc/dbu_uno.hrc | 10 +-
dbaccess/source/ui/inc/dbwiz.hxx | 38 +-
dbaccess/source/ui/inc/dbwizsetup.hxx | 38 +-
dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 2 +-
dbaccess/source/ui/inc/directsql.hxx | 66 +-
dbaccess/source/ui/inc/dlgattr.hrc | 10 +-
dbaccess/source/ui/inc/dlgattr.hxx | 4 +-
dbaccess/source/ui/inc/dlgsave.hxx | 18 +-
dbaccess/source/ui/inc/dlgsize.hxx | 20 +-
dbaccess/source/ui/inc/dsitems.hxx | 106 +--
dbaccess/source/ui/inc/dsmeta.hxx | 2 +-
dbaccess/source/ui/inc/exsrcbrw.hxx | 14 +-
dbaccess/source/ui/inc/formadapter.hxx | 132 ++--
dbaccess/source/ui/inc/imageprovider.hxx | 2 +-
dbaccess/source/ui/inc/indexcollection.hxx | 16 +-
dbaccess/source/ui/inc/indexdialog.hxx | 48 +-
dbaccess/source/ui/inc/indexes.hxx | 38 +-
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 32 +-
dbaccess/source/ui/inc/linkeddocuments.hxx | 12 +-
dbaccess/source/ui/inc/listviewitems.hxx | 14 +-
dbaccess/source/ui/inc/localresaccess.hxx | 6 +-
dbaccess/source/ui/inc/marktree.hxx | 14 +-
dbaccess/source/ui/inc/moduledbu.hxx | 22 +-
dbaccess/source/ui/inc/objectnamecheck.hxx | 4 +-
dbaccess/source/ui/inc/opendoccontrols.hxx | 2 +-
dbaccess/source/ui/inc/paramdialog.hxx | 26 +-
dbaccess/source/ui/inc/propertysetitem.hxx | 10 +-
dbaccess/source/ui/inc/propertystorage.hxx | 2 +-
dbaccess/source/ui/inc/querycontainerwindow.hxx | 58 +-
dbaccess/source/ui/inc/querycontroller.hxx | 82 +--
dbaccess/source/ui/inc/queryfilter.hxx | 70 +-
dbaccess/source/ui/inc/queryorder.hxx | 54 +-
dbaccess/source/ui/inc/queryview.hxx | 14 +-
dbaccess/source/ui/inc/sbagrid.hrc | 106 +--
dbaccess/source/ui/inc/sbagrid.hxx | 68 +-
dbaccess/source/ui/inc/sbamultiplex.hxx | 450 ++++++------
dbaccess/source/ui/inc/sqledit.hxx | 20 +-
dbaccess/source/ui/inc/sqlmessage.hxx | 18 +-
dbaccess/source/ui/inc/statusbarontroller.hxx | 4 +-
dbaccess/source/ui/inc/stringlistitem.hxx | 12 +-
dbaccess/source/ui/inc/tabletree.hxx | 42 +-
dbaccess/source/ui/inc/textconnectionsettings.hxx | 4 +-
dbaccess/source/ui/inc/toolbox_tmpl.hrc | 48 +-
dbaccess/source/ui/inc/toolboxcontroller.hxx | 10 +-
dbaccess/source/ui/inc/undosqledit.hxx | 10 +-
dbaccess/source/ui/inc/unoadmin.hxx | 16 +-
dbaccess/source/ui/inc/unodatbr.hxx | 104 +--
dbaccess/source/ui/inc/unosqlmessage.hxx | 8 +-
dbaccess/source/ui/misc/DExport.cxx | 84 +--
dbaccess/source/ui/misc/HtmlReader.cxx | 52 +-
dbaccess/source/ui/misc/ModuleHelper.cxx | 4 +-
dbaccess/source/ui/misc/RowSetDrop.cxx | 22 +-
dbaccess/source/ui/misc/RtfReader.cxx | 28 +-
dbaccess/source/ui/misc/TableCopyHelper.cxx | 26 +-
dbaccess/source/ui/misc/TokenWriter.cxx | 166 ++---
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 22 +-
dbaccess/source/ui/misc/UITools.cxx | 188 ++---
dbaccess/source/ui/misc/UpdateHelperImpl.hxx | 6 +-
dbaccess/source/ui/misc/WCPage.cxx | 62 +-
dbaccess/source/ui/misc/WColumnSelect.cxx | 28 +-
dbaccess/source/ui/misc/WCopyTable.cxx | 48 +-
dbaccess/source/ui/misc/WExtendPages.cxx | 2 +-
dbaccess/source/ui/misc/WNameMatch.cxx | 68 +-
dbaccess/source/ui/misc/WTypeSelect.cxx | 28 +-
dbaccess/source/ui/misc/WizardPages.hrc | 56 +-
dbaccess/source/ui/misc/WizardPages.src | 214 +++---
dbaccess/source/ui/misc/asyncmodaldialog.cxx | 2 +-
dbaccess/source/ui/misc/charsets.cxx | 10 +-
dbaccess/source/ui/misc/controllerframe.cxx | 16 +-
dbaccess/source/ui/misc/databaseobjectview.cxx | 10 +-
dbaccess/source/ui/misc/datasourceconnector.cxx | 20 +-
dbaccess/source/ui/misc/dbumiscres.hrc | 54 +-
dbaccess/source/ui/misc/dbumiscres.src | 6 +-
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2 +-
dbaccess/source/ui/misc/dsmeta.cxx | 4 +-
dbaccess/source/ui/misc/imageprovider.cxx | 2 +-
dbaccess/source/ui/misc/indexcollection.cxx | 26 +-
dbaccess/source/ui/misc/linkeddocuments.cxx | 64 +-
dbaccess/source/ui/misc/moduledbu.cxx | 24 +-
dbaccess/source/ui/misc/propertysetitem.cxx | 4 +-
dbaccess/source/ui/misc/propertystorage.cxx | 2 +-
dbaccess/source/ui/misc/singledoccontroller.cxx | 44 +-
dbaccess/source/ui/misc/stringlistitem.cxx | 4 +-
dbaccess/source/ui/misc/uiservices.cxx | 6 +-
dbaccess/source/ui/querydesign/ConnectionData.hxx | 14 +-
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 60 +-
.../source/ui/querydesign/ConnectionLineAccess.cxx | 14 +-
.../source/ui/querydesign/ConnectionLineData.cxx | 4 +-
dbaccess/source/ui/querydesign/JAccess.cxx | 2 +-
dbaccess/source/ui/querydesign/JoinController.cxx | 24 +-
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 8 +-
dbaccess/source/ui/querydesign/JoinExchange.cxx | 8 +-
dbaccess/source/ui/querydesign/JoinTableView.cxx | 72 +-
.../source/ui/querydesign/QTableConnection.cxx | 8 +-
.../source/ui/querydesign/QTableConnection.hxx | 10 +-
.../source/ui/querydesign/QTableConnectionData.cxx | 6 +-
.../source/ui/querydesign/QTableConnectionData.hxx | 30 +-
dbaccess/source/ui/querydesign/QTableWindow.cxx | 6 +-
dbaccess/source/ui/querydesign/QTableWindow.hxx | 40 +-
.../source/ui/querydesign/QTableWindowData.cxx | 2 +-
.../source/ui/querydesign/QTableWindowData.hxx | 2 +-
dbaccess/source/ui/querydesign/Query.hrc | 6 +-
.../ui/querydesign/QueryAddTabConnUndoAction.hxx | 2 +-
.../ui/querydesign/QueryDesignFieldUndoAct.hxx | 38 +-
.../ui/querydesign/QueryDesignUndoAction.hxx | 4 +-
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 318 ++++-----
.../ui/querydesign/QueryMoveTabWinUndoAct.cxx | 2 +-
.../ui/querydesign/QueryMoveTabWinUndoAct.hxx | 10 +-
.../ui/querydesign/QuerySizeTabWinUndoAct.hxx | 12 +-
.../ui/querydesign/QueryTabConnUndoAction.cxx | 92 +--
.../ui/querydesign/QueryTabConnUndoAction.hxx | 6 +-
.../ui/querydesign/QueryTabWinShowUndoAct.hxx | 10 +-
.../source/ui/querydesign/QueryTabWinUndoAct.cxx | 28 +-
.../source/ui/querydesign/QueryTabWinUndoAct.hxx | 16 +-
dbaccess/source/ui/querydesign/QueryTableView.cxx | 90 +--
dbaccess/source/ui/querydesign/QueryTextView.cxx | 14 +-
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 30 +-
.../source/ui/querydesign/SelectionBrowseBox.cxx | 246 +++----
.../source/ui/querydesign/SelectionBrowseBox.hxx | 340 ++++-----
dbaccess/source/ui/querydesign/TableConnection.cxx | 4 +-
.../source/ui/querydesign/TableConnectionData.cxx | 12 +-
.../ui/querydesign/TableFieldDescription.cxx | 30 +-
dbaccess/source/ui/querydesign/TableFieldInfo.cxx | 2 +-
dbaccess/source/ui/querydesign/TableFieldInfo.hxx | 14 +-
dbaccess/source/ui/querydesign/TableWindow.cxx | 46 +-
.../source/ui/querydesign/TableWindowAccess.cxx | 18 +-
dbaccess/source/ui/querydesign/TableWindowData.cxx | 4 +-
.../source/ui/querydesign/TableWindowListBox.cxx | 30 +-
.../source/ui/querydesign/TableWindowTitle.cxx | 14 +-
dbaccess/source/ui/querydesign/query.src | 2 +-
.../source/ui/querydesign/querycontainerwindow.cxx | 28 +-
dbaccess/source/ui/querydesign/querycontroller.cxx | 36 +-
dbaccess/source/ui/querydesign/querydlg.cxx | 38 +-
dbaccess/source/ui/querydesign/querydlg.hrc | 16 +-
dbaccess/source/ui/querydesign/querydlg.hxx | 32 +-
dbaccess/source/ui/querydesign/querydlg.src | 8 +-
dbaccess/source/ui/querydesign/queryview.cxx | 2 +-
.../source/ui/relationdesign/RTableConnection.cxx | 10 +-
.../source/ui/relationdesign/RTableConnection.hxx | 4 +-
.../ui/relationdesign/RTableConnectionData.cxx | 34 +-
dbaccess/source/ui/relationdesign/RTableWindow.hxx | 8 +-
.../ui/relationdesign/RelationController.cxx | 64 +-
.../ui/relationdesign/RelationDesignView.cxx | 8 +-
.../source/ui/relationdesign/RelationTableView.cxx | 30 +-
dbaccess/source/ui/relationdesign/relation.src | 2 +-
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 4 +-
dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 10 +-
.../source/ui/tabledesign/FieldDescriptions.cxx | 50 +-
dbaccess/source/ui/tabledesign/TEditControl.cxx | 100 +--
dbaccess/source/ui/tabledesign/TEditControl.hxx | 82 +--
dbaccess/source/ui/tabledesign/TableController.cxx | 242 +++----
.../source/ui/tabledesign/TableDesignControl.cxx | 8 +-
.../source/ui/tabledesign/TableDesignHelpBar.cxx | 6 +-
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 34 +-
.../source/ui/tabledesign/TableFieldControl.cxx | 8 +-
.../source/ui/tabledesign/TableFieldControl.hxx | 28 +-
.../source/ui/tabledesign/TableFieldDescWin.cxx | 74 +-
.../source/ui/tabledesign/TableFieldDescWin.hxx | 20 +-
dbaccess/source/ui/tabledesign/TableRow.cxx | 16 +-
.../source/ui/tabledesign/TableRowExchange.cxx | 4 +-
dbaccess/source/ui/tabledesign/TableUndo.cxx | 12 +-
dbaccess/source/ui/tabledesign/TableUndo.hxx | 62 +-
dbaccess/source/ui/tabledesign/table.src | 14 +-
dbaccess/source/ui/uno/AdabasSettingsDlg.cxx | 6 +-
dbaccess/source/ui/uno/AdabasSettingsDlg.hxx | 6 +-
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 8 +-
dbaccess/source/ui/uno/ColumnControl.cxx | 10 +-
dbaccess/source/ui/uno/ColumnControl.hxx | 8 +-
dbaccess/source/ui/uno/ColumnModel.cxx | 16 +-
dbaccess/source/ui/uno/ColumnModel.hxx | 30 +-
dbaccess/source/ui/uno/ColumnPeer.cxx | 20 +-
dbaccess/source/ui/uno/ColumnPeer.hxx | 8 +-
dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 6 +-
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 6 +-
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 8 +-
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 6 +-
dbaccess/source/ui/uno/TableFilterDlg.cxx | 6 +-
dbaccess/source/ui/uno/TableFilterDlg.hxx | 6 +-
dbaccess/source/ui/uno/UserSettingsDlg.cxx | 6 +-
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 6 +-
dbaccess/source/ui/uno/admindlg.cxx | 8 +-
dbaccess/source/ui/uno/admindlg.hxx | 6 +-
dbaccess/source/ui/uno/composerdialogs.cxx | 18 +-
dbaccess/source/ui/uno/composerdialogs.hxx | 2 +-
dbaccess/source/ui/uno/copytablewizard.cxx | 16 +-
dbaccess/source/ui/uno/copytablewizard.src | 2 +-
dbaccess/source/ui/uno/dbinteraction.cxx | 12 +-
dbaccess/source/ui/uno/dbinteraction.hxx | 18 +-
dbaccess/source/ui/uno/dbinteraction.src | 2 +-
.../source/ui/uno/textconnectionsettings_uno.cxx | 8 +-
dbaccess/source/ui/uno/unoDirectSql.cxx | 18 +-
dbaccess/source/ui/uno/unoDirectSql.hxx | 16 +-
dbaccess/source/ui/uno/unoadmin.cxx | 6 +-
dbaccess/source/ui/uno/unosqlmessage.cxx | 6 +-
dbaccess/uiconfig/dbapp/toolbar/toolbar.xml | 2 +-
dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml | 4 +-
dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml | 4 +-
dbaccess/util/hidother.src | 778 ++++++++++----------
dbaccess/win32/source/odbcconfig/odbcconfig.cxx | 4 +-
reportdesign/inc/ModuleHelper.hxx | 22 +-
reportdesign/inc/PropertyForward.hxx | 22 +-
reportdesign/inc/ReportDefinition.hxx | 26 +-
reportdesign/inc/ReportHelperDefines.hxx | 4 +-
reportdesign/inc/ReportVisitor.hxx | 4 +-
reportdesign/inc/RptDef.hxx | 10 +-
reportdesign/inc/RptModel.hxx | 8 +-
reportdesign/inc/RptObject.hxx | 46 +-
reportdesign/inc/RptPage.hxx | 12 +-
reportdesign/inc/RptResId.hrc | 386 +++++-----
reportdesign/inc/UndoActions.hxx | 48 +-
reportdesign/inc/UndoEnv.hxx | 14 +-
reportdesign/inc/conditionalexpression.hxx | 2 +-
reportdesign/inc/dllapi.h | 8 +-
reportdesign/inc/helpids.hrc | 158 ++--
reportdesign/inc/pch/precompiled_reportdesign.cxx | 2 +-
reportdesign/inc/pch/precompiled_reportdesign.hxx | 2 +-
reportdesign/inc/reportformula.hxx | 2 +-
reportdesign/inc/rptui_slotid.hrc | 300 ++++----
reportdesign/qa/complex/ReportDesignerTest.java | 122 ++--
reportdesign/source/core/api/FixedLine.cxx | 44 +-
reportdesign/source/core/api/FixedText.cxx | 10 +-
reportdesign/source/core/api/FormatCondition.cxx | 10 +-
reportdesign/source/core/api/FormattedField.cxx | 12 +-
reportdesign/source/core/api/Function.cxx | 10 +-
reportdesign/source/core/api/Functions.cxx | 18 +-
reportdesign/source/core/api/Group.cxx | 22 +-
reportdesign/source/core/api/Groups.cxx | 22 +-
reportdesign/source/core/api/ImageControl.cxx | 100 +--
reportdesign/source/core/api/ReportComponent.cxx | 2 +-
.../source/core/api/ReportControlModel.cxx | 2 +-
reportdesign/source/core/api/ReportDefinition.cxx | 394 +++++-----
reportdesign/source/core/api/ReportEngineJFree.cxx | 2 +-
reportdesign/source/core/api/ReportVisitor.cxx | 4 +-
reportdesign/source/core/api/Section.cxx | 26 +-
reportdesign/source/core/api/Shape.cxx | 22 +-
reportdesign/source/core/api/Tools.cxx | 2 +-
reportdesign/source/core/api/services.cxx | 6 +-
reportdesign/source/core/inc/FixedLine.hxx | 32 +-
reportdesign/source/core/inc/FixedText.hxx | 20 +-
reportdesign/source/core/inc/FormatCondition.hxx | 22 +-
reportdesign/source/core/inc/FormattedField.hxx | 24 +-
reportdesign/source/core/inc/Function.hxx | 18 +-
reportdesign/source/core/inc/Functions.hxx | 26 +-
reportdesign/source/core/inc/Group.hxx | 34 +-
reportdesign/source/core/inc/Groups.hxx | 28 +-
reportdesign/source/core/inc/ImageControl.hxx | 22 +-
reportdesign/source/core/inc/ReportComponent.hxx | 28 +-
.../source/core/inc/ReportControlModel.hxx | 58 +-
reportdesign/source/core/inc/ReportDrawPage.hxx | 2 +-
reportdesign/source/core/inc/ReportEngineJFree.hxx | 26 +-
reportdesign/source/core/inc/ReportHelperImpl.hxx | 2 +-
reportdesign/source/core/inc/ReportUndoFactory.hxx | 6 +-
reportdesign/source/core/inc/RptObjectListener.hxx | 6 +-
reportdesign/source/core/inc/Section.hxx | 62 +-
reportdesign/source/core/inc/Shape.hxx | 16 +-
reportdesign/source/core/inc/Tools.hxx | 4 +-
reportdesign/source/core/inc/conditionupdater.hxx | 2 +-
reportdesign/source/core/inc/core_resource.hrc | 36 +-
reportdesign/source/core/inc/core_resource.hxx | 4 +-
.../source/core/misc/conditionalexpression.cxx | 2 +-
reportdesign/source/core/misc/conditionupdater.cxx | 2 +-
reportdesign/source/core/misc/reportformula.cxx | 10 +-
.../source/core/resource/core_resource.cxx | 6 +-
reportdesign/source/core/resource/strings.src | 2 +-
reportdesign/source/core/sdr/ModuleHelper.cxx | 22 +-
reportdesign/source/core/sdr/PropertyForward.cxx | 14 +-
reportdesign/source/core/sdr/ReportDrawPage.cxx | 4 +-
reportdesign/source/core/sdr/ReportUndoFactory.cxx | 10 +-
reportdesign/source/core/sdr/RptModel.cxx | 8 +-
reportdesign/source/core/sdr/RptObject.cxx | 74 +-
reportdesign/source/core/sdr/RptObjectListener.cxx | 6 +-
reportdesign/source/core/sdr/RptPage.cxx | 30 +-
reportdesign/source/core/sdr/UndoActions.cxx | 20 +-
reportdesign/source/core/sdr/UndoEnv.cxx | 34 +-
reportdesign/source/core/sdr/formatnormalizer.cxx | 8 +-
reportdesign/source/core/sdr/formatnormalizer.hxx | 2 +-
reportdesign/source/filter/xml/dbloader2.cxx | 4 +-
reportdesign/source/filter/xml/dbloader2.hxx | 8 +-
reportdesign/source/filter/xml/xmlAutoStyle.cxx | 4 +-
reportdesign/source/filter/xml/xmlAutoStyle.hxx | 4 +-
reportdesign/source/filter/xml/xmlCell.cxx | 18 +-
reportdesign/source/filter/xml/xmlCell.hxx | 4 +-
reportdesign/source/filter/xml/xmlColumn.cxx | 12 +-
reportdesign/source/filter/xml/xmlColumn.hxx | 2 +-
reportdesign/source/filter/xml/xmlComponent.cxx | 16 +-
reportdesign/source/filter/xml/xmlComponent.hxx | 6 +-
reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 6 +-
reportdesign/source/filter/xml/xmlCondPrtExpr.hxx | 4 +-
.../source/filter/xml/xmlControlProperty.cxx | 66 +-
.../source/filter/xml/xmlControlProperty.hxx | 6 +-
reportdesign/source/filter/xml/xmlEnums.hxx | 66 +-
reportdesign/source/filter/xml/xmlExport.cxx | 96 +--
reportdesign/source/filter/xml/xmlExport.hxx | 94 +--
.../source/filter/xml/xmlExportDocumentHandler.cxx | 22 +-
.../source/filter/xml/xmlExportDocumentHandler.hxx | 2 +-
reportdesign/source/filter/xml/xmlFixedContent.cxx | 10 +-
reportdesign/source/filter/xml/xmlFixedContent.hxx | 2 +-
.../source/filter/xml/xmlFormatCondition.cxx | 6 +-
.../source/filter/xml/xmlFormatCondition.hxx | 4 +-
.../source/filter/xml/xmlFormattedField.cxx | 6 +-
.../source/filter/xml/xmlFormattedField.hxx | 2 +-
reportdesign/source/filter/xml/xmlFunction.cxx | 10 +-
reportdesign/source/filter/xml/xmlFunction.hxx | 10 +-
reportdesign/source/filter/xml/xmlGroup.cxx | 18 +-
reportdesign/source/filter/xml/xmlGroup.hxx | 8 +-
reportdesign/source/filter/xml/xmlHelper.cxx | 234 +++---
reportdesign/source/filter/xml/xmlHelper.hxx | 28 +-
reportdesign/source/filter/xml/xmlImage.cxx | 2 +-
reportdesign/source/filter/xml/xmlImage.hxx | 2 +-
.../source/filter/xml/xmlImportDocumentHandler.cxx | 26 +-
.../source/filter/xml/xmlImportDocumentHandler.hxx | 6 +-
reportdesign/source/filter/xml/xmlMasterFields.cxx | 4 +-
reportdesign/source/filter/xml/xmlMasterFields.hxx | 2 +-
.../source/filter/xml/xmlPropertyHandler.cxx | 2 +-
.../source/filter/xml/xmlPropertyHandler.hxx | 2 +-
reportdesign/source/filter/xml/xmlReport.cxx | 16 +-
reportdesign/source/filter/xml/xmlReport.hxx | 4 +-
.../source/filter/xml/xmlReportElement.cxx | 6 +-
.../source/filter/xml/xmlReportElement.hxx | 4 +-
.../source/filter/xml/xmlReportElementBase.cxx | 4 +-
.../source/filter/xml/xmlReportElementBase.hxx | 6 +-
reportdesign/source/filter/xml/xmlRow.cxx | 16 +-
reportdesign/source/filter/xml/xmlRow.hxx | 2 +-
reportdesign/source/filter/xml/xmlSection.cxx | 8 +-
reportdesign/source/filter/xml/xmlSection.hxx | 8 +-
reportdesign/source/filter/xml/xmlStyleImport.cxx | 10 +-
reportdesign/source/filter/xml/xmlStyleImport.hxx | 20 +-
reportdesign/source/filter/xml/xmlSubDocument.cxx | 16 +-
reportdesign/source/filter/xml/xmlSubDocument.hxx | 6 +-
reportdesign/source/filter/xml/xmlTable.cxx | 12 +-
reportdesign/source/filter/xml/xmlTable.hxx | 10 +-
reportdesign/source/filter/xml/xmlfilter.cxx | 244 +++----
reportdesign/source/filter/xml/xmlfilter.hxx | 70 +-
reportdesign/source/filter/xml/xmlservices.cxx | 4 +-
reportdesign/source/inc/GroupProperties.hxx | 18 +-
reportdesign/source/inc/constasciistring.hxx | 10 +-
reportdesign/source/inc/corestrings.hrc | 2 +-
reportdesign/source/inc/stringconstants.hrc | 268 +++----
reportdesign/source/inc/uistrings.hrc | 44 +-
reportdesign/source/inc/xmlstrings.hrc | 2 +-
reportdesign/source/shared/corestrings.cxx | 2 +-
reportdesign/source/shared/stringconstants.cxx | 334 ++++-----
reportdesign/source/shared/uistrings.cxx | 36 +-
reportdesign/source/shared/xmlstrings.cxx | 20 +-
reportdesign/source/ui/dlg/AddField.cxx | 24 +-
reportdesign/source/ui/dlg/CondFormat.cxx | 22 +-
reportdesign/source/ui/dlg/CondFormat.hrc | 4 +-
reportdesign/source/ui/dlg/CondFormat.src | 10 +-
reportdesign/source/ui/dlg/Condition.cxx | 2 +-
reportdesign/source/ui/dlg/Condition.hxx | 6 +-
reportdesign/source/ui/dlg/DateTime.cxx | 30 +-
reportdesign/source/ui/dlg/DateTime.hrc | 42 +-
reportdesign/source/ui/dlg/DateTime.src | 12 +-
reportdesign/source/ui/dlg/Formula.cxx | 16 +-
reportdesign/source/ui/dlg/GroupExchange.cxx | 2 +-
reportdesign/source/ui/dlg/GroupExchange.hxx | 8 +-
reportdesign/source/ui/dlg/GroupsSorting.cxx | 126 ++--
reportdesign/source/ui/dlg/GroupsSorting.hrc | 76 +-
reportdesign/source/ui/dlg/GroupsSorting.src | 106 +--
reportdesign/source/ui/dlg/Navigator.cxx | 64 +-
reportdesign/source/ui/dlg/Navigator.src | 12 +-
reportdesign/source/ui/dlg/PageNumber.cxx | 14 +-
reportdesign/source/ui/dlg/PageNumber.hrc | 54 +-
reportdesign/source/ui/dlg/PageNumber.src | 18 +-
reportdesign/source/ui/dlg/dlgpage.cxx | 28 +-
reportdesign/source/ui/dlg/dlgpage.src | 10 +-
reportdesign/source/ui/inc/AddField.hxx | 18 +-
reportdesign/source/ui/inc/ColorChanger.hxx | 4 +-
reportdesign/source/ui/inc/ColorListener.hxx | 30 +-
reportdesign/source/ui/inc/ColumnInfo.hxx | 6 +-
reportdesign/source/ui/inc/CondFormat.hxx | 2 +-
reportdesign/source/ui/inc/DataProviderHandler.hxx | 4 +-
reportdesign/source/ui/inc/DateTime.hxx | 36 +-
reportdesign/source/ui/inc/DefaultInspection.hxx | 2 +-
reportdesign/source/ui/inc/DesignView.hxx | 98 +--
reportdesign/source/ui/inc/EndMarker.hxx | 4 +-
reportdesign/source/ui/inc/FixedTextColor.hxx | 2 +-
.../source/ui/inc/FormattedFieldBeautifier.hxx | 2 +-
reportdesign/source/ui/inc/Formula.hxx | 8 +-
reportdesign/source/ui/inc/FunctionHelper.hxx | 2 +-
reportdesign/source/ui/inc/GeometryHandler.hxx | 18 +-
reportdesign/source/ui/inc/GroupsSorting.hxx | 94 +--
.../source/ui/inc/IReportControllerObserver.hxx | 6 +-
reportdesign/source/ui/inc/InsertFunctions.hxx | 4 +-
reportdesign/source/ui/inc/MarkedSection.hxx | 6 +-
reportdesign/source/ui/inc/Navigator.hxx | 6 +-
reportdesign/source/ui/inc/PageNumber.hxx | 38 +-
.../source/ui/inc/ReportComponentHandler.hxx | 4 +-
reportdesign/source/ui/inc/ReportController.hxx | 106 +--
.../source/ui/inc/ReportControllerObserver.hxx | 14 +-
reportdesign/source/ui/inc/ReportDefines.hxx | 8 +-
reportdesign/source/ui/inc/ReportRuler.hxx | 12 +-
reportdesign/source/ui/inc/ReportSection.hxx | 80 +--
reportdesign/source/ui/inc/ReportWindow.hxx | 82 +--
reportdesign/source/ui/inc/ScrollHelper.hxx | 86 +--
reportdesign/source/ui/inc/SectionView.hxx | 10 +-
reportdesign/source/ui/inc/SectionWindow.hxx | 36 +-
reportdesign/source/ui/inc/StartMarker.hxx | 34 +-
reportdesign/source/ui/inc/UITools.hxx | 36 +-
reportdesign/source/ui/inc/Undo.hxx | 48 +-
reportdesign/source/ui/inc/ViewsWindow.hxx | 68 +-
reportdesign/source/ui/inc/dlgedclip.hxx | 18 +-
reportdesign/source/ui/inc/dlgedfac.hxx | 2 +-
reportdesign/source/ui/inc/dlgedfunc.hxx | 18 +-
reportdesign/source/ui/inc/dlgpage.hxx | 4 +-
reportdesign/source/ui/inc/metadata.hxx | 32 +-
reportdesign/source/ui/inc/propbrw.hxx | 22 +-
reportdesign/source/ui/inc/statusbarcontroller.hxx | 22 +-
reportdesign/source/ui/inc/toolboxcontroller.hxx | 10 +-
.../source/ui/inspection/DataProviderHandler.cxx | 16 +-
.../source/ui/inspection/DefaultInspection.cxx | 18 +-
.../source/ui/inspection/GeometryHandler.cxx | 112 +--
.../ui/inspection/ReportComponentHandler.cxx | 4 +-
reportdesign/source/ui/inspection/inspection.src | 18 +-
reportdesign/source/ui/inspection/metadata.cxx | 22 +-
reportdesign/source/ui/misc/ColorListener.cxx | 18 +-
reportdesign/source/ui/misc/FunctionHelper.cxx | 14 +-
reportdesign/source/ui/misc/UITools.cxx | 14 +-
reportdesign/source/ui/misc/Undo.cxx | 20 +-
reportdesign/source/ui/misc/rptuiservices.cxx | 4 +-
.../source/ui/misc/statusbarcontroller.cxx | 10 +-
reportdesign/source/ui/misc/toolboxcontroller.cxx | 6 +-
reportdesign/source/ui/report/DesignView.cxx | 16 +-
reportdesign/source/ui/report/EndMarker.cxx | 8 +-
reportdesign/source/ui/report/FixedTextColor.cxx | 40 +-
.../source/ui/report/FormattedFieldBeautifier.cxx | 18 +-
reportdesign/source/ui/report/ReportController.cxx | 560 +++++++--------
.../source/ui/report/ReportControllerObserver.cxx | 46 +-
reportdesign/source/ui/report/ReportRuler.cxx | 6 +-
reportdesign/source/ui/report/ReportSection.cxx | 48 +-
reportdesign/source/ui/report/ReportWindow.cxx | 66 +-
reportdesign/source/ui/report/ScrollHelper.cxx | 38 +-
reportdesign/source/ui/report/SectionView.cxx | 12 +-
reportdesign/source/ui/report/SectionWindow.cxx | 36 +-
reportdesign/source/ui/report/StartMarker.cxx | 26 +-
reportdesign/source/ui/report/ViewsWindow.cxx | 172 ++---
reportdesign/source/ui/report/dlgedclip.cxx | 4 +-
reportdesign/source/ui/report/dlgedfac.cxx | 10 +-
reportdesign/source/ui/report/dlgedfunc.cxx | 258 +++----
reportdesign/source/ui/report/propbrw.cxx | 24 +-
reportdesign/source/ui/report/report.src | 40 +-
.../uiconfig/dbreport/toolbar/arrowshapes.xml | 22 +-
.../uiconfig/dbreport/toolbar/basicshapes.xml | 14 +-
.../uiconfig/dbreport/toolbar/flowchartshapes.xml | 26 +-
.../uiconfig/dbreport/toolbar/reportcontrols.xml | 2 +-
.../uiconfig/dbreport/toolbar/symbolshapes.xml | 6 +-
reportdesign/util/hidother.src | 90 +--
1048 files changed, 17125 insertions(+), 16998 deletions(-)
diff --git a/dbaccess/inc/AsyncronousLink.hxx b/dbaccess/inc/AsyncronousLink.hxx
index 2b2bbb597c7e..94068f2a80b2 100644
--- a/dbaccess/inc/AsyncronousLink.hxx
+++ b/dbaccess/inc/AsyncronousLink.hxx
@@ -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
@@ -49,11 +49,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 46d5a78922f3..43357406dfc5 100644
--- a/dbaccess/inc/IController.hxx
+++ b/dbaccess/inc/IController.hxx
@@ -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
@@ -57,43 +57,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
if the command is allowed, otherwise .
*/
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
if the command is allowed, otherwise .
*/
virtual sal_Bool isCommandEnabled( const ::rtl::OUString& _rCompleteCommandURL ) const = 0;
@@ -113,13 +113,13 @@ namespace dbaui
registerCommandURL( const ::rtl::OUString& _rCompleteCommandURL ) = 0;
/** notifyHiContrastChanged will be called when the hicontrast mode changed.
- @param _bHiContrast
+ @param _bHiContrast
when in hicontrast mode.
*/
virtual void notifyHiContrastChanged() = 0;
/** checks if the selected data source is read only
- @return
+ @return
if read only, otherwise
*/
virtual sal_Bool isDataSourceReadOnly() const = 0;
diff --git a/dbaccess/inc/IEnvironment.hxx b/dbaccess/inc/IEnvironment.hxx
index bc6766c91ebb..144f59a1f08b 100644
--- a/dbaccess/inc/IEnvironment.hxx
+++ b/dbaccess/inc/IEnvironment.hxx
@@ -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/inc/IReference.hxx b/dbaccess/inc/IReference.hxx
index ba78811e1e85..d8657c304de8 100644
--- a/dbaccess/inc/IReference.hxx
+++ b/dbaccess/inc/IReference.hxx
@@ -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
@@ -40,5 +40,5 @@ namespace dbaui
};
}
#endif // DBAUI_IREFERENCE_HXX
-
+
diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx
index 0bb93681d8c6..db1c5b282b6c 100644
--- a/dbaccess/inc/ToolBoxHelper.hxx
+++ b/dbaccess/inc/ToolBoxHelper.hxx
@@ -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
@@ -28,13 +28,13 @@
#ifndef DBAUI_TOOLBOXHELPER_HXX
#define DBAUI_TOOLBOXHELPER_HXX
-#ifndef _SAL_TYPES_H_
+#ifndef _SAL_TYPES_H_
#include
#endif
-#ifndef _LINK_HXX
+#ifndef _LINK_HXX
#include
#endif
-#ifndef _SV_GEN_HXX
+#ifndef _SV_GEN_HXX
#include
#endif
#ifndef _SV_IMAGE_HXX
@@ -50,41 +50,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
- @param _bHiContast
+ @param _bHiContast
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 942bdc42da64..057e0f7650dc 100644
--- a/dbaccess/inc/controllerframe.hxx
+++ b/dbaccess/inc/controllerframe.hxx
@@ -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/inc/dataview.hxx b/dbaccess/inc/dataview.hxx
index ae93fa1d3284..0251e04b2c59 100644
--- a/dbaccess/inc/dataview.hxx
+++ b/dbaccess/inc/dataview.hxx
@@ -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
@@ -27,7 +27,7 @@
#ifndef DBAUI_DATAVIEW_HXX
#define DBAUI_DATAVIEW_HXX
-#ifndef _SV_WINDOW_HXX
+#ifndef _SV_WINDOW_HXX
#include
#endif
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
@@ -44,19 +44,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();
@@ -75,8 +75,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 // HID_DBACCESS_START
+#include // 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
#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 7edac96cf07c..b6dffd6d601b 100644
--- a/dbaccess/inc/dbaccessdllapi.h
+++ b/dbaccess/inc/dbaccessdllapi.h
@@ -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
@@ -27,17 +27,17 @@
#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 */
diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx
index fefeec0125a1..9a5be3aac55c 100644
--- a/dbaccess/inc/genericcontroller.hxx
+++ b/dbaccess/inc/genericcontroller.hxx
@@ -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
@@ -131,7 +131,7 @@ namespace dbaui
*/
struct FeatureState
{
- sal_Bool bEnabled;
+ sal_Bool bEnabled;
optional< bool > bChecked;
optional< bool > bInvisible;
@@ -172,8 +172,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;
};
// ....................................................................
@@ -213,15 +213,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
@@ -230,8 +230,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) { }
@@ -242,32 +242,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
@@ -277,13 +277,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 );
@@ -299,22 +299,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
@@ -336,7 +336,7 @@ namespace dbaui
);
/** returns if the feature is supported, otherwise
- @param _nId
+ @param _nId
The ID of the feature.
*/
sal_Bool isFeatureSupported( sal_Int32 _nId );
@@ -434,7 +434,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 if the frame isn't initialized.
@@ -482,9 +482,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);
@@ -503,7 +503,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 1ef5d4b9c7a5..44bd67786b3b 100644
--- a/dbaccess/inc/pch/precompiled_dbaccess.cxx
+++ b/dbaccess/inc/pch/precompiled_dbaccess.cxx
@@ -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/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx
index 099adaf03988..f16091db227e 100644
--- a/dbaccess/inc/pch/precompiled_dbaccess.hxx
+++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx
@@ -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/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx
index 5bda31fb4608..4a1cfcabde56 100644
--- a/dbaccess/inc/singledoccontroller.hxx
+++ b/dbaccess/inc/singledoccontroller.hxx
@@ -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
@@ -73,22 +73,22 @@ namespace dbaui
::std::auto_ptr m_pImpl;
protected:
- SfxUndoManager m_aUndoManager;
+ SfxUndoManager m_aUndoManager;
private:
/** forces usage of a connection which we do not own
To be used from within XInitialization::initialize, resp. impl_initialize, only.
*/
- 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;
@@ -97,8 +97,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
@@ -106,13 +106,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;
@@ -122,7 +122,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;
@@ -170,7 +170,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 );
@@ -196,7 +196,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
The default implementation does a reconnect
@@ -214,7 +214,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);
@@ -227,7 +227,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 @@
com.sun.star.accessibility.Accessible
com.sun.star.accessibility.AccessibleContext
-
+
Ocke Janssen
com.sun.star.comp.dbu.OColumnControl
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 b5b9ec0ec787..7ecf9ab3e8e9 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -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
@@ -52,11 +52,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)
@@ -142,7 +142,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 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/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx
index 36d3c90c7969..18df82653579 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -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/CIndexColumn.hxx b/dbaccess/source/core/api/CIndexColumn.hxx
index 948d472ef88c..81a3302b335b 100644
--- a/dbaccess/source/core/api/CIndexColumn.hxx
+++ b/dbaccess/source/core/api/CIndexColumn.hxx
@@ -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
@@ -39,18 +39,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/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx
index 3fdd9cc4de1a..f24a358ca38c 100644
--- a/dbaccess/source/core/api/CIndexes.cxx
+++ b/dbaccess/source/core/api/CIndexes.cxx
@@ -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/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx
index c461204754be..784e2ba80b81 100644
--- a/dbaccess/source/core/api/CIndexes.hxx
+++ b/dbaccess/source/core/api/CIndexes.hxx
@@ -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/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx
index 12a7d16e8716..60c4fe1d4ea4 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -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
@@ -49,7 +49,7 @@ 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 )
{
@@ -68,7 +68,7 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaDa
DECL_PROP1_BOOL( ISAUTOINCREMENT, READONLY );
DECL_PROP1_BOOL( ISCASESENSITIVE, READONLY );
DECL_PROP1_BOOL( ISCURRENCY, READONLY );
- DECL_PROP1_BOOL( ISDEFINITELYWRITABLE, READONLY );
+ DECL_PROP1_BOOL( ISDEFINITELYWRITABLE, READONLY );
DECL_PROP1( ISNULLABLE, sal_Int32, READONLY );
DECL_PROP1_BOOL( ISREADONLY, BOUND );
DECL_PROP1_BOOL( ISROWVERSION, READONLY );
diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx
index 043837f44589..3b16166da9ce 100644
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.hxx
@@ -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
@@ -45,10 +45,10 @@ namespace dbaccess
class ORowSetColumn;
class ORowSetColumn :public ORowSetDataColumn
,public ::comphelper::OPropertyArrayUsageHelper< ORowSetColumn >
-
+
{
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 9bdcda88c93d..502a0a631e88 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -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
@@ -55,7 +55,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;
@@ -65,7 +65,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,
@@ -272,10 +272,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 ::vos::ORef< ::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 e5009d4d6f7c..90677d1174c3 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx
@@ -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
@@ -40,17 +40,17 @@ namespace dbaccess
class ORowSetDataColumn;
typedef ::comphelper::OPropertyArrayUsageHelper 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:
@@ -63,7 +63,7 @@ namespace dbaccess
const ::rtl::OUString& i_sLabel,
const ORowSetCacheIterator& _rColumnValue);
-
+
// com::sun::star::lang::XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException);
// comphelper::OPropertyArrayUsageHelper
@@ -84,8 +84,8 @@ namespace dbaccess
using ODataColumn::getFastPropertyValue;
};
// -------------------------------------------------------------------------
-// typedef connectivity::ORefVector< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> >
-// ORowSetDataColumns_COLLECTION;
+// typedef connectivity::ORefVector< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> >
+// ORowSetDataColumns_COLLECTION;
typedef connectivity::sdbcx::OCollection ORowSetDataColumns_BASE;
class ORowSetDataColumns : public ORowSetDataColumns_BASE
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index dd64e835adb4..7f53434b3683 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -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
@@ -96,17 +96,17 @@ 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)
// -------------------------------------------------------------------------
-OCacheSet::OCacheSet()
+OCacheSet::OCacheSet()
:m_bInserted(sal_False)
,m_bUpdated(sal_False)
,m_bDeleted(sal_False)
@@ -126,7 +126,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");
@@ -167,10 +167,10 @@ OCacheSet::~OCacheSet()
{
try
{
- m_xDriverSet = NULL;
- m_xDriverRow = NULL;
+ m_xDriverSet = NULL;
+ m_xDriverRow = NULL;
m_xSetMetaData = NULL;
- m_xConnection = NULL;
+ m_xConnection = NULL;
}
catch(Exception&)
{
@@ -243,27 +243,27 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti
m_bInserted = xPrep->executeUpdate() > 0;
}
-
-// ::rtl::OUString aCountSql = ::rtl::OUString::createFromAscii("SELECT COUNT(*) FROM ");
-// aCountSql += m_aComposedTableName;
-// try
-// {
-// Reference< XStatement > xStmt(m_xConnection->createStatement());
-// Reference xRes(xStmt->executeQuery(aCountSql));
-// if(xRes.is() && xRes->next())
-// {
-// Reference xRow(xRes,UNO_QUERY);
-// }
-// }
-// catch(SQLException&)
-// {
-// }
-
+
+// ::rtl::OUString aCountSql = ::rtl::OUString::createFromAscii("SELECT COUNT(*) FROM ");
+// aCountSql += m_aComposedTableName;
+// try
+// {
+// Reference< XStatement > xStmt(m_xConnection->createStatement());
+// Reference xRes(xStmt->executeQuery(aCountSql));
+// if(xRes.is() && xRes->next())
+// {
+// Reference xRow(xRes,UNO_QUERY);
+// }
+// }
+// catch(SQLException&)
+// {
+// }
+
// TODO set the bookmark in the insert row
}
// -------------------------------------------------------------------------
void OCacheSet::fillParameters( const ORowSetRow& _rRow
- ,const connectivity::OSQLTable& _xTable
+ ,const connectivity::OSQLTable& _xTable
,::rtl::OUStringBuffer& _sCondition
,::rtl::OUStringBuffer& _sParameter
,::std::list< sal_Int32>& _rOrgValues)
@@ -279,7 +279,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
if(xIndexSup.is())
xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY);
- // Reference
+ // Reference
Reference xIndexColsSup;
Reference xIndexColumns;
::std::vector< Reference > aAllIndexColumns;
@@ -288,7 +288,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
for(sal_Int32 j=0;jgetCount();++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))
)
@@ -297,15 +297,15 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
}
::rtl::OUString aColumnName;
-
+
static ::rtl::OUString aPara = ::rtl::OUString::createFromAscii("?,");
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
- ::rtl::OUString aQuote = getIdentifierQuoteString();
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
sal_Int32 nCheckCount = 1; // index for the orginal values
sal_Int32 i = 1;
-
+
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rRow->get().begin()+1;
@@ -358,7 +358,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
aSql.append(m_aComposedTableName);
aSql.append(::rtl::OUString::createFromAscii(" SET "));
// list all cloumns that should be set
-
+
::rtl::OUStringBuffer aCondition;
::std::list< sal_Int32> aOrgValues;
fillParameters(_rInsertRow,_xTable,aCondition,aSql,aOrgValues);
@@ -407,8 +407,8 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
aSql.append(::rtl::OUString::createFromAscii(" WHERE "));
// list all cloumns that should be set
- ::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
// use keys and indexes for excat postioning
// first the keys
@@ -419,7 +419,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
if(xIndexSup.is())
xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY);
- // Reference
+ // Reference
Reference xIndexColsSup;
Reference xIndexColumns;
::std::vector< Reference > aAllIndexColumns;
@@ -428,7 +428,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
for(sal_Int32 j=0;jgetCount();++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))
)
@@ -439,7 +439,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti
::rtl::OUStringBuffer aColumnName;
::std::list< sal_Int32> aOrgValues;
fillParameters(_rDeleteRow,_xTable,aSql,aColumnName,aOrgValues);
-
+
aSql.setLength(aSql.getLength()-5);
// now create end execute the prepared statement
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index ef3503fa5e4e..59601137b620 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.hxx
@@ -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
@@ -73,19 +73,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 m_aNullable;
- ::com::sun::star::uno::Sequence m_aSignedFlags;
- ::com::sun::star::uno::Sequence 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 m_aNullable;
+ ::com::sun::star::uno::Sequence m_aSignedFlags;
+ ::com::sun::star::uno::Sequence m_aColumnTypes;
+ ORowSetRow m_aInsertRow;
+ ::rtl::OUString m_aComposedTableName;
+ sal_Bool m_bInserted;
+ sal_Bool m_bUpdated;
+ sal_Bool m_bDeleted;
OCacheSet();
virtual ~OCacheSet();
@@ -97,7 +97,7 @@ namespace dbaccess
,sal_Int32 _nScale
) const;
void fillParameters( const ORowSetRow& _rRow
- ,const connectivity::OSQLTable& _xTable
+ ,const connectivity::OSQLTable& _xTable
,::rtl::OUStringBuffer& _sCondition
,::rtl::OUStringBuffer& _sParameter
,::std::list< sal_Int32>& _rOrgValues);
@@ -105,7 +105,7 @@ namespace dbaccess
::rtl::OUString getIdentifierQuoteString() const;
public:
-
+
// late constructor
virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter);
virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition);
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index aa20bf080e4d..e71ddf79b648 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -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
@@ -61,11 +61,11 @@ namespace dbaccess
*/
sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OFilteredContainer::createWildCardVector" );
+ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OFilteredContainer::createWildCardVector" );
// 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)
{
@@ -99,8 +99,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
)
@@ -256,11 +256,11 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
//==========================================================================
//= OViewContainer
//==========================================================================
- OFilteredContainer::OFilteredContainer(::cppu::OWeakObject& _rParent,
+ OFilteredContainer::OFilteredContainer(::cppu::OWeakObject& _rParent,
::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>())
@@ -269,7 +269,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
,m_pRefreshListener(_pRefreshListener)
,m_nInAppend(_nInAppend)
,m_xConnection(_xCon)
- {
+ {
}
// -------------------------------------------------------------------------
void OFilteredContainer::construct(const Reference< XNameAccess >& _rxMasterContainer,
@@ -288,7 +288,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std
}
m_xMasterContainer = _rxMasterContainer;
-
+
if ( m_xMasterContainer.is() )
{
addMasterContainerListener();
@@ -316,7 +316,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
@@ -376,9 +376,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 ) );
@@ -407,11 +407,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;
}
// -------------------------------------------------------------------------
diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx
index 2e536b5c2e26..85dbc28922dd 100644
--- a/dbaccess/source/core/api/HelperCollections.cxx
+++ b/dbaccess/source/core/api/HelperCollections.cxx
@@ -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/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
index 1169a20b0750..049f2c00051d 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.hxx
@@ -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
@@ -62,7 +62,7 @@ namespace dbaccess
typedef connectivity::sdbcx::OCollection OPrivateColumns_Base;
class OPrivateColumns : public OPrivateColumns_Base
{
- ::vos::ORef< ::connectivity::OSQLColumns> m_aColumns;
+ ::vos::ORef< ::connectivity::OSQLColumns> m_aColumns;
protected:
virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
virtual void impl_refresh() throw(RuntimeException) {}
@@ -97,7 +97,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) {}
@@ -106,7 +106,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 cee1887832d2..4d76accfc33e 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle andor its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -138,7 +138,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))
)
@@ -151,7 +151,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)
@@ -201,25 +201,14 @@ void OKeySet::findTableColumnsMatching_throw(const Any& i_aTable
,const Reference& i_xMeta
,const Reference& i_xQueryColumns)
{
- ::rtl::OUString sCatalog,sSchema,sTable;
- Reference xTableProp(i_aTable,UNO_QUERY);
- Any aCatalog = xTableProp->getPropertyValue(PROPERTY_CATALOGNAME);
- aCatalog >>= sCatalog;
- xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
- xTableProp->getPropertyValue(PROPERTY_NAME) >>= sTable;
-
// first ask the database itself for the best columns which can be used
Sequence< ::rtl::OUString> aBestColumnNames;
- Reference xKeyColumns = getPrimaryKeyColumns_throw(i_aTable);
+ Reference xKeyColumns = getPrimaryKeyColumns_throw(i_aTable);
if ( xKeyColumns.is() )
aBestColumnNames = xKeyColumns->getElementNames();
const Reference xTblColSup(i_aTable,UNO_QUERY_THROW);
const Reference xTblColumns = xTblColSup->getColumns();
- const ::rtl::OUString sComposedUpdateTableName = dbtools::composeTableName( i_xMeta, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation );
- ::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,sComposedUpdateTableName,(*m_pKeyColumnNames),true);
- ::dbaccess::getColumnPositions(i_xQueryColumns,xTblColumns->getElementNames(),sComposedUpdateTableName,(*m_pColumnNames),true);
-
// locate parameter in select columns
Reference xParaSup(m_xComposer,UNO_QUERY);
Reference xQueryParameters = xParaSup->getParameters();
@@ -230,7 +219,26 @@ void OKeySet::findTableColumnsMatching_throw(const Any& i_aTable
Reference xPara(xQueryParameters->getByIndex(i),UNO_QUERY_THROW);
xPara->getPropertyValue(PROPERTY_REALNAME) >>= aParameterColumns[i];
}
- ::dbaccess::getColumnPositions(i_xQueryColumns,aParameterColumns,sComposedUpdateTableName,(*m_pParameterNames),true);
+
+ if ( m_sUpdateTableName.getLength() )
+ {
+ ::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,m_sUpdateTableName,(*m_pKeyColumnNames),true);
+ ::dbaccess::getColumnPositions(i_xQueryColumns,xTblColumns->getElementNames(),m_sUpdateTableName,(*m_pColumnNames),true);
+ ::dbaccess::getColumnPositions(i_xQueryColumns,aParameterColumns,m_sUpdateTableName,(*m_pParameterNames),true);
+ }
+ else
+ {
+ ::rtl::OUString sCatalog,sSchema,sTable;
+ Reference xTableProp(i_aTable,UNO_QUERY);
+ Any aCatalog = xTableProp->getPropertyValue(PROPERTY_CATALOGNAME);
+ aCatalog >>= sCatalog;
+ xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema;
+ xTableProp->getPropertyValue(PROPERTY_NAME) >>= sTable;
+ const ::rtl::OUString sComposedUpdateTableName = dbtools::composeTableName( i_xMeta, sCatalog, sSchema, sTable, sal_False, ::dbtools::eInDataManipulation );
+ ::dbaccess::getColumnPositions(i_xQueryColumns,aBestColumnNames,sComposedUpdateTableName,(*m_pKeyColumnNames),true);
+ ::dbaccess::getColumnPositions(i_xQueryColumns,xTblColumns->getElementNames(),sComposedUpdateTableName,(*m_pColumnNames),true);
+ ::dbaccess::getColumnPositions(i_xQueryColumns,aParameterColumns,sComposedUpdateTableName,(*m_pParameterNames),true);
+ }
SelectColumnsMetaData::const_iterator aPosIter = m_pKeyColumnNames->begin();
SelectColumnsMetaData::const_iterator aPosEnd = m_pKeyColumnNames->end();
@@ -247,8 +255,8 @@ void OKeySet::findTableColumnsMatching_throw(const Any& i_aTable
}
::rtl::OUStringBuffer OKeySet::createKeyFilter()
{
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
- const ::rtl::OUString aQuote = getIdentifierQuoteString();
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ const ::rtl::OUString aQuote = getIdentifierQuoteString();
::rtl::OUStringBuffer aFilter;
static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM("."));
static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
@@ -273,14 +281,14 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::construct" );
OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
initColumns();
-
- Reference xKeyColumns = getKeyColumns();
+
+ Reference xKeyColumns = getKeyColumns();
Reference xMeta = m_xConnection->getMetaData();
Reference xQueryColSup(m_xComposer,UNO_QUERY);
const Reference xQueryColumns = xQueryColSup->getColumns();
findTableColumnsMatching_throw(makeAny(m_xTable),xMeta,xQueryColumns);
- // 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 >(0,NULL))));
m_aKeyIter = m_aKeyMap.begin();
@@ -296,12 +304,12 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
const Sequence< ::rtl::OUString> aSeq = xSelectTables->getElementNames();
if ( aSeq.getLength() > 1 ) // special handling for join
{
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
- const ::rtl::OUString aQuote = getIdentifierQuoteString();
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ 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 )
@@ -309,14 +317,14 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O
connectivity::OSQLTable xSelColSup(xSelectTables->getByName(*pIter),uno::UNO_QUERY);
Reference xProp(xSelColSup,uno::UNO_QUERY);
::rtl::OUString sSelectTableName = ::dbtools::composeTableName( xMeta, xProp, ::dbtools::eInDataManipulation, false, false, false );
-
- ::dbaccess::getColumnPositions(xQueryColumns,xSelColSup->getColumns()->getElementNames(),sSelectTableName,(*m_pForeignColumnNames));
-
+
+ ::dbaccess::getColumnPositions(xQueryColumns,xSelColSup->getColumns()->getElementNames(),sSelectTableName,(*m_pForeignColumnNames));
+
SelectColumnsMetaData::iterator aPosEnd = (*m_pForeignColumnNames).end();
for(SelectColumnsMetaData::iterator aPosIter = (*m_pForeignColumnNames).begin();aPosIter != aPosEnd;++aPosIter)
{
// look for columns not in the source columns to use them as filter as well
- // if ( !xSourceColumns->hasByName(aPosIter->first) )
+ // if ( !xSourceColumns->hasByName(aPosIter->first) )
{
if ( aFilter.getLength() )
aFilter.append(aAnd);
@@ -430,10 +438,10 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows
aSql.append(::rtl::OUString::createFromAscii(" WHERE "));
// list all cloumns that should be set
- const ::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
- static ::rtl::OUString aOr = ::rtl::OUString::createFromAscii(" OR ");
- static ::rtl::OUString aEqual = ::rtl::OUString::createFromAscii(" = ?");
+ const ::rtl::OUString aQuote = getIdentifierQuoteString();
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ static ::rtl::OUString aOr = ::rtl::OUString::createFromAscii(" OR ");
+ static ::rtl::OUString aEqual = ::rtl::OUString::createFromAscii(" = ?");
// use keys and indexes for excat postioning
@@ -453,8 +461,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)
@@ -469,7 +477,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)
{
@@ -517,9 +525,9 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
aSql.append(m_aComposedTableName);
aSql.append(::rtl::OUString::createFromAscii(" SET "));
// list all cloumns that should be set
- static ::rtl::OUString aPara = ::rtl::OUString::createFromAscii(" = ?,");
- ::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ static ::rtl::OUString aPara = ::rtl::OUString::createFromAscii(" = ?,");
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
@@ -615,7 +623,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow
::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection );
// now create end execute the prepared statement
-
+
::rtl::OUString sEmpty;
executeUpdate(_rInsertRow ,_rOrginalRow,aSql.makeStringAndClear(),sEmpty,aIndexColumnPositions);
}
@@ -831,7 +839,10 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString
::rtl::OUString sStmt = ::rtl::OUString::createFromAscii("SELECT ");
sStmt += sMaxStmt;
sStmt += ::rtl::OUString::createFromAscii("FROM ");
- sStmt += m_aSelectComposedTableName;
+ ::rtl::OUString sCatalog,sSchema,sTable;
+ ::dbtools::qualifiedNameComponents(m_xConnection->getMetaData(),m_sUpdateTableName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
+ sStmt += ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable );
+ //sStmt += m_aSelectComposedTableName;
try
{
// now fetch the autoincrement values
@@ -863,7 +874,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString
--aKeyIter;
ORowSetRow aKeyRow = new connectivity::ORowVector< ORowSetValue >(m_pKeyColumnNames->size());
copyRowValue(_rInsertRow,aKeyRow,aKeyIter->first + 1);
-
+
m_aKeyIter = m_aKeyMap.insert(OKeySetMatrix::value_type(aKeyIter->first + 1,OKeySetValue(aKeyRow,::std::pair >(1,NULL)))).first;
// now we set the bookmark for this row
(_rInsertRow->get())[0] = makeAny((sal_Int32)m_aKeyIter->first);
@@ -886,7 +897,7 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch)
connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaEnd;
OUpdatedParameter::iterator aUpdateFind = m_aUpdatedParameter.find(m_aKeyIter->first);
if ( aUpdateFind == m_aUpdatedParameter.end() )
- {
+ {
aParaIter = m_aParameterValueForCache.get().begin();
aParaEnd = m_aParameterValueForCache.get().end();
}
@@ -895,7 +906,7 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch)
aParaIter = aUpdateFind->second.get().begin();
aParaEnd = aUpdateFind->second.get().end();
}
-
+
for(++aParaIter;aParaIter != aParaEnd;++aParaIter,++nPos)
{
::dbtools::setObjectWithInfo( xParameter, nPos, aParaIter->makeAny(), aParaIter->getTypeKind() );
@@ -976,8 +987,8 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
aSql.append(::rtl::OUString::createFromAscii(" WHERE "));
// list all cloumns that should be set
- ::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
// use keys and indexes for excat postioning
Reference xKeyColumns = getKeyColumns();
@@ -987,7 +998,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
if ( xIndexSup.is() )
xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY);
- // Reference
+ // Reference
::std::vector< Reference > aAllIndexColumns;
lcl_fillIndexColumns(xIndexes,aAllIndexColumns);
@@ -1092,7 +1103,7 @@ Reference OKeySet::getKeyColumns() const
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getKeyColumns" );
// use keys and indexes for excat postioning
// first the keys
-
+
Reference xKeys = m_xTableKeys;
if ( !xKeys.is() )
{
@@ -1317,7 +1328,7 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
connectivity::ORowVector< ORowSetValue >::Vector::const_iterator aParaEnd;
OUpdatedParameter::iterator aUpdateFind = m_aUpdatedParameter.find(m_aKeyIter->first);
if ( aUpdateFind == m_aUpdatedParameter.end() )
- {
+ {
aParaIter = m_aParameterValueForCache.get().begin();
aParaEnd = m_aParameterValueForCache.get().end();
}
@@ -1326,7 +1337,7 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
aParaIter = aUpdateFind->second.get().begin();
aParaEnd = aUpdateFind->second.get().end();
}
-
+
for(++aParaIter;aParaIter != aParaEnd;++aParaIter,++nPos)
{
::dbtools::setObjectWithInfo( xParameter, nPos, aParaIter->makeAny(), aParaIter->getTypeKind() );
@@ -1599,11 +1610,11 @@ void getColumnPositions(const Reference& _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());
@@ -1615,24 +1626,24 @@ void getColumnPositions(const Reference& _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;
sal_Int32 nNullable = ColumnValue::NULLABLE_UNKNOWN;
OSL_VERIFY( xQueryColumnProp->getPropertyValue( PROPERTY_ISNULLABLE ) >>= nNullable );
-
+
if ( i_bAppendTableName )
{
::rtl::OUStringBuffer sName;
@@ -1642,11 +1653,11 @@ void getColumnPositions(const Reference& _rxQueryColumns,
SelectColumnDescription aColDesc( nPos, nType,nScale,nNullable != sdbc::ColumnValue::NO_NULLS, sColumnDefault );
aColDesc.sRealName = sRealName;
aColDesc.sTableName = sTableName;
- o_rColumnNames[sName.makeStringAndClear()] = aColDesc;
+ o_rColumnNames[sName.makeStringAndClear()] = aColDesc;
}
else
o_rColumnNames[sRealName] = SelectColumnDescription( nPos, nType,nScale,nNullable != sdbc::ColumnValue::NO_NULLS, sColumnDefault );
-
+
break;
}
}
@@ -1667,7 +1678,7 @@ void OKeySet::impl_convertValue_throw(const ORowSetRow& _rInsertRow,const Select
sal_Int32 nIndex = sValue.indexOf('.');
if ( nIndex != -1 )
{
- aValue = sValue.copy(0,nIndex + (i_aMetaData.nScale > 0 ? i_aMetaData.nScale + 1 : 0));
+ aValue = sValue.copy(0,::std::min(sValue.getLength(),nIndex + (i_aMetaData.nScale > 0 ? i_aMetaData.nScale + 1 : 0)));
}
}
break;
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 694593e6c608..5403a56d6719 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -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
@@ -59,7 +59,7 @@ namespace dbaccess
sal_Int32 nScale;
sal_Bool bNullable;
-
+
SelectColumnDescription()
:nPosition( 0 )
@@ -94,10 +94,10 @@ namespace dbaccess
class OKeySet : public OCacheSet
{
protected:
- OKeySetMatrix m_aKeyMap;
- OKeySetMatrix::iterator m_aKeyIter;
-
- ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones
+ OKeySetMatrix m_aKeyMap;
+ OKeySetMatrix::iterator m_aKeyIter;
+
+ ::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;
@@ -105,23 +105,22 @@ namespace dbaccess
::std::auto_ptr m_pColumnNames; // contains all column names
::std::auto_ptr m_pParameterNames; // contains all parameter names
::std::auto_ptr 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;
- ::rtl::OUString m_aSelectComposedTableName;
- ::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
*/
@@ -136,7 +135,7 @@ namespace dbaccess
+ \param i_nBookmark The bookmark is used to update the parameter
*/
void copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sal_Int32 i_nBookmark);
-
+
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getKeyColumns() const;
void fillAllRows();
sal_Bool fetchRow();
@@ -151,7 +150,7 @@ namespace dbaccess
void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector& _aIndexColumnPositions = ::std::vector());
void executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName = ::rtl::OUString(),bool bRefetch = false);
void executeStatement(::rtl::OUStringBuffer& io_aFilter,const ::rtl::OUString& i_sRowSetFilter,::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer);
-
+
virtual ~OKeySet();
public:
OKeySet(const connectivity::OSQLTable& _xTable,
@@ -159,7 +158,7 @@ namespace dbaccess
const ::rtl::OUString& _rUpdateTableName,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
const ORowSetValueVector& _aParameterValueForCache);
-
+
// late ctor which can throw exceptions
virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter);
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 2a9ac96ce82b..b68910d0f22b 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -136,7 +136,7 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::
findTableColumnsMatching_throw(xTables->getByName(*pTableNameIter),xMeta,xQueryColumns);
}
- // 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 >(0,NULL))));
m_aKeyIter = m_aKeyMap.begin();
@@ -183,9 +183,9 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
if ( m_aJoinedKeyColumns.empty() )
throw SQLException();
// list all cloumns that should be set
- static ::rtl::OUString s_sPara = ::rtl::OUString::createFromAscii(" = ?");
- ::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ static ::rtl::OUString s_sPara = ::rtl::OUString::createFromAscii(" = ?");
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
@@ -272,11 +272,11 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
TSQLStatements aParameter;
TSQLStatements aKeyConditions;
::std::map< ::rtl::OUString,bool > aResultSetChanged;
- ::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
-
+
// here we build the condition part for the update statement
SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin();
SelectColumnsMetaData::const_iterator aEnd = m_pColumnNames->end();
@@ -284,7 +284,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
{
if ( aResultSetChanged.find( aIter->second.sTableName ) == aResultSetChanged.end() )
aResultSetChanged[aIter->second.sTableName] = false;
-
+
const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName);
if ( (_rInsertRow->get())[aIter->second.nPosition].isModified() )
{
@@ -363,14 +363,14 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn
if ( xRow.is() && xRes->next() )
{
m_bResultSetChanged = true;
- continue;
+ continue;
}
}
catch(const SQLException&)
{
}
}
-
+
executeInsert(_rInsertRow,sSql.makeStringAndClear(),aSqlIter->first);
}
}
@@ -381,7 +381,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 aIndexColumnPositions;
@@ -504,7 +504,7 @@ void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_
}
// -----------------------------------------------------------------------------
void OptimisticSet::fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn)
-{
+{
sal_Int32 nLeft = 0,nRight = 0;
SelectColumnsMetaData::const_iterator aLeftIter = m_pKeyColumnNames->find(i_sLeftColumn);
SelectColumnsMetaData::const_iterator aRightIter = m_pKeyColumnNames->find(i_sRightColumn);
@@ -682,8 +682,8 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const
TSQLStatements aSql;
TSQLStatements aKeyConditions;
::std::map< ::rtl::OUString,bool > aResultSetChanged;
- ::rtl::OUString aQuote = getIdentifierQuoteString();
- static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
+ ::rtl::OUString aQuote = getIdentifierQuoteString();
+ static ::rtl::OUString aAnd = ::rtl::OUString::createFromAscii(" AND ");
::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL"));
::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?"));
// here we build the condition part for the update statement
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
index ba0a04c8b773..fd1b304a7f5b 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -47,29 +47,29 @@ 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 m_aJoinedColumns;
- ::std::map m_aJoinedKeyColumns;
-
-
+ ::std::map m_aJoinedKeyColumns;
+
+
mutable bool m_bResultSetChanged;
/**
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
*/
::rtl::OUString getComposedTableName( const ::rtl::OUString& _sCatalog,
const ::rtl::OUString& _sSchema,
const ::rtl::OUString& _sTable);
-
+
void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData);
-
+
void executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName);
void fillJoinedColumns_throw(const ::std::vector< ::connectivity::TNodePair>& i_aJoinColumns);
void fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn);
@@ -80,7 +80,7 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_xConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
const ORowSetValueVector& _aParameterValueForCache);
-
+
// late ctor which can throw exceptions
virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter);
diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx
index 939e335b4cb3..2d3baedc4c96 100644
--- a/dbaccess/source/core/api/PrivateRow.cxx
+++ b/dbaccess/source/core/api/PrivateRow.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle andor its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx
index 82dd97232c92..aabcb0d4af67 100644
--- a/dbaccess/source/core/api/PrivateRow.hxx
+++ b/dbaccess/source/core/api/PrivateRow.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index 829155709119..1f7c0294f1bc 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -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
@@ -109,28 +109,28 @@ extern "C" void SAL_CALL createRegistryInfo_ORowSet()
}
// -----------------------------------------------------------------------------
-#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();
@@ -176,52 +176,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_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_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)));
}
ORowSet::~ORowSet()
@@ -287,7 +287,7 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c
}
}
// -------------------------------------------------------------------------
-// typedef ::comphelper::OPropertyArrayUsageHelper ORowSet_Prop;
+// typedef ::comphelper::OPropertyArrayUsageHelper ORowSet_Prop;
void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception)
{
@@ -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;
@@ -569,7 +569,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
@@ -587,14 +587,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.isValid() )
@@ -791,12 +791,12 @@ void SAL_CALL ORowSet::updateBinaryStream( sal_Int32 columnIndex, const Referenc
::osl::MutexGuard aGuard( *m_pMutex );
checkUpdateConditions(columnIndex);
checkUpdateIterator();
-
+
//if(((*m_aCurrentRow)->get())[columnIndex].getTypeKind() == DataType::BLOB)
//{
// ::connectivity::ORowSetValue aOldValue = ((*m_aCurrentRow)->get())[columnIndex];
- // m_pCache->updateBinaryStream(columnIndex,x,length);
- // ((*m_aCurrentRow)->get())[columnIndex] = makeAny(x);
+ // m_pCache->updateBinaryStream(columnIndex,x,length);
+ // ((*m_aCurrentRow)->get())[columnIndex] = makeAny(x);
// ((*m_aCurrentRow)->get())[columnIndex].setTypeKind(DataType::BLOB);
// firePropertyChange(columnIndex-1 ,aOldValue);
// fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False);
@@ -858,7 +858,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());
@@ -888,7 +888,7 @@ void SAL_CALL ORowSet::insertRow( ) throw(SQLException, RuntimeException)
// when the row isn't modified
// or the concurency is read only
::osl::ResettableMutexGuard aGuard( *m_pMutex );
-
+
if(!m_pCache || !m_bNew || !m_bModified || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY)
throwFunctionSequenceException(*this);
@@ -919,7 +919,7 @@ void SAL_CALL ORowSet::insertRow( ) throw(SQLException, RuntimeException)
// - rowChanged
notifyAllListenersRowChanged(aGuard,aEvt);
-
+
if ( !aBookmarks.empty() )
{
RowsChangeEvent aUpEvt(*this,RowChangeAction::UPDATE,aBookmarks.size(),Sequence(&(*aBookmarks.begin()),aBookmarks.size()));
@@ -943,7 +943,7 @@ void SAL_CALL ORowSet::insertRow( ) throw(SQLException, RuntimeException)
sal_Int32 SAL_CALL ORowSet::getRow( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( *m_pMutex );
- checkCache();
+ checkCache();
// check if we are inserting a row
return (m_pCache && ( m_pCache->m_bNew || m_bModified )) ? 0 : ORowSetBase::getRow();
@@ -956,7 +956,7 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException)
::osl::ResettableMutexGuard aGuard( *m_pMutex );
if ( !m_pCache || m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY || m_bNew || ((m_pCache->m_nPrivileges & Privilege::UPDATE ) != Privilege::UPDATE) )
throwFunctionSequenceException(*this);
-
+
if(m_bModified)
{
@@ -971,10 +971,10 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException)
::std::vector< Any > aBookmarks;
m_pCache->updateRow(m_aCurrentRow.operator ->(),aBookmarks);
if ( !aBookmarks.empty() )
- aEvt.Bookmarks = Sequence(&(*aBookmarks.begin()),aBookmarks.size());
+ aEvt.Bookmarks = Sequence(&(*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).isValid() )
{
if ( m_pCache->isResultSetChanged() )
@@ -1083,8 +1083,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
@@ -1252,7 +1252,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw()
sal_Bool bReadOnly = sal_False;
(*aIter)->getPropertyValue(PROPERTY_ISREADONLY) >>= bReadOnly;
*aReadIter = bReadOnly;
-
+
(*aIter)->setPropertyValue(PROPERTY_ISREADONLY,makeAny(sal_False));
}
}
@@ -1317,7 +1317,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);
}
@@ -1482,7 +1482,7 @@ void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandl
const sal_Int32 nParamCount = xParamsAsIndicies.is() ? xParamsAsIndicies->getCount() : 0;
if ( m_aParametersSet.size() < (size_t)nParamCount )
m_aParametersSet.resize( nParamCount ,false);
-
+
::dbtools::askForParameters( xComposer, this, m_xActiveConnection, _rxHandler,m_aParametersSet );
}
// ensure that only the allowed exceptions leave this block
@@ -1799,8 +1799,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() );
@@ -1824,14 +1824,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");
@@ -1876,7 +1876,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
}
sName = sAlias;
}
- ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(),
+ ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(),
this,
this,
i+1,
@@ -1937,7 +1937,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
m_xColumns->getByName(sColumnLabel) >>= xColumn;
if (!xColumn.is() && m_xColumns->hasByName(sName))
m_xColumns->getByName(sName) >>= xColumn;
-
+
// check if column already in the list we need another
if ( aAllColumns.find( xColumn ) != aAllColumns.end() )
{
@@ -1980,7 +1980,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,
@@ -1989,9 +1989,9 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
sParseLabel,
m_aCurrentRow);
aColumns->get().push_back(pColumn);
-
+
pColumn->setFastPropertyValue_NoBroadcast(PROPERTY_ID_ISREADONLY,makeAny(rKeyColumns.find(i) != rKeyColumns.end()));
-
+
if(!sColumnLabel.getLength())
{
if(xColumn.is())
@@ -2324,7 +2324,7 @@ sal_Bool ORowSet::impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecu
impl_initParametersContainer_nothrow();
_out_rCommandToExecute = m_xComposer->getQueryWithSubstitution();
-
+
return bUseEscapeProcessing;
}
@@ -2418,9 +2418,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 );
/*
@@ -2645,7 +2645,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();
}
}
@@ -2763,7 +2763,7 @@ void ORowSet::checkUpdateConditions(sal_Int32 columnIndex)
// -----------------------------------------------------------------------------
void SAL_CALL ORowSet::refreshRow( ) throw(SQLException, RuntimeException)
{
-
+
ORowSetNotifier aNotifier( this );
// this will call cancelRowModification on the cache if necessary
@@ -2801,16 +2801,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();
@@ -2818,16 +2818,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)
{
@@ -2838,7 +2838,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(),
@@ -2869,16 +2869,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());
}
//--------------------------------------------------------------------------
@@ -2942,8 +2942,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 8a85237cb928..fdd0ecb857f9 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -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
@@ -59,38 +59,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
{
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;
@@ -102,49 +102,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;
private:
/** builds m_aActiveCommand from our settings
@@ -244,10 +244,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 ~ORowSet();
@@ -408,14 +408,14 @@ namespace dbaccess
protected:
/** implement the execute, 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
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 );
@@ -470,17 +470,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 57157cf4f998..e19dd8371234 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -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
@@ -116,7 +116,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 );
@@ -238,7 +238,7 @@ const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex)
}
// -----------------------------------------------------------------------------
const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
-{
+{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getValue" );
if ( m_bBeforeFirst || m_bAfterLast )
{
@@ -256,7 +256,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->isValid() );
@@ -381,7 +381,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBinaryStream" );
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
-
+
if ( m_bBeforeFirst || m_bAfterLast )
{
OSL_ENSURE(0,"ORowSetBase::getBinaryStream: Illegal call here (we're before first or after last)!");
@@ -397,7 +397,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->isValid() );
@@ -459,7 +459,7 @@ Any SAL_CALL ORowSetBase::getBookmark( ) throw(SQLException, RuntimeException)
::connectivity::checkDisposed(m_rBHelper.bDisposed);
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
-
+
if ( m_bBeforeFirst || m_bAfterLast )
::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
@@ -657,7 +657,7 @@ sal_Bool SAL_CALL ORowSetBase::next( ) throw(SQLException, RuntimeException)
sal_Bool bAfterLast = m_pCache->isAfterLast();
bRet = m_pCache->next();
doCancelModification( );
-
+
if ( bRet || bAfterLast != m_pCache->isAfterLast() )
{
@@ -850,7 +850,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& _aCheckFunctor,
+sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t& _aCheckFunctor,
::std::mem_fun_t& _aMovementFunctor)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::move" );
@@ -883,7 +883,7 @@ sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t&
setCurrentRow( bMoved, sal_True, aOldValues, aGuard );
}
else
- { // first goes wrong so there is no row
+ { // first goes wrong so there is no row
movementFailed();
}
@@ -921,13 +921,13 @@ sal_Int32 SAL_CALL ORowSetBase::getRow( ) throw(SQLException, RuntimeException)
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getRow" );
DBG_TRACE2("DBACCESS ORowSetBase::getRow() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL));
::osl::MutexGuard aGuard( *m_pMutex );
-
+
checkCache();
return impl_getRow();
}
// -------------------------------------------------------------------------
sal_Int32 ORowSetBase::impl_getRow()
-{
+{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getRow" );
sal_Int32 nPos = 0;
if ( m_bBeforeFirst )
@@ -1112,15 +1112,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!");
@@ -1135,7 +1135,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);
@@ -1146,15 +1146,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);
}
@@ -1208,7 +1208,7 @@ sal_Bool SAL_CALL ORowSetBase::rowUpdated( ) throw(SQLException, RuntimeExcepti
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::rowUpdated" );
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
-
+
if ( impl_rowDeleted() )
return sal_False;
@@ -1221,7 +1221,7 @@ sal_Bool SAL_CALL ORowSetBase::rowInserted( ) throw(SQLException, RuntimeExcept
::osl::MutexGuard aGuard( *m_pMutex );
checkCache();
-
+
if ( impl_rowDeleted() )
return sal_False;
@@ -1404,10 +1404,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));
@@ -1419,7 +1419,7 @@ ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew)
OSL_ENSURE(m_aOldRow.isValid(),"RowSetRowHElper isn't valid!");
ORowSetRow aOldValues;
if ( !_bWasNew && m_aOldRow->getRow().isValid() )
- aOldValues = new ORowSetValueVector( m_aOldRow->getRow().getBody()); // remember the old values
+ aOldValues = new ORowSetValueVector( m_aOldRow->getRow().getBody()); // remember the old values
return aOldValues;
}
// -----------------------------------------------------------------------------
@@ -1462,8 +1462,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 );
}
}
@@ -1499,8 +1499,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() ) )
@@ -1534,13 +1534,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() );
@@ -1574,4 +1574,4 @@ void ORowSetNotifier::firePropertyChange()
m_pRowSet->fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False, ORowSetBase::GrantNotifierAccess());
}
}
-} // namespace dbaccess
+} // namespace dbaccess
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 9a7e9182e1d0..4140c21750be 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.hxx
@@ -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
@@ -96,7 +96,7 @@
#include
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star {
namespace sdb { struct RowChangeEvent; }
namespace lang { struct Locale; }
} } }
@@ -105,7 +105,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,
@@ -126,38 +126,38 @@ namespace dbaccess
{
OModuleClient m_aModuleClient;
protected:
- typedef ::std::vector TDataColumns;
- ::osl::Mutex* m_pMutex; // this the mutex form the rowset itself
- ::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes
+ typedef ::std::vector 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(
@@ -182,14 +182,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 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 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 if and only if the current row is the insert row
- virtual sal_Bool isNew( ) = 0;
+ virtual sal_Bool isNew( ) = 0;
// notify the change of a boolean property
void fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld );
@@ -228,7 +228,7 @@ namespace dbaccess
const connectivity::ORowSetValue& getValue(sal_Int32 columnIndex);
// the cache has to be checked before calling this method
const connectivity::ORowSetValue& impl_getValue(sal_Int32 columnIndex);
- // sets the current and the bookmark
+ // sets the current and the bookmark
void setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard);
void checkPositioningAllowed() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
// checks if the cache is null
@@ -240,14 +240,14 @@ namespace dbaccess
ORowSetRow getOldRow(sal_Bool _bWasNew);
/** move the cache the postion defined by the member functor
- @param _aCheckFunctor
+ @param _aCheckFunctor
Return when we already stand on the row we want to.
- @param _aMovementFunctor
+ @param _aMovementFunctor
The mehtod used to move.
@return
if movement was successful.
*/
- sal_Bool SAL_CALL move( ::std::mem_fun_t& _aCheckFunctor,
+ sal_Bool SAL_CALL move( ::std::mem_fun_t& _aCheckFunctor,
::std::mem_fun_t& _aMovementFunctor);
/** same meaning as isFirst. Only need by mem_fun
@@ -379,22 +379,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; }
};
// ========================================================================
@@ -407,14 +407,14 @@ namespace dbaccess
{
private:
::std::auto_ptr 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:
@@ -441,7 +441,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
@@ -454,7 +454,7 @@ namespace dbaccess
*/
::std::vector& getChangedColumns() const;
::std::vector& getChangedBookmarks() const;
-
+
};
} // end of namespace
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx
index 92e29ac784ba..d42c8d20fc2b 100644
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@ -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,8 +128,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)
@@ -212,7 +212,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!");
Reference 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);
@@ -318,8 +318,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs,
Reference xMeta = xConnection->getMetaData();
SelectColumnsMetaData aColumnNames(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers() ? true : false);
Reference xColSup(_xAnalyzer,UNO_QUERY);
- Reference xSelColumns = xColSup->getColumns();
- Reference xColumns = m_aUpdateTable->getColumns();
+ Reference xSelColumns = xColSup->getColumns();
+ Reference xColumns = m_aUpdateTable->getColumns();
::dbaccess::getColumnPositions(xSelColumns,xColumns->getElementNames(),aUpdateTableName,aColumnNames);
// check privileges
@@ -327,8 +327,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 xColumn(xColumns->getByName(*pIter),UNO_QUERY);
@@ -402,9 +402,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);
}
@@ -424,7 +424,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
{
@@ -457,7 +457,7 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize)
// now adjust their positions because a resize invalid all iterators
::std::vector::const_iterator aIter = aPositions.begin();
::std::map::const_iterator aPosChangeIter = aCacheIterToChange.begin();
- for( aCacheIter = m_aCacheIterators.begin();
+ for( aCacheIter = m_aCacheIterators.begin();
aPosChangeIter != aCacheIterToChange.end();
++aPosChangeIter,++aCacheIter)
{
@@ -522,7 +522,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();
@@ -554,7 +554,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;iend();++i,++m_aMatrixIter) ;
+ // for(sal_Int32 i=0;iend();++i,++m_aMatrixIter) ;
bRet = m_aMatrixIter != m_pMatrix->end() && (*m_aMatrixIter).isValid();
}
@@ -634,7 +634,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference
// -------------------------------------------------------------------------
void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x
,ORowSetValueVector::Vector& io_aRow
- ,::std::vector& o_ChangedColumns
+ ,::std::vector& o_ChangedColumns
)
{
checkUpdateConditions(columnIndex);
@@ -691,7 +691,7 @@ sal_Bool ORowSetCache::next( )
// -------------------------------------------------------------------------
sal_Bool ORowSetCache::isBeforeFirst( )
{
- // return !m_nPosition;
+ // return !m_nPosition;
return m_bBeforeFirst;
}
@@ -710,7 +710,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;
}
@@ -721,9 +721,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();
@@ -771,7 +771,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)
{
@@ -806,7 +806,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)
@@ -830,17 +830,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
@@ -850,7 +850,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;
@@ -872,7 +872,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();
@@ -941,10 +941,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->isValid())
@@ -975,7 +975,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();
@@ -986,9 +986,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;
@@ -996,7 +996,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() ) );
@@ -1005,30 +1005,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;
}
@@ -1037,8 +1037,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->isValid() && bCheck;++aIter)
{
OSL_ENSURE(aIter != m_pMatrix->end(),"Invalid iterator");
@@ -1071,10 +1071,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
{
@@ -1102,10 +1102,10 @@ sal_Bool ORowSetCache::last( )
moveWindow();
// we have to repositioning because moveWindow can modify the cache
m_pCacheSet->last();
-// if(m_nPosition > m_nFetchSize)
-// m_aMatrixIter = m_pMatrix->end() -1;
-// else
-// m_aMatrixIter = m_pMatrix->begin() + m_nPosition - 1;
+// if(m_nPosition > m_nFetchSize)
+// m_aMatrixIter = m_pMatrix->end() -1;
+// else
+// m_aMatrixIter = m_pMatrix->begin() + m_nPosition - 1;
OSL_ENSURE(((m_nPosition - m_nStartPos) - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!");
m_aMatrixIter = calcPosition();
}
@@ -1151,8 +1151,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();
@@ -1165,7 +1165,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)
@@ -1306,13 +1306,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)
@@ -1336,7 +1336,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
@@ -1359,7 +1359,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;
@@ -1367,13 +1367,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->isValid();++aPos)
{
*(aPos-1) = *aPos;
- (*aPos) = NULL;
+ (*aPos) = NULL;
}
m_aMatrixIter = m_pMatrix->end();
@@ -1401,8 +1401,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->isValid())
@@ -1491,7 +1491,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;
}
@@ -1506,13 +1506,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
@@ -1561,15 +1561,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);
@@ -1618,7 +1618,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);
@@ -1712,7 +1712,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 76e1d7145752..d7823a90a9d8 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -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
@@ -117,45 +117,45 @@ namespace dbaccess
friend class ORowSetClone;
friend class ORowSetCacheIterator;
- typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows;
+ typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows;
::std::map 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);
@@ -179,7 +179,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
@@ -187,8 +187,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;}
@@ -199,8 +199,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 29d3f38278f4..91863147c683 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.cxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx
@@ -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
@@ -58,7 +58,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;
@@ -122,7 +122,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;
@@ -136,7 +136,7 @@ sal_Bool ORowSetCacheIterator::isNull() const
{
ORowSetCacheIterator_Helper aHelper = m_aIter->second;
bRet = ( m_pRowSet->isInsertRow()
- ?
+ ?
m_aIter->second.aIterator == m_pCache->m_pInsertMatrix->end()
:
m_aIter->second.aIterator == m_pCache->m_pMatrix->end()
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index 6c4c1a8576ce..641e0309dd3c 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx
@@ -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
@@ -39,22 +39,22 @@ 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);
class ORowSetCache;
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)
+ ORowSetCacheIterator(const ORowSetCacheMap::iterator& _rIter,ORowSetCache* _pCache,ORowSetBase* _pRowSet)
: m_aIter(_rIter)
,m_pCache(_pCache)
,m_pRowSet(_pRowSet)
@@ -71,7 +71,7 @@ namespace dbaccess
ORowSetRow& operator *();
const ORowSetRow& operator *() const;
-
+
ORowSetMatrix::iterator& operator ->();
const ORowSetMatrix::iterator& operator ->() const;
@@ -80,9 +80,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 1178c2990b83..e7ccd399ddbc 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -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
@@ -42,27 +42,27 @@
namespace dbaccess
{
- typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector;
- typedef ::vos::ORef< ORowSetValueVector > ORowSetRow;
- typedef ::std::vector< ORowSetRow > ORowSetMatrix;
+ typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector;
+ typedef ::vos::ORef< 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);
public:
ORowSetOldRowHelper() : m_refCount(0){}
- ORowSetOldRowHelper(const ORowSetRow& _rRow)
+ ORowSetOldRowHelper(const ORowSetRow& _rRow)
: m_refCount(0)
, m_aRow(_rRow)
{}
-// ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh)
-// : m_refCount(0)
-// , m_aRow(_rRh.m_aRow)
-// {}
+// ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh)
+// : m_refCount(0)
+// , m_aRow(_rRh.m_aRow)
+// {}
void acquire()
{
@@ -78,7 +78,7 @@ namespace dbaccess
inline void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; }
};
- typedef ::vos::ORef< ORowSetOldRowHelper > TORowSetOldRowHelperRef;
+ typedef ::vos::ORef< ORowSetOldRowHelper > TORowSetOldRowHelperRef;
class ORowSetValueCompare
{
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 69520d043c52..fc8013413e0a 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -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
@@ -89,19 +89,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
@@ -317,8 +317,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();
}
@@ -373,7 +373,7 @@ void SAL_CALL OSingleSelectQueryComposer::setQuery( const ::rtl::OUString& comma
}
// -------------------------------------------------------------------------
void SAL_CALL OSingleSelectQueryComposer::setCommand( const ::rtl::OUString& Command,sal_Int32 _nCommandType ) throw(SQLException, RuntimeException)
-{
+{
::rtl::OUStringBuffer sSQL;
switch(_nCommandType)
{
@@ -399,7 +399,7 @@ void SAL_CALL OSingleSelectQueryComposer::setCommand( const ::rtl::OUString& Com
{
DBG_UNHANDLED_EXCEPTION();
}
-
+
sSQL.append(dbtools::composeTableNameForSelect(m_xConnection,xTable));
}
else
@@ -412,7 +412,7 @@ void SAL_CALL OSingleSelectQueryComposer::setCommand( const ::rtl::OUString& Com
case CommandType::QUERY:
if ( m_xConnectionQueries->hasByName(Command) )
{
-
+
Reference xQuery(m_xConnectionQueries->getByName(Command),UNO_QUERY);
::rtl::OUString sCommand;
xQuery->getPropertyValue(PROPERTY_COMMAND) >>= sCommand;
@@ -424,7 +424,7 @@ void SAL_CALL OSingleSelectQueryComposer::setCommand( const ::rtl::OUString& Com
sMessage.SearchAndReplaceAscii( "$table$", Command );
throwGenericSQLException(sMessage,*this);
}
-
+
break;
default:
break;
@@ -462,7 +462,7 @@ void OSingleSelectQueryComposer::setQuery_Impl( const ::rtl::OUString& command )
// update columns and tables
// why? Shouldn't this be done on request only?
// otherwise nothing is working anymore :-)
-// getColumns();
+// getColumns();
getTables();
}
// -----------------------------------------------------------------------------
@@ -511,7 +511,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))
{
@@ -522,7 +522,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 xColumn;
@@ -532,10 +532,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 )
@@ -789,7 +789,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
::std::vector< ::rtl::OUString> aNames;
::vos::ORef< OSQLColumns> aSelectColumns;
sal_Bool bCase = sal_True;
- Reference< XNameAccess> xQueryColumns;
+ Reference< XNameAccess> xQueryColumns;
if ( m_nCommandType == CommandType::QUERY )
{
Reference xSup(m_xConnectionQueries->getByName(m_sCommand),UNO_QUERY);
@@ -860,10 +860,10 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
xResultSetMeta.set( xResMetaDataSup->getMetaData(), UNO_QUERY_THROW );
}
}
- catch( const Exception& )
- {
- //@see issue http://qa.openoffice.org/issues/show_bug.cgi?id=110111
- // access returns a different order of column names when executing select * from
+ catch( const Exception& )
+ {
+ //@see issue http://qa.openoffice.org/issues/show_bug.cgi?id=110111
+ // access returns a different order of column names when executing select * from
// and asking the columns from the metadata.
Reference< XParameters > xParameters( xPreparedStatement, UNO_QUERY_THROW );
Reference< XIndexAccess > xPara = getParameters();
@@ -906,7 +906,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
{
@@ -958,11 +958,11 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
if ( !sColumnName.getLength() )
xProp->getPropertyValue(PROPERTY_NAME) >>= sColumnName;
-
+
aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompareFunctor,sColumnName));
sal_Int32 j = 0;
while ( aFindName != aNames.end() )
- {
+ {
sColumnName += ::rtl::OUString::valueOf(++j);
aFindName = ::std::find_if(aNames.begin(),aNames.end(),::std::bind2nd(aCaseCompareFunctor,sColumnName));
}
@@ -970,7 +970,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr
pColumn->setName(sColumnName);
pColumn->setRealName(sRealName);
pColumn->setTableName(::comphelper::getString(xProp->getPropertyValue(PROPERTY_TABLENAME)));
-
+
(aSelectColumns->get())[i-1] = pColumn;
}
else
@@ -1067,9 +1067,9 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
::rtl::OUString aColumnName;
- // pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast(m_sDecimalSep.toChar()));
+ // pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast(m_sDecimalSep.toChar()));
pCondition->parseNodeToStr( aValue, m_xConnection, NULL );
- // pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast(m_sDecimalSep.toChar()));
+ // pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast(m_sDecimalSep.toChar()));
pCondition->getChild(0)->parseNodeToStr( aColumnName, m_xConnection, NULL );
// don't display the column name
@@ -1270,7 +1270,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++)
pCondition->getChild(i)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast( m_sDecimalSep.toChar() ) );
@@ -1329,14 +1329,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
@@ -1347,10 +1347,10 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
if(xColumnsSupp.is() && xColumnsSupp->getColumns()->hasByName(aColumnName))
{
-// Reference xTableProp(xColumnsSupp,UNO_QUERY);
-// xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog;
-// xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema;
-// xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable;
+// Reference xTableProp(xColumnsSupp,UNO_QUERY);
+// xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog;
+// xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema;
+// xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable;
aTable = *pBegin;
break;
}
@@ -1374,14 +1374,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;
}
}
@@ -1405,7 +1405,7 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters( )
{
::vos::ORef< OSQLColumns> aCols = m_aSqlIterator.getParameters();
::std::vector< ::rtl::OUString> aNames;
- OSQLColumns::Vector::const_iterator aEnd = aCols->get().end();
+ OSQLColumns::Vector::const_iterator aEnd = aCols->get().end();
for(OSQLColumns::Vector::const_iterator aIter = aCols->get().begin(); aIter != aEnd;++aIter)
aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME)));
m_aCurrentColumns[ParameterColumns] = new OPrivateColumns(aCols,m_xMetaData->supportsMixedCaseQuotedIdentifiers(),*this,m_aMutex,aNames,sal_True);
@@ -1460,7 +1460,7 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn
if ( !m_aCurrentColumns[_eType] )
{
::std::vector< ::rtl::OUString> aNames;
- OSQLColumns::Vector::const_iterator aEnd = _rCols->get().end();
+ OSQLColumns::Vector::const_iterator aEnd = _rCols->get().end();
for(OSQLColumns::Vector::const_iterator aIter = _rCols->get().begin(); aIter != aEnd;++aIter)
aNames.push_back(getString((*aIter)->getPropertyValue(PROPERTY_NAME)));
m_aCurrentColumns[_eType] = new OPrivateColumns(_rCols,m_xMetaData->supportsMixedCaseQuotedIdentifiers(),*this,m_aMutex,aNames,sal_True);
@@ -1584,7 +1584,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) )
@@ -1596,8 +1596,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;
@@ -1623,7 +1623,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
aSQL.append( ::dbtools::quoteName( aQuote, aName ) );
}
-
+
if ( aValue.hasValue() )
{
if( !m_xTypeConverter.is() )
@@ -1635,7 +1635,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
::rtl::OUString sEmpty;
lcl_addFilterCriteria_throw(filterOperator,sEmpty,aSQL);
}
-
+
switch(nType)
{
case DataType::VARCHAR:
@@ -1674,8 +1674,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 de768b6ceb8e..1965791c26fc 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -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
@@ -62,11 +62,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;
// -------------------------------------------------------------------------
@@ -228,7 +228,7 @@ sal_Bool SAL_CALL OStaticSet::last( ) throw(SQLException, RuntimeException)
m_bInserted = m_bUpdated = m_bDeleted = sal_False;
fillAllRows();
m_aSetIter = m_aSet.end()-1;
-
+
return !isBeforeFirst() && !isAfterLast();
}
// -------------------------------------------------------------------------
@@ -272,8 +272,8 @@ sal_Bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, Runt
bNext = fetchRow();
}
- if(row > (sal_Int32)m_aSet.size())
- m_aSetIter = m_aSet.end(); // check again
+ if(row > (sal_Int32)m_aSet.size())
+ m_aSetIter = m_aSet.end(); // check again
else
m_aSetIter = m_aSet.begin() + row;
}
@@ -298,7 +298,7 @@ sal_Bool SAL_CALL OStaticSet::previous( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::previous" );
m_bInserted = m_bUpdated = m_bDeleted = sal_False;
-
+
if(m_aSetIter != m_aSet.begin())
--m_aSetIter;
@@ -332,8 +332,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 676044cb61f9..794623c07595 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -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
@@ -38,9 +38,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 a296833ab6ef..ee0c0295837c 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -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
@@ -165,9 +165,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 )
@@ -196,25 +196,25 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue(
case PROPERTY_ID_TEXTLINECOLOR:
case PROPERTY_ID_TEXTEMPHASIS:
case PROPERTY_ID_TEXTRELIEF:
- case PROPERTY_ID_FONTCHARWIDTH:
- case PROPERTY_ID_FONTCHARSET:
- case PROPERTY_ID_FONTFAMILY:
- case PROPERTY_ID_FONTHEIGHT:
- case PROPERTY_ID_FONTKERNING:
- case PROPERTY_ID_FONTNAME:
- case PROPERTY_ID_FONTORIENTATION:
- case PROPERTY_ID_FONTPITCH:
- case PROPERTY_ID_FONTSLANT:
- case PROPERTY_ID_FONTSTRIKEOUT:
- case PROPERTY_ID_FONTSTYLENAME:
- case PROPERTY_ID_FONTUNDERLINE:
- case PROPERTY_ID_FONTWEIGHT:
- case PROPERTY_ID_FONTWIDTH:
+ case PROPERTY_ID_FONTCHARWIDTH:
+ case PROPERTY_ID_FONTCHARSET:
+ case PROPERTY_ID_FONTFAMILY:
+ case PROPERTY_ID_FONTHEIGHT:
+ case PROPERTY_ID_FONTKERNING:
+ case PROPERTY_ID_FONTNAME:
+ case PROPERTY_ID_FONTORIENTATION:
+ case PROPERTY_ID_FONTPITCH:
+ case PROPERTY_ID_FONTSLANT:
+ case PROPERTY_ID_FONTSTRIKEOUT:
+ case PROPERTY_ID_FONTSTYLENAME:
+ case PROPERTY_ID_FONTUNDERLINE:
+ case PROPERTY_ID_FONTWEIGHT:
+ case PROPERTY_ID_FONTWIDTH:
case PROPERTY_ID_FONTWORDLINEMODE:
- case PROPERTY_ID_FONTTYPE:
+ case PROPERTY_ID_FONTTYPE:
bRet = ODataSettings::convertFastPropertyValue(rConvertedValue, rOldValue,nHandle,rValue);
break;
-
+
default:
{
Any aValue;
@@ -232,7 +232,7 @@ void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con
switch(_nHandle)
{
case PROPERTY_ID_PRIVILEGES:
- OSL_ENSURE(0,"Property is readonly!");
+ OSL_ENSURE(0,"Property is readonly!");
case PROPERTY_ID_FILTER:
case PROPERTY_ID_ORDER:
case PROPERTY_ID_APPLYFILTER:
@@ -242,22 +242,22 @@ void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, con
case PROPERTY_ID_TEXTLINECOLOR:
case PROPERTY_ID_TEXTEMPHASIS:
case PROPERTY_ID_TEXTRELIEF:
- case PROPERTY_ID_FONTCHARWIDTH:
- case PROPERTY_ID_FONTCHARSET:
- case PROPERTY_ID_FONTFAMILY:
- case PROPERTY_ID_FONTHEIGHT:
- case PROPERTY_ID_FONTKERNING:
- case PROPERTY_ID_FONTNAME:
- case PROPERTY_ID_FONTORIENTATION:
- case PROPERTY_ID_FONTPITCH:
- case PROPERTY_ID_FONTSLANT:
- case PROPERTY_ID_FONTSTRIKEOUT:
- case PROPERTY_ID_FONTSTYLENAME:
- case PROPERTY_ID_FONTUNDERLINE:
- case PROPERTY_ID_FONTWEIGHT:
- case PROPERTY_ID_FONTWIDTH:
+ case PROPERTY_ID_FONTCHARWIDTH:
+ case PROPERTY_ID_FONTCHARSET:
+ case PROPERTY_ID_FONTFAMILY:
+ case PROPERTY_ID_FONTHEIGHT:
+ case PROPERTY_ID_FONTKERNING:
+ case PROPERTY_ID_FONTNAME:
+ case PROPERTY_ID_FONTORIENTATION:
+ case PROPERTY_ID_FONTPITCH:
+ case PROPERTY_ID_FONTSLANT:
+ case PROPERTY_ID_FONTSTRIKEOUT:
+ case PROPERTY_ID_FONTSTYLENAME:
+ case PROPERTY_ID_FONTUNDERLINE:
+ case PROPERTY_ID_FONTWEIGHT:
+ case PROPERTY_ID_FONTWIDTH:
case PROPERTY_ID_FONTWORDLINEMODE:
- case PROPERTY_ID_FONTTYPE:
+ case PROPERTY_ID_FONTTYPE:
ODataSettings::setFastPropertyValue_NoBroadcast(_nHandle, _rValue);
break;
@@ -312,7 +312,7 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c
}
}
// run through
-
+
case PROPERTY_ID_FILTER:
case PROPERTY_ID_ORDER:
case PROPERTY_ID_APPLYFILTER:
@@ -322,22 +322,22 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c
case PROPERTY_ID_TEXTLINECOLOR:
case PROPERTY_ID_TEXTEMPHASIS:
case PROPERTY_ID_TEXTRELIEF:
- case PROPERTY_ID_FONTCHARWIDTH:
- case PROPERTY_ID_FONTCHARSET:
- case PROPERTY_ID_FONTFAMILY:
- case PROPERTY_ID_FONTHEIGHT:
- case PROPERTY_ID_FONTKERNING:
- case PROPERTY_ID_FONTNAME:
- case PROPERTY_ID_FONTORIENTATION:
- case PROPERTY_ID_FONTPITCH:
- case PROPERTY_ID_FONTSLANT:
- case PROPERTY_ID_FONTSTRIKEOUT:
- case PROPERTY_ID_FONTSTYLENAME:
- case PROPERTY_ID_FONTUNDERLINE:
- case PROPERTY_ID_FONTWEIGHT:
- case PROPERTY_ID_FONTWIDTH:
+ case PROPERTY_ID_FONTCHARWIDTH:
+ case PROPERTY_ID_FONTCHARSET:
+ case PROPERTY_ID_FONTFAMILY:
+ case PROPERTY_ID_FONTHEIGHT:
+ case PROPERTY_ID_FONTKERNING:
+ case PROPERTY_ID_FONTNAME:
+ case PROPERTY_ID_FONTORIENTATION:
+ case PROPERTY_ID_FONTPITCH:
+ case PROPERTY_ID_FONTSLANT:
+ case PROPERTY_ID_FONTSTRIKEOUT:
+ case PROPERTY_ID_FONTSTYLENAME:
+ case PROPERTY_ID_FONTUNDERLINE:
+ case PROPERTY_ID_FONTWEIGHT:
+ case PROPERTY_ID_FONTWIDTH:
case PROPERTY_ID_FONTWORDLINEMODE:
- case PROPERTY_ID_FONTTYPE:
+ case PROPERTY_ID_FONTTYPE:
ODataSettings::getFastPropertyValue(_rValue, _nHandle);
break;
case PROPERTY_ID_CATALOGNAME:
@@ -395,7 +395,7 @@ void ODBTableDecorator::construct()
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createArrayHelper" );
Reference xProp(m_xTable,UNO_QUERY);
Reference xInfo = xProp->getPropertySetInfo();
-
+
Sequence< Property > aTableProps = xInfo->getProperties();
Property* pIter = aTableProps.getArray();
Property* pEnd = pIter + aTableProps.getLength();
@@ -416,11 +416,11 @@ void ODBTableDecorator::construct()
}
describeProperties(aTableProps);
-
- return new ::cppu::OPropertyArrayHelper(aTableProps);
+
+ return new ::cppu::OPropertyArrayHelper(aTableProps);
}
-// -----------------------------------------------------------------------------
-::cppu::IPropertyArrayHelper & SAL_CALL ODBTableDecorator::getInfoHelper()
+// -----------------------------------------------------------------------------
+::cppu::IPropertyArrayHelper & SAL_CALL ODBTableDecorator::getInfoHelper()
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getInfoHelper" );
Reference xProp(m_xTable,UNO_QUERY);
@@ -449,11 +449,11 @@ Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(Runti
if(m_xTable.is())
{
aRet = m_xTable->queryInterface(rType);
- if(aRet.hasValue())
- { // now we know that our table supports this type so we return ourself
+ if(aRet.hasValue())
+ { // 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);
+ aRet = ODataSettings::queryInterface(rType);
}
}
@@ -479,9 +479,9 @@ void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) thro
Reference xRename(m_xTable,UNO_QUERY);
if(xRename.is())
{
-// ::rtl::OUString sOldName;
-// Reference xProp(m_xTable,UNO_QUERY);
-// xProp->getPropertyValue(PROPERTY_NAME) >>= sOldName;
+// ::rtl::OUString sOldName;
+// Reference xProp(m_xTable,UNO_QUERY);
+// xProp->getPropertyValue(PROPERTY_NAME) >>= sOldName;
xRename->rename(_rNewName);
}
else // not supported
@@ -607,9 +607,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);
}
}
@@ -654,7 +654,7 @@ void ODBTableDecorator::refreshColumns()
::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
::std::vector< ::rtl::OUString> aVector;
-
+
Reference xNames;
if(m_xTable.is())
{
@@ -662,8 +662,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);
}
@@ -679,7 +679,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/View.cxx b/dbaccess/source/core/api/View.cxx
index fa528d203466..3644c4f42415 100644
--- a/dbaccess/source/core/api/View.cxx
+++ b/dbaccess/source/core/api/View.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -121,7 +121,7 @@ namespace dbaccess
Sequence< Type > aTypes( ::comphelper::concatSequences(View_Base::getTypes(),View_IBASE::getTypes()) );
::std::vector aOwnTypes;
- aOwnTypes.reserve(aTypes.getLength());
+ aOwnTypes.reserve(aTypes.getLength());
const Type* pIter = aTypes.getConstArray();
const Type* pEnd = pIter + aTypes.getLength();
@@ -130,7 +130,7 @@ namespace dbaccess
if( (*pIter != aAlterType || m_xViewAccess.is()) )
aOwnTypes.push_back(*pIter);
}
-
+
Type* pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
return Sequence< Type >(pTypes, aOwnTypes.size());
}
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index 22e8f61383ac..0b9c6b6c26d7 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -45,11 +45,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/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx
index 082811748e6a..e78e45a148f9 100644
--- a/dbaccess/source/core/api/WrappedResultSet.hxx
+++ b/dbaccess/source/core/api/WrappedResultSet.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx
index 22057ff7a9f6..8398c4eb9911 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -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
@@ -137,7 +137,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex
MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
-
+
Reference< XOutParameters >(m_xAggregateAsSet, UNO_QUERY)->registerOutParameter( parameterIndex, sqlType, typeName );
}
diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx
index 292bf5694793..43412bb02829 100644
--- a/dbaccess/source/core/api/column.cxx
+++ b/dbaccess/source/core/api/column.cxx
@@ -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
@@ -329,22 +329,22 @@ Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeExcepti
if(m_xDrvColumns.is())
{
aRet = m_xDrvColumns->queryInterface(rType);
- if ( aRet.hasValue() )
+ if ( aRet.hasValue() )
aRet = OColumns_BASE::queryInterface( rType);
- if ( !aRet.hasValue() )
+ if ( !aRet.hasValue() )
aRet = TXChild::queryInterface( rType);
return aRet;
}
else if(!m_pTable || (m_pTable && !m_pTable->isNew()))
{
- if(!m_bAddColumn && rType == getCppuType( (Reference*)0))
+ if(!m_bAddColumn && rType == getCppuType( (Reference*)0))
return Any();
- if(!m_bDropColumn && rType == getCppuType( (Reference*)0))
+ if(!m_bDropColumn && rType == getCppuType( (Reference*)0))
return Any();
}
aRet = OColumns_BASE::queryInterface( rType);
- if ( !aRet.hasValue() )
+ if ( !aRet.hasValue() )
aRet = TXChild::queryInterface( rType);
return aRet;
}
@@ -355,7 +355,7 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException)
sal_Int32 nSize = 0;
Type aAppendType = getCppuType( (Reference*)0);
- Type aDropType = getCppuType( (Reference*)0);
+ Type aDropType = getCppuType( (Reference*)0);
if(m_xDrvColumns.is())
{
Reference xTypes(m_xDrvColumns,UNO_QUERY);
@@ -380,8 +380,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/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx
index a88879ca5eb8..1650d068af9e 100644
--- a/dbaccess/source/core/api/columnsettings.cxx
+++ b/dbaccess/source/core/api/columnsettings.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx
index cb1be701cb99..e7bb442c8da0 100644
--- a/dbaccess/source/core/api/datacolumn.cxx
+++ b/dbaccess/source/core/api/datacolumn.cxx
@@ -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
@@ -157,7 +157,7 @@ sal_Bool ODataColumn::wasNull(void) throw( SQLException, RuntimeException )
{
MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(!m_xRow.is());
-
+
return m_xRow->wasNull();
}
@@ -479,7 +479,7 @@ void ODataColumn::updateObject(const Any& x) throw( SQLException, RuntimeExcepti
{
MutexGuard aGuard( m_aMutex );
::connectivity::checkDisposed(!m_xRowUpdate.is());
-
+
m_xRowUpdate->updateObject(m_nPos, x);
}
diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx
index 3c18fd4d830d..c55c9e77c522 100644
--- a/dbaccess/source/core/api/datacolumn.hxx
+++ b/dbaccess/source/core/api/datacolumn.hxx
@@ -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
@@ -56,12 +56,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 2f5a01fd7004..e2d766645d9f 100644
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@ -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
@@ -49,7 +49,7 @@
#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
#include
#endif
-#ifndef _SV_SVAPP_HXX
+#ifndef _SV_SVAPP_HXX
#include
#endif
#ifndef _COM_SUN_STAR_AWT_FONTWEIGHT_HPP_
@@ -118,22 +118,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));
}
//--------------------------------------------------------------------------
@@ -226,7 +226,7 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau
_rDefault <<= aFD.Weight;
break;
case PROPERTY_ID_FONTSLANT:
- _rDefault <<= aFD.Slant;
+ _rDefault <<= aFD.Slant;
break;
case PROPERTY_ID_FONTUNDERLINE:
_rDefault <<= aFD.Underline;
@@ -249,6 +249,6 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau
}
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 4620abd661f3..7f1e7a244e81 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -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
@@ -56,10 +56,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
@@ -210,7 +210,7 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_ISAUTOINCREMENT ) >>= m_bAutoIncrement );
OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_ISCURRENCY ) >>= m_bCurrency );
OSL_VERIFY( _rxParserColumn->getPropertyValue( PROPERTY_NAME ) >>= m_sName );
-
+
m_bRowVersion = sal_False;
Reference< XPropertySetInfo > xPSI( _rxParserColumn->getPropertySetInfo(), UNO_SET_THROW );
@@ -507,9 +507,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/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx
index 98c7c1c74b65..8237df8de7e3 100644
--- a/dbaccess/source/core/api/preparedstatement.cxx
+++ b/dbaccess/source/core/api/preparedstatement.cxx
@@ -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/query.cxx b/dbaccess/source/core/api/query.cxx
index f4cc3cf34714..41c8c29feea8 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -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
@@ -78,7 +78,7 @@
#endif
/** === end UNO includes === **/
-#ifndef _COMPHELPER_TYPES_HXX_
+#ifndef _COMPHELPER_TYPES_HXX_
#include
#endif
#ifndef _COMPHELPER_PROPERTY_HXX_
@@ -161,7 +161,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 !");
@@ -355,10 +355,10 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r
ODataSettings::setFastPropertyValue_NoBroadcast(_nHandle, _rValue);
::rtl::OUString sAggPropName;
sal_Int16 nAttr = 0;
- if (getInfoHelper().fillPropertyMembersByHandle(&sAggPropName,&nAttr,_nHandle) &&
+ 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);
@@ -372,7 +372,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() ) ;
}
@@ -440,6 +440,6 @@ void OQuery::registerProperties()
// -----------------------------------------------------------------------------
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx
index 81e3a38c7862..d04f782769a9 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -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
@@ -65,16 +65,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
@@ -83,29 +83,29 @@ class OQuery :public OContentHelper
friend struct TRelease;
public:
- typedef ::std::map< ::rtl::OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap;
+ 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; }
@@ -116,7 +116,7 @@ protected:
// OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
- ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); }
+ ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); }
public:
OQuery(
@@ -157,8 +157,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);
@@ -178,7 +178,7 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREAPI_QUERY_HXX_
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index ea0a3617e9ba..fab4af44c283 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -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/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx
index 043912259aff..be485c1f7a34 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -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,8 +128,8 @@ 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 );
@@ -155,8 +155,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)
@@ -175,7 +175,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 );
@@ -185,8 +185,8 @@ void OQueryContainer::disposing()
m_pCommandsListener = NULL;
}
- m_xCommandDefinitions = NULL;
- m_xConnection = NULL;
+ m_xCommandDefinitions = NULL;
+ m_xConnection = NULL;
}
// XServiceInfo
@@ -232,7 +232,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));
}
@@ -325,7 +325,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const ::com::sun::star::containe
DBG_ASSERT(m_aDocumentMap.find(sAccessor) != m_aDocumentMap.end(), "OQueryContainer::elementReplaced : oops .... we're inconsistent with our master container !");
if (!sAccessor.getLength() || !hasByName(sAccessor))
return;
-
+
xNewElement = implCreateWrapper(sAccessor);
}
@@ -367,17 +367,17 @@ 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();
}
- else
+ else
{
Reference< XContent > xSource(_rSource.Source, UNO_QUERY);
// 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() )
{
@@ -417,7 +417,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 ...
}
@@ -470,6 +470,6 @@ Sequence< ::rtl::OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx
index 0fb61dbd1f64..f22f406b6fb4 100644
--- a/dbaccess/source/core/api/querydescriptor.cxx
+++ b/dbaccess/source/core/api/querydescriptor.cxx
@@ -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
@@ -76,7 +76,7 @@ namespace dbaccess
//==========================================================================
DBG_NAME(OQueryDescriptor)
//--------------------------------------------------------------------------
-OQueryDescriptor::OQueryDescriptor()
+OQueryDescriptor::OQueryDescriptor()
:OQueryDescriptor_Base(m_aMutex,*this)
,ODataSettings(m_aBHelper,sal_True)
{
@@ -151,7 +151,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)
{
@@ -245,7 +245,7 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (Ru
throw;
}
}
-
+
return m_pColumns;
}
@@ -317,7 +317,7 @@ OColumn* OQueryDescriptor_Base::createColumn( const ::rtl::OUString& /*_rName*/
}
// -----------------------------------------------------------------------------
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx
index 2f27b4b9c628..61395e59e93b 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -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
@@ -78,7 +78,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
@@ -87,24 +87,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)
*/
@@ -125,7 +125,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);
@@ -175,7 +175,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 02195693bba1..27532a3f2985 100644
--- a/dbaccess/source/core/api/resultcolumn.cxx
+++ b/dbaccess/source/core/api/resultcolumn.cxx
@@ -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
@@ -98,7 +98,7 @@ void OResultColumn::impl_determineIsRowVersion_nothrow()
OSL_ENSURE( m_xDBMetaData.is(), "OResultColumn::impl_determineIsRowVersion_nothrow: no DBMetaData!" );
if ( !m_xDBMetaData.is() )
return;
-
+
try
{
::rtl::OUString sCatalog, sSchema, sTable, sColumnName;
@@ -186,27 +186,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();
}
@@ -334,12 +334,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 7e1842241cf6..76f856615b6d 100644
--- a/dbaccess/source/core/api/resultcolumn.hxx
+++ b/dbaccess/source/core/api/resultcolumn.hxx
@@ -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
@@ -44,9 +44,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 0f1be7553ad6..05aa785e2b33 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -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
@@ -277,12 +277,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();
}
@@ -333,7 +333,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
@@ -1072,7 +1072,7 @@ sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows)
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::moveRelativeToBookmark" );
MutexGuard aGuard(m_aMutex);
::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
-
+
checkBookmarkable();
return Reference< XRowLocate >(m_xDelegatorResultSet, UNO_QUERY)->moveRelativeToBookmark(bookmark, rows);
diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx
index cc765919c313..f95e5c2bec80 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.hxx
@@ -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
@@ -109,24 +109,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 05ef557f2582..58d6962c3055 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -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
@@ -234,15 +234,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();
}
@@ -658,7 +658,7 @@ void SAL_CALL OStatement::disposing()
bool bParseable = false;
try { m_xComposer->setQuery( _rSQL ); bParseable = true; }
catch( const SQLException& ) { }
-
+
if ( !bParseable )
// if we cannot parse it, silently accept this. The driver is probably able to cope with it then
return _rSQL;
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index e33098f74f4c..ec6c8e97b9a2 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -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
@@ -80,9 +80,9 @@ DBG_NAME(ODBTable)
ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
,const Reference< XConnection >& _rxConn
,const ::rtl::OUString& _rCatalog
- ,const ::rtl::OUString& _rSchema
+ ,const ::rtl::OUString& _rSchema
,const ::rtl::OUString& _rName
- ,const ::rtl::OUString& _rType
+ ,const ::rtl::OUString& _rType
,const ::rtl::OUString& _rDesc
,const Reference< XNameAccess >& _xColumnDefinitions) throw(SQLException)
:OTable_Base(_pTables,_rxConn,_rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers(), _rName, _rType, _rDesc, _rSchema, _rCatalog )
@@ -101,7 +101,7 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
// -----------------------------------------------------------------------------
ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
,const Reference< XConnection >& _rxConn)
- throw(SQLException)
+ throw(SQLException)
:OTable_Base(_pTables,_rxConn, _rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers())
,m_nPrivileges(-1)
{
@@ -190,7 +190,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(this)->m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),m_CatalogName,m_SchemaName, m_Name);
}
@@ -201,7 +201,7 @@ void ODBTable::construct()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::construct" );
::osl::MutexGuard aGuard(m_aMutex);
-
+
// we don't collect the privileges here, this is potentially expensive. Instead we determine them on request.
// (see getFastPropertyValue)
m_nPrivileges = -1;
@@ -228,32 +228,32 @@ void ODBTable::construct()
registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, PropertyAttribute::BOUND | PropertyAttribute::READONLY,
&m_nPrivileges, ::getCppuType(static_cast(NULL)));
-
+
registerMayBeVoidProperty(PROPERTY_TEXTLINECOLOR, PROPERTY_ID_TEXTLINECOLOR, PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
&m_aTextLineColor, ::getCppuType(static_cast(NULL)));
-
+
registerProperty(PROPERTY_TEXTEMPHASIS, PROPERTY_ID_TEXTEMPHASIS, PropertyAttribute::BOUND,
&m_nFontEmphasis, ::getCppuType(&m_nFontEmphasis));
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();
}
@@ -265,8 +265,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))
@@ -279,12 +279,12 @@ void ODBTable::construct()
pIter->Attributes = PropertyAttribute::READONLY;
}
}
-
- return new ::cppu::OPropertyArrayHelper(aProps);
+
+ return new ::cppu::OPropertyArrayHelper(aProps);
}
-// -----------------------------------------------------------------------------
-::cppu::IPropertyArrayHelper & SAL_CALL ODBTable::getInfoHelper()
-{
+// -----------------------------------------------------------------------------
+::cppu::IPropertyArrayHelper & SAL_CALL ODBTable::getInfoHelper()
+{
return *ODBTable_PROP::getArrayHelper(isNew() ? 1 : 0);
}
// -------------------------------------------------------------------------
@@ -309,7 +309,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes( ) throw(RuntimeException)
Sequence< Type > aTypes(OTable_Base::getTypes());
::std::vector aOwnTypes;
- aOwnTypes.reserve(aTypes.getLength());
+ aOwnTypes.reserve(aTypes.getLength());
const Type* pIter = aTypes.getConstArray();
const Type* pEnd = pIter + aTypes.getLength();
@@ -318,7 +318,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes( ) throw(RuntimeException)
if( (*pIter != aRenameType || getRenameService().is()) && (*pIter != aAlterType || getAlterService().is()))
aOwnTypes.push_back(*pIter);
}
-
+
Type* pTypes = aOwnTypes.empty() ? 0 : &aOwnTypes[0];
return Sequence< Type >(pTypes, aOwnTypes.size());
}
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 76d6ac063441..c8a047ac18f6 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -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
@@ -90,7 +90,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
@@ -114,19 +114,19 @@ namespace
//==========================================================================
DBG_NAME(OTableContainer)
//------------------------------------------------------------------------------
-OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent,
+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)
,m_xTableDefinitions(_xTableDefinitions)
,m_pTableMediator( NULL )
,m_bInDrop(sal_False)
-{
+{
DBG_CTOR(OTableContainer, NULL);
}
@@ -134,7 +134,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);
}
@@ -192,7 +192,7 @@ void lcl_createDefintionObject(const ::rtl::OUString& _rName
}
Reference xColumnsSupplier(_xTableDefinition,UNO_QUERY);
if ( xColumnsSupplier.is() )
- _xColumnDefinitions = xColumnsSupplier->getColumns();
+ _xColumnDefinitions = xColumnsSupplier->getColumns();
}
}
// -------------------------------------------------------------------------
@@ -211,7 +211,7 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr
Reference xTableDefinition;
Reference xColumnDefinitions;
lcl_createDefintionObject(_rName,m_xTableDefinitions,xTableDefinition,xColumnDefinitions,sal_False);
-
+
if ( xSup.is() )
{
ODBTableDecorator* pTable = new ODBTableDecorator( m_xConnection, xSup, ::dbtools::getNumberFormats( m_xConnection ) ,xColumnDefinitions);
@@ -223,8 +223,8 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr
::rtl::OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(m_xMetaData,
_rName,
- sCatalog,
- sSchema,
+ sCatalog,
+ sSchema,
sTable,
::dbtools::eInDataManipulation);
Any aCatalog;
@@ -240,8 +240,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);
@@ -266,7 +266,7 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr
if ( m_pTableMediator.is() )
m_pTableMediator->notifyElementCreated(_rName,xDest);
}
-
+
return xRet;
}
// -----------------------------------------------------------------------------
@@ -355,7 +355,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons
Reference 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) )
@@ -371,7 +371,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)
@@ -402,15 +402,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")));
}
@@ -418,7 +418,7 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement
::dbtools::throwFunctionSequenceException(static_cast(static_cast(this)));
::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP ");
-
+
// #104282# OJ
if ( bIsView ) // here we have a view
aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW "));
@@ -479,9 +479,9 @@ 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);
}
}
@@ -491,7 +491,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 0fc2542bfa4a..42412aa2e0f8 100644
--- a/dbaccess/source/core/api/viewcontainer.cxx
+++ b/dbaccess/source/core/api/viewcontainer.cxx
@@ -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 @@ 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);
}
//------------------------------------------------------------------------------
@@ -108,8 +108,8 @@ ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName)
::rtl::OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(m_xMetaData,
_rName,
- sCatalog,
- sSchema,
+ sCatalog,
+ sSchema,
sTable,
::dbtools::eInDataManipulation);
return new View(m_xConnection,
@@ -197,9 +197,9 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN
Reference 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 10361a3aa280..ec71f05aceef 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx
@@ -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
@@ -80,7 +80,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;
@@ -103,7 +103,7 @@ public:
}
void clear() { m_pComponent = NULL; }
};
-DBG_NAME(OComponentDefinition_Impl)
+DBG_NAME(OComponentDefinition_Impl)
OComponentDefinition_Impl::OComponentDefinition_Impl()
{
DBG_CTOR(OComponentDefinition_Impl,NULL);
@@ -111,7 +111,7 @@ OComponentDefinition_Impl::OComponentDefinition_Impl()
// -----------------------------------------------------------------------------
OComponentDefinition_Impl::~OComponentDefinition_Impl()
{
- DBG_DTOR(OComponentDefinition_Impl,NULL);
+ DBG_DTOR(OComponentDefinition_Impl,NULL);
}
//==========================================================================
//= OComponentDefinition
@@ -140,7 +140,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)
@@ -157,7 +157,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
@@ -195,7 +195,7 @@ Sequence< ::rtl::OUString > OComponentDefinition::getSupportedServiceNames_stati
Sequence< ::rtl::OUString > aServices(2);
aServices.getArray()[0] = SERVICE_SDB_TABLEDEFINITION;
aServices.getArray()[1] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.Content"));
-
+
return aServices;
}
@@ -277,7 +277,7 @@ OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const
if ( aFind != rDefinition.end() )
{
aFind->second->addPropertyChangeListener(::rtl::OUString(),m_xColumnPropertyListener.getRef());
- return new OTableColumnWrapper( aFind->second, aFind->second, true );
+ return new OTableColumnWrapper( aFind->second, aFind->second, true );
}
OSL_ENSURE( false, "OComponentDefinition::createColumn: is this a valid case?" );
// This here is the last place creating a OTableColumn, and somehow /me thinks it is not needed ...
@@ -295,7 +295,7 @@ void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,co
notifyDataSourceModified();
}
// -----------------------------------------------------------------------------
-void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName)
+void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName)
{
getDefinition().erase( _sName );
notifyDataSourceModified();
@@ -323,6 +323,6 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 834e7a9979fa..3a535c5c0a4e 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -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
@@ -91,8 +91,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();
@@ -118,27 +118,27 @@ 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
,public ::comphelper::OPropertyArrayUsageHelper< OComponentDefinition >
{
OComponentDefinition();
-
+
protected:
::std::auto_ptr< OColumns > m_pColumns;
- ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener>
+ ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener>
m_xColumnPropertyListener;
- sal_Bool m_bTable;
+ sal_Bool m_bTable;
- virtual ~OComponentDefinition();
+ virtual ~OComponentDefinition();
virtual void SAL_CALL disposing();
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);
@@ -179,7 +179,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);
@@ -201,7 +201,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 3ed2649caabe..6f2e24aec9fc 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -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
@@ -95,17 +95,17 @@ using namespace ::cppu;
DBG_NAME(OContentHelper_Impl)
OContentHelper_Impl::OContentHelper_Impl()
{
- DBG_CTOR(OContentHelper_Impl,NULL);
+ DBG_CTOR(OContentHelper_Impl,NULL);
}
// -----------------------------------------------------------------------------
OContentHelper_Impl::~OContentHelper_Impl()
{
- DBG_DTOR(OContentHelper_Impl,NULL);
+ DBG_DTOR(OContentHelper_Impl,NULL);
}
// -----------------------------------------------------------------------------
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)
@@ -269,7 +269,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
Reference xProp(*this,UNO_QUERY);
if ( xProp.is() )
aRet <<= xProp->getPropertySetInfo();
- // aRet <<= getPropertySetInfo(); // TODO
+ // aRet <<= getPropertySetInfo(); // TODO
}
else
{
@@ -342,7 +342,7 @@ void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< ::
// -----------------------------------------------------------------------------
// XPropertyContainer
-void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
+void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
{
DBG_ERROR( "OContentHelper::addProperty: not implemented!" );
}
@@ -386,7 +386,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();
@@ -477,7 +477,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue
if ( nChanged > 0 )
{
// @@@ Save changes.
-// storeData();
+// storeData();
notifyDataSourceModified();
aGuard.clear();
@@ -595,7 +595,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent
typedef Sequence< PropertyChangeEvent > PropertyEventSequence;
typedef ::std::map< XPropertiesChangeListener*, PropertyEventSequence* > PropertiesEventListenerMap;
PropertiesEventListenerMap aListeners;
-
+
const PropertyChangeEvent* propertyChangeEvent = evt.getConstArray();
@@ -696,14 +696,14 @@ 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;
aChanges[0].NewValue <<= _sNewName;
-
+
aGuard.clear();
-
+
m_pImpl->m_aProps.aTitle = _sNewName;
if ( _bNotify )
notifyPropertiesChange( aChanges );
@@ -717,39 +717,39 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN
// -----------------------------------------------------------------------------
void SAL_CALL OContentHelper::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException)
{
-
+
impl_rename_throw(newName);
//Reference xNameCont(m_xParentContainer,UNO_QUERY);
//if ( xNameCont.is() )
//{
- // if ( xNameCont->hasByName(newName) )
- // throw ElementExistException(newName,*this);
-
- // try
- // {
- // if ( xNameCont->hasByName(m_pImpl->m_aProps.aTitle) )
- // xNameCont->removeByName(m_pImpl->m_aProps.aTitle);
-
- // m_pImpl->m_aProps.aTitle = newName;
- // xNameCont->insertByName(m_pImpl->m_aProps.aTitle,makeAny(Reference(*this,UNO_QUERY)));
- // notifyDataSourceModified();
- // }
- // catch(IllegalArgumentException)
- // {
- // throw SQLException();
- // }
- // catch(NoSuchElementException)
- // {
- // throw SQLException();
- // }
- // catch(WrappedTargetException)
- // {
- // throw SQLException();
- // }
+ // if ( xNameCont->hasByName(newName) )
+ // throw ElementExistException(newName,*this);
+
+ // try
+ // {
+ // if ( xNameCont->hasByName(m_pImpl->m_aProps.aTitle) )
+ // xNameCont->removeByName(m_pImpl->m_aProps.aTitle);
+
+ // m_pImpl->m_aProps.aTitle = newName;
+ // xNameCont->insertByName(m_pImpl->m_aProps.aTitle,makeAny(Reference(*this,UNO_QUERY)));
+ // notifyDataSourceModified();
+ // }
+ // catch(IllegalArgumentException)
+ // {
+ // throw SQLException();
+ // }
+ // catch(NoSuchElementException)
+ // {
+ // throw SQLException();
+ // }
+ // catch(WrappedTargetException)
+ // {
+ // throw SQLException();
+ // }
//}
//else
- // m_pImpl->m_aProps.aTitle = newName;
-
+ // m_pImpl->m_aProps.aTitle = newName;
+
}
// -----------------------------------------------------------------------------
void OContentHelper::notifyDataSourceModified()
@@ -757,6 +757,6 @@ void OContentHelper::notifyDataSourceModified()
::dbaccess::notifyDataSourceModified(m_xParentContainer,sal_True);
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index ee50bea00dd0..94165392379e 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -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
@@ -1167,7 +1167,7 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings()
AsciiPropertyValue( "Reports", makeAny( ::rtl::OUString() ) ),
AsciiPropertyValue( "KeyAlterationServiceName", makeAny( ::rtl::OUString() ) ),
AsciiPropertyValue( "IndexAlterationServiceName", makeAny( ::rtl::OUString() ) ),
-
+
AsciiPropertyValue()
};
return aKnownSettings;
@@ -1497,6 +1497,6 @@ ModelDependentComponent::~ModelDependentComponent()
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index f83b2230c2b4..36fdc427ec1b 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -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
@@ -148,7 +148,7 @@ public:
VosMutexFacade( ::osl::Mutex& _rMutex );
// IMutex
- virtual void SAL_CALL acquire();
+ virtual void SAL_CALL acquire();
virtual sal_Bool SAL_CALL tryToAcquire();
virtual void SAL_CALL release();
@@ -190,8 +190,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;
@@ -205,14 +205,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;
@@ -238,32 +238,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();
@@ -334,7 +334,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(());
@@ -479,7 +479,7 @@ public:
if any of the invoked operations does so
*/
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >
- switchToStorage(
+ switchToStorage(
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxNewRootStorage
);
@@ -634,7 +634,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 d2b9f4d5196a..48f80ada2523 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.cxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx
@@ -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
@@ -41,20 +41,20 @@ 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)
OSharedConnection::OSharedConnection(Reference< XAggregation >& _rxProxyConnection)
: OSharedConnection_BASE(m_aMutex)
{
- DBG_CTOR(OSharedConnection,NULL);
+ DBG_CTOR(OSharedConnection,NULL);
setDelegation(_rxProxyConnection,m_refCount);
}
// -----------------------------------------------------------------------------
OSharedConnection::~OSharedConnection()
{
- DBG_DTOR(OSharedConnection,NULL);
+ DBG_DTOR(OSharedConnection,NULL);
}
// -----------------------------------------------------------------------------
void SAL_CALL OSharedConnection::disposing(void)
@@ -67,7 +67,7 @@ Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) throw(SQ
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->createStatement();
}
@@ -76,7 +76,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( co
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->prepareStatement(sql);
}
@@ -85,7 +85,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const :
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->prepareCall(sql);
}
@@ -94,7 +94,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const :
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->nativeSQL(sql);
}
@@ -103,7 +103,7 @@ sal_Bool SAL_CALL OSharedConnection::getAutoCommit( ) throw(SQLException, Runti
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->getAutoCommit();
}
@@ -112,7 +112,7 @@ void SAL_CALL OSharedConnection::commit( ) throw(SQLException, RuntimeException
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
m_xConnection->commit();
}
@@ -121,7 +121,7 @@ void SAL_CALL OSharedConnection::rollback( ) throw(SQLException, RuntimeExcepti
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
m_xConnection->rollback();
}
@@ -129,7 +129,7 @@ void SAL_CALL OSharedConnection::rollback( ) throw(SQLException, RuntimeExcepti
sal_Bool SAL_CALL OSharedConnection::isClosed( ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
-
+
return m_xConnection->isClosed();
}
// --------------------------------------------------------------------------------
@@ -137,16 +137,16 @@ Reference< XDatabaseMetaData > SAL_CALL OSharedConnection::getMetaData( ) throw
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->getMetaData();
}
// --------------------------------------------------------------------------------
sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeException)
-{
+{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->isReadOnly();
}
@@ -155,7 +155,7 @@ sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeE
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->getCatalog();
}
@@ -164,7 +164,7 @@ sal_Int32 SAL_CALL OSharedConnection::getTransactionIsolation( ) throw(SQLExcep
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->getTransactionIsolation();
}
@@ -173,14 +173,14 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection
{
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(rBHelper.bDisposed);
-
+
return m_xConnection->getTypeMap();
}
// -----------------------------------------------------------------------------
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index 7691411cd08b..e90ea054c685 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx
@@ -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
@@ -30,10 +30,10 @@
#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_
#include "connectivity/ConnectionWrapper.hxx"
#endif
-#ifndef _CPPUHELPER_COMPONENT_HXX_
+#ifndef _CPPUHELPER_COMPONENT_HXX_
#include
#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
+#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
#include
#endif
#ifndef _CPPUHELPER_COMPBASE1_HXX_
@@ -66,7 +66,7 @@
#ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_
#include
#endif
-#ifndef _COMPHELPER_SEQUENCE_HXX_
+#ifndef _COMPHELPER_SEQUENCE_HXX_
#include
#endif
@@ -81,9 +81,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
{
@@ -99,10 +99,10 @@ namespace dbaccess
virtual void SAL_CALL release() throw() { OSharedConnection_BASE::release(); }
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException)
{
- return ::comphelper::concatSequences(
- OSharedConnection_BASE::getTypes(),
+ return ::comphelper::concatSequences(
+ OSharedConnection_BASE::getTypes(),
OSharedConnection_BASE2::getTypes()
- );
+ );
}
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException)
@@ -119,14 +119,14 @@ namespace dbaccess
{
::osl::MutexGuard aGuard( m_aMutex );
::connectivity::checkDisposed(rBHelper.bDisposed);
-
+
}
dispose();
}
// XConnection
virtual void SAL_CALL setAutoCommit( sal_Bool /*autoCommit*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
- {
+ {
throw ::com::sun::star::sdbc::SQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("This call is not allowed when sharing connections.")),*this,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("S10000")),0,::com::sun::star::uno::Any());
}
virtual void SAL_CALL setReadOnly( sal_Bool /*readOnly*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
@@ -160,12 +160,12 @@ namespace dbaccess
virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
};
-
+
#ifdef IMPLEMENT_GET_IMPLEMENTATION_ID
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 08321a0e0053..e68794789b2e 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
@@ -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
@@ -328,7 +328,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
)
@@ -355,7 +355,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
)
@@ -387,7 +387,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);
}
//--------------------------------------------------------------------------
@@ -417,5 +417,5 @@ void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Pa
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
index 0a43371c51e5..04a446f22a8d 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
@@ -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
@@ -74,17 +74,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
@@ -93,21 +93,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.
after the construction of the object the creator has to call initialize
.
- @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,
@@ -162,26 +162,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 initialize
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
);
@@ -195,13 +195,13 @@ 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 34d7283b1837..fab4ec682591 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx
@@ -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
@@ -62,10 +62,10 @@ 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
- )
+ )
:ODefinitionContainer(_xORB,_xParentContainer,_pImpl,!_bTables)
,m_bTables(_bTables)
{
@@ -110,6 +110,6 @@ Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exc
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx
index 4528224ce24d..69f50ce4316e 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx
@@ -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
@@ -51,7 +51,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;
@@ -61,7 +61,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
);
@@ -85,7 +85,7 @@ protected:
};
//........................................................................
-} // 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 b3b41ff903b8..ec3729ce6224 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.cxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx
@@ -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
@@ -89,7 +89,7 @@ void OCommandDefinition::registerProperties()
//--------------------------------------------------------------------------
OCommandDefinition::OCommandDefinition(const Reference< XMultiServiceFactory >& _xORB
,const Reference< XInterface >& _rxContainer
- ,const TContentPtr& _pImpl)
+ ,const TContentPtr& _pImpl)
:OComponentDefinition(_xORB,_rxContainer,_pImpl,sal_False)
{
DBG_CTOR(OCommandDefinition, NULL);
@@ -102,7 +102,7 @@ OCommandDefinition::~OCommandDefinition()
}
//--------------------------------------------------------------------------
-OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer
+OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer
,const ::rtl::OUString& _rElementName
,const Reference< XMultiServiceFactory >& _xORB
,const TContentPtr& _pImpl)
@@ -174,6 +174,6 @@ void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw
}
// -----------------------------------------------------------------------------
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index 6d245324c831..27dd4bb864e5 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -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,14 +77,14 @@ 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;
-
+ OCommandDefinition_PROP;
+
-class OCommandDefinition :public OComponentDefinition
+class OCommandDefinition :public OComponentDefinition
,public OCommandDefinition_Base
,public OCommandDefinition_PROP
{
@@ -92,7 +92,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
);
@@ -136,7 +136,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 f543e2665a7e..00df5b9c270b 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -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
@@ -597,7 +597,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;
@@ -626,11 +626,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);
}
}
@@ -941,6 +941,6 @@ Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< X
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index eb80cc2fc7db..321c4ae63346 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.hxx
@@ -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
@@ -85,7 +85,7 @@ class ODatabaseSource;
//==========================================================================
//= OConnection
//==========================================================================
-class OConnection :public ::comphelper::OBaseMutex
+class OConnection :public ::comphelper::OBaseMutex
,public OSubComponent
,public ::connectivity::OConnectionWrapper
,public OConnection_Base
@@ -94,16 +94,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;
@@ -113,13 +113,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();
@@ -167,7 +167,7 @@ public:
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
-// XConnection
+// XConnection
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
@@ -215,7 +215,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();
@@ -244,7 +244,7 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_CORE_CONNECTION_HXX_
diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
index ad5078825a16..c8f9cf383052 100644
--- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
+++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
@@ -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/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index 315cbcca3b7e..e584553e65e3 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -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
@@ -304,7 +304,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
)
@@ -489,8 +489,8 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl
const Property* pProperties = aProperties.getConstArray();
for ( sal_Int32 i=0; iAttributes & PropertyAttribute::TRANSIENT) != 0 )
- && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 )
+ if ( ( ( pProperties->Attributes & PropertyAttribute::TRANSIENT) != 0 )
+ && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 )
)
{
// found such a property
@@ -677,19 +677,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 );
}
@@ -805,5 +805,5 @@ void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForD
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index dc55ff62b694..072299c76407 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -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
@@ -74,15 +74,15 @@ class DatabaseDocumentLoader;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
ODatabaseContext_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
-typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::container::XEnumerationAccess
- , ::com::sun::star::container::XNameAccess
- , ::com::sun::star::uno::XNamingService
- , ::com::sun::star::container::XContainer
- , ::com::sun::star::lang::XSingleServiceFactory
- , ::com::sun::star::lang::XUnoTunnel
- , ::com::sun::star::sdb::XDatabaseRegistrations
- > DatabaseAccessContext_Base;
+typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo
+ , ::com::sun::star::container::XEnumerationAccess
+ , ::com::sun::star::container::XNameAccess
+ , ::com::sun::star::uno::XNamingService
+ , ::com::sun::star::container::XContainer
+ , ::com::sun::star::lang::XSingleServiceFactory
+ , ::com::sun::star::lang::XUnoTunnel
+ , ::com::sun::star::sdb::XDatabaseRegistrations
+ > DatabaseAccessContext_Base;
class ODatabaseContext :public DatabaseAccessContext_Base
,public ::basic::BasicManagerCreationListener
@@ -91,7 +91,7 @@ private:
/** loads the given object from the given URL
@throws WrappedTargetException
if an error occurs accessing the URL via the UCB
-
+
*/
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > loadObjectFromURL(const ::rtl::OUString& _rName,const ::rtl::OUString& _sURL);
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getObject( const ::rtl::OUString& _rURL );
@@ -108,7 +108,7 @@ private:
impl_createNewDataSource();
protected:
- ::osl::Mutex m_aMutex;
+ ::osl::Mutex m_aMutex;
::comphelper::ComponentContext m_aContext;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >
@@ -117,17 +117,17 @@ protected:
m_xDatabaseRegistrations;
DECLARE_STL_USTRINGACCESS_MAP( ODatabaseModelImpl*, ObjectCache );
- ObjectCache m_aDatabaseObjects;
+ ObjectCache m_aDatabaseObjects;
DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >, PropertyCache );
- PropertyCache m_aDatasourceProperties;
+ PropertyCache m_aDatasourceProperties;
// as we hold our data sources weak, we have to cache all properties on the data sources which are
// transient but stored as long as the session lasts. The database context is the session (as it lives
// as long as the session does), but the data sources may die before the session does, and then be
// recreated afterwards. So it's our (the context's) responsibility to store the session-persistent
// properties.
- ::cppu::OInterfaceContainerHelper m_aContainerListeners;
+ ::cppu::OInterfaceContainerHelper m_aContainerListeners;
DatabaseDocumentLoader* m_pDatabaseDocumentLoader;
public:
@@ -205,7 +205,7 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREDATAACCESS_DATABASECONTEXT_HXX_
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 125c54121628..d748154d8eef 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -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
@@ -167,7 +167,7 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument()
}
//--------------------------------------------------------------------------
-ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference& _pImpl )
+ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference& _pImpl )
:ModelDependentComponent( _pImpl )
,ODatabaseDocument_OfficeDocument( getMutex() )
,m_aModifyListeners( getMutex() )
@@ -259,7 +259,7 @@ void SAL_CALL ODatabaseDocument::release( ) throw ()
ODatabaseDocument_OfficeDocument::release();
}
//------------------------------------------------------------------------------
-Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeException)
+Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeException)
{
Sequence< Type > aTypes = ::comphelper::concatSequences(
ODatabaseDocument_OfficeDocument::getTypes(),
@@ -2185,7 +2185,7 @@ void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference
//------------------------------------------------------------------
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index d2aa57130d18..a299d984e7d9 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -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
@@ -165,11 +165,11 @@ typedef ::comphelper::WeakComponentImplHelper17 < ::com::sun::star::frame::XMo
> ODatabaseDocument_OfficeDocument;
typedef ::cppu::ImplHelper3< ::com::sun::star::frame::XTitle
- , ::com::sun::star::frame::XTitleChangeBroadcaster
- , ::com::sun::star::frame::XUntitledNumbers
+ , ::com::sun::star::frame::XTitleChangeBroadcaster
+ , ::com::sun::star::frame::XUntitledNumbers
> ODatabaseDocument_Title;
-class ODatabaseDocument :public ModelDependentComponent // ModelDependentComponent must be first!
+class ODatabaseDocument :public ModelDependentComponent // ModelDependentComponent must be first!
,public ODatabaseDocument_OfficeDocument
,public ODatabaseDocument_Title
{
@@ -181,11 +181,11 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
};
DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers >,TNumberedController);
- ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager;
+ ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager;
- ::cppu::OInterfaceContainerHelper m_aModifyListeners;
- ::cppu::OInterfaceContainerHelper m_aCloseListener;
- ::cppu::OInterfaceContainerHelper m_aStorageListeners;
+ ::cppu::OInterfaceContainerHelper m_aModifyListeners;
+ ::cppu::OInterfaceContainerHelper m_aCloseListener;
+ ::cppu::OInterfaceContainerHelper m_aStorageListeners;
DocumentEvents* m_pEventContainer;
::rtl::Reference< DocumentEventExecutor > m_pEventExecutor;
@@ -195,8 +195,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
Controllers m_aControllers;
ViewMonitor m_aViewMonitor;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports;
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms;
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports;
::com::sun::star::uno::WeakReference< ::com::sun::star::script::provider::XScriptProvider > m_xScriptProvider;
/** @short such module manager is used to classify new opened documents. */
@@ -248,8 +248,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
/// write a single XML stream into the package
void WriteThroughComponent(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > & xComponent, /// the component we export
- const sal_Char* pStreamName, /// the stream name
- const sal_Char* pServiceName, /// service name of the component
+ const sal_Char* pStreamName, /// the stream name
+ const sal_Char* pServiceName, /// service name of the component
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> & rArguments, /// the argument (XInitialization)
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc,/// output descriptor
const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo
@@ -267,11 +267,11 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe
) const;
/** writes the content and settings
- @param sURL
+ @param sURL
The URL
- @param lArguments
+ @param lArguments
The media descriptor
- @param _xStorageToSaveTo
+ @param _xStorageToSaveTo
The storage which should be used for saving
*/
void impl_writeStorage_throw(
@@ -317,7 +317,7 @@ public:
SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
// 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);
virtual void SAL_CALL acquire( ) throw ();
virtual void SAL_CALL release( ) throw ();
@@ -371,12 +371,12 @@ public:
// XEventBroadcaster
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
-
+
// XDocumentEventBroadcaster
virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
-
+
// XPrintable
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (::com::sun::star::uno::RuntimeException) ;
virtual void SAL_CALL setPrinter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aPrinter ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) ;
@@ -620,7 +620,7 @@ private:
denotes additional document parameters
@param _rDocGuard
is the guard which currently protects the document instance
-
+
*/
sal_Bool impl_attachResource(
const ::rtl::OUString& i_rLogicalDocumentURL,
@@ -704,6 +704,6 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
index 6a8e7db21236..c6c8233731df 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -210,7 +210,7 @@ namespace dbaccess
::rtl::OUStringBuffer aReset( aNewNodeName );
sNewNodeName = aNewNodeName.makeStringAndClear();
sal_Int32 i=2;
- while ( m_aConfigurationRoot.hasByName( sNewNodeName ) )
+ while ( m_aConfigurationRoot.hasByName( sNewNodeName ) )
{
aNewNodeName = aReset;
aNewNodeName.appendAscii( " " );
@@ -254,7 +254,7 @@ namespace dbaccess
::utl::OConfigurationNode aNodeForName = impl_getNodeForName_nothrow( _Name );
return aNodeForName.isValid();
}
-
+
//------------------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException)
{
@@ -273,7 +273,7 @@ namespace dbaccess
{
::utl::OConfigurationNode aRegistrationNode = m_aConfigurationRoot.openNode( *pName );
OSL_VERIFY( aRegistrationNode.getNodeValue( getNameNodeName() ) >>= *pDisplayName );
-
+
}
return aDisplayNames;
@@ -292,7 +292,7 @@ namespace dbaccess
return sLocation;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException)
{
@@ -311,7 +311,7 @@ namespace dbaccess
aGuard.clear();
m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::registeredDatabaseLocation, aEvent );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
{
@@ -337,7 +337,7 @@ namespace dbaccess
aGuard.clear();
m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::revokedDatabaseLocation, aEvent );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException)
{
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.hxx b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
index 3d771625aa4a..927f484b709c 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.hxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 835f5398efc7..6a1151580a2e 100755
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -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
@@ -314,8 +314,8 @@ class OSharedConnectionManager : public OConnectionHelper_BASE
// contains the currently used master connections
typedef struct
{
- Reference< XConnection > xMasterConnection;
- oslInterlockedCount nALiveCount;
+ Reference< XConnection > xMasterConnection;
+ oslInterlockedCount nALiveCount;
} TConnectionHolder;
// the less-compare functor, used for the stl::map
@@ -330,13 +330,13 @@ class OSharedConnectionManager : public OConnectionHelper_BASE
}
};
- typedef ::std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections
- typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections
+ typedef ::std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections
+ typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections
- ::osl::Mutex m_aMutex;
- TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest
- TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map
- Reference< XProxyFactory > m_xProxyFactory;
+ ::osl::Mutex m_aMutex;
+ TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest
+ TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map
+ Reference< XProxyFactory > m_xProxyFactory;
protected:
~OSharedConnectionManager();
@@ -345,7 +345,7 @@ public:
OSharedConnectionManager(const Reference< XMultiServiceFactory >& _rxServiceFactory);
void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException);
- Reference getConnection( const rtl::OUString& url,
+ Reference getConnection( const rtl::OUString& url,
const rtl::OUString& user,
const rtl::OUString& password,
const Sequence< PropertyValue >& _aInfo,
@@ -382,7 +382,7 @@ void SAL_CALL OSharedConnectionManager::disposing( const ::com::sun::star::lang:
}
}
-Reference OSharedConnectionManager::getConnection( const rtl::OUString& url,
+Reference OSharedConnectionManager::getConnection( const rtl::OUString& url,
const rtl::OUString& user,
const rtl::OUString& password,
const Sequence< PropertyValue >& _aInfo,
@@ -393,15 +393,15 @@ Reference OSharedConnectionManager::getConnection( const rtl::OUStr
Sequence< PropertyValue > aInfoCopy(_aInfo);
sal_Int32 nPos = aInfoCopy.getLength();
aInfoCopy.realloc( nPos + 2 );
- aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter"));
+ aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter"));
aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableFilter;
- aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter"));
+ aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter"));
aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableTypeFilter; // #22377# OJ
::rtl::OUString sUser = user;
::rtl::OUString sPassword = password;
if ((0 == sUser.getLength()) && (0 == sPassword.getLength()) && (0 != _pDataSource->m_pImpl->m_sUser.getLength()))
- { // ease the usage of this method. data source which are intended to have a user automatically
+ { // ease the usage of this method. data source which are intended to have a user automatically
// fill in the user/password combination if the caller of this method does not specify otherwise
// 86951 - 05/08/2001 - frank.schoenheit@germany.sun.com
sUser = _pDataSource->m_pImpl->m_sUser;
@@ -484,7 +484,7 @@ namespace
}
}
if ( !aRet.empty() )
- return Sequence< PropertyValue >(&(*aRet.begin()),aRet.size());
+ return Sequence< PropertyValue >(&(*aRet.begin()),aRet.size());
}
return Sequence< PropertyValue >();
}
@@ -568,7 +568,7 @@ void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocume
Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getTypes" );
- OTypeCollection aPropertyHelperTypes( ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
+ OTypeCollection aPropertyHelperTypes( ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
::getCppuType( (const Reference< XPropertySet > *)0 ),
::getCppuType( (const Reference< XMultiPropertySet > *)0 ));
@@ -698,7 +698,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O
::rtl::OUString sUser(_rUid);
::rtl::OUString sPwd(_rPwd);
if ((0 == sUser.getLength()) && (0 == sPwd.getLength()) && (0 != m_pImpl->m_sUser.getLength()))
- { // ease the usage of this method. data source which are intended to have a user automatically
+ { // ease the usage of this method. data source which are intended to have a user automatically
// fill in the user/password combination if the caller of this method does not specify otherwise
// 86951 - 05/08/2001 - frank.schoenheit@germany.sun.com
sUser = m_pImpl->m_sUser;
@@ -809,19 +809,19 @@ Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() throw (Runt
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::createArrayHelper" );
BEGIN_PROPERTY_HELPER(13)
- DECL_PROP1(INFO, Sequence< PropertyValue >, BOUND);
- DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND);
- DECL_PROP1_BOOL(ISREADONLY, READONLY);
- DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND);
- DECL_PROP1(NAME, ::rtl::OUString, READONLY);
- DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT);
- DECL_PROP1(PASSWORD, ::rtl::OUString, TRANSIENT);
+ DECL_PROP1(INFO, Sequence< PropertyValue >, BOUND);
+ DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND);
+ DECL_PROP1_BOOL(ISREADONLY, READONLY);
+ DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND);
+ DECL_PROP1(NAME, ::rtl::OUString, READONLY);
+ DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT);
+ DECL_PROP1(PASSWORD, ::rtl::OUString, TRANSIENT);
DECL_PROP2_IFACE(SETTINGS, XPropertySet, BOUND, READONLY);
- DECL_PROP1_BOOL(SUPPRESSVERSIONCL, BOUND);
- DECL_PROP1(TABLEFILTER, Sequence< ::rtl::OUString >,BOUND);
- DECL_PROP1(TABLETYPEFILTER, Sequence< ::rtl::OUString >,BOUND);
- DECL_PROP1(URL, ::rtl::OUString, BOUND);
- DECL_PROP1(USER, ::rtl::OUString, BOUND);
+ DECL_PROP1_BOOL(SUPPRESSVERSIONCL, BOUND);
+ DECL_PROP1(TABLEFILTER, Sequence< ::rtl::OUString >,BOUND);
+ DECL_PROP1(TABLETYPEFILTER, Sequence< ::rtl::OUString >,BOUND);
+ DECL_PROP1(URL, ::rtl::OUString, BOUND);
+ DECL_PROP1(USER, ::rtl::OUString, BOUND);
END_PROPERTY_HELPER();
}
@@ -865,7 +865,7 @@ sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any &
case PROPERTY_ID_URL:
{
bModified = ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_pImpl->m_sConnectURL);
- } break;
+ } break;
case PROPERTY_ID_INFO:
{
Sequence aValues;
@@ -1173,7 +1173,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
sal_Bool bNewPasswordGiven = sal_False;
if (m_pImpl->m_bPasswordRequired && (0 == sPassword.getLength()))
- { // we need a password, but don't have one yet.
+ { // we need a password, but don't have one yet.
// -> ask the user
// build an interaction request
@@ -1470,7 +1470,7 @@ Reference< XInterface > ODatabaseSource::getThis() const
}
// -----------------------------------------------------------------------------
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index b84b3d74c727..6a94fa66d0a3 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -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
@@ -161,8 +161,8 @@ class ODatabaseSource :public ModelDependentComponent // must be first
private:
using ODatabaseSource_Base::rBHelper;
- OBookmarkContainer m_aBookmarks;
- ::cppu::OInterfaceContainerHelper m_aFlushListeners;
+ OBookmarkContainer m_aBookmarks;
+ ::cppu::OInterfaceContainerHelper m_aFlushListeners;
private:
virtual ~ODatabaseSource();
@@ -297,7 +297,7 @@ protected:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREDATAACCESS_DATALINK_HXX_
diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
index 33ce2782a1dd..8613a0849c14 100644
--- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx
+++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx
@@ -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
@@ -139,7 +139,7 @@ ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr
DBG_NAME(ODefinitionContainer)
//--------------------------------------------------------------------------
ODefinitionContainer::ODefinitionContainer( const Reference< XMultiServiceFactory >& _xORB
- , const Reference< XInterface >& _xParentContainer
+ , const Reference< XInterface >& _xParentContainer
, const TContentPtr& _pImpl
, bool _bCheckSlash
)
@@ -154,7 +154,7 @@ ODefinitionContainer::ODefinitionContainer( const Reference< XMultiServiceFact
const ODefinitionContainer_Impl& rDefinitions( getDefinitions() );
ODefinitionContainer_Impl::const_iterator aEnd = rDefinitions.end();
- for ( ODefinitionContainer_Impl::const_iterator aDefinition = rDefinitions.begin();
+ for ( ODefinitionContainer_Impl::const_iterator aDefinition = rDefinitions.begin();
aDefinition != aEnd;
++aDefinition
)
@@ -181,7 +181,7 @@ void SAL_CALL ODefinitionContainer::disposing()
Documents::iterator aIter = m_aDocumentMap.begin();
Documents::iterator aEnd = m_aDocumentMap.end();
- for (; aIter != aEnd; ++aIter)
+ for (; aIter != aEnd; ++aIter)
{
Reference xProp = aIter->second;
if ( xProp.is() )
@@ -432,7 +432,7 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu
Documents::iterator aPos = m_aDocuments[_nIndex];
Reference xProp = aPos->second;
if (!xProp.is())
- { // that's the first access to the object
+ { // that's the first access to the object
// -> create it
xProp = createObject(aPos->first);
aPos->second = Documents::mapped_type();
@@ -460,7 +460,7 @@ Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString&
Reference< XContent > xProp = aMapPos->second;
if (_bReadIfNeccessary && !xProp.is())
- { // the object has never been accessed before, so we have to read it now
+ { // the object has never been accessed before, so we have to read it now
// (that's the expensive part)
// create the object and insert it into the map
@@ -480,7 +480,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) t
Sequence< ::rtl::OUString > aNames(m_aDocumentMap.size());
::rtl::OUString* pNames = aNames.getArray();
Documents::iterator aEnd = m_aDocumentMap.end();
- for ( Documents::iterator aNameIter = m_aDocumentMap.begin();
+ for ( Documents::iterator aNameIter = m_aDocumentMap.begin();
aNameIter != aEnd;
++pNames, ++aNameIter
)
@@ -507,7 +507,7 @@ void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) thr
// 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() )
{
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index d9427eff0463..5d20a28853f3 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -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
@@ -107,7 +107,7 @@ namespace dbaccess
//........................................................................
//==========================================================================
-//= LocalNameApproval
+//= LocalNameApproval
//==========================================================================
class LocalNameApproval : public IContainerApprove
{
@@ -142,7 +142,7 @@ void SAL_CALL LocalNameApproval::approveElement( const ::rtl::OUString& _rName,
DBG_NAME(ODocumentContainer)
//--------------------------------------------------------------------------
ODocumentContainer::ODocumentContainer(const Reference< XMultiServiceFactory >& _xORB
- ,const Reference< XInterface >& _xParentContainer
+ ,const Reference< XInterface >& _xParentContainer
,const TContentPtr& _pImpl
, sal_Bool _bFormsContainer
)
@@ -350,11 +350,11 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
Reference< XCommandProcessor > xCommandProcessor(xContent,UNO_QUERY);
if ( xContent.is() )
{
- xCommandProcessor->execute(aCommand,-1,Reference< XCommandEnvironment >());
+ xCommandProcessor->execute(aCommand,-1,Reference< XCommandEnvironment >());
}
}
-
- // xRet = xContent;
+
+ // xRet = xContent;
}
else if ( ServiceSpecifier == SERVICE_NAME_FORM_COLLECTION || SERVICE_NAME_REPORT_COLLECTION == ServiceSpecifier )
{
@@ -389,7 +389,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
pElementImpl = aFind->second;
OSL_ENSURE( pElementImpl ," Invalid entry in map!");
xContent = new ODocumentContainer( m_aContext.getLegacyServiceFactory(), *this, pElementImpl, ServiceSpecifier == SERVICE_NAME_FORM_COLLECTION );
-
+
// copy children
if ( xCopyFrom.is() )
{
@@ -425,7 +425,7 @@ Reference< XInterface > SAL_CALL ODocumentContainer::createInstanceWithArguments
{
if ( m_bFormsContainer )
sServiceName = SERVICE_NAME_FORM_COLLECTION;
- else
+ else
sServiceName = SERVICE_NAME_REPORT_COLLECTION;
}
else
@@ -455,7 +455,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODocumentContainer::getAvailableServiceName
Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException)
{
Any aRet;
- if ( aCommand.Name.compareToAscii( "open" ) == 0 )
+ if ( aCommand.Name.compareToAscii( "open" ) == 0 )
{
//////////////////////////////////////////////////////////////////
// open command for a folder content
@@ -526,13 +526,13 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com
//////////////////////////////////////////////////////////////////
Sequence< ::rtl::OUString> aSeq = 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)
removeByName(*pIter);
dispose();
}
- else
+ else
aRet = OContentHelper::execute(aCommand,CommandId,Environment);
return aRet;
}
@@ -563,8 +563,8 @@ namespace
}
}
if ( nIndex == -1 )
- _sSimpleName = sName; // a content
- else
+ _sSimpleName = sName; // a content
+ else
_xNameContainer.clear(); // a sub folder doesn't exist
return bRet;
}
@@ -653,7 +653,7 @@ void SAL_CALL ODocumentContainer::insertByHierarchicalName( const ::rtl::OUStrin
::rtl::OUString sName;
if ( lcl_queryContent(_sName,xNameContainer,aContent,sName) )
throw ElementExistException(_sName,*this);
-
+
if ( !xNameContainer.is() )
{
::rtl::OUString sMessage( DBA_RES( RID_STR_NO_SUB_FOLDER ) );
@@ -768,7 +768,7 @@ void SAL_CALL ODocumentContainer::revert( ) throw (::com::sun::star::io::IOExce
}
// -----------------------------------------------------------------------------
Reference< XStorage> ODocumentContainer::getContainerStorage() const
-{
+{
return m_pImpl->m_pDataSource
? m_pImpl->m_pDataSource->getStorage( m_bFormsContainer ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT )
: Reference< XStorage>();
@@ -798,7 +798,7 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName )
// do the removal
implRemove(_rName);
- // disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name
+ // disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name
notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers );
}
@@ -828,6 +828,6 @@ void SAL_CALL ODocumentContainer::rename( const ::rtl::OUString& newName ) throw
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx
index c1a9c424d7d3..f401d68b6688 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx
@@ -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
@@ -37,7 +37,7 @@
#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
#include
#endif
-#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_
+#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_
#include
#endif
#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMECONTAINER_HPP_
@@ -48,7 +48,7 @@
#endif
#ifndef _COM_SUN_STAR_EMBED_XTRANSACTEDOBJECT_HPP_
#include
-#endif
+#endif
#ifndef COMPHELPER_PROPERTYSTATECONTAINER_HXX
#include
#endif
@@ -63,28 +63,28 @@
namespace dbaccess
{
//........................................................................
-typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XComponentLoader
- , ::com::sun::star::lang::XMultiServiceFactory
- , ::com::sun::star::container::XHierarchicalNameContainer
- , ::com::sun::star::container::XHierarchicalName
- , ::com::sun::star::embed::XTransactedObject
- > ODocumentContainer_Base;
+typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XComponentLoader
+ , ::com::sun::star::lang::XMultiServiceFactory
+ , ::com::sun::star::container::XHierarchicalNameContainer
+ , ::com::sun::star::container::XHierarchicalName
+ , ::com::sun::star::embed::XTransactedObject
+ > ODocumentContainer_Base;
//==========================================================================
-//= ODocumentContainer - collections of database documents (reports/forms)
+//= ODocumentContainer - collections of database documents (reports/forms)
//==========================================================================
-class ODocumentContainer : public ODefinitionContainer
+class ODocumentContainer : public ODefinitionContainer
, public ODocumentContainer_Base
, public ::comphelper::OPropertyStateContainer
, public ::comphelper::OPropertyArrayUsageHelper< ODocumentContainer >
{
- sal_Bool m_bFormsContainer;
+ sal_Bool m_bFormsContainer;
public:
/** constructs the container.
*/
ODocumentContainer(
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 _bFormsContainer
);
@@ -161,7 +161,7 @@ protected:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 4615c65fc042..ef8fc20ae600 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -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
@@ -316,13 +316,13 @@ namespace dbaccess
//==================================================================
// OEmbedObjectHolder
//==================================================================
- typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener > TEmbedObjectHolder;
- class OEmbedObjectHolder : public ::comphelper::OBaseMutex
+ typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener > TEmbedObjectHolder;
+ class OEmbedObjectHolder : public ::comphelper::OBaseMutex
,public TEmbedObjectHolder
{
Reference< XEmbeddedObject > m_xBroadCaster;
- ODocumentDefinition* m_pDefinition;
- bool m_bInStateChange;
+ ODocumentDefinition* m_pDefinition;
+ bool m_bInStateChange;
bool m_bInChangingState;
protected:
virtual void SAL_CALL disposing();
@@ -504,14 +504,14 @@ namespace dbaccess
//==================================================================
class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave >
{
- ::rtl::OUString m_sName;
- Reference m_xParentContainer;
+ ::rtl::OUString m_sName;
+ Reference m_xParentContainer;
public:
ODocumentSaveContinuation() { }
- inline Reference getContent() const { return m_xParentContainer; }
- inline ::rtl::OUString getName() const { return m_sName; }
+ inline Reference getContent() const { return m_xParentContainer; }
+ inline ::rtl::OUString getName() const { return m_sName; }
// XInteractionDocumentSave
virtual void SAL_CALL setName( const ::rtl::OUString& _sName,const Reference& _xParent) throw(RuntimeException);
@@ -1424,10 +1424,10 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R
}
// @@@
-// storeData();
+// storeData();
aGuard.clear();
-// inserted();
+// inserted();
}
// -----------------------------------------------------------------------------
sal_Bool ODocumentDefinition::save(sal_Bool _bApprove)
@@ -1569,16 +1569,7 @@ sal_Bool ODocumentDefinition::saveAs()
Reference xNC(pDocuSave->getContent(),UNO_QUERY);
if ( xNC.is() )
{
- if ( m_pImpl->m_aProps.aTitle == pDocuSave->getName() )
- {
- Reference xPersist(m_xEmbeddedObject,UNO_QUERY);
- if ( xPersist.is() )
- {
- xPersist->storeOwn();
- notifyDataSourceModified();
- }
- }
- else
+ if ( m_pImpl->m_aProps.aTitle != pDocuSave->getName() )
{
try
{
@@ -1618,6 +1609,12 @@ sal_Bool ODocumentDefinition::saveAs()
DBG_UNHANDLED_EXCEPTION();
}
}
+ Reference xPersist(m_xEmbeddedObject,UNO_QUERY);
+ if ( xPersist.is() )
+ {
+ xPersist->storeOwn();
+ notifyDataSourceModified();
+ }
}
}
}
@@ -2332,7 +2329,7 @@ void ODocumentDefinition::updateDocumentTitle()
if ( xUntitledProvider.is() )
sName += ::rtl::OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) );
}
-
+
Reference< XTitle > xDatabaseDocumentModel(m_pImpl->m_pDataSource->getModel_noCreate(),uno::UNO_QUERY);
if ( xDatabaseDocumentModel.is() )
sName = xDatabaseDocumentModel->getTitle() + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" : ")) + sName;
@@ -2402,6 +2399,6 @@ void NameChangeNotifier::impl_fireEvent_throw( const sal_Bool i_bVetoable )
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index 76427ea78baf..b011728a682a 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -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
@@ -79,7 +79,7 @@ namespace dbaccess
class OEmbeddedClientHelper;
//==========================================================================
//= ODocumentDefinition - a database "document" which is simply a link to a real
-//= document
+//= document
//==========================================================================
typedef ::cppu::ImplHelper4 < ::com::sun::star::embed::XComponentSupplier
@@ -94,16 +94,16 @@ class ODocumentDefinition
,public ::comphelper::OPropertyArrayUsageHelper< ODocumentDefinition >
,public ODocumentDefinition_Base
{
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject> m_xEmbeddedObject;
- ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener > m_xListener;
+ ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject> m_xEmbeddedObject;
+ ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener > m_xListener;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xLastKnownConnection;
- OInterceptor* m_pInterceptor;
- sal_Bool m_bForm; // if it is a form
- sal_Bool m_bOpenInDesign;
- sal_Bool m_bInExecute;
- sal_Bool m_bRemoveListener;
- OEmbeddedClientHelper* m_pClientHelper;
+ OInterceptor* m_pInterceptor;
+ sal_Bool m_bForm; // if it is a form
+ sal_Bool m_bOpenInDesign;
+ sal_Bool m_bInExecute;
+ sal_Bool m_bRemoveListener;
+ OEmbeddedClientHelper* m_pClientHelper;
protected:
virtual ~ODocumentDefinition();
@@ -315,7 +315,7 @@ private:
);
/** loads the EmbeddedObject if not already loaded
- @param _aClassID
+ @param _aClassID
If set, it will be used to create the embedded object.
*/
void loadEmbeddedObject(
@@ -355,7 +355,7 @@ private:
/** searches for read-only flag in the args of the model and sets it to the given value,
if the value was not found, it will be appended.
- @param _bReadOnly
+ @param _bReadOnly
If the document will be switched to readonly mode
*/
void updateDocumentTitle();
@@ -403,7 +403,7 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index c25d052a396c..6788abf596db 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -187,7 +187,7 @@ namespace dbaccess
const ::comphelper::NamedValueCollection aScriptDescriptor( xDocEvents->getByName( _Event.EventName ) );
-
+
::rtl::OUString sEventType;
bool bScriptAssigned = aScriptDescriptor.get_ensureType( "EventType", sEventType );
@@ -218,7 +218,7 @@ namespace dbaccess
DBG_UNHANDLED_EXCEPTION();
}
}
-
+
//--------------------------------------------------------------------
void SAL_CALL DocumentEventExecutor::disposing( const lang::EventObject& /*_Source*/ ) throw (RuntimeException)
{
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index 5705c5304bd7..518c2c6c0d48 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index cfbf96433971..89c533bce839 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -78,8 +78,8 @@ namespace dbaccess
bool m_bInitialized;
bool m_bDisposed;
::rtl::Reference< ::comphelper::AsyncEventNotifier > m_pEventBroadcaster;
- ::cppu::OInterfaceContainerHelper m_aLegacyEventListeners;
- ::cppu::OInterfaceContainerHelper m_aDocumentEventListeners;
+ ::cppu::OInterfaceContainerHelper m_aLegacyEventListeners;
+ ::cppu::OInterfaceContainerHelper m_aDocumentEventListeners;
public:
DocumentEventNotifier_Impl( ::cppu::OWeakObject& _rBroadcasterDocument, ::osl::Mutex& _rMutex )
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
index 870f5decf984..3beb9b3cf632 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
@@ -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/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx
index 8d191c1d3503..8594fc607022 100644
--- a/dbaccess/source/core/dataaccess/documentevents.cxx
+++ b/dbaccess/source/core/dataaccess/documentevents.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -206,7 +206,7 @@ namespace dbaccess
elementPos->second = aEventDescriptor;
}
-
+
//--------------------------------------------------------------------
Any SAL_CALL DocumentEvents::getByName( const ::rtl::OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException)
{
@@ -222,7 +222,7 @@ namespace dbaccess
aReturn <<= rEventDesc;
return aReturn;
}
-
+
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL DocumentEvents::getElementNames( ) throw (RuntimeException)
{
@@ -237,7 +237,7 @@ namespace dbaccess
);
return aNames;
}
-
+
//--------------------------------------------------------------------
::sal_Bool SAL_CALL DocumentEvents::hasByName( const ::rtl::OUString& _Name ) throw (RuntimeException)
{
@@ -245,13 +245,13 @@ namespace dbaccess
return m_pData->rEventsData.find( _Name ) != m_pData->rEventsData.end();
}
-
+
//--------------------------------------------------------------------
Type SAL_CALL DocumentEvents::getElementType( ) throw (RuntimeException)
{
return ::cppu::UnoType< Sequence< PropertyValue > >::get();
}
-
+
//--------------------------------------------------------------------
::sal_Bool SAL_CALL DocumentEvents::hasElements( ) throw (RuntimeException)
{
diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx
index 6d761027e0ca..4951cefe5bb1 100644
--- a/dbaccess/source/core/dataaccess/documentevents.hxx
+++ b/dbaccess/source/core/dataaccess/documentevents.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx
index 8a24bbcdf4a3..352cae82ba09 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -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
@@ -56,12 +56,12 @@ using namespace ::com::sun::star::container;
using namespace ::comphelper;
using namespace ::cppu;
-#define DISPATCH_SAVEAS 0
-#define DISPATCH_SAVE 1
-#define DISPATCH_CLOSEDOC 2
-#define DISPATCH_CLOSEWIN 3
-#define DISPATCH_CLOSEFRAME 4
-#define DISPATCH_RELOAD 5
+#define DISPATCH_SAVEAS 0
+#define DISPATCH_SAVE 1
+#define DISPATCH_CLOSEDOC 2
+#define DISPATCH_CLOSEWIN 3
+#define DISPATCH_CLOSEFRAME 4
+#define DISPATCH_RELOAD 5
// the OSL_ENSURE in CTOR has to be changed too, when adding new defines
void SAL_CALL OInterceptor::dispose()
@@ -97,12 +97,12 @@ OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder,sal_Bool _bAllo
OSL_ENSURE(DISPATCH_RELOAD < m_aInterceptedURL.getLength(),"Illegal size.");
- m_aInterceptedURL[DISPATCH_SAVEAS] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs"));
- m_aInterceptedURL[DISPATCH_SAVE] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
- m_aInterceptedURL[DISPATCH_CLOSEDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc"));
- m_aInterceptedURL[DISPATCH_CLOSEWIN] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
- m_aInterceptedURL[DISPATCH_CLOSEFRAME] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame"));
- m_aInterceptedURL[DISPATCH_RELOAD] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Reload"));
+ m_aInterceptedURL[DISPATCH_SAVEAS] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs"));
+ m_aInterceptedURL[DISPATCH_SAVE] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save"));
+ m_aInterceptedURL[DISPATCH_CLOSEDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc"));
+ m_aInterceptedURL[DISPATCH_CLOSEWIN] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin"));
+ m_aInterceptedURL[DISPATCH_CLOSEFRAME] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame"));
+ m_aInterceptedURL[DISPATCH_RELOAD] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Reload"));
}
@@ -182,7 +182,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& _URL,const SequenceisNewReport() )
{
FeatureStateEvent aStateEvent;
@@ -246,7 +246,7 @@ void SAL_CALL OInterceptor::addStatusListener(
aStateEvent.Requery = sal_False;
aStateEvent.State <<= (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
Control->statusChanged(aStateEvent);
- }
+ }
{
osl::MutexGuard aGuard(m_aMutex);
@@ -325,7 +325,7 @@ void SAL_CALL OInterceptor::removeStatusListener(
//XInterceptorInfo
-Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException )
+Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException )
{
// now implemented as update
return m_aInterceptedURL;
@@ -339,7 +339,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,con
{
osl::MutexGuard aGuard(m_aMutex);
const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray();
- const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength();
+ const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength();
for(;pIter != pEnd;++pIter)
{
if ( _URL.Complete == *pIter )
@@ -352,7 +352,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,con
return Reference();
}
-Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence& Requests ) throw ( RuntimeException )
+Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence& Requests ) throw ( RuntimeException )
{
Sequence< Reference< XDispatch > > aRet;
osl::MutexGuard aGuard(m_aMutex);
@@ -364,7 +364,7 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons
for(sal_Int32 i = 0; i < Requests.getLength(); ++i)
{
const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray();
- const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength();
+ const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength();
for(;pIter != pEnd;++pIter)
{
if ( Requests[i].FeatureURL.Complete == *pIter )
@@ -382,15 +382,15 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons
//XDispatchProviderInterceptor
-Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException )
+Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException )
{
osl::MutexGuard aGuard(m_aMutex);
return m_xSlaveDispatchProvider;
}
void SAL_CALL
-OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider )
- throw ( RuntimeException )
+OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider )
+ throw ( RuntimeException )
{
osl::MutexGuard aGuard(m_aMutex);
m_xSlaveDispatchProvider = NewDispatchProvider;
@@ -420,7 +420,7 @@ void SAL_CALL OInterceptor::setMasterDispatchProvider(
void SAL_CALL OInterceptor::notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException)
{
osl::ResettableMutexGuard _rGuard(m_aMutex);
- if ( m_pStatCL && Event.EventName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged")) )
+ if ( m_pStatCL && Event.EventName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged")) )
{
OInterfaceContainerHelper* pListener = m_pStatCL->getContainer(m_aInterceptedURL[DISPATCH_SAVE]);
if ( pListener )
@@ -442,6 +442,6 @@ void SAL_CALL OInterceptor::disposing( const ::com::sun::star::lang::EventObject
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx
index 9c69ee0d59d7..e7bacfc63507 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -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
@@ -69,104 +69,104 @@ protected:
public:
OInterceptor( ODocumentDefinition* _pContentHolder,sal_Bool _bAllowEditDoc );
-
+
void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
-
+
//XDispatch
- virtual void SAL_CALL
- dispatch(
+ virtual void SAL_CALL
+ dispatch(
const ::com::sun::star::util::URL& URL,
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& Arguments )
throw (::com::sun::star::uno::RuntimeException);
-
+
virtual void SAL_CALL
- addStatusListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XStatusListener >& Control,
+ addStatusListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::frame::XStatusListener >& Control,
const ::com::sun::star::util::URL& URL )
throw (
::com::sun::star::uno::RuntimeException
);
-
+
virtual void SAL_CALL
- removeStatusListener(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XStatusListener >& Control,
- const ::com::sun::star::util::URL& URL )
+ removeStatusListener(
+ const ::com::sun::star::uno::Reference<
+ ::com::sun::star::frame::XStatusListener >& Control,
+ const ::com::sun::star::util::URL& URL )
throw (
::com::sun::star::uno::RuntimeException
);
-
+
//XInterceptorInfo
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
SAL_CALL getInterceptedURLs( )
throw (
::com::sun::star::uno::RuntimeException
);
-
+
//XDispatchProvider ( inherited by XDispatchProviderInterceptor )
- virtual ::com::sun::star::uno::Reference<
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatch > SAL_CALL
- queryDispatch(
+ queryDispatch(
const ::com::sun::star::util::URL& URL,
- const ::rtl::OUString& TargetFrameName,
+ const ::rtl::OUString& TargetFrameName,
sal_Int32 SearchFlags )
throw (
::com::sun::star::uno::RuntimeException
);
-
- virtual ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Reference<
+
+ virtual ::com::sun::star::uno::Sequence<
+ ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatch > > SAL_CALL
- queryDispatches(
+ queryDispatches(
const ::com::sun::star::uno::Sequence<
::com::sun::star::frame::DispatchDescriptor >& Requests )
throw (
::com::sun::star::uno::RuntimeException
);
-
-
+
+
//XDispatchProviderInterceptor
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XDispatchProvider > SAL_CALL
- getSlaveDispatchProvider( )
+ ::com::sun::star::frame::XDispatchProvider > SAL_CALL
+ getSlaveDispatchProvider( )
throw (
::com::sun::star::uno::RuntimeException
);
-
+
virtual void SAL_CALL
- setSlaveDispatchProvider(
- const ::com::sun::star::uno::Reference<
+ setSlaveDispatchProvider(
+ const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider >& NewDispatchProvider )
throw (
::com::sun::star::uno::RuntimeException
);
- virtual ::com::sun::star::uno::Reference<
+ virtual ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider > SAL_CALL
- getMasterDispatchProvider( )
+ getMasterDispatchProvider( )
throw (
::com::sun::star::uno::RuntimeException
);
-
+
virtual void SAL_CALL
- setMasterDispatchProvider(
- const ::com::sun::star::uno::Reference<
+ setMasterDispatchProvider(
+ const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatchProvider >& NewSupplier )
throw (
::com::sun::star::uno::RuntimeException
- );
+ );
// XEventListener
virtual void SAL_CALL notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
-
-
+
+
private:
-
+
osl::Mutex m_aMutex;
-
+
ODocumentDefinition* m_pContentHolder;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatchProvider;
@@ -176,12 +176,12 @@ private:
cppu::OInterfaceContainerHelper* m_pDisposeEventListeners;
PropertyChangeListenerContainer* m_pStatCL;
- sal_Bool m_bAllowEditDoc;
+ sal_Bool m_bAllowEditDoc;
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
index 725c7c01e17a..e8602f483ddf 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
@@ -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
@@ -79,11 +79,11 @@ namespace dbaccess
struct ResultListEntry
{
- rtl::OUString aId;
- Reference< XContentIdentifier > xId;
- ::rtl::Reference< OContentHelper > xContent;
- Reference< XRow > xRow;
- const ContentProperties& rData;
+ rtl::OUString aId;
+ Reference< XContentIdentifier > xId;
+ ::rtl::Reference< OContentHelper > xContent;
+ Reference< XRow > xRow;
+ const ContentProperties& rData;
ResultListEntry( const ContentProperties& rEntry ) : rData( rEntry ) {}
};
@@ -104,12 +104,12 @@ typedef std::vector< ResultListEntry* > ResultList;
struct DataSupplier_Impl
{
- osl::Mutex m_aMutex;
- ResultList m_aResults;
- rtl::Reference< ODocumentContainer > m_xContent;
- Reference< XMultiServiceFactory > m_xSMgr;
- sal_Int32 m_nOpenMode;
- sal_Bool m_bCountFinal;
+ osl::Mutex m_aMutex;
+ ResultList m_aResults;
+ rtl::Reference< ODocumentContainer > m_xContent;
+ Reference< XMultiServiceFactory > m_xSMgr;
+ sal_Int32 m_nOpenMode;
+ sal_Bool m_bCountFinal;
DataSupplier_Impl( const Reference< XMultiServiceFactory >& rxSMgr,
const rtl::Reference< ODocumentContainer >& rContent,
@@ -196,7 +196,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex )
//=========================================================================
// virtual
-Reference< XContentIdentifier >
+Reference< XContentIdentifier >
DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
{
osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
@@ -223,7 +223,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex )
//=========================================================================
// virtual
-Reference< XContent >
+Reference< XContent >
DataSupplier::queryContent( sal_uInt32 _nIndex )
{
osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
@@ -249,7 +249,7 @@ DataSupplier::queryContent( sal_uInt32 _nIndex )
sName = sName.getToken(0,'/',nIndex);
m_pImpl->m_aResults[ _nIndex ]->xContent = m_pImpl->m_xContent->getContent(sName);
-
+
xContent = m_pImpl->m_aResults[ _nIndex ]->xContent.get();
return xContent;
@@ -289,7 +289,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
if ( nIndex < sal::static_int_cast< sal_uInt32 >( aSeq.getLength() ) )
{
const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
for(pIter = pIter + nPos;pIter != pEnd;++pIter,++nPos)
{
m_pImpl->m_aResults.push_back(
@@ -338,7 +338,7 @@ sal_uInt32 DataSupplier::totalCount()
// @@@ Obtain data and put it into result list...
Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->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)
m_pImpl->m_aResults.push_back(
new ResultListEntry( m_pImpl->m_xContent->getContent(*pIter)->getContentProperties() ) );
@@ -377,7 +377,7 @@ sal_Bool DataSupplier::isCountFinal()
//=========================================================================
// virtual
-Reference< XRow >
+Reference< XRow >
DataSupplier::queryPropertyValues( sal_uInt32 nIndex )
{
osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
index 7b1e5bd814df..3b4ceb8ef398 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
@@ -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/dataaccess/myucp_resultset.cxx b/dbaccess/source/core/dataaccess/myucp_resultset.cxx
index 0543c7f35326..26c2d2dc9572 100644
--- a/dbaccess/source/core/dataaccess/myucp_resultset.cxx
+++ b/dbaccess/source/core/dataaccess/myucp_resultset.cxx
@@ -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
@@ -85,7 +85,7 @@ void DynamicResultSet::initStatic()
m_xResultSet1
= new ::ucbhelper::ResultSet( m_xSMgr,
m_aCommand.Properties,
- new DataSupplier( m_xSMgr,
+ new DataSupplier( m_xSMgr,
m_xContent,
m_aCommand.Mode ),
m_xEnv );
@@ -97,7 +97,7 @@ void DynamicResultSet::initDynamic()
m_xResultSet1
= new ::ucbhelper::ResultSet( m_xSMgr,
m_aCommand.Properties,
- new DataSupplier( m_xSMgr,
+ new DataSupplier( m_xSMgr,
m_xContent,
m_aCommand.Mode ),
m_xEnv );
diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.hxx b/dbaccess/source/core/dataaccess/myucp_resultset.hxx
index a81658587003..24caf5c326fd 100644
--- a/dbaccess/source/core/dataaccess/myucp_resultset.hxx
+++ b/dbaccess/source/core/dataaccess/myucp_resultset.hxx
@@ -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/inc/ContainerListener.hxx b/dbaccess/source/core/inc/ContainerListener.hxx
index 2a6b976504e5..749e3df9b9b1 100644
--- a/dbaccess/source/core/inc/ContainerListener.hxx
+++ b/dbaccess/source/core/inc/ContainerListener.hxx
@@ -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
@@ -53,7 +53,7 @@ namespace dbaccess
, ::com::sun::star::container::XContainerApproveListener
> OContainerListener_BASE;
- /** is helper class to avoid a cycle in refcount
+ /** is helper class to avoid a cycle in refcount
*/
class OContainerListener : public OContainerListener_BASE
{
@@ -91,7 +91,7 @@ namespace dbaccess
virtual ~OContainerListener();
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // DBA_CONTAINERLISTENER_HXX
diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx
index f35a0bfca58b..a4bb8d44a5b3 100644
--- a/dbaccess/source/core/inc/ContainerMediator.hxx
+++ b/dbaccess/source/core/inc/ContainerMediator.hxx
@@ -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
@@ -62,10 +62,10 @@
namespace dbaccess
{
//........................................................................
-
+
class OPropertyForward;
- class OContainerMediator : public ::comphelper::OBaseMutex
+ class OContainerMediator : public ::comphelper::OBaseMutex
,public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener >
{
public:
@@ -78,9 +78,9 @@ namespace dbaccess
private:
typedef ::rtl::Reference< OPropertyForward > TPropertyForward;
typedef ::std::map< ::rtl::OUString, TPropertyForward > PropertyForwardList;
- PropertyForwardList m_aForwardList;
+ PropertyForwardList m_aForwardList;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xSettings; // can not be weak
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak
::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_aConnection;
ContainerType m_eType;
@@ -117,7 +117,7 @@ namespace dbaccess
);
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // DBA_CONTAINERMEDIATOR_HXX
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 10c5df0cd5f3..65bd10489608 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -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
@@ -99,13 +99,13 @@ namespace dbaccess
class ODatabaseModelImpl;
struct ContentProperties
{
- ::rtl::OUString aTitle; // Title
+ ::rtl::OUString aTitle; // Title
::boost::optional< ::rtl::OUString >
aContentType; // ContentType (aka MediaType aka MimeType)
sal_Bool bIsDocument; // IsDocument
- sal_Bool bIsFolder; // IsFolder
- sal_Bool bAsTemplate; // AsTemplate
- ::rtl::OUString sPersistentName;// persistent name of the document
+ sal_Bool bIsFolder; // IsFolder
+ sal_Bool bAsTemplate; // AsTemplate
+ ::rtl::OUString sPersistentName;// persistent name of the document
ContentProperties()
:bIsDocument( sal_True )
@@ -121,30 +121,30 @@ namespace dbaccess
OContentHelper_Impl();
virtual ~OContentHelper_Impl();
- ContentProperties m_aProps;
- ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists
+ ContentProperties m_aProps;
+ ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists
};
typedef ::boost::shared_ptr TContentPtr;
- typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString,
+ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString,
::comphelper::UStringHash,
::comphelper::UStringEqual
> PropertyChangeListenerContainer;
- typedef ::comphelper::OBaseMutex OContentHelper_MBASE;
- typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent
- , ::com::sun::star::ucb::XCommandProcessor
- , ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::beans::XPropertiesChangeNotifier
- , ::com::sun::star::beans::XPropertyContainer
- , ::com::sun::star::lang::XInitialization
- , ::com::sun::star::lang::XUnoTunnel
- , ::com::sun::star::container::XChild
- , ::com::sun::star::sdbcx::XRename
- > OContentHelper_COMPBASE;
-
- class OContentHelper : public OContentHelper_MBASE
+ typedef ::comphelper::OBaseMutex OContentHelper_MBASE;
+ typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent
+ , ::com::sun::star::ucb::XCommandProcessor
+ , ::com::sun::star::lang::XServiceInfo
+ , ::com::sun::star::beans::XPropertiesChangeNotifier
+ , ::com::sun::star::beans::XPropertyContainer
+ , ::com::sun::star::lang::XInitialization
+ , ::com::sun::star::lang::XUnoTunnel
+ , ::com::sun::star::container::XChild
+ , ::com::sun::star::sdbcx::XRename
+ > OContentHelper_COMPBASE;
+
+ class OContentHelper : public OContentHelper_MBASE
,public OContentHelper_COMPBASE
{
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
@@ -159,18 +159,18 @@ namespace dbaccess
void impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify = true);
protected:
- ::cppu::OInterfaceContainerHelper m_aContentListeners;
- PropertyChangeListenerContainer m_aPropertyChangeListeners;
+ ::cppu::OInterfaceContainerHelper m_aContentListeners;
+ PropertyChangeListenerContainer m_aPropertyChangeListeners;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
m_xParentContainer;
const ::comphelper::ComponentContext m_aContext;
const ::connectivity::SQLError m_aErrorHelper;
- TContentPtr m_pImpl;
- sal_uInt32 m_nCommandId;
+ TContentPtr m_pImpl;
+ sal_uInt32 m_nCommandId;
// helper
virtual void SAL_CALL disposing();
-
+
virtual void notifyDataSourceModified();
/**
@@ -185,13 +185,13 @@ namespace dbaccess
public:
OContentHelper( 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
);
// com::sun::star::lang::XTypeProvider
virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException);
- static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
+ static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
// ::com::sun::star::lang::XServiceInfo
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
@@ -237,13 +237,13 @@ namespace dbaccess
const ::comphelper::ComponentContext& getContext() const { return m_aContext; }
- inline TContentPtr getImpl() const { return m_pImpl; }
+ inline TContentPtr getImpl() const { return m_pImpl; }
protected:
virtual ::rtl::OUString determineContentType() const = 0;
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // DBA_CONTENTHELPER_HXX
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index e1ceb4dde6f2..dae466e92098 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
@@ -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
@@ -33,11 +33,12 @@
#include "com/sun/star/lang/XServiceInfo.hpp"
#include "com/sun/star/chart2/data/XDatabaseDataProvider.hpp"
#include "com/sun/star/chart2/XInternalDataProvider.hpp"
+#include
#include
#include
#include
-#include "cppuhelper/compbase3.hxx"
+#include "cppuhelper/compbase4.hxx"
#include "cppuhelper/basemutex.hxx"
#include "cppuhelper/propertysetmixin.hxx"
#include
@@ -52,8 +53,9 @@ namespace dbaccess
{
class DatabaseDataSource;
-typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::chart2::data::XDatabaseDataProvider
+typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::chart2::data::XDatabaseDataProvider
, ::com::sun::star::container::XChild
+ , ::com::sun::star::chart::XComplexDescriptionAccess
, ::com::sun::star::lang::XServiceInfo > TDatabaseDataProvider;
class DatabaseDataProvider: private ::cppu::BaseMutex,
@@ -187,6 +189,26 @@ private:
// conatiner::XChild
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException);
+
+ // ____ XComplexDescriptionAccess ____
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException);
+
+ // ____ XChartDataArray (base of XComplexDescriptionAccess) ____
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException);
+
+ // ____ XChartData (base of XChartDataArray) ____
+ virtual void SAL_CALL addChartDataChangeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeChartDataChangeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener )throw (::com::sun::star::uno::RuntimeException);
+ virtual double SAL_CALL getNotANumber()throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL isNotANumber(double nNumber )throw (::com::sun::star::uno::RuntimeException);
private:
DatabaseDataProvider(DatabaseDataProvider &); // not defined
void operator =(DatabaseDataProvider &); // not defined
@@ -205,7 +227,7 @@ private:
void impl_invalidateParameter_nothrow();
::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const;
- template void set( const ::rtl::OUString& _sProperty
+ template void set( const ::rtl::OUString& _sProperty
,const T& _Value
,T& _member)
{
@@ -229,15 +251,16 @@ private:
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XInternalDataProvider > m_xInternal;
+ ::com::sun::star::uno::Reference< ::com::sun::star::chart::XComplexDescriptionAccess > m_xComplexDescriptionAccess;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeXMLConversion> m_xRangeConversion;
::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> m_xHandler;
// the object doin' most of the work - an SDB-rowset
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xAggregateSet;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent;
::com::sun::star::uno::Sequence< ::rtl::OUString > m_MasterFields;
::com::sun::star::uno::Sequence< ::rtl::OUString > m_DetailFields;
-
+
::rtl::OUString m_Command;
::rtl::OUString m_DataSourceName;
::sal_Int32 m_CommandType;
diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index f02c3da87d19..28ba22e17359 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.hxx
@@ -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
@@ -44,17 +44,17 @@ namespace dbaccess
class OFilteredContainer : public ::connectivity::sdbcx::OCollection
{
private:
- mutable sal_Bool m_bConstructed; // late ctor called
+ mutable sal_Bool m_bConstructed; // late ctor called
protected:
::dbtools::IWarningsContainer* m_pWarningsContainer;
- IRefreshListener* m_pRefreshListener;
+ IRefreshListener* m_pRefreshListener;
oslInterlockedCount& m_nInAppend;
-
+
// holds the original container which where set in construct but they can be null
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMasterContainer;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMasterContainer;
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
/** returns a string denoting the only type of tables allowed in this container, or an empty string
if there is no such restriction
@@ -100,18 +100,18 @@ namespace dbaccess
public:
/** ctor of the container. The parent has to support the XConnection
interface.
- @param _rParent the object which acts as parent for the container.
+ @param _rParent the object which acts as parent for the container.
all refcounting is rerouted to this object
- @param _rMutex the access safety object of the parent
- @param _rTableFilter restricts the visible tables by name
- @param _rTableTypeFilter restricts the visible tables by type
- @see construct
+ @param _rMutex the access safety object of the parent
+ @param _rTableFilter restricts the visible tables by name
+ @param _rTableTypeFilter restricts the visible tables by type
+ @see construct
*/
OFilteredContainer( ::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon,
sal_Bool _bCase,
- IRefreshListener* _pRefreshListener,
+ IRefreshListener* _pRefreshListener,
::dbtools::IWarningsContainer* _pWarningsContainer,
oslInterlockedCount& _nInAppend
);
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index b0e5696387b4..dcdb81746bdb 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -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
@@ -56,8 +56,8 @@ namespace dbaccess
// ===================================================================
// = OPropertyForward
// ===================================================================
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener
- > OPropertyForward_Base;
+ typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener
+ > OPropertyForward_Base;
class OPropertyForward :public ::comphelper::OBaseMutex
,public OPropertyForward_Base
{
@@ -65,8 +65,8 @@ namespace dbaccess
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDestContainer;
- ::rtl::OUString m_sName;
- sal_Bool m_bInInsert;
+ ::rtl::OUString m_sName;
+ sal_Bool m_bInInsert;
protected:
virtual ~OPropertyForward();
@@ -90,7 +90,7 @@ namespace dbaccess
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // DBA_PROPERTYSETFORWARD_HXX
diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx
index 2b4bdda0f5a0..6b53f2bc5d6a 100644
--- a/dbaccess/source/core/inc/RefreshListener.hxx
+++ b/dbaccess/source/core/inc/RefreshListener.hxx
@@ -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
@@ -28,7 +28,7 @@
#ifndef DBA_CORE_REFRESHLISTENER_HXX
#define DBA_CORE_REFRESHLISTENER_HXX
-#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
+#ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
#include
#endif
@@ -52,7 +52,7 @@ namespace dbaccess
virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed) = 0;
};
//.........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//.........................................................................
#endif // DBA_CORE_REFRESHLISTENER_HXX
diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
index 7c0d2ba4cea3..5ba9a6329b2a 100644
--- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
+++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
@@ -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
@@ -82,16 +82,16 @@ namespace com { namespace sun { namespace star { namespace util {
namespace dbaccess
{
- typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSingleSelectQueryComposer,
+ typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSingleSelectQueryComposer,
::com::sun::star::sdb::XParametersSupplier,
::com::sun::star::sdbcx::XColumnsSupplier,
::com::sun::star::sdbcx::XTablesSupplier,
- ::com::sun::star::lang::XServiceInfo > OSingleSelectQueryComposer_BASE;
+ ::com::sun::star::lang::XServiceInfo > OSingleSelectQueryComposer_BASE;
class OPrivateColumns;
class OPrivateTables;
- class OSingleSelectQueryComposer : public ::comphelper::OMutexAndBroadcastHelper
+ class OSingleSelectQueryComposer : public ::comphelper::OMutexAndBroadcastHelper
,public OSubComponent
,public ::comphelper::OPropertyContainer
,public ::comphelper::OPropertyArrayUsageHelper < OSingleSelectQueryComposer >
@@ -109,42 +109,42 @@ namespace dbaccess
inline void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); }
enum EColumnType
{
- SelectColumns = 0,
- GroupByColumns = 1,
- OrderColumns = 2,
- ParameterColumns = 3
+ SelectColumns = 0,
+ GroupByColumns = 1,
+ OrderColumns = 2,
+ ParameterColumns = 3
};
typedef ::std::const_mem_fun_t< const ::connectivity::OSQLParseNode*, ::connectivity::OSQLParseTreeIterator >
TGetParseNode;
- ::connectivity::OSQLParser m_aSqlParser;
- ::connectivity::OSQLParseTreeIterator m_aSqlIterator; // the iterator for the complete statement
- ::connectivity::OSQLParseTreeIterator m_aAdditiveIterator; // the iterator for the "additive statement" (means without the clauses of the elementary statement)
- ::std::vector m_aColumnsCollection; // used for columns and parameters of old queries
- ::std::vector m_aTablesCollection;
+ ::connectivity::OSQLParser m_aSqlParser;
+ ::connectivity::OSQLParseTreeIterator m_aSqlIterator; // the iterator for the complete statement
+ ::connectivity::OSQLParseTreeIterator m_aAdditiveIterator; // the iterator for the "additive statement" (means without the clauses of the elementary statement)
+ ::std::vector m_aColumnsCollection; // used for columns and parameters of old queries
+ ::std::vector m_aTablesCollection;
::std::vector< ::rtl::OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionTables;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionQueries;
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionTables;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionQueries;
+ ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns;
::comphelper::ComponentContext m_aContext;
- ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter;
+ ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter;
- ::std::vector m_aCurrentColumns;
- OPrivateTables* m_pTables; // currently used tables
+ ::std::vector m_aCurrentColumns;
+ OPrivateTables* m_pTables; // currently used tables
- ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having
- ::rtl::OUString m_sDecimalSep;
- ::rtl::OUString m_sCommand;
- ::com::sun::star::lang::Locale m_aLocale;
- sal_Int32 m_nBoolCompareMode; // how to compare bool values
- sal_Int32 m_nCommandType;
+ ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having
+ ::rtl::OUString m_sDecimalSep;
+ ::rtl::OUString m_sCommand;
+ ::com::sun::star::lang::Locale m_aLocale;
+ sal_Int32 m_nBoolCompareMode; // how to compare bool values
+ sal_Int32 m_nCommandType;
//
- ::rtl::OUString m_sOrignal;
+ ::rtl::OUString m_sOrignal;
//
@@ -176,7 +176,7 @@ namespace dbaccess
,sal_Int32 filterOperator);
/** getStructuredCondition returns the structured condition for the where or having clause
- @param _aGetFunctor
+ @param _aGetFunctor
A member function to get the correct parse node.
@return
@@ -193,9 +193,9 @@ namespace dbaccess
inline bool implSetHavingClause(::rtl::OUString _sFilter) { setHavingClause(_sFilter); return true;}
/** returns the part of the seelect statement
- @param _ePart
+ @param _ePart
Which part should be returned.
- @param _bWithKeyword
+ @param _bWithKeyword
If the keyword will be added too. Otherwise not.
@param _rIterator
The iterator to use.
@@ -225,7 +225,7 @@ namespace dbaccess
virtual ~OSingleSelectQueryComposer();
public:
- OSingleSelectQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTableSupplier,
+ OSingleSelectQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTableSupplier,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
const ::comphelper::ComponentContext& _rContext);
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index 8f8ec5bf9652..3ba43e6a1d58 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -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
@@ -28,7 +28,7 @@
#ifndef _DBA_CORE_TABLEDECORATOR_HXX_
#define _DBA_CORE_TABLEDECORATOR_HXX_
-#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_
+#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATSSUPPLIER_HPP_
#include
#endif
#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
@@ -86,7 +86,7 @@
namespace dbaccess
{
- typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbcx::XColumnsSupplier,
+ typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbcx::XColumnsSupplier,
::com::sun::star::sdbcx::XKeysSupplier,
::com::sun::star::container::XNamed,
::com::sun::star::lang::XServiceInfo,
@@ -101,7 +101,7 @@ namespace dbaccess
class ODBTableDecorator;
typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTableDecorator > ODBTableDecorator_PROP;
- class ODBTableDecorator :public comphelper::OBaseMutex
+ class ODBTableDecorator :public comphelper::OBaseMutex
,public OTableDescriptor_BASE
,public ODataSettings //ODataSettings_Base
,public IColumnFactory
@@ -110,21 +110,21 @@ namespace dbaccess
{
void fillPrivileges() const;
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xColumnMediator;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xColumnMediator;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormats;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
+ ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormats;
//
- mutable sal_Int32 m_nPrivileges;
+ mutable sal_Int32 m_nPrivileges;
//
- ::connectivity::sdbcx::OCollection* m_pColumns;
- ::connectivity::sdbcx::OCollection* m_pTables;
+ ::connectivity::sdbcx::OCollection* m_pColumns;
+ ::connectivity::sdbcx::OCollection* m_pTables;
// 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);
@@ -146,7 +146,7 @@ namespace dbaccess
sal_Int32 nHandle,
const ::com::sun::star::uno::Any& rValue
)
-
+
throw (::com::sun::star::uno::Exception);
virtual ~ODBTableDecorator();
@@ -163,9 +163,9 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _rxNumberFormats,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumnDefinitions
- ) throw(::com::sun::star::sdbc::SQLException);
-
+ ) throw(::com::sun::star::sdbc::SQLException);
+
// ODescriptor
virtual void construct();
@@ -192,7 +192,7 @@ namespace dbaccess
virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
- // XNamed
+ // XNamed
virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException);
// com::sun::star::lang::XUnoTunnel
diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx
index 4e96a1882423..49d4b919068f 100644
--- a/dbaccess/source/core/inc/View.hxx
+++ b/dbaccess/source/core/inc/View.hxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2008 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx
index 64f281e7b6aa..45a405bfc716 100644
--- a/dbaccess/source/core/inc/callablestatement.hxx
+++ b/dbaccess/source/core/inc/callablestatement.hxx
@@ -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/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index 543e999f715f..9ca29d4b01d2 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -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
@@ -69,12 +69,12 @@ namespace dbaccess
//************************************************************
// OColumn
//************************************************************
- typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::lang::XServiceInfo,
+ typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::lang::XServiceInfo,
::com::sun::star::container::XNamed
> OColumnBase;
//------------------------------------------------------------
- class OColumn :public comphelper::OBaseMutex
+ class OColumn :public comphelper::OBaseMutex
,public OColumnBase
,public ::comphelper::OPropertyContainer
,public IPropertyContainer // convenience for the derived class which also derive from OColumnSettings
@@ -167,18 +167,18 @@ namespace dbaccess
class OColumns : public OColumns_BASE
,public TXChild
{
- OContainerMediator* m_pMediator;
+ OContainerMediator* m_pMediator;
protected:
// comes from the driver can be null
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDrvColumns;
- ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xParent;
- IColumnFactory* m_pColFactoryImpl;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDrvColumns;
+ ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xParent;
+ IColumnFactory* m_pColFactoryImpl;
::connectivity::sdbcx::IRefreshableColumns* m_pRefreshColumns;
- sal_Bool m_bInitialized : 1;
- sal_Bool m_bAddColumn : 1;
- sal_Bool m_bDropColumn : 1;
+ sal_Bool m_bInitialized : 1;
+ sal_Bool m_bAddColumn : 1;
+ sal_Bool m_bDropColumn : 1;
virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException);
virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
@@ -193,17 +193,17 @@ namespace dbaccess
}
/** flag which determines whether the container is filled or not
*/
- inline sal_Bool isInitialized() const { return m_bInitialized; }
- inline void setInitialized() {m_bInitialized = sal_True;}
- inline void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; }
+ inline sal_Bool isInitialized() const { return m_bInitialized; }
+ inline void setInitialized() {m_bInitialized = sal_True;}
+ inline void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; }
public:
/** constructs an empty container without configuration location.
- @param rParent the parent object. This instance will be used for refcounting, so the parent
+ @param rParent the parent object. This instance will be used for refcounting, so the parent
cannot die before the container does.
- @param _rMutex the mutex of the parent.
- @param _bCaseSensitive the initial case sensitivity flag
- @see setCaseSensitive
+ @param _rMutex the mutex of the parent.
+ @param _bCaseSensitive the initial case sensitivity flag
+ @see setCaseSensitive
*/
OColumns(
::cppu::OWeakObject& _rParent,
@@ -218,7 +218,7 @@ namespace dbaccess
OColumns(
::cppu::OWeakObject& _rParent,
- ::osl::Mutex& _rMutex,
+ ::osl::Mutex& _rMutex,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxDrvColumns,
sal_Bool _bCaseSensitive,
const ::std::vector< ::rtl::OUString> &_rVector,
diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx
index c9f6fa5b1cda..032055d1b0fe 100644
--- a/dbaccess/source/core/inc/columnsettings.hxx
+++ b/dbaccess/source/core/inc/columnsettings.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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,18 +41,18 @@ namespace dbaccess
{
public:
virtual void registerProperty(
- const ::rtl::OUString& _rName,
- sal_Int32 _nHandle,
- sal_Int32 _nAttributes,
- void* _pPointerToMember,
+ const ::rtl::OUString& _rName,
+ sal_Int32 _nHandle,
+ sal_Int32 _nAttributes,
+ void* _pPointerToMember,
const ::com::sun::star::uno::Type& _rMemberType
) = 0;
virtual void registerMayBeVoidProperty(
- const ::rtl::OUString& _rName,
- sal_Int32 _nHandle,
- sal_Int32 _nAttributes,
- ::com::sun::star::uno::Any* _pPointerToMember,
+ const ::rtl::OUString& _rName,
+ sal_Int32 _nHandle,
+ sal_Int32 _nAttributes,
+ ::com::sun::star::uno::Any* _pPointerToMember,
const ::com::sun::star::uno::Type& _rExpectedType
) = 0;
@@ -70,17 +70,17 @@ namespace dbaccess
//====================================================================
class OColumnSettings
{
- //
- ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void
- ::com::sun::star::uno::Any m_aFormatKey; // sal_Int32 or void
- ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void
- ::com::sun::star::uno::Any m_aAlignment; // sal_Int32 (::com::sun::star::awt::TextAlign) or void
- ::com::sun::star::uno::Any m_aHelpText; // the description of the column which is visible in the helptext of the column
- ::com::sun::star::uno::Any m_aControlDefault; // the default value which should be displayed as by a control when moving to a new row
+ //
+ ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void
+ ::com::sun::star::uno::Any m_aFormatKey; // sal_Int32 or void
+ ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void
+ ::com::sun::star::uno::Any m_aAlignment; // sal_Int32 (::com::sun::star::awt::TextAlign) or void
+ ::com::sun::star::uno::Any m_aHelpText; // the description of the column which is visible in the helptext of the column
+ ::com::sun::star::uno::Any m_aControlDefault; // the default value which should be displayed as by a control when moving to a new row
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
m_xControlModel;
- sal_Bool m_bHidden;
- //
+ sal_Bool m_bHidden;
+ //
protected:
virtual ~OColumnSettings();
diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx
index ea0e9644c714..8a4bd018a10a 100644
--- a/dbaccess/source/core/inc/commandbase.hxx
+++ b/dbaccess/source/core/inc/commandbase.hxx
@@ -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
@@ -28,7 +28,7 @@
#ifndef _DBA_CORE_COMMANDBASE_HXX_
#define _DBA_CORE_COMMANDBASE_HXX_
-#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
+#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
#include
#endif
#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
@@ -42,19 +42,19 @@ namespace dbaccess
//==========================================================================
//= OCommandBase - a base class (in fact just a container for some members)
-//= for classes implementing the sdb.CommandDefinition service
+//= for classes implementing the sdb.CommandDefinition service
//==========================================================================
class OCommandBase
{
public: // need public access
//
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>
m_aLayoutInformation;
- ::rtl::OUString m_sCommand;
- sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer
- ::rtl::OUString m_sUpdateTableName;
- ::rtl::OUString m_sUpdateSchemaName;
- ::rtl::OUString m_sUpdateCatalogName;
+ ::rtl::OUString m_sCommand;
+ sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer
+ ::rtl::OUString m_sUpdateTableName;
+ ::rtl::OUString m_sUpdateSchemaName;
+ ::rtl::OUString m_sUpdateCatalogName;
//
protected:
@@ -63,7 +63,7 @@ protected:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_CORE_COMMANDBASE_HXX_
diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx
index 4f7c4b7f66ef..d98ff23e4d35 100644
--- a/dbaccess/source/core/inc/composertools.hxx
+++ b/dbaccess/source/core/inc/composertools.hxx
@@ -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/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx
index 0f27559201d7..7aa84323bccb 100644
--- a/dbaccess/source/core/inc/containerapprove.hxx
+++ b/dbaccess/source/core/inc/containerapprove.hxx
@@ -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/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc
index fb6320f38932..c438314d6287 100644
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ b/dbaccess/source/core/inc/core_resource.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
@@ -33,45 +33,45 @@
#endif
//------------------------------------------------------------------------------
-#define RID_CORE_STRINGS_START RID_DBACCESS_START
+#define RID_CORE_STRINGS_START RID_DBACCESS_START
//------------------------------------------------------------------------------
//- String-IDs
-#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 )
-#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 )
-#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 )
-#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 )
-#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 )
-#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 )
-#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 )
-#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 )
-#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 )
-#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 )
-#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 )
-#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 )
-#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 )
-#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 )
-#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 )
-#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 )
-#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 )
-#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 )
-#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 )
-#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 )
-#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 )
-#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 )
-#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 )
-#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 )
-#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 )
-#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 )
-#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 )
-#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 )
-#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 )
-#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 )
-#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 )
-#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 )
-#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 )
-#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 )
-#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 )
+#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 )
+#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 )
+#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 )
+#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 )
+#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 )
+#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 )
+#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 )
+#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 )
+#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 )
+#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 )
+#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 )
+#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 )
+#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 )
+#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 )
+#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 )
+#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 )
+#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 )
+#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 )
+#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 )
+#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 )
+#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 )
+#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 )
+#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 )
+#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 )
+#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 )
+#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 )
+#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 )
+#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 )
+#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 )
+#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 )
+#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 )
+#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 )
+#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 )
+#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 )
+#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 )
#define RID_STR_FILE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 35 )
#define RID_STR_TABLE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 36 )
#define RID_STR_CONFLICTING_NAMES ( RID_CORE_STRINGS_START + 37 )
@@ -85,27 +85,27 @@
#define RID_STR_NAME_NOT_FOUND ( RID_CORE_STRINGS_START + 45 )
#define RID_STR_QUERY_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 46 )
#define RID_STR_ERROR_WHILE_SAVING ( RID_CORE_STRINGS_START + 47 )
-#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 )
+#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 )
-#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 )
-#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 )
-#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 )
-#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 )
-#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 )
-#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 )
+#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 )
+#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 )
+#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 )
+#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 )
+#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 )
+#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 )
-#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 )
-#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 )
-#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 )
-#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 )
-#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 )
-#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 )
-#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 )
-#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 )
-#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 )
-#define RID_STR_NO_EMBEDDING ( RID_CORE_STRINGS_START + 64 )
-#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 )
-#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 )
+#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 )
+#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 )
+#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 )
+#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 )
+#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 )
+#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 )
+#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 )
+#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 )
+#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 )
+#define RID_STR_NO_EMBEDDING ( RID_CORE_STRINGS_START + 64 )
+#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 )
+#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 )
#define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 )
diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx
index fd8023e15322..b97efa0c2e39 100644
--- a/dbaccess/source/core/inc/core_resource.hxx
+++ b/dbaccess/source/core/inc/core_resource.hxx
@@ -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
@@ -51,9 +51,9 @@ namespace dbaccess
class ResourceManager
{
friend class OModuleClient;
- static ::osl::Mutex s_aMutex; /// access safety
- static sal_Int32 s_nClients; /// number of registered clients
- static ResMgr* m_pImpl;
+ static ::osl::Mutex s_aMutex; /// access safety
+ static sal_Int32 s_nClients; /// number of registered clients
+ static ResMgr* m_pImpl;
private:
// no instantiation allowed
@@ -63,9 +63,9 @@ namespace dbaccess
protected:
static void ensureImplExists();
/// register a client for the module
- static void registerClient();
+ static void registerClient();
/// revoke a client for the module
- static void revokeClient();
+ static void revokeClient();
public:
/** loads the string with the specified resource id
@@ -112,13 +112,13 @@ namespace dbaccess
//=========================================================================
//= OModuleClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific ressources
*/
class OModuleClient
{
public:
- OModuleClient() { ResourceManager::registerClient(); }
- ~OModuleClient() { ResourceManager::revokeClient(); }
+ OModuleClient() { ResourceManager::registerClient(); }
+ ~OModuleClient() { ResourceManager::revokeClient(); }
};
diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx
index 9b42c7d57cf9..ada830b60ae6 100644
--- a/dbaccess/source/core/inc/datasettings.hxx
+++ b/dbaccess/source/core/inc/datasettings.hxx
@@ -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
@@ -54,25 +54,25 @@ namespace dbaccess
//==========================================================================
//= ODataSettings_Base - a base class which implements the property member
-//= for an object implementing the sdb::DataSettings
-//= service
-//= the properties have to to be registered when used
+//= for an object implementing the sdb::DataSettings
+//= service
+//= the properties have to to be registered when used
//==========================================================================
class ODataSettings_Base
{
public:
//
- ::rtl::OUString m_sFilter;
- ::rtl::OUString m_sHavingClause;
- ::rtl::OUString m_sGroupBy;
- ::rtl::OUString m_sOrder;
- sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member !
- ::com::sun::star::awt::FontDescriptor m_aFont;
- ::com::sun::star::uno::Any m_aRowHeight;
- ::com::sun::star::uno::Any m_aTextColor;
- ::com::sun::star::uno::Any m_aTextLineColor;
- sal_Int16 m_nFontEmphasis;
- sal_Int16 m_nFontRelief;
+ ::rtl::OUString m_sFilter;
+ ::rtl::OUString m_sHavingClause;
+ ::rtl::OUString m_sGroupBy;
+ ::rtl::OUString m_sOrder;
+ sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member !
+ ::com::sun::star::awt::FontDescriptor m_aFont;
+ ::com::sun::star::uno::Any m_aRowHeight;
+ ::com::sun::star::uno::Any m_aTextColor;
+ ::com::sun::star::uno::Any m_aTextLineColor;
+ sal_Int16 m_nFontEmphasis;
+ sal_Int16 m_nFontRelief;
//
protected:
@@ -82,8 +82,8 @@ protected:
};
//==========================================================================
//= ODataSettings - a base class which implements the property handling
-//= for an object implementing the sdb::DataSettings
-//= service
+//= for an object implementing the sdb::DataSettings
+//= service
//==========================================================================
class ODataSettings : public ::comphelper::OPropertyStateContainer
@@ -95,14 +95,14 @@ protected:
virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const;
/** register the properties from the param given. The parameter instance must be alive as long as tis object live.
- @param _pItem
+ @param _pItem
The database settings, can be
this
*/
void registerPropertiesFor(ODataSettings_Base* _pItem);
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_CORE_DATASETTINGS_HXX_
diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc
index a383ed4189d2..b1eb879b0470 100644
--- a/dbaccess/source/core/inc/dbamiscres.hrc
+++ b/dbaccess/source/core/inc/dbamiscres.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
@@ -30,33 +30,33 @@
//========================================================================
// string ids (relative to other resources, that's why not unique)
-#define STR_MYSQL_ODBC 1
-#define STR_MYSQL_JDBC 2
-#define STR_ADABAS 3
-#define STR_ORACLE_JDBC 4
-#define STR_JDBC 5
-#define STR_ODBC 6
-#define STR_DBASE 7
-#define STR_MSACCESS 8
+#define STR_MYSQL_ODBC 1
+#define STR_MYSQL_JDBC 2
+#define STR_ADABAS 3
+#define STR_ORACLE_JDBC 4
+#define STR_JDBC 5
+#define STR_ODBC 6
+#define STR_DBASE 7
+#define STR_MSACCESS 8
#define STR_MSACCESS2007 9
-#define STR_ADO 10
-#define STR_FLAT 11
-#define STR_CALC 12
-#define STR_MOZILLA 13
-#define STR_LDAP 14
-#define STR_OUTLOOK 15
-#define STR_OUTLOOKEXP 16
-#define STR_EVOLUTION 17
-#define STR_EVOLUTION_GROUPWISE 18
-#define STR_EVOLUTION_LDAP 19
-#define STR_KAB 20
-#define STR_MACAB 21
+#define STR_ADO 10
+#define STR_FLAT 11
+#define STR_CALC 12
+#define STR_MOZILLA 13
+#define STR_LDAP 14
+#define STR_OUTLOOK 15
+#define STR_OUTLOOKEXP 16
+#define STR_EVOLUTION 17
+#define STR_EVOLUTION_GROUPWISE 18
+#define STR_EVOLUTION_LDAP 19
+#define STR_KAB 20
+#define STR_MACAB 21
#define STR_EMBEDDED_HSQLDB 22
-#define STR_THUNDERBIRD 23
-#define STR_MYSQL_NATIVE 24
-
-#define STR_END STR_MYSQL_NATIVE + 1
-
+#define STR_THUNDERBIRD 23
+#define STR_MYSQL_NATIVE 24
+
+#define STR_END STR_MYSQL_NATIVE + 1
-#endif // _DBA_MISCRES_HRC_
+
+#endif // _DBA_MISCRES_HRC_
diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx
index 185e7d1426d8..462e273d020a 100644
--- a/dbaccess/source/core/inc/definitioncolumn.hxx
+++ b/dbaccess/source/core/inc/definitioncolumn.hxx
@@ -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
@@ -48,7 +48,7 @@ namespace dbaccess
//= OTableColumnDescriptor
// =========================================================================
/**
- * provides the properties for description. A descriptor could be used to create a new table column.
+ * provides the properties for description. A descriptor could be used to create a new table column.
*/
class OTableColumnDescriptor : public OColumn
,public OColumnSettings
@@ -59,19 +59,19 @@ namespace dbaccess
const bool m_bActAsDescriptor;
protected:
- //
- rtl::OUString m_aTypeName;
- rtl::OUString m_aDescription;
- rtl::OUString m_aDefaultValue;
- rtl::OUString m_aAutoIncrementValue;
- sal_Int32 m_nType;
- sal_Int32 m_nPrecision;
- sal_Int32 m_nScale;
- sal_Int32 m_nIsNullable;
- sal_Bool m_bAutoIncrement;
- sal_Bool m_bRowVersion;
- sal_Bool m_bCurrency;
- //
+ //
+ rtl::OUString m_aTypeName;
+ rtl::OUString m_aDescription;
+ rtl::OUString m_aDefaultValue;
+ rtl::OUString m_aAutoIncrementValue;
+ sal_Int32 m_nType;
+ sal_Int32 m_nPrecision;
+ sal_Int32 m_nScale;
+ sal_Int32 m_nIsNullable;
+ sal_Bool m_bAutoIncrement;
+ sal_Bool m_bRowVersion;
+ sal_Bool m_bCurrency;
+ //
public:
OTableColumnDescriptor( const bool _bActAsDescriptor )
@@ -193,8 +193,8 @@ namespace dbaccess
// = OColumnWrapper
// =========================================================================
/**
- * describes all properties for a columns of a table. Only the view parts are provided
- * directly, all the other parts are derived from a driver implementation
+ * describes all properties for a columns of a table. Only the view parts are provided
+ * directly, all the other parts are derived from a driver implementation
*/
class OColumnWrapper :public OColumn
{
@@ -203,7 +203,7 @@ namespace dbaccess
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
m_xAggregate;
- sal_Int32 m_nColTypeID;
+ sal_Int32 m_nColTypeID;
protected:
OColumnWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rCol, const bool _bNameIsReadOnly );
@@ -239,7 +239,7 @@ namespace dbaccess
// = OTableColumnDescriptorWrapper
// =========================================================================
/**
- * provides the properties for description. A descriptor could be used to create a new table column.
+ * provides the properties for description. A descriptor could be used to create a new table column.
*/
class OTableColumnDescriptorWrapper :public OColumnWrapper
,public OColumnSettings
@@ -288,8 +288,8 @@ namespace dbaccess
// = OTableColumnWrapper
// =========================================================================
/**
- * describes all properties for a columns of a table. Only the view parts are provided
- * directly, all the other parts are derived from a driver implementation
+ * describes all properties for a columns of a table. Only the view parts are provided
+ * directly, all the other parts are derived from a driver implementation
*/
class OTableColumnWrapper :public OTableColumnDescriptorWrapper
,public ::comphelper::OIdPropertyArrayUsageHelper < OTableColumnWrapper >
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index d70a0813e18c..4b87250e771a 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -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
@@ -123,8 +123,8 @@ private:
};
//==========================================================================
-//= ODefinitionContainer - base class of collections of database definition
-//= documents
+//= ODefinitionContainer - base class of collections of database definition
+//= documents
//==========================================================================
typedef ::cppu::ImplHelper7 < ::com::sun::star::container::XIndexAccess
, ::com::sun::star::container::XNameContainer
@@ -162,15 +162,15 @@ private:
protected:
// we can't just hold a vector of XContentRefs, as after initialization they're all empty
// cause we load them only on access
- DocumentsIndexAccess m_aDocuments; // for a efficient index access
- Documents m_aDocumentMap; // for a efficient name access
+ DocumentsIndexAccess m_aDocuments; // for a efficient index access
+ Documents m_aDocumentMap; // for a efficient name access
::cppu::OInterfaceContainerHelper
m_aApproveListeners;
::cppu::OInterfaceContainerHelper
m_aContainerListeners;
- sal_Bool m_bInPropertyChange;
+ sal_Bool m_bInPropertyChange;
bool m_bCheckSlash;
protected:
@@ -201,7 +201,7 @@ public:
*/
ODefinitionContainer(
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
, bool _bCheckSlash = true
);
@@ -259,42 +259,42 @@ protected:
virtual void SAL_CALL disposing();
/** create a object from it's persistent data within the configuration. To be overwritten by derived classes.
- @param _rName the name the object has within the container
- @return the newly created object or an empty reference if somthing went wrong
+ @param _rName the name the object has within the container
+ @return the newly created object or an empty reference if somthing went wrong
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject(
const ::rtl::OUString& _rName) = 0;
/** get the object specified by the given name. If desired, the object will be read if not already done so.
- @param _rName the object name
- @param _bReadIfNeccessary if sal_True, the object will be created if necessary
- @return the property set interface of the object. Usually the return value is not NULL, but
+ @param _rName the object name
+ @param _bReadIfNeccessary if sal_True, the object will be created if necessary
+ @return the property set interface of the object. Usually the return value is not NULL, but
if so, then the object could not be read from the configuration
- @throws NoSuchElementException if there is no object with the given name.
- @see createObject
+ @throws NoSuchElementException if there is no object with the given name.
+ @see createObject
*/
virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >
implGetByName(const ::rtl::OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException);
/** 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
*/
- virtual sal_Bool checkExistence(const ::rtl::OUString& _rName);
+ virtual sal_Bool checkExistence(const ::rtl::OUString& _rName);
/** append a new object to the container. No plausibility checks are done, e.g. if the object is non-NULL or
if the name is already used by another object or anything like this. This method is for derived classes
which may support different methods to create and/or append objects, and don't want to deal with the
internal structures of this class.
The old component will not be disposed, this is the callers responsibility, too.
- @param _rName the name of the new object
- @param _rxNewObject the new object (not surprising, is it ?)
- @see createConfigKey
- @see implReplace
- @see implRemove
+ @param _rName the name of the new object
+ @param _rxNewObject the new object (not surprising, is it ?)
+ @see createConfigKey
+ @see implReplace
+ @see implRemove
*/
- void implAppend(
+ void implAppend(
const ::rtl::OUString& _rName,
const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject
);
@@ -303,9 +303,9 @@ protected:
or not there exists an object with the given name. This is the responsibility of the caller.
Additionally the node for the given object will be removed from the registry (including all sub nodes).
The old component will not be disposed, this is the callers responsibility, too.
- @param _rName the objects name
- @see implReplace
- @see implAppend
+ @param _rName the objects name
+ @see implReplace
+ @see implAppend
*/
void implRemove(const ::rtl::OUString& _rName);
@@ -314,11 +314,11 @@ protected:
Additionally all object-related informations within the registry will be deleted. The new object config node,
where the caller may want to store the new objects information, is returned.
The old component will not be disposed, this is the callers responsibility, too.
- @param _rName the objects name
- @param _rxNewObject the new object
- @param _rNewObjectNode the configuration node where the new object may be stored
- @see implAppend
- @see implRemove
+ @param _rName the objects name
+ @param _rxNewObject the new object
+ @param _rNewObjectNode the configuration node where the new object may be stored
+ @see implAppend
+ @see implRemove
*/
void implReplace(
const ::rtl::OUString& _rName,
@@ -342,8 +342,8 @@ protected:
}
private:
- void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
- void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
+ void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
+ void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject);
/** approve that the object given may be inserted into the container. Should be overloaded by derived classes,
the default implementation just checks the object to be non-void.
@@ -368,7 +368,7 @@ private:
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_CORE_DEFINITIONCONTAINER_HXX_
diff --git a/dbaccess/source/core/inc/module_dba.hxx b/dbaccess/source/core/inc/module_dba.hxx
index 03a5faefa1d2..ef9a8cd758d8 100644
--- a/dbaccess/source/core/inc/module_dba.hxx
+++ b/dbaccess/source/core/inc/module_dba.hxx
@@ -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/inc/object.hxx b/dbaccess/source/core/inc/object.hxx
index 917cc9e05e42..9d2032d8822d 100644
--- a/dbaccess/source/core/inc/object.hxx
+++ b/dbaccess/source/core/inc/object.hxx
@@ -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/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx
index bea104c77443..cf37ed62eb7e 100644
--- a/dbaccess/source/core/inc/objectnameapproval.hxx
+++ b/dbaccess/source/core/inc/objectnameapproval.hxx
@@ -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
@@ -80,7 +80,7 @@ namespace dbaccess
ObjectNameApproval(
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection,
ObjectType _eType
- );
+ );
virtual ~ObjectNameApproval();
// IContainerApprove
diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx
index e0df114b22af..63840b22b7ad 100644
--- a/dbaccess/source/core/inc/preparedstatement.hxx
+++ b/dbaccess/source/core/inc/preparedstatement.hxx
@@ -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
@@ -65,7 +65,7 @@ namespace dbaccess
public ::com::sun::star::lang::XServiceInfo
{
protected:
- OColumns* m_pColumns;
+ OColumns* m_pColumns;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > m_xAggregateAsParameters;
public:
diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx
index 839e5e39a772..38f2dc46ab0d 100644
--- a/dbaccess/source/core/inc/querycomposer.hxx
+++ b/dbaccess/source/core/inc/querycomposer.hxx
@@ -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
@@ -76,21 +76,21 @@ namespace com { namespace sun { namespace star { namespace util {
namespace dbaccess
{
- typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSQLQueryComposer,
+ typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSQLQueryComposer,
::com::sun::star::sdb::XParametersSupplier,
::com::sun::star::sdbcx::XTablesSupplier,
::com::sun::star::sdbcx::XColumnsSupplier,
- ::com::sun::star::lang::XServiceInfo > OQueryComposer_BASE;
+ ::com::sun::star::lang::XServiceInfo > OQueryComposer_BASE;
class OPrivateColumns;
class OPrivateTables;
- class OQueryComposer : public ::comphelper::OBaseMutex,
+ class OQueryComposer : public ::comphelper::OBaseMutex,
public OSubComponent,
public OQueryComposer_BASE
{
- ::std::vector< ::rtl::OUString> m_aFilters;
- ::std::vector< ::rtl::OUString> m_aOrders;
+ ::std::vector< ::rtl::OUString> m_aFilters;
+ ::std::vector< ::rtl::OUString> m_aOrders;
::rtl::OUString m_sOrgFilter;
::rtl::OUString m_sOrgOrder;
::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposer;
@@ -101,7 +101,7 @@ namespace dbaccess
virtual ~OQueryComposer();
public:
- OQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection );
+ OQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection );
// ::com::sun::star::lang::XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx
index 9502a7002aa7..2f370fa5e63b 100644
--- a/dbaccess/source/core/inc/querycontainer.hxx
+++ b/dbaccess/source/core/inc/querycontainer.hxx
@@ -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
@@ -122,7 +122,7 @@ namespace dbaccess
class OQueryContainer;
class OContainerListener;
class OQuery;
- class OQueryContainer : public ODefinitionContainer
+ class OQueryContainer : public ODefinitionContainer
, public OQueryContainer_Base
{
protected:
@@ -133,18 +133,18 @@ namespace dbaccess
m_xConnection;
// possible actions on our "aggregate"
enum AGGREGATE_ACTION { NONE, INSERTING, FLUSHING };
- AGGREGATE_ACTION m_eDoingCurrently;
+ AGGREGATE_ACTION m_eDoingCurrently;
OContainerListener* m_pCommandsListener;
// ------------------------------------------------------------------------
/** 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
{
- OQueryContainer* m_pActor;
+ OQueryContainer* m_pActor;
public:
OAutoActionReset(OQueryContainer* _pActor) : m_pActor(_pActor) { }
~OAutoActionReset() { m_pActor->m_eDoingCurrently = NONE; }
@@ -152,7 +152,7 @@ namespace dbaccess
// ODefinitionContainer
virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName);
- virtual sal_Bool checkExistence(const ::rtl::OUString& _rName);
+ virtual sal_Bool checkExistence(const ::rtl::OUString& _rName);
// helper
virtual void SAL_CALL disposing();
@@ -163,7 +163,7 @@ namespace dbaccess
@param _pWarnings
specifies a warnings container (May be )
-
+
Any errors which occur during the lifetime of the query container,
which cannot be reported as exceptionts (for instance in methods where throwing an SQLException is
not allowed) will be appended to this container.
@@ -175,7 +175,7 @@ namespace dbaccess
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
::dbtools::IWarningsContainer* _pWarnings
);
-
+
DECLARE_XINTERFACE( )
DECLARE_XTYPEPROVIDER( )
DECLARE_SERVICE_INFO();
@@ -226,7 +226,7 @@ namespace dbaccess
};
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
#endif // _DBA_CORE_QUERYCONTAINER_HXX_
diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
index 4aa124dc7015..afc3ba88a84e 100644
--- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
+++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx
index d6044a6b9110..a5f7ad284ef8 100644
--- a/dbaccess/source/core/inc/sdbcoretools.hxx
+++ b/dbaccess/source/core/inc/sdbcoretools.hxx
@@ -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
@@ -81,7 +81,7 @@ namespace dbaccess
}
-} // namespace dbaccess
+} // namespace dbaccess
//.........................................................................
#endif // DBACORE_SDBCORETOOLS_HXX
diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx
index ae821c7a516b..7f9da9560c1a 100644
--- a/dbaccess/source/core/inc/statement.hxx
+++ b/dbaccess/source/core/inc/statement.hxx
@@ -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
@@ -76,7 +76,7 @@
//************************************************************
// OStatementBase
//************************************************************
-class OStatementBase : public comphelper::OBaseMutex,
+class OStatementBase : public comphelper::OBaseMutex,
public OSubComponent,
public ::cppu::OPropertySetHelper,
public ::comphelper::OPropertyArrayUsageHelper < OStatementBase >,
@@ -88,12 +88,12 @@ class OStatementBase : public comphelper::OBaseMutex,
public ::com::sun::star::sdbc::XGeneratedResultSet
{
protected:
- ::osl::Mutex m_aCancelMutex;
+ ::osl::Mutex m_aCancelMutex;
- ::com::sun::star::uno::WeakReferenceHelper m_aResultSet;
+ ::com::sun::star::uno::WeakReferenceHelper m_aResultSet;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAggregateAsSet;
::com::sun::star::uno::Reference< ::com::sun::star::util::XCancellable > m_xAggregateAsCancellable;
- sal_Bool m_bUseBookmarks;
+ sal_Bool m_bUseBookmarks;
sal_Bool m_bEscapeProcessing;
virtual ~OStatementBase();
@@ -101,7 +101,7 @@ protected:
public:
OStatementBase(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & _xConn,
const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & _xStatement);
-
+
// ::com::sun::star::lang::XTypeProvider
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 95e984949619..ec35f805de14 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -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
@@ -55,10 +55,10 @@ namespace dbaccess
//==========================================================================
class ODBTable;
class OContainerMediator;
- typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable > ODBTable_PROP;
- typedef ::connectivity::OTableHelper OTable_Base;
+ typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable > ODBTable_PROP;
+ typedef ::connectivity::OTableHelper OTable_Base;
- class ODBTable :public ODataSettings_Base
+ class ODBTable :public ODataSettings_Base
,public ODBTable_PROP
,public OTable_Base
,public IColumnFactory
@@ -67,36 +67,36 @@ namespace dbaccess
::rtl::Reference< OContainerMediator > m_pColumnMediator;
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDriverColumns;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDriverColumns;
//
- sal_Int32 m_nPrivileges;
+ sal_Int32 m_nPrivileges;
//
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const;
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);
/** creates the column collection for the table
- @param _rNames
+ @param _rNames
The column names.
*/
virtual ::connectivity::sdbcx::OCollection* createColumns(const ::connectivity::TStringVector& _rNames);
/** creates the key collection for the table
- @param _rNames
+ @param _rNames
The key names.
*/
virtual ::connectivity::sdbcx::OCollection* createKeys(const ::connectivity::TStringVector& _rNames);
/** creates the index collection for the table
- @param _rNames
+ @param _rNames
The index names.
*/
virtual ::connectivity::sdbcx::OCollection* createIndexes(const ::connectivity::TStringVector& _rNames);
@@ -105,13 +105,13 @@ namespace dbaccess
virtual void SAL_CALL disposing(void);
public:
/** constructs a wrapper supporting the com.sun.star.sdb.Table service.
- @param _rxConn the connection the table belongs to
- @param _rxTable the table from the driver can be null
- @param _rCatalog the name of the catalog the table belongs to. May be empty.
- @param _rSchema the name of the schema the table belongs to. May be empty.
- @param _rName the name of the table
- @param _rType the type of the table, as supplied by the driver
- @param _rDesc the description of the table, as supplied by the driver
+ @param _rxConn the connection the table belongs to
+ @param _rxTable the table from the driver can be null
+ @param _rCatalog the name of the catalog the table belongs to. May be empty.
+ @param _rSchema the name of the schema the table belongs to. May be empty.
+ @param _rName the name of the table
+ @param _rType the type of the table, as supplied by the driver
+ @param _rDesc the description of the table, as supplied by the driver
*/
ODBTable(connectivity::sdbcx::OCollection* _pTables
,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn
@@ -142,7 +142,7 @@ namespace dbaccess
DECLARE_SERVICE_INFO();
// com::sun::star::beans::XPropertySet
- // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
+ // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const;
// ::com::sun::star::sdbcx::XRename,
diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx
index 5e64e8896d55..4503edd5d643 100644
--- a/dbaccess/source/core/inc/tablecontainer.hxx
+++ b/dbaccess/source/core/inc/tablecontainer.hxx
@@ -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
@@ -87,14 +87,14 @@ namespace dbaccess
class OTable;
class OTableContainer;
class OContainerMediator;
-
+
class OTableContainer : public OFilteredContainer,
public OTableContainer_Base
{
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xTableDefinitions;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xTableDefinitions;
::rtl::Reference< OContainerMediator > m_pTableMediator;
- sal_Bool m_bInDrop; // set when we are in the drop method
-
+ sal_Bool m_bInDrop; // set when we are in the drop method
+
// OFilteredContainer
virtual void addMasterContainerListener();
@@ -102,8 +102,8 @@ namespace dbaccess
virtual ::rtl::OUString getTableTypeRestriction() const;
// ::connectivity::sdbcx::OCollection
- virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
+ virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
@@ -124,19 +124,19 @@ namespace dbaccess
public:
/** ctor of the container. The parent has to support the XConnection
interface.
- @param _rParent the object which acts as parent for the container.
+ @param _rParent the object which acts as parent for the container.
all refcounting is rerouted to this object
- @param _rMutex the access safety object of the parent
- @param _rTableFilter restricts the visible tables by name
- @param _rTableTypeFilter restricts the visible tables by type
- @see construct
+ @param _rMutex the access safety object of the parent
+ @param _rTableFilter restricts the visible tables by name
+ @param _rTableTypeFilter restricts the visible tables by type
+ @see construct
*/
OTableContainer( ::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon,
sal_Bool _bCase,
- const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xTableDefinitions,
- IRefreshListener* _pRefreshListener,
+ const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xTableDefinitions,
+ IRefreshListener* _pRefreshListener,
::dbtools::IWarningsContainer* _pWarningsContainer,
oslInterlockedCount& _nInAppend
);
diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx
index 24dbbb206f2c..a2dcbcf397fd 100644
--- a/dbaccess/source/core/inc/userinformation.hxx
+++ b/dbaccess/source/core/inc/userinformation.hxx
@@ -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
@@ -38,12 +38,12 @@
class UserInformation
{
- ::com::sun::star::lang::Locale m_aUserLocale;
+ ::com::sun::star::lang::Locale m_aUserLocale;
public:
UserInformation();
- ::com::sun::star::lang::Locale getUserLanguage() const { return m_aUserLocale; }
+ ::com::sun::star::lang::Locale getUserLanguage() const { return m_aUserLocale; }
};
#endif // _DBA_CORE_USERINFORMATION_HXX_
diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx
index 00de76c7b73e..ccf2349be7f2 100644
--- a/dbaccess/source/core/inc/veto.hxx
+++ b/dbaccess/source/core/inc/veto.hxx
@@ -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/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx
index beb5c08e6350..dc19dd8cdd44 100644
--- a/dbaccess/source/core/inc/viewcontainer.hxx
+++ b/dbaccess/source/core/inc/viewcontainer.hxx
@@ -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
@@ -88,23 +88,23 @@ namespace dbaccess
public:
/** ctor of the container. The parent has to support the XConnection
interface.
- @param _rParent the object which acts as parent for the container.
+ @param _rParent the object which acts as parent for the container.
all refcounting is rerouted to this object
- @param _rMutex the access safety object of the parent
- @param _rTableFilter restricts the visible tables by name
- @param _rTableTypeFilter restricts the visible tables by type
- @see construct
+ @param _rMutex the access safety object of the parent
+ @param _rTableFilter restricts the visible tables by name
+ @param _rTableTypeFilter restricts the visible tables by type
+ @see construct
*/
OViewContainer( ::cppu::OWeakObject& _rParent,
::osl::Mutex& _rMutex,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon,
sal_Bool _bCase,
- IRefreshListener* _pRefreshListener,
+ IRefreshListener* _pRefreshListener,
::dbtools::IWarningsContainer* _pWarningsContainer,
oslInterlockedCount& _nInAppend
);
- virtual ~OViewContainer();
+ virtual ~OViewContainer();
protected:
// OFilteredContainer overridables
@@ -124,8 +124,8 @@ namespace dbaccess
virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException);
// ::connectivity::sdbcx::OCollection
- virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
+ virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName);
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor();
virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor );
virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName);
diff --git a/dbaccess/source/core/misc/ContainerListener.cxx b/dbaccess/source/core/misc/ContainerListener.cxx
index efdd32c1fee3..5995b8fa5c09 100644
--- a/dbaccess/source/core/misc/ContainerListener.cxx
+++ b/dbaccess/source/core/misc/ContainerListener.cxx
@@ -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
@@ -65,7 +65,7 @@ namespace dbaccess
return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveInsertElement( _Event );
}
-
+
//--------------------------------------------------------------------
Reference< XVeto > SAL_CALL OContainerListener::approveReplaceElement( const ContainerEvent& _Event ) throw (WrappedTargetException, RuntimeException)
{
@@ -75,7 +75,7 @@ namespace dbaccess
return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveReplaceElement( _Event );
}
-
+
//--------------------------------------------------------------------
Reference< XVeto > SAL_CALL OContainerListener::approveRemoveElement( const ContainerEvent& _Event ) throw (WrappedTargetException, RuntimeException)
{
@@ -85,7 +85,7 @@ namespace dbaccess
return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveRemoveElement( _Event );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL OContainerListener::elementInserted( const ContainerEvent& _Event ) throw(RuntimeException)
{
@@ -95,7 +95,7 @@ namespace dbaccess
dynamic_cast< XContainerListener& >( m_rDestination ).elementInserted( _Event );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL OContainerListener::elementRemoved( const ContainerEvent& _Event ) throw(RuntimeException)
{
@@ -105,7 +105,7 @@ namespace dbaccess
dynamic_cast< XContainerListener& >( m_rDestination ).elementRemoved( _Event );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL OContainerListener::elementReplaced( const ContainerEvent& _Event ) throw(RuntimeException)
{
@@ -115,7 +115,7 @@ namespace dbaccess
dynamic_cast< XContainerListener& >( m_rDestination ).elementReplaced( _Event );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL OContainerListener::disposing( const EventObject& _Source ) throw(RuntimeException)
{
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index 7d7ea80f558a..07c07b01509a 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -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
@@ -80,15 +80,15 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain
, m_aConnection( _rxConnection )
, m_eType( _eType )
{
- DBG_CTOR(OContainerMediator,NULL);
-
+ DBG_CTOR(OContainerMediator,NULL);
+
if ( _xSettings.is() && _xContainer.is() )
{
osl_incrementInterlockedCount(&m_refCount);
try
{
m_xContainer->addContainerListener(this);
- Reference< XContainer > xContainer(_xSettings, UNO_QUERY);
+ Reference< XContainer > xContainer(_xSettings, UNO_QUERY);
if ( xContainer.is() )
xContainer->addContainerListener(this);
}
@@ -107,7 +107,7 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain
// -----------------------------------------------------------------------------
OContainerMediator::~OContainerMediator()
{
- DBG_DTOR(OContainerMediator,NULL);
+ DBG_DTOR(OContainerMediator,NULL);
acquire();
impl_cleanup_nothrow();
}
@@ -117,7 +117,7 @@ void OContainerMediator::impl_cleanup_nothrow()
{
try
{
- Reference< XContainer > xContainer( m_xSettings, UNO_QUERY );
+ Reference< XContainer > xContainer( m_xSettings, UNO_QUERY );
if ( xContainer.is() )
xContainer->removeContainerListener( this );
m_xSettings.clear();
@@ -137,7 +137,7 @@ void OContainerMediator::impl_cleanup_nothrow()
// -----------------------------------------------------------------------------
void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException)
-{
+{
::osl::MutexGuard aGuard(m_aMutex);
if ( _rEvent.Source == m_xSettings && m_xSettings.is() )
{
@@ -181,7 +181,7 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent
{
::rtl::OUString sElementName;
_rEvent.ReplacedElement >>= sElementName;
-
+
PropertyForwardList::iterator aFind = m_aForwardList.find(sElementName);
if ( aFind != m_aForwardList.end() )
{
@@ -210,7 +210,7 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent
void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) throw(RuntimeException)
{
::osl::MutexGuard aGuard(m_aMutex);
-
+
impl_cleanup_nothrow();
}
@@ -277,5 +277,5 @@ void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, co
}
// -----------------------------------------------------------------------------
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index a83b04d93471..0ede9ff23b37 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -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,6 +43,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -72,6 +73,7 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex
{
m_xInternal.set( m_xContext->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.chart.InternalDataProvider")),m_xContext ), uno::UNO_QUERY );
m_xRangeConversion.set(m_xInternal,uno::UNO_QUERY);
+ m_xComplexDescriptionAccess.set(m_xInternal,uno::UNO_QUERY);
osl_incrementInterlockedCount( &m_refCount );
{
@@ -212,7 +214,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat
if ( pArgIter->Name.equalsAscii("HasCategories") )
{
pArgIter->Value >>= bHasCategories;
-
+
}
else if ( pArgIter->Name.equalsAscii("ComplexColumnDescriptions") )
{
@@ -315,6 +317,75 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::cre
}
return xData;
}
+
+uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException)
+{
+ return m_xComplexDescriptionAccess->getComplexRowDescriptions();
+}
+void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (uno::RuntimeException)
+{
+ m_xComplexDescriptionAccess->setComplexRowDescriptions(aRowDescriptions);
+}
+uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException)
+{
+ return m_xComplexDescriptionAccess->getComplexColumnDescriptions();
+}
+void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< rtl::OUString > >& aColumnDescriptions ) throw (uno::RuntimeException)
+{
+ m_xComplexDescriptionAccess->setComplexColumnDescriptions(aColumnDescriptions);
+}
+// ____ XChartDataArray ____
+uno::Sequence< uno::Sequence< double > > SAL_CALL DatabaseDataProvider::getData() throw (uno::RuntimeException)
+{
+ return m_xComplexDescriptionAccess->getData();
+}
+
+void SAL_CALL DatabaseDataProvider::setData( const uno::Sequence< uno::Sequence< double > >& rDataInRows ) throw (uno::RuntimeException)
+{
+ m_xComplexDescriptionAccess->setData(rDataInRows);
+}
+
+void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< rtl::OUString >& aRowDescriptions ) throw (uno::RuntimeException)
+{
+ m_xComplexDescriptionAccess->setRowDescriptions(aRowDescriptions);
+}
+
+void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< rtl::OUString >& aColumnDescriptions ) throw (uno::RuntimeException)
+{
+ m_xComplexDescriptionAccess->setColumnDescriptions(aColumnDescriptions);
+}
+
+uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException)
+{
+ return m_xComplexDescriptionAccess->getRowDescriptions();
+}
+
+uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException)
+{
+ return m_xComplexDescriptionAccess->getColumnDescriptions();
+}
+
+// ____ XChartData (base of XChartDataArray) ____
+void SAL_CALL DatabaseDataProvider::addChartDataChangeEventListener(const uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& x) throw (uno::RuntimeException)
+{
+ m_xComplexDescriptionAccess->addChartDataChangeEventListener(x);
+}
+
+void SAL_CALL DatabaseDataProvider::removeChartDataChangeEventListener(const uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& x) throw (uno::RuntimeException)
+{
+ m_xComplexDescriptionAccess->removeChartDataChangeEventListener(x);
+}
+
+double SAL_CALL DatabaseDataProvider::getNotANumber() throw (uno::RuntimeException)
+{
+ return m_xComplexDescriptionAccess->getNotANumber();
+}
+
+::sal_Bool SAL_CALL DatabaseDataProvider::isNotANumber( double nNumber ) throw (uno::RuntimeException)
+{
+ return m_xComplexDescriptionAccess->isNotANumber(nNumber);
+}
+
// -----------------------------------------------------------------------------
uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRangeSelection() throw (uno::RuntimeException)
@@ -616,26 +687,28 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
uno::Reference< sdbc::XResultSet> xRes(m_xRowSet,uno::UNO_QUERY_THROW);
uno::Reference< sdbc::XRow> xRow(m_xRowSet,uno::UNO_QUERY_THROW);
uno::Reference< sdbc::XResultSetMetaData> xResultSetMetaData = uno::Reference< sdbc::XResultSetMetaDataSupplier>(m_xRowSet,uno::UNO_QUERY)->getMetaData();
+ uno::Reference< sdbc::XColumnLocate> xColumnLocate(m_xRowSet,uno::UNO_QUERY_THROW);
::std::vector aColumnTypes;
uno::Sequence< uno::Any > aLabelArgs(1);
const sal_Int32 nCount = aColumns.getLength();
if ( nCount )
aColumnTypes.push_back(xResultSetMetaData->getColumnType(1));
- for (sal_Int32 i = 1; i < nCount; ++i)
- {
- aColumnTypes.push_back(xResultSetMetaData->getColumnType(i+1));
- } // for (sal_Int32 i = 1; i < nCount; ++i)
+ ::std::vector< sal_Int32 > aColumnPositions;
const ::rtl::OUString* pIter = aColumns.getConstArray();
const ::rtl::OUString* pEnd = pIter + aColumns.getLength();
for(sal_Int32 k = 0;pIter != pEnd;++pIter,++k)
{
+ aColumnPositions.push_back(xColumnLocate->findColumn(*pIter));
uno::Reference< beans::XPropertySet> xColumn(xColumns->getByName(*pIter),uno::UNO_QUERY);
+ sal_Int32 nType = sdbc::DataType::VARCHAR;
if ( xColumn.is() )
{
m_aNumberFormats.insert( ::std::map< ::rtl::OUString,uno::Any>::value_type(::rtl::OUString::valueOf(k),xColumn->getPropertyValue(PROPERTY_NUMBERFORMAT)));
+ xColumn->getPropertyValue(PROPERTY_TYPE) >>= nType;
}
+ aColumnTypes.push_back(nType);
}
::std::vector< ::rtl::OUString > aRowLabels;
@@ -645,13 +718,21 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
while( xRes->next() && (!m_RowLimit || nRowCount < m_RowLimit) )
{
++nRowCount;
-
+
aValue.fill(1,aColumnTypes[0],xRow);
aRowLabels.push_back(aValue.getString());
::std::vector< double > aRow;
- for (sal_Int32 j = _bHasCategories ? 2 : 1,i = 0; j <= nCount; ++j,++i)
+ ::std::vector< sal_Int32 >::iterator aColumnPosIter = aColumnPositions.begin();
+ ::std::vector< sal_Int32 >::iterator aColumnPosEnd = aColumnPositions.end();
+ sal_Int32 i = 0;
+ if ( _bHasCategories )
{
- aValue.fill(j,aColumnTypes[j-1],xRow);
+ ++aColumnPosIter;
+ ++i;
+ }
+ for (; aColumnPosIter != aColumnPosEnd; ++aColumnPosIter,++i)
+ {
+ aValue.fill(*aColumnPosIter,aColumnTypes[i],xRow);
if ( aValue.isNull() )
{
double nValue;
@@ -660,7 +741,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
}
else
aRow.push_back(aValue.getDouble());
- } // for (sal_Int32 j = 2,i = 0; j <= nCount; ++j,++i)
+ }
aDataValues.push_back(aRow);
} // while( xRes->next() && (!m_RowLimit || nRowCount < m_RowLimit) )
@@ -679,7 +760,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
::std::vector< double > aRow;
const sal_Int32 nSize = sizeof(fDefaultData)/sizeof(fDefaultData[0]);
for (sal_Int32 j = 0; j < (nCount-1); ++j,++k)
- {
+ {
if ( k >= nSize )
k = 0;
aRow.push_back(fDefaultData[k]);
@@ -687,7 +768,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat
aDataValues.push_back(aRow);
}
} // if ( !nRowCount )
-
+
uno::Reference< chart::XChartDataArray> xData(m_xInternal,uno::UNO_QUERY);
xData->setRowDescriptions(uno::Sequence< ::rtl::OUString >(&(*aRowLabels.begin()),aRowLabels.size()));
xData->setColumnDescriptions(uno::Sequence< ::rtl::OUString >(aColumns.getArray()+ (_bHasCategories ? 1 : 0),aColumns.getLength() - (_bHasCategories ? 1 : 0) ));
diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx
index 4f9aa81ab28c..e6e41a00d2e0 100644
--- a/dbaccess/source/core/misc/PropertyForward.cxx
+++ b/dbaccess/source/core/misc/PropertyForward.cxx
@@ -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
@@ -51,7 +51,7 @@ namespace dbaccess
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::lang;
- DBG_NAME(OPropertyForward)
+ DBG_NAME(OPropertyForward)
//------------------------------------------------------------------------
OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer,
@@ -61,7 +61,7 @@ namespace dbaccess
,m_sName( _sName )
,m_bInInsert( sal_False )
{
- DBG_CTOR(OPropertyForward,NULL);
+ DBG_CTOR(OPropertyForward,NULL);
osl_incrementInterlockedCount(&m_refCount);
try
@@ -86,7 +86,7 @@ namespace dbaccess
// -----------------------------------------------------------------------------
OPropertyForward::~OPropertyForward()
{
- DBG_DTOR(OPropertyForward,NULL);
+ DBG_DTOR(OPropertyForward,NULL);
}
// -----------------------------------------------------------------------------
@@ -168,6 +168,6 @@ namespace dbaccess
}
//........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//........................................................................
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index c53f936df234..05478d031479 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -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
@@ -116,7 +116,7 @@ void OSubComponent::release() throw ( )
}
OSL_ENSURE( m_refCount == 1, "OSubComponent::release: invalid ref count (before dispose)!" );
-
+
// First dispose
dispose();
diff --git a/dbaccess/source/core/misc/dbastrings.cxx b/dbaccess/source/core/misc/dbastrings.cxx
index 80f1427842e8..771da8075f9a 100644
--- a/dbaccess/source/core/misc/dbastrings.cxx
+++ b/dbaccess/source/core/misc/dbastrings.cxx
@@ -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/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index b21707cb3add..f473586b4470 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -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
@@ -56,8 +56,8 @@ namespace dbaccess
{
if ( _sUrl.GetTokenCount(':') >= 2 )
{
- _sHostname = _sUrl.GetToken(0,':');
- _nPortNumber = _sUrl.GetToken(1,':').ToInt32();
+ _sHostname = _sUrl.GetToken(0,':');
+ _nPortNumber = _sUrl.GetToken(1,':').ToInt32();
}
}
}
@@ -118,7 +118,7 @@ String ODsnTypeCollection::cutPrefix(const ::rtl::OUString& _sURL) const
sOldPattern = *aIter;
}
}
-
+
return sRet;
}
@@ -143,7 +143,7 @@ String ODsnTypeCollection::getPrefix(const ::rtl::OUString& _sURL) const
sOldPattern = *aIter;
}
}
-
+
return sRet;
}
@@ -211,14 +211,14 @@ String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUStrin
// -----------------------------------------------------------------------------
bool ODsnTypeCollection::isShowPropertiesEnabled( const ::rtl::OUString& _sURL ) const
{
- return !( _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1)
- || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlook",sizeof("sdbc:address:outlook")-1)
- || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlookexp",sizeof("sdbc:address:outlookexp")-1)
- || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:mozilla:",sizeof("sdbc:address:mozilla:")-1)
- || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:kab",sizeof("sdbc:address:kab")-1)
- || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:local",sizeof("sdbc:address:evolution:local")-1)
- || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:groupwise",sizeof("sdbc:address:evolution:groupwise")-1)
- || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:ldap",sizeof("sdbc:address:evolution:ldap")-1)
+ return !( _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1)
+ || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlook",sizeof("sdbc:address:outlook")-1)
+ || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlookexp",sizeof("sdbc:address:outlookexp")-1)
+ || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:mozilla:",sizeof("sdbc:address:mozilla:")-1)
+ || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:kab",sizeof("sdbc:address:kab")-1)
+ || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:local",sizeof("sdbc:address:evolution:local")-1)
+ || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:groupwise",sizeof("sdbc:address:evolution:groupwise")-1)
+ || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:ldap",sizeof("sdbc:address:evolution:ldap")-1)
|| _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:macab",sizeof("sdbc:address:macab")-1) );
}
// -----------------------------------------------------------------------------
@@ -326,7 +326,7 @@ bool ODsnTypeCollection::isEmbeddedDatabase( const ::rtl::OUString& _sURL ) cons
if ( aInstalled.hasByName("EmbeddedDatabases/DefaultEmbeddedDatabase/Value") )
{
static const ::rtl::OUString s_sValue(RTL_CONSTASCII_USTRINGPARAM("EmbeddedDatabases/DefaultEmbeddedDatabase/Value"));
-
+
aInstalled.getNodeValue(s_sValue) >>= sEmbeddedDatabaseURL;
if ( sEmbeddedDatabaseURL.getLength() )
aInstalled.getNodeValue(s_sValue + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEmbeddedDatabaseURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/URL"))) >>= sEmbeddedDatabaseURL;
@@ -547,7 +547,7 @@ sal_Int32 ODsnTypeCollection::getIndexOf(const ::rtl::OUString& _sURL) const
sOldPattern = *aIter;
}
}
-
+
return nRet;
}
// -----------------------------------------------------------------------------
@@ -600,7 +600,7 @@ String ODsnTypeCollection::TypeIterator::getDisplayName() const
return m_pContainer->m_aDsnPrefixes[m_nPosition];
}
//-------------------------------------------------------------------------
-const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator++()
+const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator++()
{
DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size(), "ODsnTypeCollection::TypeIterator::operator++ : invalid position!");
if (m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size())
@@ -609,7 +609,7 @@ const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operat
}
//-------------------------------------------------------------------------
-const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator--()
+const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator--()
{
DBG_ASSERT(m_nPosition >= 0, "ODsnTypeCollection::TypeIterator::operator-- : invalid position!");
if (m_nPosition >= 0)
@@ -624,6 +624,6 @@ bool operator==(const ODsnTypeCollection::TypeIterator& lhs, const ODsnTypeColle
}
//.........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//.........................................................................
diff --git a/dbaccess/source/core/misc/module_dba.cxx b/dbaccess/source/core/misc/module_dba.cxx
index 0010927f733c..e943ddea233d 100644
--- a/dbaccess/source/core/misc/module_dba.cxx
+++ b/dbaccess/source/core/misc/module_dba.cxx
@@ -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/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx
index 50b78e386d98..1ac277a8923c 100644
--- a/dbaccess/source/core/misc/objectnameapproval.cxx
+++ b/dbaccess/source/core/misc/objectnameapproval.cxx
@@ -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/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx
index dea2328dc907..6fb936cb4e6f 100644
--- a/dbaccess/source/core/misc/sdbcoretools.cxx
+++ b/dbaccess/source/core/misc/sdbcoretools.cxx
@@ -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
@@ -170,6 +170,6 @@ namespace dbaccess
} } // tools::stor
//.........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//.........................................................................
diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx
index 5c427d1eb57e..7b3ea6a54652 100644
--- a/dbaccess/source/core/misc/services.cxx
+++ b/dbaccess/source/core/misc/services.cxx
@@ -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
@@ -57,7 +57,7 @@ namespace dba{
::cppu::ImplementationEntry entries[] = {
{ &::dbaccess::DatabaseDataProvider::Create, &::dbaccess::DatabaseDataProvider::getImplementationName_Static, &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static,
&cppu::createSingleComponentFactory, 0, 0 },
- { 0, 0, 0, 0, 0, 0 }
+ { 0, 0, 0, 0, 0, 0 }
};
}
@@ -85,8 +85,8 @@ extern "C" void SAL_CALL createRegistryInfo_DBA()
//---------------------------------------------------------------------------------------
extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment **
+ const sal_Char **ppEnvTypeName,
+ uno_Environment **
)
{
createRegistryInfo_DBA();
diff --git a/dbaccess/source/core/misc/userinformation.cxx b/dbaccess/source/core/misc/userinformation.cxx
index 9143b123899b..a37837ae48ec 100644
--- a/dbaccess/source/core/misc/userinformation.cxx
+++ b/dbaccess/source/core/misc/userinformation.cxx
@@ -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/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx
index b3ab20bf9beb..0a43ae9d310f 100644
--- a/dbaccess/source/core/misc/veto.cxx
+++ b/dbaccess/source/core/misc/veto.cxx
@@ -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
@@ -65,7 +65,7 @@ namespace dbaccess
{
return m_sReason;
}
-
+
//--------------------------------------------------------------------
Any SAL_CALL Veto::getDetails() throw (RuntimeException)
{
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 6f31f17682fd..6833d7faf04b 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index 566bf42ae847..c30792b7886c 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx
index 3415092ee93a..372f084f7e22 100644
--- a/dbaccess/source/core/recovery/settingsimport.hxx
+++ b/dbaccess/source/core/recovery/settingsimport.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx
index ec6ff49a6098..c02569b3b8f3 100644
--- a/dbaccess/source/core/recovery/storagestream.cxx
+++ b/dbaccess/source/core/recovery/storagestream.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx
index 2485cfac24cb..91503221fb58 100644
--- a/dbaccess/source/core/recovery/storagestream.hxx
+++ b/dbaccess/source/core/recovery/storagestream.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx
index af1b832b67b3..0a680a19256a 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx
index 08d02008f1a4..19ec4bcdc830 100644
--- a/dbaccess/source/core/recovery/storagetextstream.hxx
+++ b/dbaccess/source/core/recovery/storagetextstream.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx
index 8405cce75903..47a326842c21 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.cxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index 10a8aaaed5de..572c86a69b9d 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
index 5fd120a5009b..5ea946f2e784 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -164,14 +164,14 @@ namespace dbaccess
// not interested in
(void)i_rEvent;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SubComponentLoader::windowMoved( const WindowEvent& i_rEvent ) throw (RuntimeException)
{
// not interested in
(void)i_rEvent;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SubComponentLoader::windowShown( const EventObject& i_rEvent ) throw (RuntimeException)
{
@@ -180,7 +180,7 @@ namespace dbaccess
lcl_onWindowShown_nothrow( *m_pData );
m_pData->xAppComponentWindow->removeWindowListener( this );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SubComponentLoader::windowHidden( const EventObject& i_rEvent ) throw (RuntimeException)
{
diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx
index f3bec5b6b39e..96c98fe4508c 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.hxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 0ae69402faeb..c2ec6c6f0b45 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -321,12 +321,12 @@ namespace dbaccess
void SAL_CALL SettingsDocumentHandler::startDocument( ) throw (SAXException, RuntimeException)
{
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::endDocument( ) throw (SAXException, RuntimeException)
{
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::startElement( const ::rtl::OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException)
{
@@ -358,7 +358,7 @@ namespace dbaccess
m_aStates.push( pNewState );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::endElement( const ::rtl::OUString& i_Name ) throw (SAXException, RuntimeException)
{
@@ -369,7 +369,7 @@ namespace dbaccess
pCurrentState->endElement();
m_aStates.pop();
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::characters( const ::rtl::OUString& i_Chars ) throw (SAXException, RuntimeException)
{
@@ -378,14 +378,14 @@ namespace dbaccess
::rtl::Reference< SettingsImport > pCurrentState( m_aStates.top() );
pCurrentState->characters( i_Chars );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException)
{
// ignore them - that's why they're called "ignorable"
(void)aWhitespaces;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::processingInstruction( const ::rtl::OUString& i_Target, const ::rtl::OUString& i_Data ) throw (SAXException, RuntimeException)
{
@@ -393,7 +393,7 @@ namespace dbaccess
(void)i_Target;
(void)i_Data;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) throw (SAXException, RuntimeException)
{
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
index 2cec262937a8..dee2436d9bf5 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index d1ba0ccb1966..65a837355776 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-*
+*
* Copyright 2009 by Sun Microsystems, Inc.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index f2efb811418d..973d1fff295b 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -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
@@ -49,8 +49,8 @@ namespace dbaccess
//==================================================================
//= ResourceManager
//==================================================================
- ::osl::Mutex ResourceManager::s_aMutex;
- sal_Int32 ResourceManager::s_nClients = 0;
+ ::osl::Mutex ResourceManager::s_aMutex;
+ sal_Int32 ResourceManager::s_nClients = 0;
ResMgr* ResourceManager::m_pImpl = NULL;
//------------------------------------------------------------------
diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src
index dc7023ca6fba..bd20da391edd 100644
--- a/dbaccess/source/core/resource/strings.src
+++ b/dbaccess/source/core/resource/strings.src
@@ -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
@@ -79,7 +79,7 @@ String RID_STR_DATASOURCE_NOT_STORED
};
String RID_STR_ONLY_QUERY
{
- Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed.";
+ Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed.";
};
String RID_STR_NO_VALUE_CHANGED
{
diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx
index 1b2f5a50e588..67362f86071c 100644
--- a/dbaccess/source/ext/adabas/ANewDb.cxx
+++ b/dbaccess/source/ext/adabas/ANewDb.cxx
@@ -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
@@ -67,13 +67,13 @@ OAdabasCreateDialog::OAdabasCreateDialog(const Reference< XMultiServiceFactory >
:OAdabasCreateDialogBase(_rxORB)
,m_pDialog(NULL)
{
- registerProperty(PROPERTY_CREATECATALOG, PROPERTY_ID_CREATECATALOG, PropertyAttribute::TRANSIENT,&m_xCreateCatalog, ::getCppuType(&m_xCreateCatalog));
- registerProperty(PROPERTY_DATABASENAME, PROPERTY_ID_DATABASENAME, PropertyAttribute::TRANSIENT,&m_sDatabaseName, ::getCppuType(&m_sDatabaseName));
- registerProperty(PROPERTY_CONTROL_USER, PROPERTY_ID_CONTROL_USER, PropertyAttribute::TRANSIENT,&m_sControlUser, ::getCppuType(&m_sControlUser));
- registerProperty(PROPERTY_CONTROL_PASSWORD, PROPERTY_ID_CONTROL_PASSWORD, PropertyAttribute::TRANSIENT,&m_sControlPassword, ::getCppuType(&m_sControlPassword));
- registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT,&m_sUser, ::getCppuType(&m_sUser));
- registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT,&m_sUserPassword, ::getCppuType(&m_sUserPassword));
- registerProperty(PROPERTY_CACHESIZE, PROPERTY_ID_CACHESIZE, PropertyAttribute::TRANSIENT,&m_nCacheSize, ::getCppuType(&m_nCacheSize));
+ registerProperty(PROPERTY_CREATECATALOG, PROPERTY_ID_CREATECATALOG, PropertyAttribute::TRANSIENT,&m_xCreateCatalog, ::getCppuType(&m_xCreateCatalog));
+ registerProperty(PROPERTY_DATABASENAME, PROPERTY_ID_DATABASENAME, PropertyAttribute::TRANSIENT,&m_sDatabaseName, ::getCppuType(&m_sDatabaseName));
+ registerProperty(PROPERTY_CONTROL_USER, PROPERTY_ID_CONTROL_USER, PropertyAttribute::TRANSIENT,&m_sControlUser, ::getCppuType(&m_sControlUser));
+ registerProperty(PROPERTY_CONTROL_PASSWORD, PROPERTY_ID_CONTROL_PASSWORD, PropertyAttribute::TRANSIENT,&m_sControlPassword, ::getCppuType(&m_sControlPassword));
+ registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT,&m_sUser, ::getCppuType(&m_sUser));
+ registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT,&m_sUserPassword, ::getCppuType(&m_sUserPassword));
+ registerProperty(PROPERTY_CACHESIZE, PROPERTY_ID_CACHESIZE, PropertyAttribute::TRANSIENT,&m_nCacheSize, ::getCppuType(&m_nCacheSize));
}
//-------------------------------------------------------------------------
@@ -137,7 +137,7 @@ Reference SAL_CALL OAdabasCreateDialog::getPropertySetInfo()
}
//------------------------------------------------------------------------------
-Dialog* OAdabasCreateDialog::createDialog(Window* _pParent)
+Dialog* OAdabasCreateDialog::createDialog(Window* _pParent)
{
if(!m_xCreateCatalog.is())
throw SQLException();
@@ -149,12 +149,12 @@ void OAdabasCreateDialog::executedDialog(sal_Int16 _nExecutionResult)
{
if(m_pDialog && _nExecutionResult == RET_OK)
{ // fill the variables
- m_sDatabaseName = m_pDialog->GetDatabaseName();
- m_sControlUser = m_pDialog->GetControlUser();
- m_sControlPassword = m_pDialog->GetControlPassword();
- m_sUser = m_pDialog->GetUser();
- m_sUserPassword = m_pDialog->GetUserPassword();
- m_nCacheSize = m_pDialog->GetCacheSize();
+ m_sDatabaseName = m_pDialog->GetDatabaseName();
+ m_sControlUser = m_pDialog->GetControlUser();
+ m_sControlPassword = m_pDialog->GetControlPassword();
+ m_sUser = m_pDialog->GetUser();
+ m_sUserPassword = m_pDialog->GetUserPassword();
+ m_nCacheSize = m_pDialog->GetCacheSize();
}
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ext/adabas/ANewDb.hxx b/dbaccess/source/ext/adabas/ANewDb.hxx
index 46de53c1fcaf..6af12e56436a 100644
--- a/dbaccess/source/ext/adabas/ANewDb.hxx
+++ b/dbaccess/source/ext/adabas/ANewDb.hxx
@@ -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
@@ -55,12 +55,12 @@ namespace adabasui
protected:
OAdabasNewDbDlg* m_pDialog; // just to avoid a cast
//
- ::rtl::OUString m_sDatabaseName;
- ::rtl::OUString m_sControlUser;
- ::rtl::OUString m_sControlPassword;
- ::rtl::OUString m_sUser;
- ::rtl::OUString m_sUserPassword;
- sal_Int32 m_nCacheSize;
+ ::rtl::OUString m_sDatabaseName;
+ ::rtl::OUString m_sControlUser;
+ ::rtl::OUString m_sControlPassword;
+ ::rtl::OUString m_sUser;
+ ::rtl::OUString m_sUserPassword;
+ sal_Int32 m_nCacheSize;
::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog;
//
@@ -90,11 +90,11 @@ namespace adabasui
protected:
// OGenericUnoDialog overridables
- virtual Dialog* createDialog(Window* _pParent);
+ virtual Dialog* createDialog(Window* _pParent);
virtual void executedDialog(sal_Int16 _nExecutionResult);
};
//.........................................................................
-} // namespace adabasui
+} // namespace adabasui
//.........................................................................
#endif // ADABASUI_NEWDB_HXX
diff --git a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx
index e434eff9ee64..d010f8a6dd4e 100644
--- a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx
+++ b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx
@@ -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
@@ -28,7 +28,7 @@
#ifndef ADABASUI_SQLNAMEEDIT_HXX
#define ADABASUI_SQLNAMEEDIT_HXX
-#ifndef _SV_EDIT_HXX
+#ifndef _SV_EDIT_HXX
#include
#endif
#ifndef _SV_COMBOBOX_HXX
@@ -47,7 +47,7 @@ namespace adabasui
,public OSQLNameChecker
{
public:
- OSQLNameEdit(Window* _pParent,const ResId& _rRes)
+ OSQLNameEdit(Window* _pParent,const ResId& _rRes)
: Edit(_pParent,_rRes)
{
}
diff --git a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
index e0fd807982e6..5affe474878f 100644
--- a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
+++ b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx
@@ -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
@@ -41,14 +41,14 @@ namespace adabasui
);
}
//------------------------------------------------------------------
- sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue,
+ sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue,
const ::rtl::OUString& _sToCheck,
::rtl::OUString& _rsCorrected)
{
sal_Bool bCorrected = sal_False;
- XubString sSavedValue = _sOldValue;
- XubString sText = _sToCheck;
- xub_StrLen nMatch = 0;
+ XubString sSavedValue = _sOldValue;
+ XubString sText = _sToCheck;
+ xub_StrLen nMatch = 0;
for ( xub_StrLen i=nMatch;i < sText.Len(); ++i )
{
if ( !isCharOk( sText.GetBuffer()[i]) )
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
index 467a36b75afb..1c34c26526a6 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx
@@ -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,10 +43,10 @@
#include
#endif
-#define ENTER_MOD_METHOD() \
- ::osl::MutexGuard aGuard(s_aMutex); \
+#define ENTER_MOD_METHOD() \
+ ::osl::MutexGuard aGuard(s_aMutex); \
ensureImpl()
-
+
//.........................................................................
namespace COMPMOD_NAMESPACE
{
@@ -65,9 +65,9 @@ namespace COMPMOD_NAMESPACE
*/
class OModuleImpl
{
- ResMgr* m_pRessources;
- sal_Bool m_bInitialized;
- ByteString m_sFilePrefix;
+ ResMgr* m_pRessources;
+ sal_Bool m_bInitialized;
+ ByteString m_sFilePrefix;
public:
/// ctor
@@ -75,8 +75,8 @@ namespace COMPMOD_NAMESPACE
~OModuleImpl();
/// get the manager for the ressources of the module
- ResMgr* getResManager();
- void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
+ ResMgr* getResManager();
+ void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; }
};
//-------------------------------------------------------------------------
@@ -94,7 +94,7 @@ namespace COMPMOD_NAMESPACE
}
//-------------------------------------------------------------------------
- ResMgr* OModuleImpl::getResManager()
+ ResMgr* OModuleImpl::getResManager()
{
// note that this method is not threadsafe, which counts for the whole class !
if (!m_pRessources && !m_bInitialized)
@@ -104,10 +104,10 @@ namespace COMPMOD_NAMESPACE
ByteString aMgrName = m_sFilePrefix;
m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer());
- DBG_ASSERT(m_pRessources,
+ DBG_ASSERT(m_pRessources,
(ByteString("OModuleImpl::getResManager: could not create the resource manager (file name: ")
- += aMgrName
- += ByteString(")!")).GetBuffer());
+ += aMgrName
+ += ByteString(")!")).GetBuffer());
m_bInitialized = sal_True;
}
@@ -117,12 +117,12 @@ namespace COMPMOD_NAMESPACE
//=========================================================================
//= OModule
//=========================================================================
- ::osl::Mutex OModule::s_aMutex;
- sal_Int32 OModule::s_nClients = 0;
- OModuleImpl* OModule::s_pImpl = NULL;
- ::rtl::OString OModule::s_sResPrefix;
+ ::osl::Mutex OModule::s_aMutex;
+ sal_Int32 OModule::s_nClients = 0;
+ OModuleImpl* OModule::s_pImpl = NULL;
+ ::rtl::OString OModule::s_sResPrefix;
//-------------------------------------------------------------------------
- ResMgr* OModule::getResManager()
+ ResMgr* OModule::getResManager()
{
ENTER_MOD_METHOD();
return s_pImpl->getResManager();
@@ -168,10 +168,10 @@ namespace COMPMOD_NAMESPACE
//- registration helper
//--------------------------------------------------------------------------
- Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL;
- Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL;
- Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL;
- Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL;
+ Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL;
+ Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL;
+ Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL;
+ Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL;
//--------------------------------------------------------------------------
void OModule::registerComponent(
@@ -192,9 +192,9 @@ namespace COMPMOD_NAMESPACE
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::registerComponent : inconsistent state (the pointers (2)) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::registerComponent : inconsistent state !");
sal_Int32 nOldLen = s_pImplementationNames->getLength();
@@ -219,9 +219,9 @@ namespace COMPMOD_NAMESPACE
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::revokeComponent : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::revokeComponent : inconsistent state !");
sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -261,9 +261,9 @@ namespace COMPMOD_NAMESPACE
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::writeComponentInfos : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::writeComponentInfos : inconsistent state !");
sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -310,9 +310,9 @@ namespace COMPMOD_NAMESPACE
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModule::getComponentFactory : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModule::getComponentFactory : inconsistent state !");
@@ -346,6 +346,6 @@ namespace COMPMOD_NAMESPACE
//.........................................................................
-} // namespace COMPMOD_NAMESPACE
+} // namespace COMPMOD_NAMESPACE
//.........................................................................
diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
index 7b5f1466a092..a9211527f6f2 100644
--- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx
+++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx
@@ -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
@@ -54,7 +54,7 @@
#ifndef _COM_SUN_STAR_REGISTRY_XREGISTRYKEY_HPP_
#include
#endif
-#ifndef _CPPUHELPER_FACTORY_HXX_
+#ifndef _CPPUHELPER_FACTORY_HXX_
#include
#endif
#ifndef _RTL_STRING_HXX_
@@ -91,36 +91,36 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
protected:
// resource administration
- static ::osl::Mutex s_aMutex; /// access safety
- static sal_Int32 s_nClients; /// number of registered clients
- static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered
- static ::rtl::OString s_sResPrefix;
+ static ::osl::Mutex s_aMutex; /// access safety
+ static sal_Int32 s_nClients; /// number of registered clients
+ static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered
+ static ::rtl::OString s_sResPrefix;
// auto registration administration
- static ::com::sun::star::uno::Sequence< ::rtl::OUString >*
+ static ::com::sun::star::uno::Sequence< ::rtl::OUString >*
s_pImplementationNames;
- static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
+ static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
s_pSupportedServices;
- static ::com::sun::star::uno::Sequence< sal_Int64 >*
+ static ::com::sun::star::uno::Sequence< sal_Int64 >*
s_pCreationFunctionPointers;
- static ::com::sun::star::uno::Sequence< sal_Int64 >*
+ static ::com::sun::star::uno::Sequence< sal_Int64 >*
s_pFactoryFunctionPointers;
public:
// cna be set as long as no resource has been accessed ...
- static void setResourceFilePrefix(const ::rtl::OString& _rPrefix);
+ static void setResourceFilePrefix(const ::rtl::OString& _rPrefix);
/// get the vcl res manager of the module
- static ResMgr* getResManager();
+ static ResMgr* getResManager();
/** register a component implementing a service with the given data.
- @param _rImplementationName
+ @param _rImplementationName
the implementation name of the component
- @param _rServiceNames
+ @param _rServiceNames
the services the component supports
- @param _pCreateFunction
+ @param _pCreateFunction
a function for creating an instance of the component
- @param _pFactoryFunction
+ @param _pFactoryFunction
a function for creating a factory for that component
@see revokeComponent
*/
@@ -131,7 +131,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
FactoryInstantiation _pFactoryFunction);
/** revoke the registration for the specified component
- @param _rImplementationName
+ @param _rImplementationName
the implementation name of the component
*/
static void revokeComponent(
@@ -141,9 +141,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
writes the registration information of all components which are currently registered into the
specified registry.
Usually used from within component_writeInfo.
- @param _rxServiceManager
+ @param _rxServiceManager
the service manager
- @param _rRootKey
+ @param _rRootKey
the registry key under which the information will be stored
@return
sal_True if the registration of all implementations was successfull, sal_False otherwise
@@ -154,9 +154,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
/** creates a Factory for the component with the given implementation name.
Usually used from within component_getFactory.
- @param _rxServiceManager
+ @param _rxServiceManager
a pointer to an XMultiServiceFactory interface as got in component_getFactory
- @param _pImplementationName
+ @param _pImplementationName
the implementation name of the component
@return
the XInterface access to a factory for the component
@@ -168,9 +168,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
protected:
/// register a client for the module
- static void registerClient();
+ static void registerClient();
/// revoke a client for the module
- static void revokeClient();
+ static void revokeClient();
private:
/** ensure that the impl class exists
@@ -182,13 +182,13 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
//=========================================================================
//= OModuleResourceClient
//=========================================================================
- /** base class for objects which uses any global module-specific ressources
+ /** base class for objects which uses any global module-specific ressources
*/
class OModuleResourceClient
{
public:
- OModuleResourceClient() { OModule::registerClient(); }
- ~OModuleResourceClient() { OModule::revokeClient(); }
+ OModuleResourceClient() { OModule::registerClient(); }
+ ~OModuleResourceClient() { OModule::revokeClient(); }
};
//=========================================================================
@@ -287,7 +287,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
}
//.........................................................................
-} // namespace COMPMOD_NAMESPACE
+} // namespace COMPMOD_NAMESPACE
//.........................................................................
#endif // _EXTENSIONS_COMPONENT_MODULE_HXX_
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
index d4a68435a548..40ac350fe6a8 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@ -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
@@ -124,11 +124,11 @@ namespace adabasui
{
class ODatabaseCreator : public ::osl::Thread
{
- Link m_aTerminateHandler;
- Sequence< PropertyValue> m_aValues;
- Reference m_xCreateCatalog;
- Reference< XMultiServiceFactory > m_xORB;
- Window* m_pErrorWindow;
+ Link m_aTerminateHandler;
+ Sequence< PropertyValue> m_aValues;
+ Reference m_xCreateCatalog;
+ Reference< XMultiServiceFactory > m_xORB;
+ Window* m_pErrorWindow;
public:
ODatabaseCreator(const Reference& _rxCreateCatalog
,Window* _pErrorWindow
@@ -162,7 +162,7 @@ namespace adabasui
catch(Exception&)
{
OSL_ASSERT(0);
- // showError(::dbtools::SQLExceptionInfo(e),this,);
+ // showError(::dbtools::SQLExceptionInfo(e),this,);
}
}
void SAL_CALL ODatabaseCreator::onTerminated()
@@ -175,7 +175,7 @@ DBG_NAME( OAdabasNewDbDlg )
//========================================================================
OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
const Reference& _rxCreateCatalog,
- const Reference< XMultiServiceFactory >& _rxORB,
+ const Reference< XMultiServiceFactory >& _rxORB,
BOOL _bRestore)
:ModalDialog( pParent, ModuleRes( DLG_ADABAS_NEWDB ))
,m_FT_DATABASENAME( this, ModuleRes( FT_DATABASENAME ) )
@@ -257,8 +257,8 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_ET_SYSUSR.SetText(String::CreateFromAscii("DUMMY"));
m_BMP_SYS.Hide();
m_BMP_DOMAIN.Hide();
- m_ET_RESTORE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_ET_RESTORE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_RESTORE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_RESTORE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_ET_RESTORE.SetMaxTextLen(40);
}
else
@@ -267,26 +267,26 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_ET_RESTORE.Hide();
m_PB_RESTORE.Hide();
- m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_ET_DOMAIN_USR.Enable(FALSE);
- // m_ET_SYSUSR.setUpperCase();
- // m_ET_CONUSR.setUpperCase();
+ // m_ET_SYSUSR.setUpperCase();
+ // m_ET_CONUSR.setUpperCase();
}
- m_ET_SYSDEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_ET_TRANSACTIONLOG.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_ET_DATADEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_SYSDEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_TRANSACTIONLOG.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_DATADEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_ET_SYSDEVSPACE.SetMaxTextLen(40);
m_ET_TRANSACTIONLOG.SetMaxTextLen(40);
m_ET_DATADEVSPACE.SetMaxTextLen(40);
- m_NF_TRANSACTIONLOG_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_NF_DATADEVSPACE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_NF_TRANSACTIONLOG_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_NF_DATADEVSPACE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_NF_TRANSACTIONLOG_SIZE.SetMin(10);
m_NF_DATADEVSPACE_SIZE.SetMin(10);
@@ -306,19 +306,19 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_ET_DATABASENAME.SetMaxTextLen( 8 ); //98292
- m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
- m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
- m_PB_DOMAINPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
+ m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
+ m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
+ m_PB_DOMAINPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl));
- m_PB_RESTORE.SetClickHdl( LINK(this,OAdabasNewDbDlg,LoadButtonClickHdl));
+ m_PB_RESTORE.SetClickHdl( LINK(this,OAdabasNewDbDlg,LoadButtonClickHdl));
- m_PB_SYSDEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
- m_PB_TRANSACTIONLOG.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
- m_PB_DATADEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
+ m_PB_SYSDEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
+ m_PB_TRANSACTIONLOG.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
+ m_PB_DATADEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl));
- m_BMP_CON.SetImage( ModuleRes(UNCHECK_RED) );
- m_BMP_SYS.SetImage( ModuleRes(UNCHECK_RED) );
- m_BMP_DOMAIN.SetImage( ModuleRes(UNCHECK_RED) );
+ m_BMP_CON.SetImage( ModuleRes(UNCHECK_RED) );
+ m_BMP_SYS.SetImage( ModuleRes(UNCHECK_RED) );
+ m_BMP_DOMAIN.SetImage( ModuleRes(UNCHECK_RED) );
static String s_sRoot(RTL_CONSTASCII_USTRINGPARAM("DBROOT"));
static String s_sConfig(RTL_CONSTASCII_USTRINGPARAM("DBCONFIG"));
@@ -401,7 +401,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent,
m_PB_OK.SetClickHdl(LINK(this,OAdabasNewDbDlg,ImplOKHdl));
m_PB_OK.Enable(FALSE);
- m_ET_DATABASENAME.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
+ m_ET_DATABASENAME.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
}
// -----------------------------------------------------------------------
@@ -435,11 +435,11 @@ IMPL_LINK(OAdabasNewDbDlg, OnNoAccessRights, void*, /*_pArg*/)
// -----------------------------------------------------------------------
IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
{
- m_SYSDEV_File = m_ET_SYSDEVSPACE.GetText();
+ m_SYSDEV_File = m_ET_SYSDEVSPACE.GetText();
m_TRANSDEV_File = m_ET_TRANSACTIONLOG.GetText();
- m_DATADEV_File = m_ET_DATADEVSPACE.GetText();
+ m_DATADEV_File = m_ET_DATADEVSPACE.GetText();
- m_Backup_File = m_ET_RESTORE.GetText();
+ m_Backup_File = m_ET_RESTORE.GetText();
if(m_bRestore)
{
INetURLObject aURL;
@@ -520,36 +520,36 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ )
sal_Int32 nPos = 0;
Sequence< PropertyValue> aCreateArgs(m_bRestore ? 14 : 12);
- aCreateArgs[nPos].Name = PROPERTY_CONTROL_USER;
+ aCreateArgs[nPos].Name = PROPERTY_CONTROL_USER;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_CONUSR.GetText().ToUpperAscii());
- aCreateArgs[nPos].Name = PROPERTY_CONTROL_PASSWORD;
+ aCreateArgs[nPos].Name = PROPERTY_CONTROL_PASSWORD;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ConPwd);
- aCreateArgs[nPos].Name = PROPERTY_USER;
+ aCreateArgs[nPos].Name = PROPERTY_USER;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_SYSUSR.GetText().ToUpperAscii());
- aCreateArgs[nPos].Name = PROPERTY_PASSWORD;
+ aCreateArgs[nPos].Name = PROPERTY_PASSWORD;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_SysPwd);
- aCreateArgs[nPos].Name = PROPERTY_DOMAINPASSWORD;
+ aCreateArgs[nPos].Name = PROPERTY_DOMAINPASSWORD;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_DomainPwd);
- aCreateArgs[nPos].Name = PROPERTY_CACHESIZE;
+ aCreateArgs[nPos].Name = PROPERTY_CACHESIZE;
aCreateArgs[nPos++].Value <<= ::rtl::OUString::valueOf(sal_Int32(m_NF_CACHE_SIZE.GetValue()*256));
- aCreateArgs[nPos].Name = PROPERTY_DATABASENAME;
+ aCreateArgs[nPos].Name = PROPERTY_DATABASENAME;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_DATABASENAME.GetText().ToUpperAscii());
- aCreateArgs[nPos].Name = PROPERTY_DATADEVSPACE;
+ aCreateArgs[nPos].Name = PROPERTY_DATADEVSPACE;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_DATADEV_File);
- aCreateArgs[nPos].Name = PROPERTY_SYSDEVSPACE;
+ aCreateArgs[nPos].Name = PROPERTY_SYSDEVSPACE;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_SYSDEV_File);
- aCreateArgs[nPos].Name = PROPERTY_TRANSACTION_LOG;
+ aCreateArgs[nPos].Name = PROPERTY_TRANSACTION_LOG;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_TRANSDEV_File);
- aCreateArgs[nPos].Name = PROPERTY_DATADEVSIZE;
+ aCreateArgs[nPos].Name = PROPERTY_DATADEVSIZE;
aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_DATADEVSPACE_SIZE.GetValue()*256);
- aCreateArgs[nPos].Name = PROPERTY_LOGDEVSIZE;
- aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_TRANSACTIONLOG_SIZE.GetValue()*256);
+ aCreateArgs[nPos].Name = PROPERTY_LOGDEVSIZE;
+ aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_TRANSACTIONLOG_SIZE.GetValue()*256);
if(m_bRestore)
{
- aCreateArgs[nPos].Name = PROPERTY_RESTOREDATABASE;
+ aCreateArgs[nPos].Name = PROPERTY_RESTOREDATABASE;
aCreateArgs[nPos++].Value <<= ::cppu::bool2any(sal_True);
- aCreateArgs[nPos].Name = PROPERTY_BACKUPNAME;
+ aCreateArgs[nPos].Name = PROPERTY_BACKUPNAME;
aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_Backup_File);
}
@@ -631,8 +631,8 @@ IMPL_LINK( OAdabasNewDbDlg, LoadButtonClickHdl, Button *, /*pButton*/ )
//------------------------------------------------------------------------
IMPL_LINK( OAdabasNewDbDlg, ButtonClickHdl, Button *, pButton )
{
- WinBits nBits(WB_3DLOOK|WB_STDMODAL|WB_SAVEAS);
- ::sfx2::FileDialogHelper aFileDlg( static_cast(nBits) ); // new FileDialog( this, nBits );
+ WinBits nBits(WB_3DLOOK|WB_STDMODAL|WB_SAVEAS);
+ ::sfx2::FileDialogHelper aFileDlg( static_cast(nBits) ); // new FileDialog( this, nBits );
String aPath;
if(pButton == &m_PB_SYSDEVSPACE)
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hrc b/dbaccess/source/ext/adabas/AdabasNewDb.hrc
index 30216a30e6b7..e38a808ae645 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.hrc
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.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,50 +29,50 @@
#define ADABASUI_ADABASNEWDB_HRC
-#define PB_SYSDEVSPACE 1
-#define PB_TRANSACTIONLOG 2
-#define PB_DATADEVSPACE 3
-#define PB_DOMAINPWD 4
-#define PB_CONPWD 5
-#define PB_SYSPWD 6
-#define PB_OK 7
-#define PB_CANCEL 8
-#define PB_RESTORE 9
+#define PB_SYSDEVSPACE 1
+#define PB_TRANSACTIONLOG 2
+#define PB_DATADEVSPACE 3
+#define PB_DOMAINPWD 4
+#define PB_CONPWD 5
+#define PB_SYSPWD 6
+#define PB_OK 7
+#define PB_CANCEL 8
+#define PB_RESTORE 9
-#define NF_TRANSACTIONLOG_SIZE 1
-#define NF_DATADEVSPACE_SIZE 2
-#define NF_CACHE_SIZE 3
+#define NF_TRANSACTIONLOG_SIZE 1
+#define NF_DATADEVSPACE_SIZE 2
+#define NF_CACHE_SIZE 3
-#define ET_SYSUSR 1
-#define ET_DOMAIN_USR 2
-#define ET_CONUSR 3
-#define ET_SYSDEVSPACE 4
-#define ET_TRANSACTIONLOG 5
-#define ET_DATADEVSPACE 6
-#define ET_RESTORE 7
-#define ET_DATABASENAME 8
+#define ET_SYSUSR 1
+#define ET_DOMAIN_USR 2
+#define ET_CONUSR 3
+#define ET_SYSDEVSPACE 4
+#define ET_TRANSACTIONLOG 5
+#define ET_DATADEVSPACE 6
+#define ET_RESTORE 7
+#define ET_DATABASENAME 8
-#define FT_SYSUSR 1
-#define FT_DOMAIN_USR 2
-#define FT_TRANSACTIONLOG_SIZE 3
-#define FT_DATADEVSPACE_SIZE 4
-#define FT_CONUSR 6
-#define FT_SYSDEVSPACE 7
-#define FT_TRANSACTIONLOG 8
-#define FT_DATADEVSPACE 9
-#define FT_CACHE_SIZE 10
-#define FT_RESTORE 11
-#define FT_DATABASENAME 12
+#define FT_SYSUSR 1
+#define FT_DOMAIN_USR 2
+#define FT_TRANSACTIONLOG_SIZE 3
+#define FT_DATADEVSPACE_SIZE 4
+#define FT_CONUSR 6
+#define FT_SYSDEVSPACE 7
+#define FT_TRANSACTIONLOG 8
+#define FT_DATADEVSPACE 9
+#define FT_CACHE_SIZE 10
+#define FT_RESTORE 11
+#define FT_DATABASENAME 12
#define FL_USER 1
#define FL_DBSETTINGS 2
#define FL_END 3
-#define BMP_CON 1
-#define BMP_SYS 2
-#define BMP_DOMAIN 3
+#define BMP_CON 1
+#define BMP_SYS 2
+#define BMP_DOMAIN 3
-#define STR_BACKUPFILE_LOAD 1
+#define STR_BACKUPFILE_LOAD 1
#endif // ADABASUI_ADABASNEWDB_HRC
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
index 4a29f7c68e7e..b8f4e65c0cc2 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx
@@ -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
@@ -68,76 +68,76 @@ namespace adabasui
class OAdabasNewDbDlg : public ModalDialog
{
private:
- FixedText m_FT_DATABASENAME;
- OSQLNameEdit m_ET_DATABASENAME;
+ FixedText m_FT_DATABASENAME;
+ OSQLNameEdit m_ET_DATABASENAME;
FixedLine m_FL_USER;
- FixedText m_FT_SYSUSR;
- FixedText m_FT_CONUSR;
- FixedText m_FT_DOMAIN_USR;
+ FixedText m_FT_SYSUSR;
+ FixedText m_FT_CONUSR;
+ FixedText m_FT_DOMAIN_USR;
- OSQLNameEdit m_ET_SYSUSR;
- PushButton m_PB_SYSPWD;
- OSQLNameEdit m_ET_CONUSR;
- PushButton m_PB_CONPWD;
- OSQLNameEdit m_ET_DOMAIN_USR;
- PushButton m_PB_DOMAINPWD;
+ OSQLNameEdit m_ET_SYSUSR;
+ PushButton m_PB_SYSPWD;
+ OSQLNameEdit m_ET_CONUSR;
+ PushButton m_PB_CONPWD;
+ OSQLNameEdit m_ET_DOMAIN_USR;
+ PushButton m_PB_DOMAINPWD;
- FixedImage m_BMP_CON;
- FixedImage m_BMP_SYS;
- FixedImage m_BMP_DOMAIN;
+ FixedImage m_BMP_CON;
+ FixedImage m_BMP_SYS;
+ FixedImage m_BMP_DOMAIN;
- FixedText m_FT_RESTORE;
- Edit m_ET_RESTORE;
- PushButton m_PB_RESTORE;
+ FixedText m_FT_RESTORE;
+ Edit m_ET_RESTORE;
+ PushButton m_PB_RESTORE;
FixedLine m_FL_DBSETTINGS;
- FixedText m_FT_SYSDEVSPACE;
- FixedText m_FT_TRANSACTIONLOG;
- FixedText m_FT_DATADEVSPACE;
- Edit m_ET_SYSDEVSPACE;
- PushButton m_PB_SYSDEVSPACE;
- Edit m_ET_TRANSACTIONLOG;
- PushButton m_PB_TRANSACTIONLOG;
- Edit m_ET_DATADEVSPACE;
- PushButton m_PB_DATADEVSPACE;
-
- FixedText m_FT_TRANSACTIONLOG_SIZE;
- NumericField m_NF_TRANSACTIONLOG_SIZE;
- FixedText m_FT_DATADEVSPACE_SIZE;
- NumericField m_NF_DATADEVSPACE_SIZE;
- FixedText m_FT_CACHE_SIZE;
- NumericField m_NF_CACHE_SIZE;
+ FixedText m_FT_SYSDEVSPACE;
+ FixedText m_FT_TRANSACTIONLOG;
+ FixedText m_FT_DATADEVSPACE;
+ Edit m_ET_SYSDEVSPACE;
+ PushButton m_PB_SYSDEVSPACE;
+ Edit m_ET_TRANSACTIONLOG;
+ PushButton m_PB_TRANSACTIONLOG;
+ Edit m_ET_DATADEVSPACE;
+ PushButton m_PB_DATADEVSPACE;
+
+ FixedText m_FT_TRANSACTIONLOG_SIZE;
+ NumericField m_NF_TRANSACTIONLOG_SIZE;
+ FixedText m_FT_DATADEVSPACE_SIZE;
+ NumericField m_NF_DATADEVSPACE_SIZE;
+ FixedText m_FT_CACHE_SIZE;
+ NumericField m_NF_CACHE_SIZE;
FixedLine m_FL_END;
- OKButton m_PB_OK;
- CancelButton m_PB_CANCEL;
-
- String m_SYSDEV_File;
- String m_TRANSDEV_File;
- String m_DATADEV_File;
- String m_Backup_File;
- String m_ConPwd;
- String m_SysPwd;
- String m_DomainPwd;
- String m_DBName;
- String m_sDbWork;
- String m_sDbConfig;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog;
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xORB;
- BOOL m_bRestore;
- INT8 m_nSetBitmap;
-
- ::std::auto_ptr m_aCreatorWait;
- ::std::auto_ptr m_aCreatorThread;
-
- DECL_LINK( LoadButtonClickHdl, Button * );
- DECL_LINK( ButtonClickHdl, Button * );
- DECL_LINK( PwdClickHdl, Button * );
- DECL_LINK( ImplOKHdl, OKButton * );
- DECL_LINK( LoseFocusHdl, Edit * );
- DECL_LINK( TerminateHdl, void * );
+ OKButton m_PB_OK;
+ CancelButton m_PB_CANCEL;
+
+ String m_SYSDEV_File;
+ String m_TRANSDEV_File;
+ String m_DATADEV_File;
+ String m_Backup_File;
+ String m_ConPwd;
+ String m_SysPwd;
+ String m_DomainPwd;
+ String m_DBName;
+ String m_sDbWork;
+ String m_sDbConfig;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog;
+ com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xORB;
+ BOOL m_bRestore;
+ INT8 m_nSetBitmap;
+
+ ::std::auto_ptr m_aCreatorWait;
+ ::std::auto_ptr m_aCreatorThread;
+
+ DECL_LINK( LoadButtonClickHdl, Button * );
+ DECL_LINK( ButtonClickHdl, Button * );
+ DECL_LINK( PwdClickHdl, Button * );
+ DECL_LINK( ImplOKHdl, OKButton * );
+ DECL_LINK( LoseFocusHdl, Edit * );
+ DECL_LINK( TerminateHdl, void * );
void CheckBitmaps();
@@ -149,16 +149,16 @@ namespace adabasui
public:
OAdabasNewDbDlg(Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog>& _rxCreateCatalog,
- const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB,
+ const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB,
BOOL _bRestore=FALSE);
virtual ~OAdabasNewDbDlg();
- ::rtl::OUString GetDatabaseName() const { return m_ET_DATABASENAME.GetText(); }
- ::rtl::OUString GetControlUser() const { return m_ET_CONUSR.GetText(); }
- ::rtl::OUString GetControlPassword() const { return m_ConPwd; }
- ::rtl::OUString GetUser() const { return m_ET_SYSUSR.GetText(); }
- ::rtl::OUString GetUserPassword() const { return m_SysPwd; }
- sal_Int32 GetCacheSize() const { return static_cast(m_NF_CACHE_SIZE.GetValue()); }
+ ::rtl::OUString GetDatabaseName() const { return m_ET_DATABASENAME.GetText(); }
+ ::rtl::OUString GetControlUser() const { return m_ET_CONUSR.GetText(); }
+ ::rtl::OUString GetControlPassword() const { return m_ConPwd; }
+ ::rtl::OUString GetUser() const { return m_ET_SYSUSR.GetText(); }
+ ::rtl::OUString GetUserPassword() const { return m_SysPwd; }
+ sal_Int32 GetCacheSize() const { return static_cast(m_NF_CACHE_SIZE.GetValue()); }
};
}
#endif // adabasui_ADABAS_CREATEDB_HXX
diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.src b/dbaccess/source/ext/adabas/AdabasNewDb.src
index 33915b06266b..ae3cd2e2d24c 100644
--- a/dbaccess/source/ext/adabas/AdabasNewDb.src
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.src
@@ -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
@@ -33,23 +33,23 @@
//==================================================================
// NEWDB Admin
//==================================================================
-#define WIN_X 268
-#define WIN_Y 210
-#define MOVE_Y 21
+#define WIN_X 268
+#define WIN_Y 210
+#define MOVE_Y 21
#define ADJUST_X 45
ModalDialog DLG_ADABAS_NEWDB
{
- Moveable = TRUE ;
- Closeable = TRUE ;
- OutputSize = TRUE ;
- SVLook = TRUE;
- HelpID = HID_DLG_ADABAS_NEWDB ;
- Size = MAP_APPFONT ( WIN_X , WIN_Y + MOVE_Y) ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ OutputSize = TRUE ;
+ SVLook = TRUE;
+ HelpID = HID_DLG_ADABAS_NEWDB ;
+ Size = MAP_APPFONT ( WIN_X , WIN_Y + MOVE_Y) ;
FixedText FT_DATABASENAME
{
- Pos = MAP_APPFONT ( 12 , 6) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 6) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
Text[ en-US ] = "Database ~name";
};
Edit ET_DATABASENAME
@@ -58,50 +58,50 @@ ModalDialog DLG_ADABAS_NEWDB
Pos = MAP_APPFONT ( 77 + ADJUST_X, 5) ;
Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_DBNAME ;
+ HelpID = HID_DLG_ADABAS_DBNAME ;
};
FixedLine FL_USER
{
- Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ;
+ Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ;
Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ;
Text[ en-US ] = "User settings";
};
FixedText FT_CONUSR
{
- Pos = MAP_APPFONT ( 12 , 31 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 31 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
Text[ en-US ] = "~Control user";
};
FixedText FT_SYSUSR
{
- Pos = MAP_APPFONT ( 12 , 14 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 14 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
Text[ en-US ] = "~Administrator";
};
FixedText FT_DOMAIN_USR
{
- Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
Text[ en-US ] = "~Domain user";
};
Edit ET_SYSUSR
{
- Border = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_SYSUSR ;
+ HelpID = HID_DLG_ADABAS_SYSUSR ;
};
PushButton PB_SYSPWD
{
Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_SYSPWD ;
+ HelpID = HID_DLG_ADABAS_SYSPWD ;
Text[ en-US ] = "P~assword...";
};
@@ -109,87 +109,87 @@ ModalDialog DLG_ADABAS_NEWDB
{
Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 30 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_CONUSR ;
+ HelpID = HID_DLG_ADABAS_CONUSR ;
};
PushButton PB_CONPWD
{
Pos = MAP_APPFONT ( 188 , 30 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_CONPWD ;
+ HelpID = HID_DLG_ADABAS_CONPWD ;
Text[ en-US ] = "~Password...";
};
Edit ET_DOMAIN_USR
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 47 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
- Border = TRUE ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Border = TRUE ;
TabStop = TRUE ;
ReadOnly= TRUE;
- HelpID = HID_DLG_ADABAS_USR ;
+ HelpID = HID_DLG_ADABAS_USR ;
Text = "adabas";
};
PushButton PB_DOMAINPWD
{
Pos = MAP_APPFONT ( 188 , 47 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_DOMAINPWD ;
+ HelpID = HID_DLG_ADABAS_DOMAINPWD ;
Text[ en-US ] = "Passwo~rd...";
};
FixedImage BMP_CON
{
Pos = MAP_APPFONT ( 240 , 27 + MOVE_Y) ;
- Size = MAP_APPFONT ( 20 , 20 ) ;
- HelpID = HID_DLG_ADABAS_CON_PWD ;
+ Size = MAP_APPFONT ( 20 , 20 ) ;
+ HelpID = HID_DLG_ADABAS_CON_PWD ;
};
FixedImage BMP_SYS
{
Pos = MAP_APPFONT ( 240 , 11 + MOVE_Y) ;
- Size = MAP_APPFONT ( 20 , 20 ) ;
- HelpID = HID_DLG_ADABAS_SYS_PWD ;
+ Size = MAP_APPFONT ( 20 , 20 ) ;
+ HelpID = HID_DLG_ADABAS_SYS_PWD ;
};
FixedImage BMP_DOMAIN
{
Pos = MAP_APPFONT ( 240 , 44 + MOVE_Y) ;
- Size = MAP_APPFONT ( 20 , 20 ) ;
- HelpID = HID_DLG_ADABAS_DOMAIN_PWD ;
+ Size = MAP_APPFONT ( 20 , 20 ) ;
+ HelpID = HID_DLG_ADABAS_DOMAIN_PWD ;
};
FixedText FT_RESTORE
{
- Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ;
Text[ en-US ] = "~Backup file";
};
Edit ET_RESTORE
{
- Border = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
+ Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_RESTORE ;
+ HelpID = HID_DLG_ADABAS_RESTORE ;
};
PushButton PB_RESTORE
{
Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBRESTORE ;
- Text[ en-US ] = "...";
+ HelpID = HID_DLG_ADABAS_PBRESTORE ;
+ Text[ en-US ] = "...";
};
/* DEVSPACE positions */
FixedLine FL_DBSETTINGS
{
- Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ;
+ Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ;
Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ;
Text[ en-US ] = "Database settings";
};
@@ -217,37 +217,37 @@ ModalDialog DLG_ADABAS_NEWDB
Edit ET_SYSDEVSPACE
{
- Border = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 81 + MOVE_Y) ;
Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_SYSDEVSPACE ;
+ HelpID = HID_DLG_ADABAS_SYSDEVSPACE ;
};
PushButton PB_SYSDEVSPACE
{
- Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ;
- Text[ en-US ] = "...";
+ HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ;
+ Text[ en-US ] = "...";
};
Edit ET_TRANSACTIONLOG
{
- Border = TRUE ;
+ Border = TRUE ;
Pos = MAP_APPFONT ( 77 + ADJUST_X, 97 + MOVE_Y) ;
Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ;
+ HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ;
};
PushButton PB_TRANSACTIONLOG
{
- Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y) ;
+ Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ;
+ HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ;
Text[ en-US ] = "...";
};
@@ -255,18 +255,18 @@ ModalDialog DLG_ADABAS_NEWDB
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 114 + MOVE_Y) ;
Size = MAP_APPFONT ( 161 - ADJUST_X, 12) ;
- Border = TRUE ;
+ Border = TRUE ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_DATADEVSPACE ;
+ HelpID = HID_DLG_ADABAS_DATADEVSPACE ;
};
PushButton PB_DATADEVSPACE
{
- Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ;
- Size = MAP_APPFONT ( 12 , 12 ) ;
+ Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 12 , 12 ) ;
TabStop = TRUE ;
- HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ;
+ HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ;
Text[ en-US ] = "...";
};
/* DEVSPACE sizes */
@@ -280,11 +280,11 @@ ModalDialog DLG_ADABAS_NEWDB
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 131 + MOVE_Y) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
StrictFormat = TRUE;
- HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ;
+ HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ;
};
FixedText FT_DATADEVSPACE_SIZE
{
@@ -296,11 +296,11 @@ StrictFormat = TRUE;
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 148 + MOVE_Y) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
StrictFormat = TRUE;
- HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ;
+ HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ;
};
FixedText FT_CACHE_SIZE
{
@@ -312,11 +312,11 @@ StrictFormat = TRUE;
{
Pos = MAP_APPFONT ( 77 + ADJUST_X, 165 + MOVE_Y) ;
Size = MAP_APPFONT ( 40 , 12 ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
StrictFormat = TRUE;
- HelpID = HID_DLG_ADABAS_CACHE_SIZE ;
+ HelpID = HID_DLG_ADABAS_CACHE_SIZE ;
};
FixedLine FL_END
{
@@ -325,21 +325,21 @@ StrictFormat = TRUE;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
+ Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
};
CancelButton PB_CANCEL
{
- Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
+ Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ;
+ Size = MAP_APPFONT ( 50 , 14 ) ;
+ TabStop = TRUE ;
};
String STR_BACKUPFILE_LOAD
{
- Text[ en-US ] = "Backup file information";
+ Text[ en-US ] = "Backup file information";
};
Text[ en-US ] = "Create New Adabas D Database";
@@ -348,42 +348,42 @@ StrictFormat = TRUE;
Image CHECK_GREEN
{
ImageBitmap = Bitmap { File = "nu07.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
Image UNCHECK_RED
{
ImageBitmap = Bitmap { File = "nu08.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
Image DEFAULT_BLUE
{
ImageBitmap = Bitmap { File = "nu09.bmp"; };
- MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
+ MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
/* Fehlermeldungen beim Erstellen einer Adabas DB */
String STR_ADABAS_NO_PARAM_SET
{
- Text[ en-US ] = "No entry could be written in the configuration file.";
+ Text[ en-US ] = "No entry could be written in the configuration file.";
};
String STR_ADABAS_NO_DB_CREATED
{
- Text[ en-US ] = "An error occurred as the DB files were being created.";
+ Text[ en-US ] = "An error occurred as the DB files were being created.";
};
String STR_ADABAS_NO_SYSTEM_TABLES
{
- Text[ en-US ] = "An error occurred as the system tables were being created.";
+ Text[ en-US ] = "An error occurred as the system tables were being created.";
};
String STR_ADABAS_NO_BACKUP_FILE
{
- Text[ en-US ] = "The backup file entered does not exist.";
+ Text[ en-US ] = "The backup file entered does not exist.";
};
InfoBox INFO_STR_MAX_FILE_LENGTH
{
- Message[ en-US ] = "The fully qualified file cannot be longer than \'#\' characters.";
+ Message[ en-US ] = "The fully qualified file cannot be longer than \'#\' characters.";
};
String STR_NO_SAME_USER
diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx
index 7ea45579157f..2009147b7d04 100644
--- a/dbaccess/source/ext/adabas/Aservices.cxx
+++ b/dbaccess/source/ext/adabas/Aservices.cxx
@@ -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
@@ -65,8 +65,8 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui()
extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL
component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment **
+ const sal_Char **ppEnvTypeName,
+ uno_Environment **
)
{
createRegistryInfo_adabasui();
@@ -79,8 +79,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
void* pRegistryKey
)
{
- if (pRegistryKey)
- try
+ if (pRegistryKey)
+ try
{
return OModule::writeComponentInfos(
static_cast(pServiceManager),
diff --git a/dbaccess/source/ext/adabas/Astringconstants.cxx b/dbaccess/source/ext/adabas/Astringconstants.cxx
index bede25514524..5fd0ed1a8232 100644
--- a/dbaccess/source/ext/adabas/Astringconstants.cxx
+++ b/dbaccess/source/ext/adabas/Astringconstants.cxx
@@ -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/ext/adabas/Astringconstants.hrc b/dbaccess/source/ext/adabas/Astringconstants.hrc
index 49697f556024..2a1bed02f850 100644
--- a/dbaccess/source/ext/adabas/Astringconstants.hrc
+++ b/dbaccess/source/ext/adabas/Astringconstants.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
@@ -62,13 +62,13 @@ struct _ConstAsciiString_
//= property ids
//============================================================
-#define PROPERTY_ID_CREATECATALOG 3
-#define PROPERTY_ID_DATABASENAME 4
-#define PROPERTY_ID_CONTROL_USER 5
-#define PROPERTY_ID_CONTROL_PASSWORD 6
-#define PROPERTY_ID_USER 7
-#define PROPERTY_ID_PASSWORD 8
-#define PROPERTY_ID_CACHESIZE 9
+#define PROPERTY_ID_CREATECATALOG 3
+#define PROPERTY_ID_DATABASENAME 4
+#define PROPERTY_ID_CONTROL_USER 5
+#define PROPERTY_ID_CONTROL_PASSWORD 6
+#define PROPERTY_ID_USER 7
+#define PROPERTY_ID_PASSWORD 8
+#define PROPERTY_ID_CACHESIZE 9
//============================================================
//= property names
diff --git a/dbaccess/source/ext/adabas/adabasui_resource.hrc b/dbaccess/source/ext/adabas/adabasui_resource.hrc
index b0b0e63e91c7..922a897bdbd2 100644
--- a/dbaccess/source/ext/adabas/adabasui_resource.hrc
+++ b/dbaccess/source/ext/adabas/adabasui_resource.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,60 +32,60 @@
#include
#endif
-#define RID_DIALOG_START RID_DB_EXTENSIONS_START
-#define RID_PAGE_START RID_DB_EXTENSIONS_START
-#define RID_ERRORBOX_START RID_DB_EXTENSIONS_START
-#define RID_QUERYBOX_START RID_DB_EXTENSIONS_START
-#define RID_TOOLBOX_START RID_DB_EXTENSIONS_START
-#define RID_BITMAP_START RID_DB_EXTENSIONS_START
-#define RID_IMAGE_START RID_DB_EXTENSIONS_START
-#define RID_IMAGELIST_START RID_DB_EXTENSIONS_START
-#define RID_MENU_START RID_DB_EXTENSIONS_START
-#define RID_STRING_START RID_DB_EXTENSIONS_START
-#define RID_UNTYPED_START RID_DB_EXTENSIONS_START
-#define RID_WARN_START RID_DB_EXTENSIONS_START
+#define RID_DIALOG_START RID_DB_EXTENSIONS_START
+#define RID_PAGE_START RID_DB_EXTENSIONS_START
+#define RID_ERRORBOX_START RID_DB_EXTENSIONS_START
+#define RID_QUERYBOX_START RID_DB_EXTENSIONS_START
+#define RID_TOOLBOX_START RID_DB_EXTENSIONS_START
+#define RID_BITMAP_START RID_DB_EXTENSIONS_START
+#define RID_IMAGE_START RID_DB_EXTENSIONS_START
+#define RID_IMAGELIST_START RID_DB_EXTENSIONS_START
+#define RID_MENU_START RID_DB_EXTENSIONS_START
+#define RID_STRING_START RID_DB_EXTENSIONS_START
+#define RID_UNTYPED_START RID_DB_EXTENSIONS_START
+#define RID_WARN_START RID_DB_EXTENSIONS_START
//========================================================================
// dialog ids
-#define DLG_ADABAS_NEWDB RID_DIALOG_START + 0
+#define DLG_ADABAS_NEWDB RID_DIALOG_START + 0
//========================================================================
// images
-#define CHECK_GREEN RID_IMAGE_START + 0
-#define UNCHECK_RED RID_IMAGE_START + 1
-#define DEFAULT_BLUE RID_IMAGE_START + 2
+#define CHECK_GREEN RID_IMAGE_START + 0
+#define UNCHECK_RED RID_IMAGE_START + 1
+#define DEFAULT_BLUE RID_IMAGE_START + 2
//========================================================================
// warning boxes
-#define INFO_STR_MAX_FILE_LENGTH RID_WARN_START + 0
+#define INFO_STR_MAX_FILE_LENGTH RID_WARN_START + 0
//========================================================================
// strings
-#define STR_ADABAS_NO_BACKUP_FILE RID_STRING_START + 0
+#define STR_ADABAS_NO_BACKUP_FILE RID_STRING_START + 0
//
-#define STR_NO_SAME_USER RID_STRING_START + 2
-#define STR_DEVSPACE_NO_FILE RID_STRING_START + 3
-#define STR_NO_PERMISSION RID_STRING_START + 4
-#define STR_FILE_OR_DIR_UNKNOWN RID_STRING_START + 5
-#define STR_STAT_WARNING RID_STRING_START + 6
+#define STR_NO_SAME_USER RID_STRING_START + 2
+#define STR_DEVSPACE_NO_FILE RID_STRING_START + 3
+#define STR_NO_PERMISSION RID_STRING_START + 4
+#define STR_FILE_OR_DIR_UNKNOWN RID_STRING_START + 5
+#define STR_STAT_WARNING RID_STRING_START + 6
//
-#define STR_ADABAS_NO_PARAM_SET RID_STRING_START + 8
+#define STR_ADABAS_NO_PARAM_SET RID_STRING_START + 8
//
//
-#define STR_ADABAS_NO_DB_CREATED RID_STRING_START + 11
-#define STR_ADABAS_NO_SYSTEM_TABLES RID_STRING_START + 12
-#define STR_ERROR_IN_ADABAS_INSTALLATION RID_STRING_START + 13
-#define STR_ADABAS_CREATEFILES RID_STRING_START + 14
-#define STR_ADABAS_CREATEPARAM_FILE RID_STRING_START + 15
-#define STR_ADABAS_START_DATABASE RID_STRING_START + 16
-#define STR_ADABAS_DB_EXISTS RID_STRING_START + 17
-#define STR_ADABAS_NO_DEFAULTNAME RID_STRING_START + 18
-#define STR_ADABAS_NO_ACCESSRIGHTS RID_STRING_START + 19
-#define STR_ADABAS_CANNOT_CONVERT RID_STRING_START + 20
-#define STR_ADABAS_PASSWORD_ILLEGAL RID_STRING_START + 21
+#define STR_ADABAS_NO_DB_CREATED RID_STRING_START + 11
+#define STR_ADABAS_NO_SYSTEM_TABLES RID_STRING_START + 12
+#define STR_ERROR_IN_ADABAS_INSTALLATION RID_STRING_START + 13
+#define STR_ADABAS_CREATEFILES RID_STRING_START + 14
+#define STR_ADABAS_CREATEPARAM_FILE RID_STRING_START + 15
+#define STR_ADABAS_START_DATABASE RID_STRING_START + 16
+#define STR_ADABAS_DB_EXISTS RID_STRING_START + 17
+#define STR_ADABAS_NO_DEFAULTNAME RID_STRING_START + 18
+#define STR_ADABAS_NO_ACCESSRIGHTS RID_STRING_START + 19
+#define STR_ADABAS_CANNOT_CONVERT RID_STRING_START + 20
+#define STR_ADABAS_PASSWORD_ILLEGAL RID_STRING_START + 21
#endif // _ADABASUI_RESOURCE_HRC_
diff --git a/dbaccess/source/ext/adabas/adabasuistrings.cxx b/dbaccess/source/ext/adabas/adabasuistrings.cxx
index c1dae127c868..e640f77ed3cf 100644
--- a/dbaccess/source/ext/adabas/adabasuistrings.cxx
+++ b/dbaccess/source/ext/adabas/adabasuistrings.cxx
@@ -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/ext/adabas/adabasuistrings.hrc b/dbaccess/source/ext/adabas/adabasuistrings.hrc
index 7ee5fd19275c..6ef536e99380 100644
--- a/dbaccess/source/ext/adabas/adabasuistrings.hrc
+++ b/dbaccess/source/ext/adabas/adabasuistrings.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
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index b0a76aa0907e..8ea3dc724cf9 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.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
@@ -74,13 +74,13 @@
#define STR_JAVA ( RID_DBMM_STRING_START + 9 )
#define STR_PYTHON ( RID_DBMM_STRING_START + 10 )
#define STR_DIALOG ( RID_DBMM_STRING_START + 11 )
-#define STR_MIGRATING_LIBS ( RID_DBMM_STRING_START + 12 )
+#define STR_MIGRATING_LIBS ( RID_DBMM_STRING_START + 12 )
#define STR_ERRORS ( RID_DBMM_STRING_START + 13 )
#define STR_WARNINGS ( RID_DBMM_STRING_START + 14 )
#define STR_EXCEPTION ( RID_DBMM_STRING_START + 15 )
#define STR_LIBRARY_TYPE_AND_NAME ( RID_DBMM_STRING_START + 16 )
-#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 )
-#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 )
-#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 )
+#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 )
+#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 )
+#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 )
#endif // DBACCESS_DBMM_GLOBAL_HRC
diff --git a/dbaccess/source/ext/macromigration/dbmm_module.cxx b/dbaccess/source/ext/macromigration/dbmm_module.cxx
index e4863ed8f2c3..5dcc21409381 100644
--- a/dbaccess/source/ext/macromigration/dbmm_module.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_module.cxx
@@ -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/ext/macromigration/dbmm_module.hxx b/dbaccess/source/ext/macromigration/dbmm_module.hxx
index 264550f4cba4..c11ea114de24 100644
--- a/dbaccess/source/ext/macromigration/dbmm_module.hxx
+++ b/dbaccess/source/ext/macromigration/dbmm_module.hxx
@@ -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/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx
index 7776631dd449..8217037edce1 100644
--- a/dbaccess/source/ext/macromigration/dbmm_services.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx
@@ -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/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx
index 6e2369498137..aa119c28f904 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.cxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/ext/macromigration/dbmm_types.hxx b/dbaccess/source/ext/macromigration/dbmm_types.hxx
index 49f5de86a98b..7695eb285e1c 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.hxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.hxx
@@ -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/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx
index ef42fc881c2a..0f37cfb9060c 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.cxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.cxx
@@ -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/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx
index 51036eb90d54..514d0b8e4623 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.hxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.hxx
@@ -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
@@ -66,7 +66,7 @@ namespace dbmm
/** requests a document password
@param _rDocumentName
the document name
- @param _io_rPassword
+ @param _io_rPassword
the initial password on method entry, the password as entered by the user on method leave
@return
if and only if the user entered a password, and confirmed with OK,
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc
index ab6ea726868d..ac1a5c244e17 100644
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ b/dbaccess/source/ext/macromigration/macromigration.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
diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src
index 9742dcdfec71..97cc72f5f30e 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -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
@@ -222,7 +222,7 @@ TabPage TP_MIGRATE
};
FixedText FT_CURRENT_OBJECT
- {
+ {
Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60,
CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ), FIXED_TEXT_HEIGHT );
@@ -238,7 +238,7 @@ TabPage TP_MIGRATE
};
FixedText FT_CURRENT_PROGRESS
- {
+ {
Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60,
CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ), FIXED_TEXT_HEIGHT );
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
index 5ee29ff5d35f..ec1b5c2f196c 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx
@@ -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
@@ -133,7 +133,7 @@ namespace dbmm
bool bMigrationFailure;
bool bMigrationSuccess;
- MacroMigrationDialog_Data(
+ MacroMigrationDialog_Data(
const ::comphelper::ComponentContext& _rContext,
const Reference< XOfficeDatabaseDocument >& _rxDocument )
:aContext( _rContext )
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index d2af622316da..947f9d1aedd7 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -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
@@ -72,7 +72,7 @@ namespace dbmm
// Dialog overridables
virtual BOOL Close();
- virtual short Execute();
+ virtual short Execute();
private:
void impl_showCloseDocsError( bool _bShow );
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
index c2bd3986e27a..653070683f3f 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx
@@ -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
@@ -335,7 +335,7 @@ namespace dbmm
m_aChangesLabel.SetText( _bSuccessful ? m_aSuccessful : m_aUnsuccessful );
m_aChanges.SetText( _rSummary );
- // resize m_aChangesLabel and m_aChances as needed for the label text to fit
+ // resize m_aChangesLabel and m_aChances as needed for the label text to fit
Rectangle aOriginalLabelSize( m_aChangesLabel.GetPosPixel(), m_aChangesLabel.GetSizePixel() );
// assume 3 lines, at most
Rectangle aNewLabelSize( aOriginalLabelSize );
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 8c269982999d..321c2c76a173 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -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
@@ -102,7 +102,7 @@ namespace dbmm
protected:
FixedText m_aExplanation;
FixedText m_aSaveAsLabel;
- ::svt::OFileURLControl m_aSaveAsLocation;
+ ::svt::OFileURLControl m_aSaveAsLocation;
PushButton m_aBrowseSaveAsLocation;
FixedText m_aStartMigration;
::svx::DatabaseLocationInputController
diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
index 2f60d848ffb5..c8df485dbf39 100644
--- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
+++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx
@@ -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
@@ -107,7 +107,7 @@ namespace dbmm
~MacroMigrationDialogService();
protected:
- virtual Dialog* createDialog( Window* _pParent );
+ virtual Dialog* createDialog( Window* _pParent );
virtual void destroyDialog();
private:
@@ -146,7 +146,7 @@ namespace dbmm
}
//--------------------------------------------------------------------
- Dialog* MacroMigrationDialogService::createDialog( Window* _pParent )
+ Dialog* MacroMigrationDialogService::createDialog( Window* _pParent )
{
return new MacroMigrationDialog( _pParent, m_aContext, m_xDocument );
}
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx
index 5dd3129452fd..9e6781d10bcf 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -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
@@ -1132,7 +1132,7 @@ namespace dbmm
bool MigrationEngine_Impl::impl_handleDocument_nothrow( const SubDocument& _rDocument ) const
{
OSL_ENSURE( m_nCurrentDocumentID == -1,
- "MigrationEngine_Impl::impl_handleDocument_nothrow: there already is a current document!");
+ "MigrationEngine_Impl::impl_handleDocument_nothrow: there already is a current document!");
m_nCurrentDocumentID = m_rLogger.startedDocument( _rDocument.eType, _rDocument.sHierarchicalName );
// start the progress
diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx
index 2a203c9a82eb..f0a8e9bf06a9 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.hxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.hxx
@@ -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/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx
index 8e0a0fd29082..21fa31e7f67c 100644
--- a/dbaccess/source/ext/macromigration/migrationerror.hxx
+++ b/dbaccess/source/ext/macromigration/migrationerror.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx
index 79cd4f02c8d1..1c49c5fa2773 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -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/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx
index c8dd0910242e..e5356eca5d89 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.hxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.hxx
@@ -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/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx
index a38cc6365f7b..613b1c238220 100644
--- a/dbaccess/source/ext/macromigration/migrationprogress.hxx
+++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx
@@ -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/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx
index 723a6335261a..40e405b8cc30 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.cxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.cxx
@@ -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
@@ -99,7 +99,7 @@ namespace dbmm
if ( !m_pData->bDisposed )
m_pData->rMasterProgress.startObject( m_pData->sObjectName, _rText, _nRange );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL ProgressCapture::end( ) throw (RuntimeException)
{
@@ -107,7 +107,7 @@ namespace dbmm
if ( !m_pData->bDisposed )
m_pData->rMasterProgress.endObject();
}
-
+
//--------------------------------------------------------------------
void SAL_CALL ProgressCapture::setText( const ::rtl::OUString& _rText ) throw (RuntimeException)
{
@@ -115,7 +115,7 @@ namespace dbmm
if ( !m_pData->bDisposed )
m_pData->rMasterProgress.setObjectProgressText( _rText );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL ProgressCapture::setValue( ::sal_Int32 _nValue ) throw (RuntimeException)
{
@@ -123,7 +123,7 @@ namespace dbmm
if ( !m_pData->bDisposed )
m_pData->rMasterProgress.setObjectProgressValue( _nValue );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL ProgressCapture::reset( ) throw (RuntimeException)
{
diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx
index 263ad9861475..0b2aec9b45c7 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.hxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.hxx
@@ -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/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx
index cf1031e1a506..62bedc87f5f6 100644
--- a/dbaccess/source/ext/macromigration/progressmixer.cxx
+++ b/dbaccess/source/ext/macromigration/progressmixer.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx
index 784692da07a3..2c9ac4b92196 100644
--- a/dbaccess/source/ext/macromigration/progressmixer.hxx
+++ b/dbaccess/source/ext/macromigration/progressmixer.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
index e94f15dbdfbe..5a4168dfe266 100644
--- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
+++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
@@ -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/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx
index 67e1bd3ec103..2c62a36ea230 100644
--- a/dbaccess/source/filter/migration/cfgimport.cxx
+++ b/dbaccess/source/filter/migration/cfgimport.cxx
@@ -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
@@ -157,21 +157,21 @@ extern "C" void SAL_CALL createRegistryInfo_OCfgImport( )
static ::dbacfg::OMultiInstanceAutoRegistration< ::dbacfg::OCfgImport > aAutoRegistration;
}
-#define DATASOURCES 1
-#define DATASOURCE 2
-#define DATASOURCESETTINGS 3
-#define TABLES 4
-#define QUERIES 5
-#define BOOKMARKS 6
-#define DATASOURCESETTING 7
-#define BOOKMARK 8
-#define QUERY 9
-#define TABLE 10
-#define DATASETTINGS 11
-#define COLUMNS 12
-#define COLUMN 13
-#define NO_PROP 14
-#define LOGINTIMEOUT 15
+#define DATASOURCES 1
+#define DATASOURCE 2
+#define DATASOURCESETTINGS 3
+#define TABLES 4
+#define QUERIES 5
+#define BOOKMARKS 6
+#define DATASOURCESETTING 7
+#define BOOKMARK 8
+#define QUERY 9
+#define TABLE 10
+#define DATASETTINGS 11
+#define COLUMNS 12
+#define COLUMN 13
+#define NO_PROP 14
+#define LOGINTIMEOUT 15
//--------------------------------------------------------------------------
using namespace dbacfg;
@@ -376,20 +376,20 @@ void LoadTableFields(const Reference< XObjectInputStream>& _rxIn,Sequence& _rxIn,PropertyValue& _rProperty)
{
- ::rtl::OUString aTableName;
- ::rtl::OUString aAliasName; // table range
- ::rtl::OUString aFieldName; // column
- ::rtl::OUString aFieldAlias; // column alias
- ::rtl::OUString aDatabaseName; // qualifier or catalog
- ::rtl::OUString aFunctionName; // enth"alt den Funktionsnamen, nur wenn eFunctionType != FKT_NONE gesetzt
-
- sal_Int32 eDataType;
- sal_Int32 eFunctionType;
- sal_Int32 eFieldType;
- sal_Int32 eOrderDir;
- sal_Int32 nColWidth;
- sal_Bool bGroupBy;
- sal_Bool bVisible;
+ ::rtl::OUString aTableName;
+ ::rtl::OUString aAliasName; // table range
+ ::rtl::OUString aFieldName; // column
+ ::rtl::OUString aFieldAlias; // column alias
+ ::rtl::OUString aDatabaseName; // qualifier or catalog
+ ::rtl::OUString aFunctionName; // enth"alt den Funktionsnamen, nur wenn eFunctionType != FKT_NONE gesetzt
+
+ sal_Int32 eDataType;
+ sal_Int32 eFunctionType;
+ sal_Int32 eFieldType;
+ sal_Int32 eOrderDir;
+ sal_Int32 nColWidth;
+ sal_Bool bGroupBy;
+ sal_Bool bVisible;
OStreamSection aSection(_rxIn.get());
_rxIn >> aTableName;
@@ -482,7 +482,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const :
// get TypeName
::rtl::OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aMedDescr, sal_True );
const PropertyValue* pIter = aMedDescr.getConstArray();
- const PropertyValue* pEnd = pIter + aMedDescr.getLength();
+ const PropertyValue* pEnd = pIter + aMedDescr.getLength();
for( ; pIter != pEnd && !pIter->Name.equalsAscii( "FilterName" ); ++pIter)
;
if ( aTypeName.getLength() && pIter == pEnd )
@@ -540,7 +540,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const :
Reference< XNameContainer> xControls(xForms->getByName(*elementNames),UNO_QUERY);
Sequence< ::rtl::OUString> aControlSeq = xControls.is() ? xControls->getElementNames() : Sequence< ::rtl::OUString>();
const ::rtl::OUString* pControlIter = aControlSeq.getConstArray();
- const ::rtl::OUString* pControlEnd = pControlIter + aControlSeq.getLength();
+ const ::rtl::OUString* pControlEnd = pControlIter + aControlSeq.getLength();
for(;pControlIter != pControlEnd && !bForm;++pControlIter)
{
Reference xProp(xControls->getByName(*pControlIter),UNO_QUERY);
@@ -654,7 +654,7 @@ void OCfgImport::setProperties(sal_Int16 _eType)
OSL_ENSURE(m_aProperties[_eType].getLength() == m_aValues[_eType].getLength(),"Count is not equal!");
try
{
- Reference< XMultiPropertySet > xFormMultiSet;
+ Reference< XMultiPropertySet > xFormMultiSet;
if ( _eType == COLUMN )
xFormMultiSet.set(m_xCurrentColumn,UNO_QUERY);
else if ( _eType == TABLE || _eType == QUERY )
@@ -1040,7 +1040,7 @@ void SAL_CALL OCfgImport::overrideProperty(
{
m_bPropertyMayBeVoid = sal_False;
::rtl::OUString sProp;
- if ( aName == CONFIGKEY_DEFSET_FILTER ) sProp = PROPERTY_FILTER;
+ if ( aName == CONFIGKEY_DEFSET_FILTER ) sProp = PROPERTY_FILTER;
else if ( aName == CONFIGKEY_DEFSET_FONT_NAME ) sProp = PROPERTY_FONTNAME;
else if ( aName == CONFIGKEY_DEFSET_ORDER ) sProp = PROPERTY_ORDER;
else if ( aName == CONFIGKEY_DEFSET_APPLYFILTER ) sProp = PROPERTY_APPLYFILTER;
@@ -1189,7 +1189,7 @@ void SAL_CALL OCfgImport::setPropertyValue(
Sequence< PropertyValue > aLayout;
if ( aInputSequence.getLength() )
{
- Reference< XInputStream> xInStreamHelper = new SequenceInputStream(aInputSequence);; // used for wrapping sequence to xinput
+ Reference< XInputStream> xInStreamHelper = new SequenceInputStream(aInputSequence);; // used for wrapping sequence to xinput
Reference< XObjectInputStream> xInStream = Reference< XObjectInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.ObjectInputStream")),UNO_QUERY);
Reference< XInputStream> xMarkInStream = Reference< XInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.MarkableInputStream")),UNO_QUERY);
Reference< XActiveDataSink >(xMarkInStream,UNO_QUERY)->setInputStream(xInStreamHelper);
diff --git a/dbaccess/source/filter/migration/cfgimport.hxx b/dbaccess/source/filter/migration/cfgimport.hxx
index ff2926944dca..658991fc8a4a 100644
--- a/dbaccess/source/filter/migration/cfgimport.hxx
+++ b/dbaccess/source/filter/migration/cfgimport.hxx
@@ -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
@@ -75,37 +75,37 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
-typedef ::cppu::WeakImplHelper4 < ::com::sun::star::lang::XServiceInfo
- , ::com::sun::star::lang::XInitialization
- , ::com::sun::star::task::XJob
- , ::com::sun::star::configuration::backend::XLayerHandler
- > OCfgImport_COMPBASE;
+typedef ::cppu::WeakImplHelper4 < ::com::sun::star::lang::XServiceInfo
+ , ::com::sun::star::lang::XInitialization
+ , ::com::sun::star::task::XJob
+ , ::com::sun::star::configuration::backend::XLayerHandler
+ > OCfgImport_COMPBASE;
// -------------
// - OCfgImport -
// -------------
class OCfgImport : public OCfgImport_COMPBASE
{
private:
- typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType;
- typedef ::std::stack< TElementType > TElementStack;
- typedef ::std::vector< PropertyValue > TDataSourceSettings;
-
- Reference< XMultiServiceFactory > m_xORB;
- Reference< XMultiServiceFactory > m_xOldORB;
- Reference< ::com::sun::star::configuration::backend::XLayer> m_xLayer;
- Reference m_xCurrentDS;
- Reference m_xModel;
- Reference m_xCurrentObject; /// can either be a query or a table
- Reference m_xCurrentColumn;
- ::std::map< sal_Int16 ,Sequence< ::rtl::OUString> > m_aProperties;
+ typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType;
+ typedef ::std::stack< TElementType > TElementStack;
+ typedef ::std::vector< PropertyValue > TDataSourceSettings;
+
+ Reference< XMultiServiceFactory > m_xORB;
+ Reference< XMultiServiceFactory > m_xOldORB;
+ Reference< ::com::sun::star::configuration::backend::XLayer> m_xLayer;
+ Reference m_xCurrentDS;
+ Reference m_xModel;
+ Reference m_xCurrentObject; /// can either be a query or a table
+ Reference m_xCurrentColumn;
+ ::std::map< sal_Int16 ,Sequence< ::rtl::OUString> > m_aProperties;
::std::map< sal_Int16 ,Sequence< Any> > m_aValues;
- ::rtl::OUString m_sCurrentDataSourceName;
- ::rtl::OUString m_sBookmarkName;
- ::rtl::OUString m_sDocumentLocation;
+ ::rtl::OUString m_sCurrentDataSourceName;
+ ::rtl::OUString m_sBookmarkName;
+ ::rtl::OUString m_sDocumentLocation;
- TElementStack m_aStack;
- TDataSourceSettings m_aDataSourceSettings;
- sal_Bool m_bPropertyMayBeVoid;
+ TElementStack m_aStack;
+ TDataSourceSettings m_aDataSourceSettings;
+ sal_Bool m_bPropertyMayBeVoid;
/** convert the old configuration settings into new database documents.
*/
@@ -115,9 +115,9 @@ private:
void setProperties(sal_Int16 _eType);
protected:
- virtual ~OCfgImport() throw();
+ virtual ~OCfgImport() throw();
public:
-
+
OCfgImport( const Reference< XMultiServiceFactory >& _rxMSF );
@@ -132,88 +132,88 @@ public:
virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// XLayerHandler
- virtual void SAL_CALL startLayer()
+ virtual void SAL_CALL startLayer()
throw(::com::sun::star::lang::WrappedTargetException);
- virtual void SAL_CALL endLayer()
- throw(
+ virtual void SAL_CALL endLayer()
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL overrideNode(
- const rtl::OUString& aName,
- sal_Int16 aAttributes,
+ virtual void SAL_CALL overrideNode(
+ const rtl::OUString& aName,
+ sal_Int16 aAttributes,
sal_Bool bClear)
throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
virtual void SAL_CALL addOrReplaceNode(
- const rtl::OUString& aName,
- sal_Int16 aAttributes)
- throw(
+ const rtl::OUString& aName,
+ sal_Int16 aAttributes)
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL addOrReplaceNodeFromTemplate(
+ virtual void SAL_CALL addOrReplaceNodeFromTemplate(
const rtl::OUString& aName,
const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate,
- sal_Int16 aAttributes )
+ sal_Int16 aAttributes )
throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL endNode()
- throw(
+ virtual void SAL_CALL endNode()
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL dropNode(
- const rtl::OUString& aName )
- throw(
+ virtual void SAL_CALL dropNode(
+ const rtl::OUString& aName )
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL overrideProperty(
+ virtual void SAL_CALL overrideProperty(
const rtl::OUString& aName,
sal_Int16 aAttributes,
const Type& aType,
- sal_Bool bClear )
- throw(
+ sal_Bool bClear )
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL setPropertyValue(
- const Any& aValue )
- throw(
+ virtual void SAL_CALL setPropertyValue(
+ const Any& aValue )
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL setPropertyValueForLocale(
+ virtual void SAL_CALL setPropertyValueForLocale(
const Any& aValue,
- const rtl::OUString& aLocale )
- throw(
+ const rtl::OUString& aLocale )
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL endProperty()
- throw(
+ virtual void SAL_CALL endProperty()
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL addProperty(
+ virtual void SAL_CALL addProperty(
const rtl::OUString& aName,
sal_Int16 aAttributes,
const Type& aType )
- throw(
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
- virtual void SAL_CALL addPropertyWithValue(
+ virtual void SAL_CALL addPropertyWithValue(
const rtl::OUString& aName,
sal_Int16 aAttributes,
- const Any& aValue )
- throw(
+ const Any& aValue )
+ throw(
::com::sun::star::configuration::backend::MalformedDataException,
::com::sun::star::lang::WrappedTargetException );
};
diff --git a/dbaccess/source/filter/migration/cfgservices.cxx b/dbaccess/source/filter/migration/cfgservices.cxx
index c9696f37ca71..57b5299601e6 100644
--- a/dbaccess/source/filter/migration/cfgservices.cxx
+++ b/dbaccess/source/filter/migration/cfgservices.cxx
@@ -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
@@ -65,8 +65,8 @@ extern "C" void SAL_CALL createRegistryInfo_dbacfg()
//---------------------------------------------------------------------------------------
extern "C" void SAL_CALL component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment **
+ const sal_Char **ppEnvTypeName,
+ uno_Environment **
)
{
createRegistryInfo_dbacfg();
@@ -79,8 +79,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
void* pRegistryKey
)
{
- if (pRegistryKey)
- try
+ if (pRegistryKey)
+ try
{
return ::dbacfg::OModuleRegistration::writeComponentInfos(
static_cast(pServiceManager),
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index 126a043145ab..cc823d92ae9f 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -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
@@ -114,12 +114,12 @@ public:
DBTypeDetection(const Reference< XMultiServiceFactory >&);
// XServiceInfo
- ::rtl::OUString SAL_CALL getImplementationName() throw( );
- sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( );
- Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( );
+ ::rtl::OUString SAL_CALL getImplementationName() throw( );
+ sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( );
+ Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( );
// static methods
- static ::rtl::OUString getImplementationName_Static() throw( )
+ static ::rtl::OUString getImplementationName_Static() throw( )
{
return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBTypeDetection");
}
@@ -212,8 +212,8 @@ Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMult
sal_Bool SAL_CALL DBTypeDetection::supportsService(const ::rtl::OUString& ServiceName) throw( )
{
Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames();
- const ::rtl::OUString * pBegin = aSNL.getConstArray();
- const ::rtl::OUString * pEnd = pBegin + aSNL.getLength();
+ const ::rtl::OUString * pBegin = aSNL.getConstArray();
+ const ::rtl::OUString * pEnd = pBegin + aSNL.getLength();
for( ; pBegin != pEnd; ++pBegin)
if( *pBegin == ServiceName )
return sal_True;
@@ -244,9 +244,9 @@ class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader, XServiceIn
{
private:
::comphelper::ComponentContext m_aContext;
- Reference< XFrameLoader > m_xMySelf;
- ::rtl::OUString m_sCurrentURL;
- ULONG m_nStartWizard;
+ Reference< XFrameLoader > m_xMySelf;
+ ::rtl::OUString m_sCurrentURL;
+ ULONG m_nStartWizard;
DECL_LINK( OnStartTableWizard, void* );
public:
@@ -254,12 +254,12 @@ public:
~DBContentLoader();
// XServiceInfo
- ::rtl::OUString SAL_CALL getImplementationName() throw( );
- sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( );
- Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( );
+ ::rtl::OUString SAL_CALL getImplementationName() throw( );
+ sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( );
+ Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( );
// static methods
- static ::rtl::OUString getImplementationName_Static() throw( )
+ static ::rtl::OUString getImplementationName_Static() throw( )
{
return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBContentLoader2");
}
@@ -268,7 +268,7 @@ public:
SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
// XLoader
- virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL,
+ virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL,
const Sequence< PropertyValue >& _rArgs,
const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL cancel(void) throw();
@@ -311,8 +311,8 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult
sal_Bool SAL_CALL DBContentLoader::supportsService(const ::rtl::OUString& ServiceName) throw( )
{
Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames();
- const ::rtl::OUString * pBegin = aSNL.getConstArray();
- const ::rtl::OUString * pEnd = pBegin + aSNL.getLength();
+ const ::rtl::OUString * pBegin = aSNL.getConstArray();
+ const ::rtl::OUString * pEnd = pBegin + aSNL.getLength();
for( ; pBegin != pEnd; ++pBegin)
if( *pBegin == ServiceName )
return sal_True;
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
index f21bf781713d..b3b227c356b7 100644
--- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx
@@ -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
@@ -27,7 +27,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef DBA_XMLAUTOSTYLE_HXX
+#ifndef DBA_XMLAUTOSTYLE_HXX
#include "xmlAutoStyle.hxx"
#endif
#ifndef DBA_XMLHELPER_HXX
@@ -63,7 +63,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes(
::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin();
::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end();
for ( ; i != aEnd ; ++i )
- {
+ {
sal_Int16 nContextID = aPropMapper->GetEntryContextId(i->mnIndex);
switch (nContextID)
{
@@ -82,7 +82,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes(
}
}
break;
- }
+ }
}
}
}
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx
index b966d68908d5..3c6427ef0eb0 100644
--- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx
@@ -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
@@ -24,7 +24,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef DBA_XMLAUTOSTYLE_HXX
+#ifndef DBA_XMLAUTOSTYLE_HXX
#define DBA_XMLAUTOSTYLE_HXX
#ifndef _XMLOFF_PROPMAPPINGTYPES_HXX
#include
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx
index 35fed91af93b..7b8ac9beb0a9 100644
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@ -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 @@ void OXMLColumn::EndElement()
if ( m_aDefaultValue.hasValue() )
xProp->setPropertyValue(PROPERTY_CONTROLDEFAULT,m_aDefaultValue);
-
+
Reference xAppend(m_xParentContainer,UNO_QUERY);
if ( xAppend.is() )
xAppend->appendByDescriptor(xProp);
@@ -194,7 +194,7 @@ void OXMLColumn::EndElement()
}
}
}
-
+
}
} // if ( xFac.is() && m_sName.getLength() )
else if ( m_sCellStyleName.getLength() )
diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx
index d4b9c9f5bc3b..462560c291e7 100644
--- a/dbaccess/source/filter/xml/xmlColumn.hxx
+++ b/dbaccess/source/filter/xml/xmlColumn.hxx
@@ -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
@@ -44,7 +44,7 @@ namespace dbaxml
::rtl::OUString m_sCellStyleName;
::rtl::OUString m_sHelpMessage;
::com::sun::star::uno::Any m_aDefaultValue;
- sal_Bool m_bHidden;
+ sal_Bool m_bHidden;
ODBFilter& GetOwnImport();
public:
diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx
index a01020565120..2b5608d81e41 100644
--- a/dbaccess/source/filter/xml/xmlComponent.cxx
+++ b/dbaccess/source/filter/xml/xmlComponent.cxx
@@ -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/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx
index 2523bad6d112..8e3237cef5d0 100644
--- a/dbaccess/source/filter/xml/xmlComponent.hxx
+++ b/dbaccess/source/filter/xml/xmlComponent.hxx
@@ -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,7 +43,7 @@ namespace dbaxml
::rtl::OUString m_sName;
::rtl::OUString m_sHREF;
::rtl::OUString m_sComponentServiceName;
- sal_Bool m_bAsTemplate;
+ sal_Bool m_bAsTemplate;
ODBFilter& GetOwnImport();
public:
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx
index e627c334d2cb..c074b4b1d96b 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx
@@ -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
@@ -88,7 +88,7 @@ SvXMLImportContext* OXMLConnectionData::CreateChildContext(
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap();
+ const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx
index 6dac18107c30..8b1a959db7d7 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.hxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx
@@ -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/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
index e79002670ce9..e9167a5dc5a7 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx
@@ -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/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx
index 2645dba69bb2..f95cbb00dd70 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx
@@ -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/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx
index 53aa482f4b8f..a81caf8f153a 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.cxx
@@ -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
@@ -252,7 +252,7 @@ SvXMLImportContext* OXMLDataSource::CreateChildContext(
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap();
+ const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap();
const sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName );
switch( nToken )
diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx
index 2b6a640f6576..f92e1476f705 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.hxx
@@ -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/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
index d56238fdab61..fade66239989 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
@@ -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
@@ -157,7 +157,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport
aProperty.Name = INFO_CHARSET;
aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("utf8"));
rImport.addInfo(aProperty);
- }
+ }
}
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
index 86832af5de77..e09214058a62 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
@@ -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/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
index 9960c4bce478..6bc1bb989143 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx
@@ -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
@@ -67,7 +67,7 @@ DBG_NAME(OXMLDataSourceSetting)
OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
,sal_uInt16 nPrfx
,const ::rtl::OUString& _sLocalName
- ,const Reference< XAttributeList > & _xAttrList
+ ,const Reference< XAttributeList > & _xAttrList
,OXMLDataSourceSetting* _pContainer) :
SvXMLImportContext( rImport, nPrfx, _sLocalName )
,m_pContainer(_pContainer)
@@ -101,13 +101,13 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
static MapString2Type s_aTypeNameMap;
if (!s_aTypeNameMap.size())
{
- s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType();
- s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) );
- s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) );
- s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) );
- s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) );
- s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) );
- s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType();
+ s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType();
+ s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) );
+ s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) );
+ s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) );
+ s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) );
+ s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) );
+ s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType();
}
const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue);
@@ -121,7 +121,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport
break;
}
}
-
+
}
// -----------------------------------------------------------------------------
@@ -136,7 +136,7 @@ SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext(
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap();
+ const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
@@ -186,7 +186,7 @@ void OXMLDataSourceSetting::addValue(const ::rtl::OUString& _sValue)
if ( !m_bIsList )
m_aSetting.Value = aValue;
- else
+ else
{
sal_Int32 nPos = m_aInfoSequence.getLength();
m_aInfoSequence.realloc(nPos+1);
@@ -205,7 +205,7 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx
Any aReturn;
switch (_rExpectedType.getTypeClass())
{
- case TypeClass_BOOLEAN: // sal_Bool
+ case TypeClass_BOOLEAN: // sal_Bool
{
sal_Bool bValue;
#if OSL_DEBUG_LEVEL > 0
@@ -214,14 +214,14 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx
rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
- += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into a boolean!"));
+ += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
+ += ::rtl::OString("\" into a boolean!"));
aReturn <<= bValue;
}
break;
- case TypeClass_SHORT: // sal_Int16
- case TypeClass_LONG: // sal_Int32
- { // it's a real int32/16 property
+ case TypeClass_SHORT: // sal_Int16
+ case TypeClass_LONG: // sal_Int32
+ { // it's a real int32/16 property
sal_Int32 nValue(0);
#if OSL_DEBUG_LEVEL > 0
sal_Bool bSuccess =
@@ -229,8 +229,8 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx
rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
- += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into an integer!"));
+ += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
+ += ::rtl::OString("\" into an integer!"));
if (TypeClass_SHORT == _rExpectedType.getTypeClass())
aReturn <<= (sal_Int16)nValue;
else
@@ -251,8 +251,8 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx
rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess,
::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"")
- += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
- += ::rtl::OString("\" into a double!"));
+ += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
+ += ::rtl::OString("\" into a double!"));
aReturn <<= (double)nValue;
}
break;
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
index e1e0891069a8..c6515e50369f 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
@@ -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
@@ -46,7 +46,7 @@ namespace dbaxml
::com::sun::star::beans::PropertyValue m_aSetting;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aInfoSequence;
OXMLDataSourceSetting* m_pContainer;
- ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently
+ ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently
sal_Bool m_bIsList;
ODBFilter& GetOwnImport();
@@ -69,7 +69,7 @@ namespace dbaxml
/** adds value to property
- @param _sValue
+ @param _sValue
The value to add.
*/
void addValue(const ::rtl::OUString& _sValue);
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
index ed19bac9345c..2497e89e0ad6 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx
@@ -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
@@ -88,7 +88,7 @@ SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext(
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap();
+ const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
index df9690dafd0f..3855ef182cb6 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
@@ -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/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx
index 7fff786ca518..67b97edb3853 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.cxx
@@ -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
@@ -72,7 +72,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext(
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseElemTokenMap();
+ const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx
index 3a41f3d01c7f..b599f276930e 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.hxx
@@ -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/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
index 95443f119f71..d0b186674ae5 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx
@@ -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
@@ -84,7 +84,7 @@ SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext(
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseDescriptionElemTokenMap();
+ const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseDescriptionElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
index 03c4cd94a8ec..42e5bc53f1fb 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
@@ -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/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx
index 0ff3b6d74317..93eac4b8b9da 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.cxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.cxx
@@ -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
@@ -110,7 +110,7 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext(
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap();
+ const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
@@ -126,7 +126,7 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext(
GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName );
break;
- // case XML_TOK_QUERY_COLLECTION:
+ // case XML_TOK_QUERY_COLLECTION:
case XML_TOK_COMPONENT_COLLECTION:
GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName );
diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx
index 26444e9e5454..486d7d3d31bc 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.hxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.hxx
@@ -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
@@ -44,8 +44,8 @@ namespace dbaxml
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer;
- ::rtl::OUString m_sCollectionServiceName;
- ::rtl::OUString m_sComponentServiceName;
+ ::rtl::OUString m_sCollectionServiceName;
+ ::rtl::OUString m_sComponentServiceName;
ODBFilter& GetOwnImport();
public:
diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx
index 2298b13c58e1..816ac5b538c1 100644
--- a/dbaccess/source/filter/xml/xmlEnums.hxx
+++ b/dbaccess/source/filter/xml/xmlEnums.hxx
@@ -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
@@ -50,21 +50,21 @@ namespace dbaxml
};
enum XMLDataSource
{
- XML_TOK_CONNECTION_RESOURCE,
- XML_TOK_SUPPRESS_VERSION_COLUMNS,
- XML_TOK_JAVA_DRIVER_CLASS,
- XML_TOK_EXTENSION,
- XML_TOK_IS_FIRST_ROW_HEADER_LINE,
- XML_TOK_SHOW_DELETED,
- XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED,
- XML_TOK_SYSTEM_DRIVER_SETTINGS,
- XML_TOK_ENABLE_SQL92_CHECK,
- XML_TOK_APPEND_TABLE_ALIAS_NAME,
- XML_TOK_PARAMETER_NAME_SUBSTITUTION,
- XML_TOK_IGNORE_DRIVER_PRIVILEGES,
- XML_TOK_BOOLEAN_COMPARISON_MODE,
- XML_TOK_USE_CATALOG,
- XML_TOK_BASE_DN,
+ XML_TOK_CONNECTION_RESOURCE,
+ XML_TOK_SUPPRESS_VERSION_COLUMNS,
+ XML_TOK_JAVA_DRIVER_CLASS,
+ XML_TOK_EXTENSION,
+ XML_TOK_IS_FIRST_ROW_HEADER_LINE,
+ XML_TOK_SHOW_DELETED,
+ XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED,
+ XML_TOK_SYSTEM_DRIVER_SETTINGS,
+ XML_TOK_ENABLE_SQL92_CHECK,
+ XML_TOK_APPEND_TABLE_ALIAS_NAME,
+ XML_TOK_PARAMETER_NAME_SUBSTITUTION,
+ XML_TOK_IGNORE_DRIVER_PRIVILEGES,
+ XML_TOK_BOOLEAN_COMPARISON_MODE,
+ XML_TOK_USE_CATALOG,
+ XML_TOK_BASE_DN,
XML_TOK_MAX_ROW_COUNT,
XML_TOK_LOGIN,
XML_TOK_TABLE_FILTER,
@@ -126,12 +126,12 @@ namespace dbaxml
};
enum XMLComponent
{
- XML_TOK_HREF ,
- XML_TOK_TYPE ,
- XML_TOK_SHOW ,
+ XML_TOK_HREF ,
+ XML_TOK_TYPE ,
+ XML_TOK_SHOW ,
XML_TOK_ACTUATE ,
XML_TOK_AS_TEMPLATE ,
- XML_TOK_COMPONENT_NAME
+ XML_TOK_COMPONENT_NAME
};
enum XMLType
{
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 9782ef9fb0d3..e501032f873d 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -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
@@ -150,12 +150,12 @@ namespace dbaxml
{
// possible types we can write (either because we recognize them directly or because we convert _rValue
// into one of these types)
- static const ::rtl::OUString s_sTypeBoolean (RTL_CONSTASCII_USTRINGPARAM("boolean"));
- static const ::rtl::OUString s_sTypeShort (RTL_CONSTASCII_USTRINGPARAM("short"));
- static const ::rtl::OUString s_sTypeInteger (RTL_CONSTASCII_USTRINGPARAM("int"));
- static const ::rtl::OUString s_sTypeLong (RTL_CONSTASCII_USTRINGPARAM("long"));
- static const ::rtl::OUString s_sTypeDouble (RTL_CONSTASCII_USTRINGPARAM("double"));
- static const ::rtl::OUString s_sTypeString (RTL_CONSTASCII_USTRINGPARAM("string"));
+ static const ::rtl::OUString s_sTypeBoolean (RTL_CONSTASCII_USTRINGPARAM("boolean"));
+ static const ::rtl::OUString s_sTypeShort (RTL_CONSTASCII_USTRINGPARAM("short"));
+ static const ::rtl::OUString s_sTypeInteger (RTL_CONSTASCII_USTRINGPARAM("int"));
+ static const ::rtl::OUString s_sTypeLong (RTL_CONSTASCII_USTRINGPARAM("long"));
+ static const ::rtl::OUString s_sTypeDouble (RTL_CONSTASCII_USTRINGPARAM("double"));
+ static const ::rtl::OUString s_sTypeString (RTL_CONSTASCII_USTRINGPARAM("string"));
// handle the type description
switch (_rType.getTypeClass())
@@ -802,7 +802,7 @@ void ODBExport::exportSequence(const Sequence< ::rtl::OUString>& _aValue
SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, _eTokenFilter, sal_True, sal_True);
const ::rtl::OUString* pIter = _aValue.getConstArray();
- const ::rtl::OUString* pEnd = pIter + _aValue.getLength();
+ const ::rtl::OUString* pEnd = pIter + _aValue.getLength();
for(;pIter != pEnd;++pIter)
{
SvXMLElementExport aDataSource(*this,XML_NAMESPACE_DB, _eTokenType, sal_True, sal_False);
@@ -843,7 +843,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection
pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, sal_True, sal_True));
Sequence< ::rtl::OUString> aSeq = _xCollection->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)
{
Reference xProp(_xCollection->getByName(*pIter),UNO_QUERY);
@@ -1009,7 +1009,7 @@ void ODBExport::exportColumns(const Reference& _xColSup)
SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, sal_True, sal_True);
Sequence< ::rtl::OUString> aSeq = xNameAccess->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)
{
Reference xProp(xNameAccess->getByName(*pIter),UNO_QUERY);
@@ -1116,7 +1116,7 @@ void ODBExport::exportQueries(sal_Bool _bExportContext)
Reference< XNameAccess > xCollection = xSup->getQueryDefinitions();
if ( xCollection.is() && xCollection->hasElements() )
{
- ::std::auto_ptr< ::comphelper::mem_fun1_t > pMemFunc;
+ ::std::auto_ptr< ::comphelper::mem_fun1_t > pMemFunc;
if ( _bExportContext )
pMemFunc.reset( new ::comphelper::mem_fun1_t(&ODBExport::exportQuery) );
else
@@ -1312,7 +1312,7 @@ void ODBExport::GetViewSettings(Sequence& aProps)
aProps[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Queries"));
Sequence< ::rtl::OUString> aSeq = xCollection->getElementNames();
const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
Sequence aQueries(aSeq.getLength());
for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i)
@@ -1366,7 +1366,7 @@ void ODBExport::GetConfigurationSettings(Sequence& aProps)
switch (_rValue.getValueTypeClass())
{
case TypeClass_STRING:
- { // extract the string
+ { // extract the string
::rtl::OUString sCurrentValue;
_rValue >>= sCurrentValue;
aBuffer.append(sCurrentValue);
@@ -1436,7 +1436,7 @@ void SAL_CALL ODBExport::setSourceDocument( const Reference< XComponent >& xDoc
// -----------------------------------------------------------------------------
void ODBExport::_ExportFontDecls()
{
- GetFontAutoStylePool(); // make sure the pool is created
+ GetFontAutoStylePool(); // make sure the pool is created
collectComponentStyles();
SvXMLExport::_ExportFontDecls();
}
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 15681aa62525..112ae856c460 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -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
@@ -144,86 +144,86 @@ class ODBExport : public SvXMLExport
}
};
- ::std::auto_ptr< TStringPair > m_aAutoIncrement;
- ::std::auto_ptr< TDelimiter > m_aDelimiter;
+ ::std::auto_ptr< TStringPair > m_aAutoIncrement;
+ ::std::auto_ptr< TDelimiter > m_aDelimiter;
::std::vector< TypedPropertyValue > m_aDataSourceSettings;
::std::vector< XMLPropertyState > m_aCurrentPropertyStates;
- TPropertyStyleMap m_aAutoStyleNames;
- TPropertyStyleMap m_aCellAutoStyleNames;
- TPropertyStyleMap m_aRowAutoStyleNames;
+ TPropertyStyleMap m_aAutoStyleNames;
+ TPropertyStyleMap m_aCellAutoStyleNames;
+ TPropertyStyleMap m_aRowAutoStyleNames;
TTableColumnMap m_aTableDummyColumns;
- ::rtl::OUString m_sCharSet;
- UniReference < SvXMLExportPropertyMapper> m_xExportHelper;
- UniReference < SvXMLExportPropertyMapper> m_xColumnExportHelper;
- UniReference < SvXMLExportPropertyMapper> m_xCellExportHelper;
- UniReference < SvXMLExportPropertyMapper> m_xRowExportHelper;
-
- mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper;
- mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
- mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper;
- mutable UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper;
-
- Reference m_xDataSource;
+ ::rtl::OUString m_sCharSet;
+ UniReference < SvXMLExportPropertyMapper> m_xExportHelper;
+ UniReference < SvXMLExportPropertyMapper> m_xColumnExportHelper;
+ UniReference < SvXMLExportPropertyMapper> m_xCellExportHelper;
+ UniReference < SvXMLExportPropertyMapper> m_xRowExportHelper;
+
+ mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper;
+ mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
+ mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper;
+ mutable UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper;
+
+ Reference m_xDataSource;
::dbaccess::ODsnTypeCollection m_aTypeCollection;
sal_Bool m_bAllreadyFilled;
- void exportDataSource();
+ void exportDataSource();
void exportConnectionData();
void exportDriverSettings(const TSettingsMap& _aSettings);
void exportApplicationConnectionSettings(const TSettingsMap& _aSettings);
- void exportLogin();
- void exportSequence(const Sequence< ::rtl::OUString>& _aValue
+ void exportLogin();
+ void exportSequence(const Sequence< ::rtl::OUString>& _aValue
,::xmloff::token::XMLTokenEnum _eTokenFilter
,::xmloff::token::XMLTokenEnum _eTokenType);
- void exportDelimiter();
- void exportAutoIncrement();
- void exportCharSet();
- void exportDataSourceSettings();
- void exportForms();
- void exportReports();
- void exportQueries(sal_Bool _bExportContext);
- void exportTables(sal_Bool _bExportContext);
- void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt);
+ void exportDelimiter();
+ void exportAutoIncrement();
+ void exportCharSet();
+ void exportDataSourceSettings();
+ void exportForms();
+ void exportReports();
+ void exportQueries(sal_Bool _bExportContext);
+ void exportTables(sal_Bool _bExportContext);
+ void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt);
void exportStyleName(const ::xmloff::token::XMLTokenEnum _eToken,const Reference& _xProp,SvXMLAttributeList& _rAtt,TPropertyStyleMap& _rMap);
- void exportCollection(const Reference< XNameAccess >& _xCollection
+ void exportCollection(const Reference< XNameAccess >& _xCollection
,enum ::xmloff::token::XMLTokenEnum _eComponents
,enum ::xmloff::token::XMLTokenEnum _eSubComponents
,sal_Bool _bExportContext
,const ::comphelper::mem_fun1_t& _aMemFunc
);
- void exportComponent(XPropertySet* _xProp);
- void exportQuery(XPropertySet* _xProp);
- void exportTable(XPropertySet* _xProp);
- void exportFilter(XPropertySet* _xProp
+ void exportComponent(XPropertySet* _xProp);
+ void exportQuery(XPropertySet* _xProp);
+ void exportTable(XPropertySet* _xProp);
+ void exportFilter(XPropertySet* _xProp
,const ::rtl::OUString& _sProp
,enum ::xmloff::token::XMLTokenEnum _eStatementType);
- void exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate);
- void exportAutoStyle(XPropertySet* _xProp);
- void exportColumns(const Reference& _xColSup);
+ void exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate);
+ void exportAutoStyle(XPropertySet* _xProp);
+ void exportColumns(const Reference& _xColSup);
void collectComponentStyles();
- ::rtl::OUString implConvertAny(const Any& _rValue);
+ ::rtl::OUString implConvertAny(const Any& _rValue);
UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const;
-
+
private:
ODBExport();
protected:
- virtual void _ExportStyles( BOOL bUsed );
- virtual void _ExportAutoStyles();
- virtual void _ExportContent();
- virtual void _ExportMasterStyles();
- virtual void _ExportFontDecls();
- virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass );
- virtual SvXMLAutoStylePoolP* CreateAutoStylePool();
+ virtual void _ExportStyles( BOOL bUsed );
+ virtual void _ExportAutoStyles();
+ virtual void _ExportContent();
+ virtual void _ExportMasterStyles();
+ virtual void _ExportFontDecls();
+ virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass );
+ virtual SvXMLAutoStylePoolP* CreateAutoStylePool();
virtual void GetViewSettings(com::sun::star::uno::Sequence& aProps);
virtual void GetConfigurationSettings(com::sun::star::uno::Sequence& aProps);
-
- virtual ~ODBExport(){};
-public:
-
+
+ virtual ~ODBExport(){};
+public:
+
ODBExport(const Reference< XMultiServiceFactory >& _rxMSF, sal_uInt16 nExportFlag = EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_PRETTY | EXPORT_FONTDECLS | EXPORT_SCRIPTS );
// XServiceInfo
DECLARE_SERVICE_INFO_STATIC( );
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
index cb95f8681f0e..8a891a03a59f 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx
@@ -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/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx
index 2e5a957ebad9..a4c8a1b6840e 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx
@@ -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/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index 8dfb220e7e77..536f27af3ebc 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -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
@@ -90,8 +90,8 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
{
static SvXMLEnumMapEntry aDisplayMap[] =
{
- { XML_VISIBLE, sal_True },
- { XML_COLLAPSE, sal_False },
+ { XML_VISIBLE, sal_True },
+ { XML_COLLAPSE, sal_False },
{ XML_TOKEN_INVALID, 0 }
};
m_pDisplayHandler.reset(new XMLConstantsPropertyHandler(aDisplayMap, XML_TOKEN_INVALID ));
@@ -104,42 +104,42 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32
return pHandler;
}
// -----------------------------------------------------------------------------
-#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 }
#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFVER_010}
// -----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMapper()
{
static const XMLPropertyMapEntry s_aTableStylesProperties[] =
{
- //MAP_CONST( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ),
- //MAP_CONST( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ),
- //MAP_CONST( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
+ //MAP_CONST( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ),
+ //MAP_CONST( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ),
+ //MAP_CONST( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
- //MAP_CONST( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
- //MAP_CONST( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
- //MAP_CONST( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ),
- //MAP_CONST( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ),
- //MAP_CONST( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ),
- //MAP_CONST( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ),
- //MAP_CONST( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ),
+ //MAP_CONST( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
+ //MAP_CONST( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
+ //MAP_CONST( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ),
+ //MAP_CONST( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ),
+ //MAP_CONST( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ),
+ //MAP_CONST( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ),
+ //MAP_CONST( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ),
//
- //MAP_CONST( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ),
- //MAP_CONST( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ),
- //MAP_CONST( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
- //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
- //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0),
- //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
- //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0),
- //MAP_CONST( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ),
- //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
- //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
- //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
- //MAP_CONST_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
- //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
- //MAP_CONST( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
- //MAP_CONST( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ),
- //MAP_CONST( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE, 0 ),
+ //MAP_CONST( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ),
+ //MAP_CONST( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ),
+ //MAP_CONST( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
+ //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
+ //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0),
+ //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
+ //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0),
+ //MAP_CONST( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ),
+ //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
+ //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
+ //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
+ //MAP_CONST_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
+ //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
+ //MAP_CONST( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
+ //MAP_CONST( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ),
+ //MAP_CONST( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE, 0 ),
MAP_END()
};
UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory();
@@ -148,12 +148,12 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMappe
// -----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapper()
{
-#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010 }
static const XMLPropertyMapEntry s_aColumnStylesProperties[] =
{
- MAP_CONST_COLUMN( PROPERTY_WIDTH, XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0),
- MAP_CONST_COLUMN( PROPERTY_HIDDEN, XML_NAMESPACE_TABLE, XML_DISPLAY, XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_DB_ISVISIBLE ),
- MAP_CONST_COLUMN( PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM, CTF_DB_NUMBERFORMAT),
+ MAP_CONST_COLUMN( PROPERTY_WIDTH, XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0),
+ MAP_CONST_COLUMN( PROPERTY_HIDDEN, XML_NAMESPACE_TABLE, XML_DISPLAY, XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_DB_ISVISIBLE ),
+ MAP_CONST_COLUMN( PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM, CTF_DB_NUMBERFORMAT),
MAP_END()
};
UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory();
@@ -162,40 +162,40 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapp
// -----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper()
{
-#define MAP_CONST_CELL( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
-#define MAP_CONST_TEXT_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_CELL( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_TEXT_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 }
static const XMLPropertyMapEntry s_aCellStylesProperties[] =
{
- MAP_CONST_CELL( PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN),
- MAP_CONST_TEXT( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ),
- MAP_CONST_TEXT( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ),
- MAP_CONST_TEXT( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
-
- MAP_CONST_TEXT( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_CONST_TEXT( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ),
+ MAP_CONST_CELL( PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN),
+ MAP_CONST_TEXT( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ),
+ MAP_CONST_TEXT( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ),
+ MAP_CONST_TEXT( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
- MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0),
- MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
- MAP_CONST_TEXT_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ),
- MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
+ MAP_CONST_TEXT( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ),
+ MAP_CONST_TEXT( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ),
+
+ MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ),
+ MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0),
+ MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0),
+ MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0),
+ MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0),
+ MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ),
+ MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ),
+ MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ),
+ MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ),
+ MAP_CONST_TEXT_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
+ MAP_CONST_TEXT_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ),
+ MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ),
MAP_END()
};
UniReference < XMLPropertyHandlerFactory> xFac = new /*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory();
@@ -204,10 +204,10 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper
// -----------------------------------------------------------------------------
UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper()
{
-#define MAP_CONST_ROW( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010 }
+#define MAP_CONST_ROW( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010 }
static const XMLPropertyMapEntry s_aStylesProperties[] =
{
- MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0),
+ MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0),
MAP_END()
};
UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory();
diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx
index 58853f4b1b17..e7a9e4cd5b70 100644
--- a/dbaccess/source/filter/xml/xmlHelper.hxx
+++ b/dbaccess/source/filter/xml/xmlHelper.hxx
@@ -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
@@ -39,21 +39,21 @@
#include
-#define CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1)
-#define CTF_DB_ISVISIBLE (XML_DB_CTF_START + 2)
-#define CTF_DB_MASTERPAGENAME (XML_DB_CTF_START + 3)
-#define CTF_DB_NUMBERFORMAT (XML_DB_CTF_START + 4)
-#define CTF_DB_COLUMN_TEXT_ALIGN (XML_DB_CTF_START + 5)
+#define CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1)
+#define CTF_DB_ISVISIBLE (XML_DB_CTF_START + 2)
+#define CTF_DB_MASTERPAGENAME (XML_DB_CTF_START + 3)
+#define CTF_DB_NUMBERFORMAT (XML_DB_CTF_START + 4)
+#define CTF_DB_COLUMN_TEXT_ALIGN (XML_DB_CTF_START + 5)
-#define XML_DB_TYPE_EQUAL (XML_DB_TYPES_START + 1)
+#define XML_DB_TYPE_EQUAL (XML_DB_TYPES_START + 1)
namespace dbaxml
{
class OPropertyHandlerFactory : public ::xmloff::OControlPropertyHandlerFactory
{
protected:
- mutable ::std::auto_ptr m_pDisplayHandler;
- mutable ::std::auto_ptr m_pTextAlignHandler;
+ mutable ::std::auto_ptr m_pDisplayHandler;
+ mutable ::std::auto_ptr m_pTextAlignHandler;
public:
OPropertyHandlerFactory();
virtual ~OPropertyHandlerFactory();
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
index 277505913623..5875ef84adad 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx
@@ -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
@@ -79,7 +79,7 @@ DBG_NAME(OXMLHierarchyCollection)
OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport
,sal_uInt16 nPrfx
,const ::rtl::OUString& _sLocalName
- ,const Reference< XAttributeList > & _xAttrList
+ ,const Reference< XAttributeList > & _xAttrList
,const Reference< XNameAccess >& _xParentContainer
,const ::rtl::OUString& _sCollectionServiceName
,const ::rtl::OUString& _sComponentServiceName) :
@@ -165,13 +165,13 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
const Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap();
+ const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
-// case XML_TOK_QUERY:
-// pContext = new OXMLQuery( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer );
-// break;
+// case XML_TOK_QUERY:
+// pContext = new OXMLQuery( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer );
+// break;
case XML_TOK_COMPONENT:
GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName );
@@ -180,7 +180,7 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext(
GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
pContext = new OXMLColumn( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_xTable);
break;
- // case XML_TOK_QUERY_COLLECTION:
+ // case XML_TOK_QUERY_COLLECTION:
case XML_TOK_COMPONENT_COLLECTION:
GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP );
pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName);
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
index 5bd7f54730df..2bd21739ed64 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
@@ -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
@@ -41,9 +41,9 @@ namespace dbaxml
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer;
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer;
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable;
- ::rtl::OUString m_sName;
- ::rtl::OUString m_sCollectionServiceName;
- ::rtl::OUString m_sComponentServiceName;
+ ::rtl::OUString m_sName;
+ ::rtl::OUString m_sCollectionServiceName;
+ ::rtl::OUString m_sComponentServiceName;
ODBFilter& GetOwnImport();
public:
diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx
index f7ad978bf5e5..95e17c831b36 100644
--- a/dbaccess/source/filter/xml/xmlLogin.cxx
+++ b/dbaccess/source/filter/xml/xmlLogin.cxx
@@ -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
@@ -119,7 +119,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport,
if ( !bUserFound )
{
bUserFound = true;
- PropertyValue aProperty;
+ PropertyValue aProperty;
aProperty.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSystemUser"));
aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False);
rImport.addInfo(aProperty);
diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx
index a41920d76562..db2276966a92 100644
--- a/dbaccess/source/filter/xml/xmlLogin.hxx
+++ b/dbaccess/source/filter/xml/xmlLogin.hxx
@@ -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/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx
index 8eef96ba000f..b935c4c21916 100644
--- a/dbaccess/source/filter/xml/xmlQuery.cxx
+++ b/dbaccess/source/filter/xml/xmlQuery.cxx
@@ -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
@@ -73,7 +73,7 @@ DBG_NAME(OXMLQuery)
OXMLQuery::OXMLQuery( ODBFilter& rImport
,sal_uInt16 nPrfx
,const ::rtl::OUString& _sLocalName
- ,const Reference< XAttributeList > & _xAttrList
+ ,const Reference< XAttributeList > & _xAttrList
,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer
) :
OXMLTable( rImport, nPrfx, _sLocalName,_xAttrList,_xParentContainer,SERVICE_SDB_COMMAND_DEFINITION )
@@ -157,7 +157,7 @@ void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp )
_xProp->setPropertyValue(PROPERTY_UPDATE_CATALOGNAME,makeAny(m_sCatalog));
if ( m_sSchema.getLength() )
_xProp->setPropertyValue(PROPERTY_UPDATE_SCHEMANAME,makeAny(m_sSchema));
-
+
const ODBFilter::TPropertyNameMap& rSettings = GetOwnImport().getQuerySettings();
ODBFilter::TPropertyNameMap::const_iterator aFind = rSettings.find(m_sName);
if ( aFind != rSettings.end() )
diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx
index f751d9b7af50..3e2c03c4d8e1 100644
--- a/dbaccess/source/filter/xml/xmlQuery.hxx
+++ b/dbaccess/source/filter/xml/xmlQuery.hxx
@@ -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
@@ -42,7 +42,7 @@ namespace dbaxml
{
::rtl::OUString m_sCommand;
::rtl::OUString m_sTable;
- sal_Bool m_bEscapeProcessing;
+ sal_Bool m_bEscapeProcessing;
protected:
virtual void setProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xProp);
public:
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
index b2781ef4fb89..692033bf2818 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx
@@ -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
@@ -153,7 +153,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport,
sURL.append(sPortNumber);
}
}
- else
+ else
{
sURL.append(sType);
sURL.appendAscii(":");
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx
index 4eb2b8de402f..e0fa9906247d 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx
@@ -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/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx
index 4f6b24a222ed..b5f5215dc256 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.cxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx
@@ -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
@@ -323,7 +323,7 @@ Reference < XNameContainer >
case XML_STYLE_FAMILY_TABLE_CELL:
sServiceName = sCellStyleServiceName;
break;
-
+
}
}
return sServiceName;
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx
index b9210e49e0e9..323ac3066c00 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.hxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx
@@ -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
@@ -66,15 +66,15 @@ namespace dbaxml
class OTableStyleContext : public XMLPropStyleContext
{
- ::rtl::OUString m_sDataStyleName;
- ::rtl::OUString sPageStyle;
- const rtl::OUString sNumberFormat;
- SvXMLStylesContext* pStyles;
- // std::vector aMaps;
- com::sun::star::uno::Any aConditionalFormat;
- sal_Int32 m_nNumberFormat;
- sal_Bool bConditionalFormatCreated : 1;
- sal_Bool bParentSet : 1;
+ ::rtl::OUString m_sDataStyleName;
+ ::rtl::OUString sPageStyle;
+ const rtl::OUString sNumberFormat;
+ SvXMLStylesContext* pStyles;
+ // std::vector aMaps;
+ com::sun::star::uno::Any aConditionalFormat;
+ sal_Int32 m_nNumberFormat;
+ sal_Bool bConditionalFormatCreated : 1;
+ sal_Bool bParentSet : 1;
ODBFilter& GetOwnImport();
diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx
index fa3bde94d6a5..b495340d5b05 100644
--- a/dbaccess/source/filter/xml/xmlTable.cxx
+++ b/dbaccess/source/filter/xml/xmlTable.cxx
@@ -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
@@ -81,7 +81,7 @@ DBG_NAME(OXMLTable)
OXMLTable::OXMLTable( ODBFilter& _rImport
,sal_uInt16 nPrfx
,const ::rtl::OUString& _sLocalName
- ,const uno::Reference< XAttributeList > & _xAttrList
+ ,const uno::Reference< XAttributeList > & _xAttrList
,const uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer
,const ::rtl::OUString& _sServiceName
)
@@ -153,7 +153,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext(
const uno::Reference< XAttributeList > & xAttrList )
{
SvXMLImportContext *pContext = 0;
- const SvXMLTokenMap& rTokenMap = GetOwnImport().GetQueryElemTokenMap();
+ const SvXMLTokenMap& rTokenMap = GetOwnImport().GetQueryElemTokenMap();
switch( rTokenMap.Get( nPrefix, rLocalName ) )
{
@@ -227,7 +227,7 @@ void OXMLTable::EndElement()
if ( m_xTable.is() )
{
setProperties(m_xTable);
-
+
if ( m_sStyleName.getLength() )
{
const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles();
@@ -240,7 +240,7 @@ void OXMLTable::EndElement()
}
}
}
-
+
xNameContainer->insertByName(m_sName,makeAny(m_xTable));
}
}
@@ -249,7 +249,7 @@ void OXMLTable::EndElement()
OSL_ENSURE(0,"OXMLQuery::EndElement -> exception catched");
}
}
-
+
}
// -----------------------------------------------------------------------------
void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/
diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx
index 0fab2577c32d..02cf49db3e00 100644
--- a/dbaccess/source/filter/xml/xmlTable.hxx
+++ b/dbaccess/source/filter/xml/xmlTable.hxx
@@ -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,8 +43,8 @@ namespace dbaxml
class OXMLTable : public SvXMLImportContext
{
protected:
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer;
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer;
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable;
::rtl::OUString m_sFilterStatement;
::rtl::OUString m_sOrderStatement;
::rtl::OUString m_sName;
@@ -52,13 +52,13 @@ namespace dbaxml
::rtl::OUString m_sCatalog;
::rtl::OUString m_sStyleName;
::rtl::OUString m_sServiceName;
- sal_Bool m_bApplyFilter;
- sal_Bool m_bApplyOrder;
-
+ sal_Bool m_bApplyFilter;
+ sal_Bool m_bApplyOrder;
+
ODBFilter& GetOwnImport();
- void fillAttributes( sal_uInt16 nPrfx
+ void fillAttributes( sal_uInt16 nPrfx
,const ::rtl::OUString& _sLocalName
,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList
, ::rtl::OUString& _rsCommand
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index d791e286d8d4..0068ac0100db 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@ -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
@@ -101,7 +101,7 @@ SvXMLImportContext* OXMLTableFilterList::CreateChildContext(
else if ( IsXMLToken( rLocalName, XML_TABLE_TYPE ) )
pContext = new OXMLTableFilterPattern( GetImport(), nPrefix, rLocalName,sal_False,*this);
else if ( IsXMLToken( rLocalName, XML_TABLE_INCLUDE_FILTER ) )
- pContext = new OXMLTableFilterList( GetImport(), nPrefix, rLocalName );
+ pContext = new OXMLTableFilterList( GetImport(), nPrefix, rLocalName );
}
if( !pContext )
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
index fe22ac40bb52..6b284fa10d73 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
@@ -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
@@ -55,7 +55,7 @@ namespace dbaxml
virtual void EndElement();
/** pushes a new TableFilterPattern to the list of patterns
- @param _sTableFilterPattern
+ @param _sTableFilterPattern
The new filter pattern.
*/
inline void pushTableFilterPattern(const ::rtl::OUString& _sTableFilterPattern)
@@ -64,7 +64,7 @@ namespace dbaxml
}
/** pushes a new TableTypeFilter to the list of patterns
- @param _sTypeFilter
+ @param _sTypeFilter
The new type filter.
*/
inline void pushTableTypeFilter(const ::rtl::OUString& _sTypeFilter)
diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
index a65d4a11cde3..555721b49bb6 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx
@@ -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/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx
index c33136849e0e..7c027d55858b 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx
@@ -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
@@ -36,10 +36,10 @@ namespace dbaxml
class OXMLTableFilterList;
class OXMLTableFilterPattern : public SvXMLImportContext
{
- OXMLTableFilterList& m_rParent;
- sal_Bool m_bNameFilter;
+ OXMLTableFilterList& m_rParent;
+ sal_Bool m_bNameFilter;
public:
- OXMLTableFilterPattern( SvXMLImport& rImport
+ OXMLTableFilterPattern( SvXMLImport& rImport
,sal_uInt16 nPrfx
,const ::rtl::OUString& rLName
,sal_Bool _bNameFilter
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 73ed237f534e..07ef531a3c3c 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -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
@@ -670,15 +670,15 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
- { XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
- { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
- { XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES },
- { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
- { XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
- { XML_NAMESPACE_OFFICE, XML_DATABASE, XML_TOK_DOC_DATABASE },
- { XML_NAMESPACE_OOO, XML_DATABASE, XML_TOK_DOC_DATABASE },
- { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT },
+ { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
+ { XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS },
+ { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES },
+ { XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES },
+ { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
+ { XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES },
+ { XML_NAMESPACE_OFFICE, XML_DATABASE, XML_TOK_DOC_DATABASE },
+ { XML_NAMESPACE_OOO, XML_DATABASE, XML_TOK_DOC_DATABASE },
+ { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT },
XML_TOKEN_MAP_END
};
m_pDocElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -692,13 +692,13 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_DB, XML_DATASOURCE, XML_TOK_DATASOURCE },
- { XML_NAMESPACE_DB, XML_FORMS, XML_TOK_FORMS},
- { XML_NAMESPACE_DB, XML_REPORTS, XML_TOK_REPORTS},
- { XML_NAMESPACE_DB, XML_QUERIES, XML_TOK_QUERIES},
- { XML_NAMESPACE_DB, XML_TABLES, XML_TOK_TABLES},
- { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATIONS, XML_TOK_TABLES},
- { XML_NAMESPACE_DB, XML_SCHEMA_DEFINITION, XML_TOK_SCHEMA_DEFINITION},
+ { XML_NAMESPACE_DB, XML_DATASOURCE, XML_TOK_DATASOURCE },
+ { XML_NAMESPACE_DB, XML_FORMS, XML_TOK_FORMS},
+ { XML_NAMESPACE_DB, XML_REPORTS, XML_TOK_REPORTS},
+ { XML_NAMESPACE_DB, XML_QUERIES, XML_TOK_QUERIES},
+ { XML_NAMESPACE_DB, XML_TABLES, XML_TOK_TABLES},
+ { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATIONS, XML_TOK_TABLES},
+ { XML_NAMESPACE_DB, XML_SCHEMA_DEFINITION, XML_TOK_SCHEMA_DEFINITION},
XML_TOKEN_MAP_END
};
m_pDatabaseElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -712,44 +712,44 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE},
- { XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS},
- { XML_NAMESPACE_DB, XML_JAVA_DRIVER_CLASS, XML_TOK_JAVA_DRIVER_CLASS},
- { XML_NAMESPACE_DB, XML_EXTENSION, XML_TOK_EXTENSION},
- { XML_NAMESPACE_DB, XML_IS_FIRST_ROW_HEADER_LINE, XML_TOK_IS_FIRST_ROW_HEADER_LINE},
- { XML_NAMESPACE_DB, XML_SHOW_DELETED, XML_TOK_SHOW_DELETED},
- { XML_NAMESPACE_DB, XML_IS_TABLE_NAME_LENGTH_LIMITED, XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED},
- { XML_NAMESPACE_DB, XML_SYSTEM_DRIVER_SETTINGS, XML_TOK_SYSTEM_DRIVER_SETTINGS},
- { XML_NAMESPACE_DB, XML_ENABLE_SQL92_CHECK, XML_TOK_ENABLE_SQL92_CHECK},
- { XML_NAMESPACE_DB, XML_APPEND_TABLE_ALIAS_NAME, XML_TOK_APPEND_TABLE_ALIAS_NAME},
- { XML_NAMESPACE_DB, XML_PARAMETER_NAME_SUBSTITUTION, XML_TOK_PARAMETER_NAME_SUBSTITUTION},
- { XML_NAMESPACE_DB, XML_IGNORE_DRIVER_PRIVILEGES, XML_TOK_IGNORE_DRIVER_PRIVILEGES},
- { XML_NAMESPACE_DB, XML_BOOLEAN_COMPARISON_MODE, XML_TOK_BOOLEAN_COMPARISON_MODE},
- { XML_NAMESPACE_DB, XML_USE_CATALOG, XML_TOK_USE_CATALOG},
- { XML_NAMESPACE_DB, XML_BASE_DN, XML_TOK_BASE_DN},
- { XML_NAMESPACE_DB, XML_MAX_ROW_COUNT, XML_TOK_MAX_ROW_COUNT},
- { XML_NAMESPACE_DB, XML_LOGIN, XML_TOK_LOGIN},
- { XML_NAMESPACE_DB, XML_TABLE_FILTER, XML_TOK_TABLE_FILTER},
- { XML_NAMESPACE_DB, XML_TABLE_TYPE_FILTER, XML_TOK_TABLE_TYPE_FILTER},
- { XML_NAMESPACE_DB, XML_AUTO_INCREMENT, XML_TOK_AUTO_INCREMENT},
- { XML_NAMESPACE_DB, XML_DELIMITER, XML_TOK_DELIMITER},
- { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, XML_TOK_DATA_SOURCE_SETTINGS},
- { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET},
+ { XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE},
+ { XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS},
+ { XML_NAMESPACE_DB, XML_JAVA_DRIVER_CLASS, XML_TOK_JAVA_DRIVER_CLASS},
+ { XML_NAMESPACE_DB, XML_EXTENSION, XML_TOK_EXTENSION},
+ { XML_NAMESPACE_DB, XML_IS_FIRST_ROW_HEADER_LINE, XML_TOK_IS_FIRST_ROW_HEADER_LINE},
+ { XML_NAMESPACE_DB, XML_SHOW_DELETED, XML_TOK_SHOW_DELETED},
+ { XML_NAMESPACE_DB, XML_IS_TABLE_NAME_LENGTH_LIMITED, XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED},
+ { XML_NAMESPACE_DB, XML_SYSTEM_DRIVER_SETTINGS, XML_TOK_SYSTEM_DRIVER_SETTINGS},
+ { XML_NAMESPACE_DB, XML_ENABLE_SQL92_CHECK, XML_TOK_ENABLE_SQL92_CHECK},
+ { XML_NAMESPACE_DB, XML_APPEND_TABLE_ALIAS_NAME, XML_TOK_APPEND_TABLE_ALIAS_NAME},
+ { XML_NAMESPACE_DB, XML_PARAMETER_NAME_SUBSTITUTION, XML_TOK_PARAMETER_NAME_SUBSTITUTION},
+ { XML_NAMESPACE_DB, XML_IGNORE_DRIVER_PRIVILEGES, XML_TOK_IGNORE_DRIVER_PRIVILEGES},
+ { XML_NAMESPACE_DB, XML_BOOLEAN_COMPARISON_MODE, XML_TOK_BOOLEAN_COMPARISON_MODE},
+ { XML_NAMESPACE_DB, XML_USE_CATALOG, XML_TOK_USE_CATALOG},
+ { XML_NAMESPACE_DB, XML_BASE_DN, XML_TOK_BASE_DN},
+ { XML_NAMESPACE_DB, XML_MAX_ROW_COUNT, XML_TOK_MAX_ROW_COUNT},
+ { XML_NAMESPACE_DB, XML_LOGIN, XML_TOK_LOGIN},
+ { XML_NAMESPACE_DB, XML_TABLE_FILTER, XML_TOK_TABLE_FILTER},
+ { XML_NAMESPACE_DB, XML_TABLE_TYPE_FILTER, XML_TOK_TABLE_TYPE_FILTER},
+ { XML_NAMESPACE_DB, XML_AUTO_INCREMENT, XML_TOK_AUTO_INCREMENT},
+ { XML_NAMESPACE_DB, XML_DELIMITER, XML_TOK_DELIMITER},
+ { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, XML_TOK_DATA_SOURCE_SETTINGS},
+ { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET},
// db odf 12
- { XML_NAMESPACE_DB, XML_CONNECTION_DATA, XML_TOK_CONNECTION_DATA},
- { XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, XML_TOK_DATABASE_DESCRIPTION},
- { XML_NAMESPACE_DB, XML_COMPOUND_DATABASE, XML_TOK_COMPOUND_DATABASE},
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_DB_HREF},
- { XML_NAMESPACE_DB, XML_MEDIA_TYPE, XML_TOK_MEDIA_TYPE},
- { XML_NAMESPACE_DB, XML_TYPE, XML_TOK_DB_TYPE},
- { XML_NAMESPACE_DB, XML_HOSTNAME, XML_TOK_HOSTNAME},
- { XML_NAMESPACE_DB, XML_PORT, XML_TOK_PORT},
- { XML_NAMESPACE_DB, XML_LOCAL_SOCKET, XML_TOK_LOCAL_SOCKET},
- { XML_NAMESPACE_DB, XML_DATABASE_NAME, XML_TOK_DATABASE_NAME},
- { XML_NAMESPACE_DB, XML_DRIVER_SETTINGS, XML_TOK_DRIVER_SETTINGS},
- { XML_NAMESPACE_DB, XML_JAVA_CLASSPATH, XML_TOK_JAVA_CLASSPATH},
- { XML_NAMESPACE_DB, XML_CHARACTER_SET, XML_TOK_CHARACTER_SET},
- { XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS,XML_TOK_APPLICATION_CONNECTION_SETTINGS},
+ { XML_NAMESPACE_DB, XML_CONNECTION_DATA, XML_TOK_CONNECTION_DATA},
+ { XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, XML_TOK_DATABASE_DESCRIPTION},
+ { XML_NAMESPACE_DB, XML_COMPOUND_DATABASE, XML_TOK_COMPOUND_DATABASE},
+ { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_DB_HREF},
+ { XML_NAMESPACE_DB, XML_MEDIA_TYPE, XML_TOK_MEDIA_TYPE},
+ { XML_NAMESPACE_DB, XML_TYPE, XML_TOK_DB_TYPE},
+ { XML_NAMESPACE_DB, XML_HOSTNAME, XML_TOK_HOSTNAME},
+ { XML_NAMESPACE_DB, XML_PORT, XML_TOK_PORT},
+ { XML_NAMESPACE_DB, XML_LOCAL_SOCKET, XML_TOK_LOCAL_SOCKET},
+ { XML_NAMESPACE_DB, XML_DATABASE_NAME, XML_TOK_DATABASE_NAME},
+ { XML_NAMESPACE_DB, XML_DRIVER_SETTINGS, XML_TOK_DRIVER_SETTINGS},
+ { XML_NAMESPACE_DB, XML_JAVA_CLASSPATH, XML_TOK_JAVA_CLASSPATH},
+ { XML_NAMESPACE_DB, XML_CHARACTER_SET, XML_TOK_CHARACTER_SET},
+ { XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS,XML_TOK_APPLICATION_CONNECTION_SETTINGS},
XML_TOKEN_MAP_END
};
m_pDataSourceElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -763,10 +763,10 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_DB, XML_USER_NAME, XML_TOK_USER_NAME},
- { XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED, XML_TOK_IS_PASSWORD_REQUIRED},
- { XML_NAMESPACE_DB, XML_USE_SYSTEM_USER, XML_TOK_USE_SYSTEM_USER},
- { XML_NAMESPACE_DB, XML_LOGIN_TIMEOUT, XML_TOK_LOGIN_TIMEOUT},
+ { XML_NAMESPACE_DB, XML_USER_NAME, XML_TOK_USER_NAME},
+ { XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED, XML_TOK_IS_PASSWORD_REQUIRED},
+ { XML_NAMESPACE_DB, XML_USE_SYSTEM_USER, XML_TOK_USE_SYSTEM_USER},
+ { XML_NAMESPACE_DB, XML_LOGIN_TIMEOUT, XML_TOK_LOGIN_TIMEOUT},
XML_TOKEN_MAP_END
};
m_pLoginElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -780,8 +780,8 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, XML_TOK_FILE_BASED_DATABASE},
- { XML_NAMESPACE_DB, XML_SERVER_DATABASE, XML_TOK_SERVER_DATABASE},
+ { XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, XML_TOK_FILE_BASED_DATABASE},
+ { XML_NAMESPACE_DB, XML_SERVER_DATABASE, XML_TOK_SERVER_DATABASE},
XML_TOKEN_MAP_END
};
m_pDatabaseDescriptionElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -795,19 +795,19 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT},
- { XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT, XML_TOK_ROW_RETRIEVING_STATEMENT},
- { XML_NAMESPACE_DB, XML_STRING, XML_TOK_STRING},
- { XML_NAMESPACE_DB, XML_FIELD, XML_TOK_FIELD},
- { XML_NAMESPACE_DB, XML_DECIMAL, XML_TOK_DECIMAL},
- { XML_NAMESPACE_DB, XML_THOUSAND, XML_TOK_THOUSAND},
- { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, XML_TOK_DATA_SOURCE_SETTING},
- { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, XML_TOK_DATA_SOURCE_SETTING_VALUE},
- { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,XML_TOK_DATA_SOURCE_SETTING_IS_LIST},
- { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, XML_TOK_DATA_SOURCE_SETTING_TYPE},
- { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, XML_TOK_DATA_SOURCE_SETTING_NAME},
- { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET},
- { XML_NAMESPACE_DB, XML_ENCODING, XML_TOK_ENCODING},
+ { XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT},
+ { XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT, XML_TOK_ROW_RETRIEVING_STATEMENT},
+ { XML_NAMESPACE_DB, XML_STRING, XML_TOK_STRING},
+ { XML_NAMESPACE_DB, XML_FIELD, XML_TOK_FIELD},
+ { XML_NAMESPACE_DB, XML_DECIMAL, XML_TOK_DECIMAL},
+ { XML_NAMESPACE_DB, XML_THOUSAND, XML_TOK_THOUSAND},
+ { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, XML_TOK_DATA_SOURCE_SETTING},
+ { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, XML_TOK_DATA_SOURCE_SETTING_VALUE},
+ { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,XML_TOK_DATA_SOURCE_SETTING_IS_LIST},
+ { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, XML_TOK_DATA_SOURCE_SETTING_TYPE},
+ { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, XML_TOK_DATA_SOURCE_SETTING_NAME},
+ { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET},
+ { XML_NAMESPACE_DB, XML_ENCODING, XML_TOK_ENCODING},
XML_TOKEN_MAP_END
};
m_pDataSourceInfoElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -821,13 +821,13 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_DB, XML_COMPONENT, XML_TOK_COMPONENT},
- { XML_NAMESPACE_DB, XML_COMPONENT_COLLECTION, XML_TOK_COMPONENT_COLLECTION},
- { XML_NAMESPACE_DB, XML_QUERY_COLLECTION, XML_TOK_QUERY_COLLECTION},
- { XML_NAMESPACE_DB, XML_QUERY, XML_TOK_QUERY},
- { XML_NAMESPACE_DB, XML_TABLE, XML_TOK_TABLE},
- { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATION, XML_TOK_TABLE},
- { XML_NAMESPACE_DB, XML_COLUMN, XML_TOK_COLUMN},
+ { XML_NAMESPACE_DB, XML_COMPONENT, XML_TOK_COMPONENT},
+ { XML_NAMESPACE_DB, XML_COMPONENT_COLLECTION, XML_TOK_COMPONENT_COLLECTION},
+ { XML_NAMESPACE_DB, XML_QUERY_COLLECTION, XML_TOK_QUERY_COLLECTION},
+ { XML_NAMESPACE_DB, XML_QUERY, XML_TOK_QUERY},
+ { XML_NAMESPACE_DB, XML_TABLE, XML_TOK_TABLE},
+ { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATION, XML_TOK_TABLE},
+ { XML_NAMESPACE_DB, XML_COLUMN, XML_TOK_COLUMN},
XML_TOKEN_MAP_END
};
m_pDocumentsElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -841,12 +841,12 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_HREF },
- { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_TYPE },
- { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_SHOW },
- { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_ACTUATE},
- { XML_NAMESPACE_DB, XML_AS_TEMPLATE, XML_TOK_AS_TEMPLATE },
- { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COMPONENT_NAME },
+ { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_HREF },
+ { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_TYPE },
+ { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_SHOW },
+ { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_ACTUATE},
+ { XML_NAMESPACE_DB, XML_AS_TEMPLATE, XML_TOK_AS_TEMPLATE },
+ { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COMPONENT_NAME },
XML_TOKEN_MAP_END
};
m_pComponentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -860,17 +860,17 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_DB, XML_COMMAND, XML_TOK_COMMAND },
- { XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING },
- { XML_NAMESPACE_DB, XML_NAME, XML_TOK_QUERY_NAME },
- { XML_NAMESPACE_DB, XML_FILTER_STATEMENT, XML_TOK_FILTER_STATEMENT },
- { XML_NAMESPACE_DB, XML_ORDER_STATEMENT, XML_TOK_ORDER_STATEMENT },
- { XML_NAMESPACE_DB, XML_CATALOG_NAME, XML_TOK_CATALOG_NAME },
- { XML_NAMESPACE_DB, XML_SCHEMA_NAME, XML_TOK_SCHEMA_NAME },
- { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_STYLE_NAME},
- { XML_NAMESPACE_DB, XML_APPLY_FILTER, XML_TOK_APPLY_FILTER},
- { XML_NAMESPACE_DB, XML_APPLY_ORDER, XML_TOK_APPLY_ORDER},
- { XML_NAMESPACE_DB, XML_COLUMNS, XML_TOK_COLUMNS},
+ { XML_NAMESPACE_DB, XML_COMMAND, XML_TOK_COMMAND },
+ { XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING },
+ { XML_NAMESPACE_DB, XML_NAME, XML_TOK_QUERY_NAME },
+ { XML_NAMESPACE_DB, XML_FILTER_STATEMENT, XML_TOK_FILTER_STATEMENT },
+ { XML_NAMESPACE_DB, XML_ORDER_STATEMENT, XML_TOK_ORDER_STATEMENT },
+ { XML_NAMESPACE_DB, XML_CATALOG_NAME, XML_TOK_CATALOG_NAME },
+ { XML_NAMESPACE_DB, XML_SCHEMA_NAME, XML_TOK_SCHEMA_NAME },
+ { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_STYLE_NAME},
+ { XML_NAMESPACE_DB, XML_APPLY_FILTER, XML_TOK_APPLY_FILTER},
+ { XML_NAMESPACE_DB, XML_APPLY_ORDER, XML_TOK_APPLY_ORDER},
+ { XML_NAMESPACE_DB, XML_COLUMNS, XML_TOK_COLUMNS},
XML_TOKEN_MAP_END
};
m_pQueryElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
@@ -884,14 +884,14 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const
{
static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]=
{
- { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME },
- { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME },
- { XML_NAMESPACE_DB, XML_HELP_MESSAGE, XML_TOK_COLUMN_HELP_MESSAGE },
- { XML_NAMESPACE_DB, XML_VISIBILITY, XML_TOK_COLUMN_VISIBILITY },
- { XML_NAMESPACE_DB, XML_DEFAULT_VALUE, XML_TOK_COLUMN_DEFAULT_VALUE },
- { XML_NAMESPACE_DB, XML_TYPE_NAME, XML_TOK_COLUMN_TYPE_NAME },
- { XML_NAMESPACE_DB, XML_VISIBLE, XML_TOK_COLUMN_VISIBLE },
- { XML_NAMESPACE_DB, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_DEFAULT_CELL_STYLE_NAME },
+ { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME },
+ { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME },
+ { XML_NAMESPACE_DB, XML_HELP_MESSAGE, XML_TOK_COLUMN_HELP_MESSAGE },
+ { XML_NAMESPACE_DB, XML_VISIBILITY, XML_TOK_COLUMN_VISIBILITY },
+ { XML_NAMESPACE_DB, XML_DEFAULT_VALUE, XML_TOK_COLUMN_DEFAULT_VALUE },
+ { XML_NAMESPACE_DB, XML_TYPE_NAME, XML_TOK_COLUMN_TYPE_NAME },
+ { XML_NAMESPACE_DB, XML_VISIBLE, XML_TOK_COLUMN_VISIBLE },
+ { XML_NAMESPACE_DB, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_DEFAULT_CELL_STYLE_NAME },
XML_TOKEN_MAP_END
};
m_pColumnElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap ));
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index a14e5cd90984..b9513852f92a 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -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
@@ -109,35 +109,35 @@ public:
DECLARE_STL_USTRINGACCESS_MAP(Sequence,TPropertyNameMap);
typedef ::std::vector< ::com::sun::star::beans::PropertyValue> TInfoSequence;
private:
- TPropertyNameMap m_aQuerySettings;
- TPropertyNameMap m_aTablesSettings;
+ TPropertyNameMap m_aQuerySettings;
+ TPropertyNameMap m_aTablesSettings;
TInfoSequence m_aInfoSequence;
- Reference< XComponent > m_xSrcDoc;
- mutable ::std::auto_ptr m_pDocElemTokenMap;
- mutable ::std::auto_ptr m_pDatabaseElemTokenMap;
- mutable ::std::auto_ptr m_pDataSourceElemTokenMap;
- mutable ::std::auto_ptr m_pLoginElemTokenMap;
- mutable ::std::auto_ptr m_pDatabaseDescriptionElemTokenMap;
- mutable ::std::auto_ptr m_pDataSourceInfoElemTokenMap;
- mutable ::std::auto_ptr m_pDocumentsElemTokenMap;
- mutable ::std::auto_ptr m_pComponentElemTokenMap;
- mutable ::std::auto_ptr m_pQueryElemTokenMap;
- mutable ::std::auto_ptr m_pColumnElemTokenMap;
-
- mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper;
- mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
- mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper;
- Reference m_xDataSource;
- sal_Int32 m_nPreviewMode;
+ Reference< XComponent > m_xSrcDoc;
+ mutable ::std::auto_ptr m_pDocElemTokenMap;
+ mutable ::std::auto_ptr m_pDatabaseElemTokenMap;
+ mutable ::std::auto_ptr m_pDataSourceElemTokenMap;
+ mutable ::std::auto_ptr m_pLoginElemTokenMap;
+ mutable ::std::auto_ptr m_pDatabaseDescriptionElemTokenMap;
+ mutable ::std::auto_ptr m_pDataSourceInfoElemTokenMap;
+ mutable ::std::auto_ptr m_pDocumentsElemTokenMap;
+ mutable ::std::auto_ptr m_pComponentElemTokenMap;
+ mutable ::std::auto_ptr m_pQueryElemTokenMap;
+ mutable ::std::auto_ptr m_pColumnElemTokenMap;
+
+ mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper;
+ mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper;
+ mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper;
+ Reference m_xDataSource;
+ sal_Int32 m_nPreviewMode;
bool m_bNewFormat;
- sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
+ sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException);
/** fills the map with the Properties
- @param _rValue
+ @param _rValue
The Any where the sequence resists in.
- @param _rMap
+ @param _rMap
The map to fill.
*/
void fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap);
@@ -152,9 +152,9 @@ protected:
const ::rtl::OUString& rLocalName,
const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList );
- virtual ~ODBFilter() throw();
+ virtual ~ODBFilter() throw();
public:
-
+
ODBFilter( const Reference< XMultiServiceFactory >& _rxMSF );
// XFilter
@@ -189,7 +189,7 @@ public:
UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const;
/** add a Info to the sequence which will be appened to the data source
- @param _rInfo The property to append.
+ @param _rInfo The property to append.
*/
inline void addInfo(const ::com::sun::star::beans::PropertyValue& _rInfo)
{
diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx
index 6d7f9dd1cb75..852fd3625554 100644
--- a/dbaccess/source/filter/xml/xmlservices.cxx
+++ b/dbaccess/source/filter/xml/xmlservices.cxx
@@ -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
@@ -75,8 +75,8 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml()
//---------------------------------------------------------------------------------------
extern "C" void SAL_CALL component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment **
+ const sal_Char **ppEnvTypeName,
+ uno_Environment **
)
{
createRegistryInfo_dbaxml();
@@ -89,8 +89,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
void* pRegistryKey
)
{
- if (pRegistryKey)
- try
+ if (pRegistryKey)
+ try
{
writeDBLoaderInfo2(pRegistryKey);
return ::dbaxml::OModuleRegistration::writeComponentInfos(
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx
index d025ff343462..8f44097e488f 100755
--- a/dbaccess/source/inc/OAuthenticationContinuation.hxx
+++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx
@@ -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,7 +43,7 @@ namespace dbaccess
{
//........................................................................
-class OOO_DLLPUBLIC_DBA OAuthenticationContinuation :
+class OOO_DLLPUBLIC_DBA OAuthenticationContinuation :
public comphelper::OInteraction< com::sun::star::ucb::XInteractionSupplyAuthentication >
{
sal_Bool m_bRemberPassword : 1; // remember the password for this session ?
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index d16d085f3750..cd4bbaf2fbe3 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -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
@@ -57,7 +57,7 @@ DECLARE_STL_VECTOR(::com::sun::star::uno::WeakReferenceHelper, OWeakRefArray);
//==================================================================================
//= OSubComponent - a component which holds a hard ref to it's parent
-//= and is been hold itself (by the parent) with a weak ref
+//= and is been hold itself (by the parent) with a weak ref
//==================================================================================
class OSubComponent : public ::cppu::OComponentHelper
{
@@ -89,263 +89,263 @@ public:
//----------------------------------------------------------------------------------
// (internal - not to be used outside - usually)
-#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
- ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
- { \
- return ::rtl::OUString::createFromAscii(implasciiname); \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
- ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
- { \
- return getImplementationName_Static(); \
- } \
- ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \
- { \
- return ::rtl::OUString::createFromAscii(implasciiname); \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \
- const ::rtl::OUString* pSupported = aSupported.getConstArray(); \
- for (sal_Int32 i=0; iequals(_rServiceName)) \
- return sal_True; \
+#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
+ ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
+ { \
+ return ::rtl::OUString::createFromAscii(implasciiname); \
+ } \
+
+#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
+ ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \
+ { \
+ return getImplementationName_Static(); \
+ } \
+ ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \
+ { \
+ return ::rtl::OUString::createFromAscii(implasciiname); \
+ } \
+
+#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
+ sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \
+ const ::rtl::OUString* pSupported = aSupported.getConstArray(); \
+ for (sal_Int32 i=0; iequals(_rServiceName)) \
+ return sal_True; \
\
- return sal_False; \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
- return aSupported; \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- return getSupportedServiceNames_Static(); \
- } \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
- return aSupported; \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- return getSupportedServiceNames_Static(); \
- } \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \
- aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \
- return aSupported; \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \
- aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \
- return aSupported; \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
- { \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \
- aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \
- aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \
- aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \
- return aSupported; \
- } \
-
-#define IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \
- SAL_CALL classname::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) \
- { \
- return static_cast< XServiceInfo* >(new classname(_rxORB)); \
- } \
+ return sal_False; \
+ } \
+
+#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \
+ aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
+ return aSupported; \
+ } \
+
+#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ return getSupportedServiceNames_Static(); \
+ } \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \
+ aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \
+ return aSupported; \
+ } \
+
+#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ return getSupportedServiceNames_Static(); \
+ } \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \
+ aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \
+ aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \
+ return aSupported; \
+ } \
+
+#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \
+ aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \
+ aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \
+ return aSupported; \
+ } \
+
+#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \
+ aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \
+ aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \
+ aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \
+ return aSupported; \
+ } \
+
+#define IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \
+ SAL_CALL classname::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) \
+ { \
+ return static_cast< XServiceInfo* >(new classname(_rxORB)); \
+ } \
//----------------------------------------------------------------------------------
// declare service info methods - no getImplementationName, so the class is abstract
-#define DECLARE_SERVICE_INFO_ABSTRACT() \
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+#define DECLARE_SERVICE_INFO_ABSTRACT() \
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
//----------------------------------------------------------------------------------
// declare service info methods
-#define DECLARE_SERVICE_INFO() \
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
-
-#define DECLARE_SERVICE_INFO_STATIC() \
- DECLARE_SERVICE_INFO(); \
- static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \
- static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \
- SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \
+#define DECLARE_SERVICE_INFO() \
+ virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \
+ virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \
+ virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \
+
+#define DECLARE_SERVICE_INFO_STATIC() \
+ DECLARE_SERVICE_INFO(); \
+ static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \
+ static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \
+ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \
+ SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \
//----------------------------------------------------------------------------------
-#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
- IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
+#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \
+ IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
+ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
+ IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
//----------------------------------------------------------------------------------
-#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \
- IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \
- IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
+#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \
+ IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
+ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
+ IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \
+ IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
//----------------------------------------------------------------------------------
-#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
- IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
+#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
+ IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
+ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2)
-
+
//----------------------------------------------------------------------------------
-#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
- IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \
- IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
+#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \
+ IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \
+ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
+ IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \
+ IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \
//----------------------------------------------------------------------------------
-#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
- IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
+#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
+ IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \
+ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
+ IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \
//----------------------------------------------------------------------------------
-#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
+#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \
+ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
+ IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \
//----------------------------------------------------------------------------------
-#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \
- IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
- IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \
+#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \
+ IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \
+ IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \
//==================================================================================
//= XTypeProvider helpers
//--------------------------------------------------------------------------
-#define DECLARE_IMPLEMENTATION_ID( ) \
+#define DECLARE_IMPLEMENTATION_ID( ) \
virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); \
- static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \
+ static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \
//--------------------------------------------------------------------------
-#define DECLARE_GETTYPES( ) \
+#define DECLARE_GETTYPES( ) \
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException);
//--------------------------------------------------------------------------
-#define DECLARE_TYPEPROVIDER( ) \
- DECLARE_GETTYPES( ) \
+#define DECLARE_TYPEPROVIDER( ) \
+ DECLARE_GETTYPES( ) \
DECLARE_IMPLEMENTATION_ID( )
//--------------------------------------------------------------------------
-#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \
-::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \
-{ \
- static ::cppu::OImplementationId* pId = 0; \
- if ( !pId ) \
- { \
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \
- if ( !pId ) \
- { \
- static ::cppu::OImplementationId aId; \
- pId = &aId; \
- } \
- } \
- return pId->getImplementationId(); \
+#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \
+::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \
+{ \
+ static ::cppu::OImplementationId* pId = 0; \
+ if ( !pId ) \
+ { \
+ ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \
+ if ( !pId ) \
+ { \
+ static ::cppu::OImplementationId aId; \
+ pId = &aId; \
+ } \
+ } \
+ return pId->getImplementationId(); \
} \
-::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
-{ \
+::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (::com::sun::star::uno::RuntimeException) \
+{ \
return classname::getUnoTunnelImplementationId(); \
}
//--------------------------------------------------------------------------
-#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \
- { \
- return ::comphelper::concatSequences( \
- baseclass1::getTypes( ), \
- baseclass2::getTypes( ) \
- ); \
+#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \
+ { \
+ return ::comphelper::concatSequences( \
+ baseclass1::getTypes( ), \
+ baseclass2::getTypes( ) \
+ ); \
}
//--------------------------------------------------------------------------
-#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \
- ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \
- { \
- return ::comphelper::concatSequences( \
- baseclass1::getTypes( ), \
- baseclass2::getTypes( ), \
- baseclass3::getTypes( ) \
- ); \
+#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \
+ ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \
+ { \
+ return ::comphelper::concatSequences( \
+ baseclass1::getTypes( ), \
+ baseclass2::getTypes( ), \
+ baseclass3::getTypes( ) \
+ ); \
}
//--------------------------------------------------------------------------
-#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \
- IMPLEMENT_IMPLEMENTATION_ID( classname) \
+#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \
+ IMPLEMENT_IMPLEMENTATION_ID( classname) \
IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 )
//--------------------------------------------------------------------------
-#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \
- IMPLEMENT_IMPLEMENTATION_ID( classname) \
+#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \
+ IMPLEMENT_IMPLEMENTATION_ID( classname) \
IMPLEMENT_GETTYPES3(classname, baseclass1, baseclass2, baseclass3 )
//==================================================================================
//= helper for declaring/implementing classes based on the OPropertyContainer and an OPropertyArrayUsageHelper
//----------------------------------------------------------------------------------
-#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \
- virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \
+#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \
+ virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \
virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const
-
+
//----------------------------------------------------------------------------------
-#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \
- { \
- Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); \
- return xInfo; \
- } \
- ::cppu::IPropertyArrayHelper& classname::getInfoHelper() \
- { \
- return *baseclass1::getArrayHelper(); \
- } \
- ::cppu::IPropertyArrayHelper* classname::createArrayHelper( ) const \
- { \
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; \
- describeProperties(aProps); \
- return new ::cppu::OPropertyArrayHelper(aProps); \
+#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \
+ { \
+ Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); \
+ return xInfo; \
+ } \
+ ::cppu::IPropertyArrayHelper& classname::getInfoHelper() \
+ { \
+ return *baseclass1::getArrayHelper(); \
+ } \
+ ::cppu::IPropertyArrayHelper* classname::createArrayHelper( ) const \
+ { \
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; \
+ describeProperties(aProps); \
+ return new ::cppu::OPropertyArrayHelper(aProps); \
}
//----------------------------------------------------------------------------------
-#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( classname ) \
+#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( classname ) \
IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname, classname )
//==================================================================================
//= helper for implementing the createArrayHelper
//----------------------------------------------------------------------------------
-#define BEGIN_PROPERTY_SEQUENCE(count) \
- ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aDescriptor(count); \
- ::com::sun::star::beans::Property* pDesc = aDescriptor.getArray(); \
- sal_Int32 nPos = 0; \
+#define BEGIN_PROPERTY_SEQUENCE(count) \
+ ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aDescriptor(count); \
+ ::com::sun::star::beans::Property* pDesc = aDescriptor.getArray(); \
+ sal_Int32 nPos = 0; \
//----------------------------------------------------------------------------------
-#define BEGIN_PROPERTY_HELPER(count) \
+#define BEGIN_PROPERTY_HELPER(count) \
BEGIN_PROPERTY_SEQUENCE(count)
//----------------------------------------------------------------------------------
@@ -353,103 +353,103 @@ public:
pDesc[nPos++] = ::com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cpputype,
//----------------------------------------------------------------------------------
-#define DECL_PROP0(varname, type) \
+#define DECL_PROP0(varname, type) \
DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) 0)
//----------------------------------------------------------------------------------
-#define DECL_PROP0_BOOL(varname) \
+#define DECL_PROP0_BOOL(varname) \
DECL_PROP_IMPL(varname, ::getBooleanCppuType()) 0)
//----------------------------------------------------------------------------------
-#define DECL_PROP0_IFACE(varname, iface) \
+#define DECL_PROP0_IFACE(varname, iface) \
DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) 0)
//----------------------------------------------------------------------------------
-#define DECL_PROP1(varname, type, attrib1) \
+#define DECL_PROP1(varname, type, attrib1) \
DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1)
//----------------------------------------------------------------------------------
-#define DECL_PROP1_BOOL(varname, attrib1) \
+#define DECL_PROP1_BOOL(varname, attrib1) \
DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1)
//----------------------------------------------------------------------------------
-#define DECL_PROP1_IFACE(varname, iface, attrib1) \
+#define DECL_PROP1_IFACE(varname, iface, attrib1) \
DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1)
//----------------------------------------------------------------------------------
-#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \
+#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \
DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
//----------------------------------------------------------------------------------
-#define DECL_PROP2(varname, type, attrib1, attrib2) \
+#define DECL_PROP2(varname, type, attrib1, attrib2) \
DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
//----------------------------------------------------------------------------------
-#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \
+#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \
DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2)
//----------------------------------------------------------------------------------
-#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \
+#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \
DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3)
//----------------------------------------------------------------------------------
-#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \
+#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \
DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3)
//----------------------------------------------------------------------------------
-#define END_PROPERTY_SEQUENCE() \
- OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \
+#define END_PROPERTY_SEQUENCE() \
+ OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \
//----------------------------------------------------------------------------------
-#define END_PROPERTY_HELPER() \
- END_PROPERTY_SEQUENCE() \
+#define END_PROPERTY_HELPER() \
+ END_PROPERTY_SEQUENCE() \
return new ::cppu::OPropertyArrayHelper(aDescriptor);
-#define NOTIFY_LISTERNERS(_rListeners,T,method) \
+#define NOTIFY_LISTERNERS(_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(); \
- while( pxInt > pxIntBegin ) \
- { \
- try \
- { \
- while( pxInt > pxIntBegin ) \
- { \
- --pxInt; \
- static_cast< T* >( pxInt->get() )->method(aEvt); \
- } \
- } \
- catch( RuntimeException& ) \
- { \
- } \
- } \
+ _rGuard.clear(); \
+ while( pxInt > pxIntBegin ) \
+ { \
+ try \
+ { \
+ while( pxInt > pxIntBegin ) \
+ { \
+ --pxInt; \
+ static_cast< T* >( pxInt->get() )->method(aEvt); \
+ } \
+ } \
+ catch( RuntimeException& ) \
+ { \
+ } \
+ } \
_rGuard.reset();
-#define NOTIFY_LISTERNERS1(_rListeners,T,method,arg1) \
+#define NOTIFY_LISTERNERS1(_rListeners,T,method,arg1) \
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(); \
- while( pxInt > pxIntBegin ) \
- { \
- try \
- { \
- while( pxInt > pxIntBegin ) \
- { \
- --pxInt; \
- static_cast< T* >( pxInt->get() )->method(aEvt,arg1); \
- } \
- } \
- catch( RuntimeException& ) \
- { \
- } \
- } \
+ _rGuard.clear(); \
+ while( pxInt > pxIntBegin ) \
+ { \
+ try \
+ { \
+ while( pxInt > pxIntBegin ) \
+ { \
+ --pxInt; \
+ static_cast< T* >( pxInt->get() )->method(aEvt,arg1); \
+ } \
+ } \
+ catch( RuntimeException& ) \
+ { \
+ } \
+ } \
_rGuard.reset();
//==================================================================================
// miscellaneous
-#define UNUSED(x) x;
+#define UNUSED(x) x;
#endif // _DBASHARED_APITOOLS_HXX_
diff --git a/dbaccess/source/inc/cfg_reghelper.hxx b/dbaccess/source/inc/cfg_reghelper.hxx
index 157b6eaa72de..039bdd82c888 100644
--- a/dbaccess/source/inc/cfg_reghelper.hxx
+++ b/dbaccess/source/inc/cfg_reghelper.hxx
@@ -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/inc/cfgstrings.hrc b/dbaccess/source/inc/cfgstrings.hrc
index 82f46a60a96e..5364dca5acf0 100644
--- a/dbaccess/source/inc/cfgstrings.hrc
+++ b/dbaccess/source/inc/cfgstrings.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
diff --git a/dbaccess/source/inc/constasciistring.hxx b/dbaccess/source/inc/constasciistring.hxx
index 07861a054a47..4d5e91d65cb8 100644
--- a/dbaccess/source/inc/constasciistring.hxx
+++ b/dbaccess/source/inc/constasciistring.hxx
@@ -13,17 +13,17 @@
// string constants
struct ConstAsciiString
{
- const sal_Char* ascii;
- sal_Int32 length;
+ const sal_Char* ascii;
+ sal_Int32 length;
- inline operator const ::rtl::OUString& () const;
- inline operator const sal_Char* () const { return ascii; }
+ inline operator const ::rtl::OUString& () const;
+ inline operator const sal_Char* () const { return ascii; }
inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength);
inline ~ConstAsciiString();
private:
- mutable ::rtl::OUString* ustring;
+ mutable ::rtl::OUString* ustring;
};
//------------------------------------------------------------
diff --git a/dbaccess/source/inc/dbadllapi.hxx b/dbaccess/source/inc/dbadllapi.hxx
index 3edf80da5643..37508ab36380 100644
--- a/dbaccess/source/inc/dbadllapi.hxx
+++ b/dbaccess/source/inc/dbadllapi.hxx
@@ -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/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc
index eb6b98d5bd8b..db629f1ce220 100644
--- a/dbaccess/source/inc/dbastrings.hrc
+++ b/dbaccess/source/inc/dbastrings.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
@@ -41,7 +41,7 @@ namespace dbaccess
//= SQLSTATE
//============================================================
DECLARE_CONSTASCII_USTRING(SQLSTATE_GENERAL);
-
+
//============================================================
//= Properties
//============================================================
diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx
index 644216dbb8c4..16fca9fd4fc5 100644
--- a/dbaccess/source/inc/dbu_reghelper.hxx
+++ b/dbaccess/source/inc/dbu_reghelper.hxx
@@ -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/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc
index aeef19d752dd..9bd4325eedb8 100644
--- a/dbaccess/source/inc/dbustrings.hrc
+++ b/dbaccess/source/inc/dbustrings.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
@@ -53,7 +53,7 @@ namespace dbaui
//= service names
//============================================================
DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG);
-
+
//============================================================
//= other DBU relevant strings
//============================================================
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index 97e2b2ff6f31..f08c59c66bb8 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -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
@@ -68,11 +68,11 @@ enum DATASOURCE_TYPE
DST_KAB = 20,
DST_MACAB = 21,
DST_MSACCESS_2007 = 22,
- DST_EMBEDDED_HSQLDB = 23,
+ DST_EMBEDDED_HSQLDB = 23,
DST_MYSQL_NATIVE = 24,
DST_MYSQL_NATIVE_DIRECT = 25,
- DST_USERDEFINE1, /// first user defined driver
+ DST_USERDEFINE1, /// first user defined driver
DST_USERDEFINE2,
DST_USERDEFINE3,
DST_USERDEFINE4,
@@ -84,18 +84,18 @@ enum DATASOURCE_TYPE
DST_USERDEFINE10,
- DST_UNKNOWN /// unrecognized type
+ DST_UNKNOWN /// unrecognized type
};
#define PAGE_DBSETUPWIZARD_INTRO 0
-#define PAGE_DBSETUPWIZARD_DBASE 1
+#define PAGE_DBSETUPWIZARD_DBASE 1
#define PAGE_DBSETUPWIZARD_TEXT 2
#define PAGE_DBSETUPWIZARD_MSACCESS 3
#define PAGE_DBSETUPWIZARD_LDAP 4
#define PAGE_DBSETUPWIZARD_ADABAS 5
#define PAGE_DBSETUPWIZARD_MYSQL_INTRO 6
#define PAGE_DBSETUPWIZARD_MYSQL_JDBC 7
-#define PAGE_DBSETUPWIZARD_MYSQL_ODBC 8
+#define PAGE_DBSETUPWIZARD_MYSQL_ODBC 8
#define PAGE_DBSETUPWIZARD_ORACLE 9
#define PAGE_DBSETUPWIZARD_JDBC 10
#define PAGE_DBSETUPWIZARD_ADO 11
@@ -116,13 +116,13 @@ class OOO_DLLPUBLIC_DBA ODsnTypeCollection
protected:
DECLARE_STL_VECTOR(String, StringVector);
- StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types
- StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource
+ StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types
+ StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource
::connectivity::DriversConfig m_aDriverConfig;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory;
#ifdef DBG_UTIL
- sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators
+ sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators
#endif
public:
@@ -137,7 +137,7 @@ public:
/// on a given string, cut the type prefix and return the result
String cutPrefix(const ::rtl::OUString& _sURL) const;
-
+
/// on a given string, return the type prefix
String getPrefix(const ::rtl::OUString& _sURL) const;
@@ -160,7 +160,7 @@ public:
/// check if the given data source allows to show column description.
sal_Bool supportsColumnDescription(const ::rtl::OUString& _sURL) const;
-
+
// check if a Browse button may be shown to insert connection url
sal_Bool supportsBrowsing(const ::rtl::OUString& _sURL) const;
@@ -183,9 +183,9 @@ public:
getDefaultDBSettings( const ::rtl::OUString& _sURL ) const;
/// get access to the first element of the types collection
- TypeIterator begin() const;
+ TypeIterator begin() const;
/// get access to the (last + 1st) element of the types collection
- TypeIterator end() const;
+ TypeIterator end() const;
void fillPageIds(const ::rtl::OUString& _sURL,::std::vector& _rOutPathIds) const;
@@ -209,32 +209,32 @@ class OOO_DLLPUBLIC_DBA ODsnTypeCollection::TypeIterator
friend bool OOO_DLLPUBLIC_DBA operator!=(const TypeIterator& lhs, const TypeIterator& rhs) { return !(lhs == rhs); }
protected:
- const ODsnTypeCollection* m_pContainer;
- sal_Int32 m_nPosition;
+ const ODsnTypeCollection* m_pContainer;
+ sal_Int32 m_nPosition;
public:
TypeIterator(const TypeIterator& _rSource);
~TypeIterator();
::rtl::OUString getURLPrefix() const;
- String getDisplayName() const;
+ String getDisplayName() const;
/// prefix increment
- const TypeIterator& operator++();
+ const TypeIterator& operator++();
/// postfix increment
- const TypeIterator operator++(int) { TypeIterator hold(*this); ++*this; return hold; }
+ const TypeIterator operator++(int) { TypeIterator hold(*this); ++*this; return hold; }
/// prefix decrement
- const TypeIterator& operator--();
+ const TypeIterator& operator--();
/// postfix decrement
- const TypeIterator operator--(int) { TypeIterator hold(*this); --*this; return hold; }
+ const TypeIterator operator--(int) { TypeIterator hold(*this); --*this; return hold; }
protected:
TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos = 0);
};
//.........................................................................
-} // namespace dbaccess
+} // namespace dbaccess
//.........................................................................
#endif // _DBACCESS_DSNTYPES_HXX_
diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx
index 6ed767c00b86..25acdfead578 100644
--- a/dbaccess/source/inc/flt_reghelper.hxx
+++ b/dbaccess/source/inc/flt_reghelper.hxx
@@ -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/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx
index b7861e89faf0..7399ff8613a5 100644
--- a/dbaccess/source/inc/registrationhelper.hxx
+++ b/dbaccess/source/inc/registrationhelper.hxx
@@ -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
@@ -34,20 +34,20 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager,
const ::rtl::OUString & _rComponentName,
::cppu::ComponentInstantiation _pCreateFunction,
- const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames,
+ const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames,
rtl_ModuleCount* _p
);
//==========================================================================
class OModuleRegistration
{
- static ::com::sun::star::uno::Sequence< ::rtl::OUString >*
+ static ::com::sun::star::uno::Sequence< ::rtl::OUString >*
s_pImplementationNames;
- static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
+ static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >*
s_pSupportedServices;
- static ::com::sun::star::uno::Sequence< sal_Int64 >*
+ static ::com::sun::star::uno::Sequence< sal_Int64 >*
s_pCreationFunctionPointers;
- static ::com::sun::star::uno::Sequence< sal_Int64 >*
+ static ::com::sun::star::uno::Sequence< sal_Int64 >*
s_pFactoryFunctionPointers;
// no direct instantiation, only static members/methods
@@ -55,10 +55,10 @@ class OModuleRegistration
public:
/** register a component implementing a service with the given data.
- @param _rImplementationName the implementation name of the component
- @param _rServiceNames the services the component supports
- @param _pCreateFunction a function for creating an instance of the component
- @param _pFactoryFunction a function for creating a factory for that component
+ @param _rImplementationName the implementation name of the component
+ @param _rServiceNames the services the component supports
+ @param _pCreateFunction a function for creating an instance of the component
+ @param _pFactoryFunction a function for creating a factory for that component
@see revokeComponent
*/
static void registerComponent(
@@ -68,25 +68,25 @@ public:
FactoryInstantiation _pFactoryFunction);
/** revoke the registration for the specified component
- @param _rImplementationName the implementation name of the component
+ @param _rImplementationName the implementation name of the component
*/
static void revokeComponent(
const ::rtl::OUString& _rImplementationName);
/** writes the registration information of all components which are currently registered into the specified registry.
Usually used from within component_writeInfo.
- @param _rxServiceManager the service manager
- @param _rRootKey the registry key under which the information will be stored
- @return sal_True if the registration of all implementations was successfull, sal_False otherwise
+ @param _rxServiceManager the service manager
+ @param _rRootKey the registry key under which the information will be stored
+ @return sal_True if the registration of all implementations was successfull, sal_False otherwise
*/
static sal_Bool writeComponentInfos(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager,
const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey);
/** creates a Factory for the component with the given implementation name. Usually used from within component_getFactory.
- @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory
- @param _pImplementationName the implementation name of the component
- @return the XInterface access to a factory for the component
+ @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory
+ @param _pImplementationName the implementation name of the component
+ @return the XInterface access to a factory for the component
*/
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory(
const ::rtl::OUString& _rImplementationName,
diff --git a/dbaccess/source/inc/sdbtstrings.hrc b/dbaccess/source/inc/sdbtstrings.hrc
index c4837f52bce1..b7490d4af078 100644
--- a/dbaccess/source/inc/sdbtstrings.hrc
+++ b/dbaccess/source/inc/sdbtstrings.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
diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc
index f295bb50378c..5d7b985eac18 100644
--- a/dbaccess/source/inc/stringconstants.hrc
+++ b/dbaccess/source/inc/stringconstants.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
@@ -39,133 +39,133 @@
//============================================================
//= property ids
//============================================================
-#define PROPERTY_ID_TITLE 1
-#define PROPERTY_ID_URL 2
-#define PROPERTY_ID_INFO 4
-#define PROPERTY_ID_ISPASSWORDREQUIRED 5
-#define PROPERTY_ID_TABLEFILTER 6
-#define PROPERTY_ID_NAME 7
-#define PROPERTY_ID_SCHEMANAME 8
-#define PROPERTY_ID_CATALOGNAME 9
-#define PROPERTY_ID_PRIVILEGES 10
-#define PROPERTY_ID_ESCAPE_PROCESSING 11
-#define PROPERTY_ID_COMMAND 12
-#define PROPERTY_ID_TYPE 13
-#define PROPERTY_ID_TYPENAME 14
-#define PROPERTY_ID_PRECISION 15
-#define PROPERTY_ID_SCALE 16
-#define PROPERTY_ID_ISNULLABLE 17
-#define PROPERTY_ID_ISAUTOINCREMENT 18
-#define PROPERTY_ID_ISROWVERSION 19
-#define PROPERTY_ID_DESCRIPTION 20
-#define PROPERTY_ID_DEFAULTVALUE 21
-#define PROPERTY_ID_NUMBERFORMAT 22
-#define PROPERTY_ID_QUERYTIMEOUT 23
-#define PROPERTY_ID_MAXFIELDSIZE 24
-#define PROPERTY_ID_MAXROWS 25
-#define PROPERTY_ID_CURSORNAME 26
-#define PROPERTY_ID_RESULTSETCONCURRENCY 27
-#define PROPERTY_ID_RESULTSETTYPE 28
-#define PROPERTY_ID_FETCHDIRECTION 29
-#define PROPERTY_ID_FETCHSIZE 30
-#define PROPERTY_ID_USEBOOKMARKS 31
-#define PROPERTY_ID_ISSEARCHABLE 32
-#define PROPERTY_ID_ISCURRENCY 33
-#define PROPERTY_ID_ISSIGNED 34
-#define PROPERTY_ID_DISPLAYSIZE 35
-#define PROPERTY_ID_LABEL 36
-#define PROPERTY_ID_ISREADONLY 37
-#define PROPERTY_ID_ISWRITABLE 38
-#define PROPERTY_ID_ISDEFINITELYWRITABLE 39
-#define PROPERTY_ID_VALUE 40
-#define PROPERTY_ID_TABLENAME 41
-#define PROPERTY_ID_ISCASESENSITIVE 42
-#define PROPERTY_ID_SERVICENAME 43
-#define PROPERTY_ID_ISBOOKMARKABLE 44
-#define PROPERTY_ID_CANUPDATEINSERTEDROWS 45
-#define PROPERTY_ID_ISSET 46
-#define PROPERTY_ID_ISOUTPARAMETER 47
-#define PROPERTY_ID_NUMBERFORMATSSUPPLIER 48
-#define PROPERTY_ID_ISCALCULATED 49
-#define PROPERTY_ID_DATASOURCENAME 50
-#define PROPERTY_ID_TRANSACTIONISOLATION 51
-#define PROPERTY_ID_TYPEMAP 52
-#define PROPERTY_ID_USER 53
-#define PROPERTY_ID_PASSWORD 54
+#define PROPERTY_ID_TITLE 1
+#define PROPERTY_ID_URL 2
+#define PROPERTY_ID_INFO 4
+#define PROPERTY_ID_ISPASSWORDREQUIRED 5
+#define PROPERTY_ID_TABLEFILTER 6
+#define PROPERTY_ID_NAME 7
+#define PROPERTY_ID_SCHEMANAME 8
+#define PROPERTY_ID_CATALOGNAME 9
+#define PROPERTY_ID_PRIVILEGES 10
+#define PROPERTY_ID_ESCAPE_PROCESSING 11
+#define PROPERTY_ID_COMMAND 12
+#define PROPERTY_ID_TYPE 13
+#define PROPERTY_ID_TYPENAME 14
+#define PROPERTY_ID_PRECISION 15
+#define PROPERTY_ID_SCALE 16
+#define PROPERTY_ID_ISNULLABLE 17
+#define PROPERTY_ID_ISAUTOINCREMENT 18
+#define PROPERTY_ID_ISROWVERSION 19
+#define PROPERTY_ID_DESCRIPTION 20
+#define PROPERTY_ID_DEFAULTVALUE 21
+#define PROPERTY_ID_NUMBERFORMAT 22
+#define PROPERTY_ID_QUERYTIMEOUT 23
+#define PROPERTY_ID_MAXFIELDSIZE 24
+#define PROPERTY_ID_MAXROWS 25
+#define PROPERTY_ID_CURSORNAME 26
+#define PROPERTY_ID_RESULTSETCONCURRENCY 27
+#define PROPERTY_ID_RESULTSETTYPE 28
+#define PROPERTY_ID_FETCHDIRECTION 29
+#define PROPERTY_ID_FETCHSIZE 30
+#define PROPERTY_ID_USEBOOKMARKS 31
+#define PROPERTY_ID_ISSEARCHABLE 32
+#define PROPERTY_ID_ISCURRENCY 33
+#define PROPERTY_ID_ISSIGNED 34
+#define PROPERTY_ID_DISPLAYSIZE 35
+#define PROPERTY_ID_LABEL 36
+#define PROPERTY_ID_ISREADONLY 37
+#define PROPERTY_ID_ISWRITABLE 38
+#define PROPERTY_ID_ISDEFINITELYWRITABLE 39
+#define PROPERTY_ID_VALUE 40
+#define PROPERTY_ID_TABLENAME 41
+#define PROPERTY_ID_ISCASESENSITIVE 42
+#define PROPERTY_ID_SERVICENAME 43
+#define PROPERTY_ID_ISBOOKMARKABLE 44
+#define PROPERTY_ID_CANUPDATEINSERTEDROWS 45
+#define PROPERTY_ID_ISSET 46
+#define PROPERTY_ID_ISOUTPARAMETER 47
+#define PROPERTY_ID_NUMBERFORMATSSUPPLIER 48
+#define PROPERTY_ID_ISCALCULATED 49
+#define PROPERTY_ID_DATASOURCENAME 50
+#define PROPERTY_ID_TRANSACTIONISOLATION 51
+#define PROPERTY_ID_TYPEMAP 52
+#define PROPERTY_ID_USER 53
+#define PROPERTY_ID_PASSWORD 54
#define PROPERTY_ID_COMMAND_TYPE 55
-#define PROPERTY_ID_ACTIVECOMMAND 56
-#define PROPERTY_ID_ACTIVE_CONNECTION 57
-#define PROPERTY_ID_FILTER 58
-#define PROPERTY_ID_APPLYFILTER 59
-#define PROPERTY_ID_ORDER 60
-#define PROPERTY_ID_ISMODIFIED 61
-#define PROPERTY_ID_ISNEW 62
-#define PROPERTY_ID_ROWCOUNT 63
-#define PROPERTY_ID_ISROWCOUNTFINAL 64
-#define PROPERTY_ID_HELPFILENAME 65
-#define PROPERTY_ID_REALNAME 66
-#define PROPERTY_ID_HIDDEN 67
-#define PROPERTY_ID_ALIGN 68
-#define PROPERTY_ID_WIDTH 69
-#define PROPERTY_ID_TABLETYPEFILTER 70
+#define PROPERTY_ID_ACTIVECOMMAND 56
+#define PROPERTY_ID_ACTIVE_CONNECTION 57
+#define PROPERTY_ID_FILTER 58
+#define PROPERTY_ID_APPLYFILTER 59
+#define PROPERTY_ID_ORDER 60
+#define PROPERTY_ID_ISMODIFIED 61
+#define PROPERTY_ID_ISNEW 62
+#define PROPERTY_ID_ROWCOUNT 63
+#define PROPERTY_ID_ISROWCOUNTFINAL 64
+#define PROPERTY_ID_HELPFILENAME 65
+#define PROPERTY_ID_REALNAME 66
+#define PROPERTY_ID_HIDDEN 67
+#define PROPERTY_ID_ALIGN 68
+#define PROPERTY_ID_WIDTH 69
+#define PROPERTY_ID_TABLETYPEFILTER 70
#define PROPERTY_ID_DATABASE_LOCATION 71
-#define PROPERTY_ID_FONT 72
-#define PROPERTY_ID_ROW_HEIGHT 73
-#define PROPERTY_ID_TEXTCOLOR 74
-#define PROPERTY_ID_UPDATE_TABLENAME 75
-#define PROPERTY_ID_UPDATE_SCHEMANAME 76
-#define PROPERTY_ID_UPDATE_CATALOGNAME 77
-#define PROPERTY_ID_CONTROLMODEL 78
-#define PROPERTY_ID_RELATIVEPOSITION 79
-#define PROPERTY_ID_ISASCENDING 80
-#define PROPERTY_ID_RELATEDCOLUMN 81
-#define PROPERTY_ID_ISUNIQUE 82
-#define PROPERTY_ID_ISPRIMARYKEYINDEX 83
-#define PROPERTY_ID_IGNORERESULT 84
-#define PROPERTY_ID_DELETERULE 85
-#define PROPERTY_ID_UPDATERULE 86
-#define PROPERTY_ID_REFERENCEDTABLE 87
-#define PROPERTY_ID_REFERENCEDCOLUMN 88
-#define PROPERTY_ID_PARENTWINDOW 89
-#define PROPERTY_ID_SQLEXCEPTION 90
-#define PROPERTY_ID_ISHIDDEN 91
-#define PROPERTY_ID_SUPPRESSVERSIONCL 92
-#define PROPERTY_ID_LAYOUTINFORMATION 93
-#define PROPERTY_ID_TEXTLINECOLOR 94
-#define PROPERTY_ID_TEXTEMPHASIS 95
-#define PROPERTY_ID_TEXTRELIEF 96
-#define PROPERTY_ID_HELPTEXT 97
-#define PROPERTY_ID_CONTROLDEFAULT 98
-#define PROPERTY_ID_AUTOINCREMENTCREATION 99
-#define PROPERTY_ID_SPECIAL_OPTIONS 100
-#define PROPERTY_ID_FONTCHARWIDTH 101
-#define PROPERTY_ID_FONTCHARSET 102
-#define PROPERTY_ID_FONTFAMILY 103
-#define PROPERTY_ID_FONTHEIGHT 104
-#define PROPERTY_ID_FONTKERNING 105
-#define PROPERTY_ID_FONTNAME 106
-#define PROPERTY_ID_FONTORIENTATION 107
-#define PROPERTY_ID_FONTPITCH 108
-#define PROPERTY_ID_FONTSLANT 109
-#define PROPERTY_ID_FONTSTRIKEOUT 110
-#define PROPERTY_ID_FONTSTYLENAME 111
-#define PROPERTY_ID_FONTUNDERLINE 112
-#define PROPERTY_ID_FONTWEIGHT 113
-#define PROPERTY_ID_FONTWIDTH 114
-#define PROPERTY_ID_FONTWORDLINEMODE 115
-#define PROPERTY_ID_FONTTYPE 116
-#define PROPERTY_ID_PERSISTENT_NAME 117
-#define PROPERTY_ID_ORIGINAL 118
-#define PROPERTY_ID_TABSTOP 119
-#define PROPERTY_ID_DEFAULTCONTROL 120
-#define PROPERTY_ID_ENABLED 121
-#define PROPERTY_ID_BORDER 122
-#define PROPERTY_ID_COLUMN 123
-#define PROPERTY_ID_AS_TEMPLATE 124
-#define PROPERTY_ID_IS_FORM 125
-#define PROPERTY_ID_HAVING_CLAUSE 126
-#define PROPERTY_ID_GROUP_BY 127
-#define PROPERTY_ID_EDIT_WIDTH 128
+#define PROPERTY_ID_FONT 72
+#define PROPERTY_ID_ROW_HEIGHT 73
+#define PROPERTY_ID_TEXTCOLOR 74
+#define PROPERTY_ID_UPDATE_TABLENAME 75
+#define PROPERTY_ID_UPDATE_SCHEMANAME 76
+#define PROPERTY_ID_UPDATE_CATALOGNAME 77
+#define PROPERTY_ID_CONTROLMODEL 78
+#define PROPERTY_ID_RELATIVEPOSITION 79
+#define PROPERTY_ID_ISASCENDING 80
+#define PROPERTY_ID_RELATEDCOLUMN 81
+#define PROPERTY_ID_ISUNIQUE 82
+#define PROPERTY_ID_ISPRIMARYKEYINDEX 83
+#define PROPERTY_ID_IGNORERESULT 84
+#define PROPERTY_ID_DELETERULE 85
+#define PROPERTY_ID_UPDATERULE 86
+#define PROPERTY_ID_REFERENCEDTABLE 87
+#define PROPERTY_ID_REFERENCEDCOLUMN 88
+#define PROPERTY_ID_PARENTWINDOW 89
+#define PROPERTY_ID_SQLEXCEPTION 90
+#define PROPERTY_ID_ISHIDDEN 91
+#define PROPERTY_ID_SUPPRESSVERSIONCL 92
+#define PROPERTY_ID_LAYOUTINFORMATION 93
+#define PROPERTY_ID_TEXTLINECOLOR 94
+#define PROPERTY_ID_TEXTEMPHASIS 95
+#define PROPERTY_ID_TEXTRELIEF 96
+#define PROPERTY_ID_HELPTEXT 97
+#define PROPERTY_ID_CONTROLDEFAULT 98
+#define PROPERTY_ID_AUTOINCREMENTCREATION 99
+#define PROPERTY_ID_SPECIAL_OPTIONS 100
+#define PROPERTY_ID_FONTCHARWIDTH 101
+#define PROPERTY_ID_FONTCHARSET 102
+#define PROPERTY_ID_FONTFAMILY 103
+#define PROPERTY_ID_FONTHEIGHT 104
+#define PROPERTY_ID_FONTKERNING 105
+#define PROPERTY_ID_FONTNAME 106
+#define PROPERTY_ID_FONTORIENTATION 107
+#define PROPERTY_ID_FONTPITCH 108
+#define PROPERTY_ID_FONTSLANT 109
+#define PROPERTY_ID_FONTSTRIKEOUT 110
+#define PROPERTY_ID_FONTSTYLENAME 111
+#define PROPERTY_ID_FONTUNDERLINE 112
+#define PROPERTY_ID_FONTWEIGHT 113
+#define PROPERTY_ID_FONTWIDTH 114
+#define PROPERTY_ID_FONTWORDLINEMODE 115
+#define PROPERTY_ID_FONTTYPE 116
+#define PROPERTY_ID_PERSISTENT_NAME 117
+#define PROPERTY_ID_ORIGINAL 118
+#define PROPERTY_ID_TABSTOP 119
+#define PROPERTY_ID_DEFAULTCONTROL 120
+#define PROPERTY_ID_ENABLED 121
+#define PROPERTY_ID_BORDER 122
+#define PROPERTY_ID_COLUMN 123
+#define PROPERTY_ID_AS_TEMPLATE 124
+#define PROPERTY_ID_IS_FORM 125
+#define PROPERTY_ID_HAVING_CLAUSE 126
+#define PROPERTY_ID_GROUP_BY 127
+#define PROPERTY_ID_EDIT_WIDTH 128
#define PROPERTY_ID_SETTINGS 129
#define PROPERTY_ID_CONNECTION_RESOURCE 130
#define PROPERTY_ID_RESULT_SET 131
@@ -183,7 +183,7 @@
#define PROPERTY_ID_PERSISTENT_PATH 143
#define PROPERTY_ID_CURRENT_QUERY_DESIGN 144
#define PROPERTY_ID_SINGLESELECTQUERYCOMPOSER 145
-
+
//============================================================
//= property names
//============================================================
diff --git a/dbaccess/source/inc/xmlstrings.hrc b/dbaccess/source/inc/xmlstrings.hrc
index db5a729e2ea6..82fcbab8b94d 100644
--- a/dbaccess/source/inc/xmlstrings.hrc
+++ b/dbaccess/source/inc/xmlstrings.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
diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
index 52a418105985..b4498011e689 100644
--- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
@@ -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
@@ -45,7 +45,7 @@ namespace sdbtools
//====================================================================
//= ConnectionDependentComponent
//====================================================================
- class ConnectionDependentComponent
+ class ConnectionDependentComponent
{
private:
mutable ::osl::Mutex m_aMutex;
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx
index 1de93461d106..ed65d0380f5d 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.cxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx
@@ -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
@@ -101,14 +101,14 @@ namespace sdbtools
EntryGuard aGuard( *this );
return new TableName( getContext(), getConnection() );
}
-
+
//--------------------------------------------------------------------
Reference< XObjectNames > SAL_CALL ConnectionTools::getObjectNames() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return new ObjectNames( getContext(), getConnection() );
}
-
+
//--------------------------------------------------------------------
Reference< XDataSourceMetaData > SAL_CALL ConnectionTools::getDataSourceMetaData() throw (RuntimeException)
{
@@ -139,7 +139,7 @@ namespace sdbtools
{
return getImplementationName_static();
}
-
+
//--------------------------------------------------------------------
::sal_Bool SAL_CALL ConnectionTools::supportsService(const ::rtl::OUString & _ServiceName) throw (RuntimeException)
{
@@ -148,7 +148,7 @@ namespace sdbtools
const ::rtl::OUString* end = aSupported.getConstArray() + aSupported.getLength();
return ::std::find( begin, end, _ServiceName ) != end;
}
-
+
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames() throw (RuntimeException)
{
@@ -160,7 +160,7 @@ namespace sdbtools
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.dbaccess.ConnectionTools" ) );
}
-
+
//--------------------------------------------------------------------
Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static()
{
@@ -168,13 +168,13 @@ namespace sdbtools
aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.tools.ConnectionTools" ) );
return aSupported;
}
-
+
//--------------------------------------------------------------------
Reference< XInterface > SAL_CALL ConnectionTools::Create(const Reference< XComponentContext >& _rxContext )
{
return *( new ConnectionTools( ::comphelper::ComponentContext( _rxContext ) ) );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL ConnectionTools::initialize(const Sequence< Any > & _rArguments) throw (RuntimeException, Exception)
{
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx
index c2235e54c526..9e24c8e5606b 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx
@@ -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/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
index 5d9ba83fe9c3..28332566a005 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx
@@ -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/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
index de4a82df1340..2361d502e097 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
@@ -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/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 01e6931de526..0755b0d8c058 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -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
@@ -205,7 +205,7 @@ namespace sdbtools
if ( ( _rName.indexOf( (sal_Unicode)34 ) >= 0 ) // "
|| ( _rName.indexOf( (sal_Unicode)39 ) >= 0 ) // '
|| ( _rName.indexOf( (sal_Unicode)96 ) >= 0 ) //
- || ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) //
+ || ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) //
|| ( _rName.indexOf( (sal_Unicode)146 ) >= 0 ) //
|| ( _rName.indexOf( (sal_Unicode)180 ) >= 0 ) // #86621# removed unparsable chars
)
@@ -453,7 +453,7 @@ namespace sdbtools
return sName;
}
-
+
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL ObjectNames::convertToSQLName( const ::rtl::OUString& Name ) throw (RuntimeException)
{
@@ -461,7 +461,7 @@ namespace sdbtools
Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), UNO_QUERY_THROW );
return ::dbtools::convertName2SQLName( Name, xMeta->getExtraNameCharacters() );
}
-
+
//--------------------------------------------------------------------
::sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
{
@@ -470,7 +470,7 @@ namespace sdbtools
PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), _CommandType, getConnection()) );
return !pNameCheck->validateName( _Name );
}
-
+
//--------------------------------------------------------------------
::sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException)
{
@@ -479,7 +479,7 @@ namespace sdbtools
PNameValidation pNameCheck( NameCheckFactory::createValidityCheck( getContext(), _CommandType, getConnection()) );
return pNameCheck->validateName( _Name );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (SQLException, RuntimeException)
{
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx
index 0f72896aa118..678304ec04d0 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -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/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx
index aedc62451300..a6350002768d 100644
--- a/dbaccess/source/sdbtools/connection/tablename.cxx
+++ b/dbaccess/source/sdbtools/connection/tablename.cxx
@@ -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
@@ -106,49 +106,49 @@ namespace sdbtools
EntryGuard aGuard( *this );
return m_pImpl->sCatalog;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL TableName::setCatalogName( const ::rtl::OUString& _catalogName ) throw (RuntimeException)
{
EntryGuard aGuard( *this );
m_pImpl->sCatalog = _catalogName;
}
-
+
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL TableName::getSchemaName() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return m_pImpl->sSchema;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL TableName::setSchemaName( const ::rtl::OUString& _schemaName ) throw (RuntimeException)
{
EntryGuard aGuard( *this );
m_pImpl->sSchema = _schemaName;
}
-
+
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL TableName::getTableName() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return m_pImpl->sName;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL TableName::setTableName( const ::rtl::OUString& _tableName ) throw (RuntimeException)
{
EntryGuard aGuard( *this );
m_pImpl->sName = _tableName;
}
-
+
//--------------------------------------------------------------------
::rtl::OUString SAL_CALL TableName::getNameForSelect() throw (RuntimeException)
{
EntryGuard aGuard( *this );
return composeTableNameForSelect( getConnection(), m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName );
}
-
+
//--------------------------------------------------------------------
Reference< XPropertySet > SAL_CALL TableName::getTable() throw (NoSuchElementException, RuntimeException)
{
@@ -176,7 +176,7 @@ namespace sdbtools
return xTable;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL TableName::setTable( const Reference< XPropertySet >& _table ) throw (IllegalArgumentException, RuntimeException)
{
@@ -206,7 +206,7 @@ namespace sdbtools
throw IllegalArgumentException( e.Message, e.Context, 0 );
}
}
-
+
//--------------------------------------------------------------------
namespace
{
@@ -216,7 +216,7 @@ namespace sdbtools
*/
EComposeRule lcl_translateCompositionType_throw( sal_Int32 _nType )
{
- struct
+ struct
{
sal_Int32 nCompositionType;
EComposeRule eComposeRule;
@@ -256,7 +256,7 @@ namespace sdbtools
m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName, _Quote,
lcl_translateCompositionType_throw( _Type ) );
}
-
+
//--------------------------------------------------------------------
void SAL_CALL TableName::setComposedName( const ::rtl::OUString& _ComposedName, ::sal_Int32 _Type ) throw (RuntimeException)
{
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx
index fae1b8fae0be..980f61091ce4 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -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/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx
index 5b17ff86b4f0..4c2f17874a43 100644
--- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx
+++ b/dbaccess/source/sdbtools/inc/module_sdbt.hxx
@@ -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/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
index 1a23ab206fd8..5b94f748b7ae 100644
--- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc
+++ b/dbaccess/source/sdbtools/inc/sdbt_resource.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
@@ -33,7 +33,7 @@
#endif
//------------------------------------------------------------------------------
-#define RID_SDBT_STRINGS_START RID_DBACCESS_START
+#define RID_SDBT_STRINGS_START RID_DBACCESS_START
//------------------------------------------------------------------------------
//- String-IDs
diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx
index 9c9ee6304168..45aa686cbf58 100644
--- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx
+++ b/dbaccess/source/sdbtools/misc/module_sdbt.cxx
@@ -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/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
index 1c6d746ed99b..f62574b3e66b 100644
--- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx
+++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx
@@ -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
@@ -57,8 +57,8 @@ extern "C" void SAL_CALL sdbt_initializeModule()
//---------------------------------------------------------------------------------------
extern "C" void SAL_CALL component_getImplementationEnvironment(
- const sal_Char **ppEnvTypeName,
- uno_Environment **
+ const sal_Char **ppEnvTypeName,
+ uno_Environment **
)
{
sdbt_initializeModule();
@@ -71,8 +71,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo(
void* pRegistryKey
)
{
- if (pRegistryKey)
- try
+ if (pRegistryKey)
+ try
{
return ::sdbtools::SdbtModule::getInstance().writeComponentInfos(
static_cast(pServiceManager),
diff --git a/dbaccess/source/sdbtools/resource/sdbt_strings.src b/dbaccess/source/sdbtools/resource/sdbt_strings.src
index bd6d7d49f5c1..f19a52c4b2c0 100644
--- a/dbaccess/source/sdbtools/resource/sdbt_strings.src
+++ b/dbaccess/source/sdbtools/resource/sdbt_strings.src
@@ -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/shared/cfg_reghelper.cxx b/dbaccess/source/shared/cfg_reghelper.cxx
index 38766a6a1b24..659f14029294 100644
--- a/dbaccess/source/shared/cfg_reghelper.cxx
+++ b/dbaccess/source/shared/cfg_reghelper.cxx
@@ -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/shared/cfgstrings.cxx b/dbaccess/source/shared/cfgstrings.cxx
index ee0bc9ff403e..22ca71ea4343 100644
--- a/dbaccess/source/shared/cfgstrings.cxx
+++ b/dbaccess/source/shared/cfgstrings.cxx
@@ -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
@@ -44,7 +44,7 @@ namespace dbacfg
IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_PASSWORDREQUIRED, "IsPasswordRequired");
IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_SUPPRESSVERSIONCL, "SuppressVersionColumns");
IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_BOOKMARKS, "Bookmarks");
-
+
IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COMMAND, "Command");
IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_ESCAPE_PROCESSING, "EscapeProcessing");
IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_TABLENAME, "UpdateTableName");
diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx
index 5aebacf4b757..c6cf05be1e97 100644
--- a/dbaccess/source/shared/dbu_reghelper.cxx
+++ b/dbaccess/source/shared/dbu_reghelper.cxx
@@ -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/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx
index c6d8aa99e6ea..c7eac6002170 100644
--- a/dbaccess/source/shared/dbustrings.cxx
+++ b/dbaccess/source/shared/dbustrings.cxx
@@ -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
@@ -49,13 +49,13 @@ namespace dbaui
//============================================================
//= service names
//============================================================
- IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG, "org.openoffice.comp.dbu.DirectSqlDialog");
+ IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG, "org.openoffice.comp.dbu.DirectSqlDialog");
//============================================================
//= other
//============================================================
- IMPLEMENT_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW, "QueryPreview");
- IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTROLDEFAULT, "com.sun.star.comp.dbu.OColumnControl");
+ IMPLEMENT_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW, "QueryPreview");
+ IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTROLDEFAULT, "com.sun.star.comp.dbu.OColumnControl");
IMPLEMENT_CONSTASCII_USTRING(PROPERTY_QUERYDESIGNVIEW, "QueryDesignView");
IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GRAPHICAL_DESIGN, "GraphicalDesign");
IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HELP_URL, "HelpURL");
@@ -63,8 +63,8 @@ namespace dbaui
//============================================================
//= properties
//============================================================
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE, "TriState");
- IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLEOUTERJOIN, "EnableOuterJoinEscape");
+ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE, "TriState");
+ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLEOUTERJOIN, "EnableOuterJoinEscape");
IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABSTOP, "TabStop");
IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL, "DefaultControl");
diff --git a/dbaccess/source/shared/flt_reghelper.cxx b/dbaccess/source/shared/flt_reghelper.cxx
index b890bb484fa2..ebf88f027ed4 100644
--- a/dbaccess/source/shared/flt_reghelper.cxx
+++ b/dbaccess/source/shared/flt_reghelper.cxx
@@ -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/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx
index b606c6bcf9b6..d96d6250f2e2 100644
--- a/dbaccess/source/shared/registrationhelper.cxx
+++ b/dbaccess/source/shared/registrationhelper.cxx
@@ -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
@@ -36,10 +36,10 @@ using namespace ::com::sun::star;
using namespace ::comphelper;
using namespace ::cppu;
-uno::Sequence< ::rtl::OUString >* OModuleRegistration::s_pImplementationNames = NULL;
-uno::Sequence< uno::Sequence< ::rtl::OUString > >* OModuleRegistration::s_pSupportedServices = NULL;
-uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = NULL;
-uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = NULL;
+uno::Sequence< ::rtl::OUString >* OModuleRegistration::s_pImplementationNames = NULL;
+uno::Sequence< uno::Sequence< ::rtl::OUString > >* OModuleRegistration::s_pSupportedServices = NULL;
+uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = NULL;
+uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = NULL;
//--------------------------------------------------------------------------
void OModuleRegistration::registerComponent(
@@ -60,9 +60,9 @@ void OModuleRegistration::registerComponent(
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModuleRegistration::registerComponent : inconsistent state (the pointers (2)) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModuleRegistration::registerComponent : inconsistent state !");
sal_Int32 nOldLen = s_pImplementationNames->getLength();
@@ -87,9 +87,9 @@ void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementatio
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModuleRegistration::revokeComponent : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModuleRegistration::revokeComponent : inconsistent state !");
sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -129,9 +129,9 @@ sal_Bool OModuleRegistration::writeComponentInfos(
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModuleRegistration::writeComponentInfos : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModuleRegistration::writeComponentInfos : inconsistent state !");
sal_Int32 nLen = s_pImplementationNames->getLength();
@@ -178,9 +178,9 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory(
}
OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers,
"OModuleRegistration::getComponentFactory : inconsistent state (the pointers) !");
- OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
- && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
- && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
+ OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength())
+ && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength())
+ && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()),
"OModuleRegistration::getComponentFactory : inconsistent state !");
diff --git a/dbaccess/source/shared/sdbtstrings.cxx b/dbaccess/source/shared/sdbtstrings.cxx
index b972df52bfec..3032628eed3c 100644
--- a/dbaccess/source/shared/sdbtstrings.cxx
+++ b/dbaccess/source/shared/sdbtstrings.cxx
@@ -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/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx
index 569d7216cd97..4ca295668933 100644
--- a/dbaccess/source/shared/xmlstrings.cxx
+++ b/dbaccess/source/shared/xmlstrings.cxx
@@ -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/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 1905193a4f04..94bbb23d760e 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -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
@@ -425,8 +425,8 @@ void SAL_CALL OApplicationController::disposing()
::comphelper::NamedValueCollection aArgs( m_xModel->getArgs() );
if ( true == aArgs.getOrDefault( "PickListEntry", true ) )
{
- ::rtl::OUString aFilter;
- INetURLObject aURL( m_xModel->getURL() );
+ ::rtl::OUString aFilter;
+ INetURLObject aURL( m_xModel->getURL() );
const SfxFilter* pFilter = getStandardDatabaseFilter();
if ( pFilter )
aFilter = pFilter->GetFilterName();
@@ -1445,7 +1445,7 @@ void OApplicationController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:Save", ID_BROWSER_SAVEDOC, CommandGroup::DOCUMENT );
implDescribeSupportedFeature( ".uno:SaveAs", ID_BROWSER_SAVEASDOC, CommandGroup::DOCUMENT );
- implDescribeSupportedFeature( ".uno:SendMail", SID_MAIL_SENDDOC, CommandGroup::DOCUMENT );
+ implDescribeSupportedFeature( ".uno:SendMail", SID_MAIL_SENDDOC, CommandGroup::DOCUMENT );
implDescribeSupportedFeature( ".uno:DBSendReportAsMail",SID_DB_APP_SENDREPORTASMAIL,
CommandGroup::DOCUMENT );
implDescribeSupportedFeature( ".uno:DBSendReportToWriter",SID_DB_APP_SENDREPORTTOWRITER,
@@ -1457,7 +1457,7 @@ void OApplicationController::describeSupportedFeatures()
SID_FORM_CREATE_REPWIZ_PRE_SEL,
CommandGroup::APPLICATION );
- implDescribeSupportedFeature( ".uno:DBNewReport", SID_APP_NEW_REPORT, CommandGroup::INSERT );
+ implDescribeSupportedFeature( ".uno:DBNewReport", SID_APP_NEW_REPORT, CommandGroup::INSERT );
implDescribeSupportedFeature( ".uno:DBNewReportAutoPilot",
ID_DOCUMENT_CREATE_REPWIZ, CommandGroup::INSERT );
implDescribeSupportedFeature( ".uno:DBNewReportAutoPilotWithPreSelection",
@@ -1474,7 +1474,7 @@ void OApplicationController::describeSupportedFeatures()
implDescribeSupportedFeature( ".uno:DBNewViewSQL", SID_DB_NEW_VIEW_SQL, CommandGroup::INSERT );
implDescribeSupportedFeature( ".uno:DBDelete", SID_DB_APP_DELETE, CommandGroup::EDIT );
- implDescribeSupportedFeature( ".uno:Delete", SID_DB_APP_DELETE, CommandGroup::EDIT );
+ implDescribeSupportedFeature( ".uno:Delete", SID_DB_APP_DELETE, CommandGroup::EDIT );
implDescribeSupportedFeature( ".uno:DBRename", SID_DB_APP_RENAME, CommandGroup::EDIT );
implDescribeSupportedFeature( ".uno:DBEdit", SID_DB_APP_EDIT, CommandGroup::EDIT );
implDescribeSupportedFeature( ".uno:DBEditSqlView", SID_DB_APP_EDIT_SQL_VIEW, CommandGroup::EDIT );
@@ -1535,18 +1535,18 @@ void OApplicationController::describeSupportedFeatures()
// this one should not appear under Tools->Customize->Keyboard
implDescribeSupportedFeature( ".uno:DBNewReportWithPreSelection",
SID_APP_NEW_REPORT_PRE_SEL,CommandGroup::INTERNAL );
- implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL);
- implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL);
- implDescribeSupportedFeature( ".uno:DBDBAdmin", SID_DB_APP_DBADMIN, CommandGroup::INTERNAL);
+ implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL);
+ implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL);
+ implDescribeSupportedFeature( ".uno:DBDBAdmin", SID_DB_APP_DBADMIN, CommandGroup::INTERNAL);
// status info
- implDescribeSupportedFeature( ".uno:DBStatusType", SID_DB_APP_STATUS_TYPE, CommandGroup::INTERNAL);
- implDescribeSupportedFeature( ".uno:DBStatusDBName", SID_DB_APP_STATUS_DBNAME, CommandGroup::INTERNAL);
- implDescribeSupportedFeature( ".uno:DBStatusUserName", SID_DB_APP_STATUS_USERNAME, CommandGroup::INTERNAL);
- implDescribeSupportedFeature( ".uno:DBStatusHostName", SID_DB_APP_STATUS_HOSTNAME, CommandGroup::INTERNAL);
+ implDescribeSupportedFeature( ".uno:DBStatusType", SID_DB_APP_STATUS_TYPE, CommandGroup::INTERNAL);
+ implDescribeSupportedFeature( ".uno:DBStatusDBName", SID_DB_APP_STATUS_DBNAME, CommandGroup::INTERNAL);
+ implDescribeSupportedFeature( ".uno:DBStatusUserName", SID_DB_APP_STATUS_USERNAME, CommandGroup::INTERNAL);
+ implDescribeSupportedFeature( ".uno:DBStatusHostName", SID_DB_APP_STATUS_HOSTNAME, CommandGroup::INTERNAL);
}
// -----------------------------------------------------------------------------
-OApplicationView* OApplicationController::getContainer() const
+OApplicationView* OApplicationController::getContainer() const
{
return static_cast< OApplicationView* >( getView() );
}
@@ -1663,7 +1663,7 @@ void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rE
default:
break;
}
- // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName);
+ // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName);
}
catch( Exception& )
{
@@ -2154,7 +2154,7 @@ void OApplicationController::renameEntry()
{
::rtl::OUString sName = aDialog->getName();
::rtl::OUString sCatalog = aDialog->getCatalog();
- ::rtl::OUString sSchema = aDialog->getSchema();
+ ::rtl::OUString sSchema = aDialog->getSchema();
sNewName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sName, sal_False, ::dbtools::eInDataManipulation );
}
@@ -2520,18 +2520,18 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt )
m_nAsyncDrop = 0;
m_aAsyncDrop.aDroppedData.clear();
- m_aAsyncDrop.nType = pView->getElementType();
- m_aAsyncDrop.nAction = _rEvt.mnAction;
- m_aAsyncDrop.bError = sal_False;
- m_aAsyncDrop.bHtml = sal_False;
- m_aAsyncDrop.aUrl = ::rtl::OUString();
+ m_aAsyncDrop.nType = pView->getElementType();
+ m_aAsyncDrop.nAction = _rEvt.mnAction;
+ m_aAsyncDrop.bError = sal_False;
+ m_aAsyncDrop.bHtml = sal_False;
+ m_aAsyncDrop.aUrl = ::rtl::OUString();
// loop through the available formats and see what we can do ...
// first we have to check if it is our own format, if not we have to copy the stream :-(
if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(aDroppedData.GetDataFlavorExVector()) )
{
- m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData);
+ m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData);
// asyncron because we some dialogs and we aren't allowed to show them while in D&D
m_nAsyncDrop = Application::PostUserEvent(LINK(this, OApplicationController, OnAsyncDrop));
@@ -2837,7 +2837,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
{
ElementType eType = E_NONE;
const NamedValue* pIter = aCurrentSelection.getConstArray();
- const NamedValue* pEnd = pIter + aCurrentSelection.getLength();
+ const NamedValue* pEnd = pIter + aCurrentSelection.getLength();
for(;pIter != pEnd;++pIter)
{
if ( pIter->Name.equalsAscii("Type") )
@@ -2999,6 +2999,6 @@ void OApplicationController::impl_migrateScripts_nothrow()
}
//........................................................................
-} // namespace dbaui
+} // namespace dbaui
//........................................................................
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 1edda1d44758..03029d06275e 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -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
@@ -87,7 +87,7 @@ namespace dbaui
, ::com::sun::star::sdb::application::XDatabaseDocumentUI
, ::com::sun::star::ui::XContextMenuInterception
, ::com::sun::star::view::XSelectionSupplier
- > OApplicationController_Base;
+ > OApplicationController_Base;
class SelectionNotifier;
@@ -102,14 +102,14 @@ namespace dbaui
private:
- OTableCopyHelper::DropDescriptor m_aAsyncDrop;
+ OTableCopyHelper::DropDescriptor m_aAsyncDrop;
SharedConnection m_xDataSourceConnection;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >
m_xMetaData;
- OModuleClient m_aModuleClient;
- TransferableDataHelper m_aSystemClipboard; // content of the clipboard
+ OModuleClient m_aModuleClient;
+ TransferableDataHelper m_aSystemClipboard; // content of the clipboard
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
m_xDataSource;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
@@ -119,21 +119,21 @@ namespace dbaui
::cppu::OInterfaceContainerHelper
m_aContextMenuInterceptors;
- TContainerVector m_aCurrentContainers; // the containers where we are listener on
+ TContainerVector m_aCurrentContainers; // the containers where we are listener on
::rtl::Reference< SubComponentManager >
m_pSubComponentManager;
- ::dbaccess::ODsnTypeCollection
+ ::dbaccess::ODsnTypeCollection
m_aTypeCollection;
OTableCopyHelper m_aTableCopyHelper;
TransferableClipboardListener*
- m_pClipbordNotifier; // notifier for changes in the clipboard
- ULONG m_nAsyncDrop;
+ m_pClipbordNotifier; // notifier for changes in the clipboard
+ ULONG m_nAsyncDrop;
OAsyncronousLink m_aControllerConnectedEvent;
OAsyncronousLink m_aSelectContainerEvent;
- PreviewMode m_ePreviewMode; // the mode of the preview
- ElementType m_eCurrentType;
- sal_Bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date
- sal_Bool m_bSuspended; // is true when the controller was already suspended
+ PreviewMode m_ePreviewMode; // the mode of the preview
+ ElementType m_eCurrentType;
+ sal_Bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date
+ sal_Bool m_bSuspended; // is true when the controller was already suspended
::std::auto_ptr< SelectionNotifier >
m_pSelectionNotifier;
@@ -142,7 +142,7 @@ namespace dbaui
private:
- OApplicationView* getContainer() const;
+ OApplicationView* getContainer() const;
/** returns the database name
@@ -158,17 +158,17 @@ namespace dbaui
::rtl::OUString getStrippedDatabaseName() const;
/** return the element type for given container
- @param _xContainer The container where the element type has to be found
- @return the element type coressponding to the given container
+ @param _xContainer The container where the element type has to be found
+ @return the element type coressponding to the given container
*/
ElementType getElementType(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer) const;
/** opens a new frame with either the table or the query or report or form or view
- @param _sName
+ @param _sName
The name of the object to open
- @param _eType
+ @param _eType
Defines the type to open
- @param _eOpenMode
+ @param _eOpenMode
denotes the mode in which to open the object
@param _nInstigatorCommand
denotes the command which instigated the action. Might be 0.
@@ -192,9 +192,9 @@ namespace dbaui
);
/** opens a new frame for creation or auto pilot
- @param _eType
+ @param _eType
Defines the type to open
- @param i_rAdditionalArguments
+ @param i_rAdditionalArguments
Additional arguments to pass when creating the component
*/
::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
@@ -214,7 +214,7 @@ namespace dbaui
void newElementWithPilot( ElementType _eType );
/** converts the query to a view
- @param _sName
+ @param _sName
The name of the query.
*/
void convertToView(const ::rtl::OUString& _sName);
@@ -235,19 +235,19 @@ namespace dbaui
void renameEntry();
/** deletes queries, forms, or reports
- @param _eType
+ @param _eType
the type of the objects
- @param _rList
+ @param _rList
The names of the elements to delete
- @param _bConfirm
+ @param _bConfirm
determines whether the user must confirm the deletion
*/
- void deleteObjects( ElementType _eType,
+ void deleteObjects( ElementType _eType,
const ::std::vector< ::rtl::OUString>& _rList,
bool _bConfirm );
/** deletes tables.
- @param _rList
+ @param _rList
The list of tables.
*/
void deleteTables(const ::std::vector< ::rtl::OUString>& _rList);
@@ -259,9 +259,9 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getElements(ElementType _eType);
/** returns the document access for the specific type
- @param _eType
+ @param _eType
the type
- @return ::std::auto_ptr
+ @return ::std::auto_ptr
*/
::std::auto_ptr getDocumentsAccess(ElementType _eType);
@@ -269,19 +269,19 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer> getQueryDefintions() const;
/** pastes a special format from the system clipboard to the currently selected object types
- @param _nFormatId
+ @param _nFormatId
The format to be copied.
*/
void pasteFormat(sal_uInt32 _nFormatId);
/** pastes a query, form or report into the data source
- @param _eType
+ @param _eType
The type of the object to paste.
- @param _rPasteData
+ @param _rPasteData
The data descriptor.
- @param _sParentFolder
+ @param _sParentFolder
The name of the parent folder if it exists.
- @param _bMove
+ @param _bMove
if the name of the content must be inserted without any change, otherwise not.
@return
if the paste opertions was successfull, otherwise .
@@ -295,21 +295,21 @@ namespace dbaui
sal_Bool isTableFormat() const;
/** fills the vector with all supported formats
- @param _eType
+ @param _eType
The type for which we need the formats
- @param _rFormatIds
+ @param _rFormatIds
The vector to be filled up.
*/
void getSupportedFormats(ElementType _eType,::std::vector& _rFormatIds) const;
/** adds a listener to the current name access.
- @param _xCollection
+ @param _xCollection
The collection where we want to listen on.
*/
void addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xCollection);
/** opens a uno dialog withthe currently selected data source as initialize argument
- @param _sServiceName
+ @param _sServiceName
The serivce name of the dialog to be executed.
*/
void openDialog(const ::rtl::OUString& _sServiceName);
@@ -343,35 +343,35 @@ namespace dbaui
);
/** Inserts a new object into the hierachy given be the type.
- @param _eType
+ @param _eType
Where to insert the new item.
- @param _sParentFolder
+ @param _sParentFolder
The name of the parent folder if it exists.
- @param _xContent
+ @param _xContent
The content to insert.
- @param _bMove
+ @param _bMove
if the name of the content must be inserted without any change, otherwise not.
@return
if the insert opertions was successfull, otherwise .
*/
- sal_Bool insertHierachyElement( ElementType _eType
+ sal_Bool insertHierachyElement( ElementType _eType
,const String& _sParentFolder
,sal_Bool _bCollection = sal_True
,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>()
,sal_Bool _bMove = sal_False);
/** checks if delete command or rename comamnd is allowed
- @param _eType
+ @param _eType
The element type.
- @param _bDelete
+ @param _bDelete
If then the delete command should be checked.
@return
if the command is allowed
*/
sal_Bool isRenameDeleteAllowed(ElementType _eType,sal_Bool _bDelete) const;
/** all selected entries will be opened, or edited, or converted to a view
- @param _nId
+ @param _nId
The slot which should be executed.
- @param _eOpenMode
+ @param _eOpenMode
Defines the mode of opening. @see ElementOpenMode
*/
void doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMode);
@@ -412,12 +412,12 @@ namespace dbaui
/** forces usage of a connection which we do not own
To be used from within XInitialization::initialize only.
*/
- 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 );
// 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);
// OGenericUnoController
virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager );
@@ -530,9 +530,9 @@ namespace dbaui
// IControlActionListener overridables
virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const;
- virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel );
- virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors );
- virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt );
+ virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel );
+ virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors );
+ virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt );
// IContextMenuProvider (base of IApplicationController)
virtual PopupMenu* getContextMenu( Control& _rControl ) const;
@@ -554,11 +554,11 @@ namespace dbaui
/** disconnects from our XConnection, and cleans up this connection
*/
- virtual void disconnect();
+ virtual void disconnect();
// late construction
- virtual sal_Bool Construct(Window* pParent);
- virtual void describeSupportedFeatures();
+ virtual sal_Bool Construct(Window* pParent);
+ virtual void describeSupportedFeatures();
protected:
// XEventListener
@@ -569,7 +569,7 @@ namespace dbaui
};
//........................................................................
-} // namespace dbaui
+} // namespace dbaui
//........................................................................
#endif // DBAUI_APPCONTROLLER_HXX
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 6bc1789b0006..abb5ed8da31a 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -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
@@ -637,7 +637,7 @@ TransferableHelper* OApplicationController::copyObject()
::rtl::OUString sName = getContainer()->getQualifiedName( NULL );
if ( sName.getLength() )
{
- ::rtl::OUString sDataSource = getDatabaseName();
+ ::rtl::OUString sDataSource = getDatabaseName();
if ( eType == E_TABLE )
{
@@ -689,22 +689,22 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
{
sal_Int32 nCommandType = CommandType::TABLE;
if ( _rPasteData.has(daCommandType) )
- _rPasteData[daCommandType] >>= nCommandType;
+ _rPasteData[daCommandType] >>= nCommandType;
if ( CommandType::QUERY == nCommandType || CommandType::COMMAND == nCommandType )
{
// read all nescessary data
- ::rtl::OUString sCommand;
+ ::rtl::OUString sCommand;
sal_Bool bEscapeProcessing = sal_True;
_rPasteData[daCommand] >>= sCommand;
if ( _rPasteData.has(daEscapeProcessing) )
- _rPasteData[daEscapeProcessing] >>= bEscapeProcessing;
+ _rPasteData[daEscapeProcessing] >>= bEscapeProcessing;
// plausibility check
sal_Bool bValidDescriptor = sal_False;
- ::rtl::OUString sDataSourceName = _rPasteData.getDataSource();
+ ::rtl::OUString sDataSourceName = _rPasteData.getDataSource();
if (CommandType::QUERY == nCommandType)
bValidDescriptor = sDataSourceName.getLength() && sCommand.getLength();
else if (CommandType::COMMAND == nCommandType)
@@ -754,7 +754,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
bSuccess = true;
}
}
- catch(SQLException&) { throw; } // caught and handled by the outer catch
+ catch(SQLException&) { throw; } // caught and handled by the outer catch
catch( const Exception& )
{
DBG_UNHANDLED_EXCEPTION();
@@ -790,7 +790,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
has a /table/ with that name) */
if ( bNeedAskForName )
{
- OSaveAsDlg aAskForName( getView(),
+ OSaveAsDlg aAskForName( getView(),
CommandType::QUERY,
getORB(),
getConnection(),
@@ -835,7 +835,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
Sequence< ::rtl::OUString> aSeq = xSrcNameAccess->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)
{
Reference xSrcProp(xSrcNameAccess->getByName(*pIter),UNO_QUERY);
@@ -936,7 +936,7 @@ IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ )
return 0L;
}
//........................................................................
-} // namespace dbaui
+} // namespace dbaui
//........................................................................
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 435c6ff25fef..7d25752206a5 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -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
@@ -163,7 +163,7 @@ void OApplicationController::convertToView(const ::rtl::OUString& _sName)
{
::rtl::OUString sName = aDlg.getName();
::rtl::OUString sCatalog = aDlg.getCatalog();
- ::rtl::OUString sSchema = aDlg.getSchema();
+ ::rtl::OUString sSchema = aDlg.getSchema();
::rtl::OUString sNewName(
::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, sal_False, ::dbtools::eInTableDefinitions ) );
Reference xView = ::dbaui::createView(sNewName,xConnection,xSourceObject);
@@ -598,15 +598,15 @@ void OApplicationController::previewChanged( sal_Int32 _nMode )
// -----------------------------------------------------------------------------
//void OApplicationController::updateTitle()
//{
-// ::rtl::OUString sName = getStrippedDatabaseName();
+// ::rtl::OUString sName = getStrippedDatabaseName();
//
-// String sTitle = String(ModuleRes(STR_APP_TITLE));
-// sName = sName + sTitle;
+// String sTitle = String(ModuleRes(STR_APP_TITLE));
+// sName = sName + sTitle;
//#ifdef DBG_UTIL
// ::rtl::OUString aDefault;
-// sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ["));
+// sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ["));
// sName += utl::Bootstrap::getBuildIdData( aDefault );
-// sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
+// sName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
//#endif
//}
// -----------------------------------------------------------------------------
@@ -806,7 +806,7 @@ void OApplicationController::doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMod
// special handling for mail, if more than one document is selected attach them all
if ( _eOpenMode == E_OPEN_FOR_MAIL )
{
-
+
::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentIter = aCompoments.begin();
::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentEnd = aCompoments.end();
::rtl::OUString aDocTypeString;
@@ -851,5 +851,5 @@ ElementType OApplicationController::getElementType(const Reference< XContainer >
}
//........................................................................
-} // namespace dbaui
+} // namespace dbaui
//........................................................................
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index afad4e3a2d7c..746b7ec1c067 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -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/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 5ade6b687949..d483d597a979 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -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
@@ -81,15 +81,15 @@ namespace dbaui
class OPreviewWindow : public Window
{
- GraphicObject m_aGraphicObj;
- Rectangle m_aPreviewRect;
+ GraphicObject m_aGraphicObj;
+ Rectangle m_aPreviewRect;
/** gets the graphic cnter rect
- @param rGraphic
+ @param rGraphic
the graphic
- @param rResultRect
+ @param rResultRect
the resulting rectangle
-
+
@return
when successfull
*/
@@ -111,17 +111,17 @@ namespace dbaui
//==================================================================
class OAppDetailPageHelper : public Window
{
- DBTreeListBox* m_pLists[ELEMENT_COUNT];
- OAppBorderWindow& m_rBorderWin;
- FixedLine m_aFL;
- ToolBox m_aTBPreview;
- Window m_aBorder;
- OPreviewWindow m_aPreview;
+ DBTreeListBox* m_pLists[ELEMENT_COUNT];
+ OAppBorderWindow& m_rBorderWin;
+ FixedLine m_aFL;
+ ToolBox m_aTBPreview;
+ Window m_aBorder;
+ OPreviewWindow m_aPreview;
::svtools::ODocumentInfoPreview
m_aDocumentInfo;
- Window* m_pTablePreview;
+ Window* m_pTablePreview;
::std::auto_ptr m_aMenu;
- PreviewMode m_ePreviewMode;
+ PreviewMode m_ePreviewMode;
::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >
m_xFrame;
::com::sun::star::uno::Reference < ::com::sun::star::io::XPersist >
@@ -133,9 +133,9 @@ namespace dbaui
int getVisibleControlIndex() const;
/** sorts the entries in the tree list box.
- @param _nPos
+ @param _nPos
Which list should be sorted.
- @param _eSortMode
+ @param _eSortMode
How should be sorted.
*/
void sort(int _nPos,SvSortMode _eSortMode );
@@ -145,15 +145,15 @@ namespace dbaui
void getElementIcons( ElementType _eType, USHORT& _rImageId, USHORT& _rHighContrastImageId );
/** fills the names in the listbox
- @param _xContainer
+ @param _xContainer
This can either be the queries, forms or report names.
- @param _eType
+ @param _eType
the type of elements which are being filled
@param _nImageId
the resource id of the image to use for non-container entries
@param _nHighContrastImageId
the resource id of the high contrast image to use for non-container entries
- @param _pParent
+ @param _pParent
The parent of the entries to be inserted.
*/
void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer,
@@ -163,17 +163,17 @@ namespace dbaui
SvLBoxEntry* _pParent );
/** sets the detail page
- @param _pWindow
+ @param _pWindow
The control which should be visible.
*/
void setDetailPage(Window* _pWindow);
/** sets all HandleCallbacks
- @param _pTreeView
+ @param _pTreeView
The newly created DBTreeListBox
- @param _rImage
+ @param _rImage
the resource id of the default icon
- @param _rImageHC
+ @param _rImageHC
the resource id of the default icon (HC version)
@return
The new tree.
@@ -181,24 +181,24 @@ namespace dbaui
DBTreeListBox* createTree( DBTreeListBox* _pTreeView, const Image& _rImage, const Image& _rImageHC );
/** creates the tree and sets all HandleCallbacks
- @param _nHelpId
+ @param _nHelpId
The help id of the control
- @param _nCollapsedBitmap
+ @param _nCollapsedBitmap
The image to use for tree entries.
- @param _rImageHC
+ @param _rImageHC
The image to use in high contrast mode.
@return
The new tree.
*/
DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC );
- DECL_LINK( OnEntryDoubleClick, SvTreeListBox* );
- DECL_LINK( OnEntrySelChange, void* );
+ DECL_LINK( OnEntryDoubleClick, SvTreeListBox* );
+ DECL_LINK( OnEntrySelChange, void* );
- DECL_LINK( OnCutEntry, void* );
- DECL_LINK( OnCopyEntry, void* );
- DECL_LINK( OnPasteEntry, void* );
- DECL_LINK( OnDeleteEntry, void* );
+ DECL_LINK( OnCutEntry, void* );
+ DECL_LINK( OnCopyEntry, void* );
+ DECL_LINK( OnPasteEntry, void* );
+ DECL_LINK( OnDeleteEntry, void* );
DECL_LINK(PreviewChangeHdl, void*);
// click a TB slot
@@ -223,27 +223,27 @@ namespace dbaui
void paste();
/** creates the tables page
- @param _xConnection
+ @param _xConnection
The connection to get the table names
*/
void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection);
/** creates the page for the specific type.
- @param _eType
+ @param _eType
The type which should be created. E_TABLE isn't allowed.
- @param _xContainer
+ @param _xContainer
The container of the elements to be inserted.
*/
void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer);
/** returns the current visible tree list box
*/
- inline DBTreeListBox* getCurrentView() const
- {
+ inline DBTreeListBox* getCurrentView() const
+ {
ElementType eType = getElementType();
- return (eType != E_NONE ) ? m_pLists[static_cast(eType)] : NULL;
+ return (eType != E_NONE ) ? m_pLists[static_cast(eType)] : NULL;
}
-
+
/// select all entries in the visible control
void selectAll();
@@ -257,7 +257,7 @@ namespace dbaui
void sortUp();
/** returns the element names which are selected
- @param _rNames
+ @param _rNames
The list will be filled.
*/
void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const;
@@ -283,8 +283,8 @@ namespace dbaui
void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames);
/** return the qualified name.
- @param _pEntry
- The entry of a table, or query, form, report to get the qualified name.
+ @param _pEntry
+ The entry of a table, or query, form, report to get the qualified name.
If the entry is , the first selected is chosen.
@return
the qualified name
@@ -323,13 +323,13 @@ namespace dbaui
sal_Bool isFilled() const;
/** adds a new object to the detail page.
- @param _eType
+ @param _eType
The type where the entry shold be appended.
- @param _rName
+ @param _rName
The name of the object to be inserted
- @param _rObject
+ @param _rObject
The object to add.
- @param _rxConn
+ @param _rxConn
If we insert a table, the connection must be set.
*/
SvLBoxEntry* elementAdded(ElementType eType
@@ -337,13 +337,13 @@ namespace dbaui
,const ::com::sun::star::uno::Any& _rObject );
/** replaces a objects name with a new one
- @param _eType
+ @param _eType
The type where the entry shold be appended.
- @param _rOldName
+ @param _rOldName
The old name of the object to be replaced
- @param _rNewName
+ @param _rNewName
The new name of the object to be replaced
- @param _rxConn
+ @param _rxConn
If we insert a table, the connection must be set.
*/
void elementReplaced(ElementType eType
@@ -351,17 +351,17 @@ namespace dbaui
,const ::rtl::OUString& _rNewName );
/** removes an element from the detail page.
- @param _eType
+ @param _eType
The type where the entry shold be appended.
- @param _rName
+ @param _rName
The name of the element to be removed.
- @param _rxConn
+ @param _rxConn
If we remove a table, the connection must be set.
*/
void elementRemoved(ElementType _eType
,const ::rtl::OUString& _rName );
-
+
/// returns the preview mode
PreviewMode getPreviewMode();
@@ -369,29 +369,29 @@ namespace dbaui
sal_Bool isPreviewEnabled();
/** switches to the given preview mode
- @param _eMode
+ @param _eMode
the mode to set for the preview
- @param _bForce
+ @param _bForce
Force the preview to be resetted
*/
void switchPreview(PreviewMode _eMode,BOOL _bForce = FALSE);
/** shows the Preview of the content when it is enabled.
- @param _xContent
+ @param _xContent
The content which must support the "preview" command.
*/
void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent);
/** shows the Preview of a table or query
- @param _sDataSourceName
+ @param _sDataSourceName
the name of the data source
- @param _sName
+ @param _sName
the name of table or query
- @param _bTable
+ @param _bTable
if it is a table, otherwise
- @return void
+ @return void
*/
- void showPreview( const ::rtl::OUString& _sDataSourceName,
+ void showPreview( const ::rtl::OUString& _sDataSourceName,
const ::rtl::OUString& _sName,
sal_Bool _bTable);
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 9908134b8e1c..1b13168ce9b1 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -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
@@ -35,7 +35,7 @@
#endif
#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
+#endif
#ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
#endif
@@ -113,7 +113,7 @@ using namespace ::com::sun::star::beans;
using ::com::sun::star::util::URL;
using ::com::sun::star::sdb::application::NamedDatabaseObject;
-#define SPACEBETWEENENTRIES 4
+#define SPACEBETWEENENTRIES 4
// -----------------------------------------------------------------------------
TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled )
@@ -405,7 +405,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
,m_aFL(this,WB_VERT)
,m_pDetailView(_pDetailView)
{
- DBG_CTOR(OTasksWindow,NULL);
+ DBG_CTOR(OTasksWindow,NULL);
SetUniqueId(UID_APP_TASKS_WINDOW);
m_aCreation.SetHelpId(HID_APP_CREATION_LIST);
m_aCreation.SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl));
@@ -417,7 +417,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView
// -----------------------------------------------------------------------------
OTasksWindow::~OTasksWindow()
{
- DBG_DTOR(OTasksWindow,NULL);
+ DBG_DTOR(OTasksWindow,NULL);
Clear();
}
// -----------------------------------------------------------------------
@@ -433,7 +433,7 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt )
Invalidate();
}
}
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
DBG_CHKTHIS(OTasksWindow,NULL);
@@ -506,13 +506,13 @@ void OTasksWindow::Resize()
//////////////////////////////////////////////////////////////////////
// Abmessungen parent window
Size aOutputSize( GetOutputSize() );
- long nOutputWidth = aOutputSize.Width();
- long nOutputHeight = aOutputSize.Height();
+ long nOutputWidth = aOutputSize.Width();
+ long nOutputHeight = aOutputSize.Height();
Size aFLSize = LogicToPixel( Size( 2, 6 ), MAP_APPFONT );
sal_Int32 n6PPT = aFLSize.Height();
long nHalfOutputWidth = static_cast(nOutputWidth * 0.5);
-
+
m_aCreation.SetPosSizePixel( Point(0, 0), Size(nHalfOutputWidth - n6PPT, nOutputHeight) );
// i77897 make the m_aHelpText a little bit smaller. (-5)
sal_Int32 nNewWidth = nOutputWidth - nHalfOutputWidth - aFLSize.Width() - 5;
@@ -522,15 +522,15 @@ void OTasksWindow::Resize()
m_aDescription.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, 0), Size(nNewWidth, nOutputHeight) );
Size aDesc = m_aDescription.CalcMinimumSize();
m_aHelpText.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, aDesc.Height() ), Size(nNewWidth, nOutputHeight - aDesc.Height() - n6PPT) );
-
+
m_aFL.SetPosSizePixel( Point(nHalfOutputWidth , 0), Size(aFLSize.Width(), nOutputHeight ) );
}
// -----------------------------------------------------------------------------
void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
-{
+{
DBG_CHKTHIS(OTasksWindow,NULL);
Clear();
-
+
try
{
Reference xModuleCfgMgrSupplier(getDetailView()->getBorderWin().getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY);
@@ -568,7 +568,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList )
{
}
- m_aCreation.Show();
+ m_aCreation.Show();
m_aCreation.SelectAll(FALSE);
m_aHelpText.Show();
m_aDescription.Show();
@@ -587,7 +587,7 @@ void OTasksWindow::Clear()
delete reinterpret_cast< TaskEntry* >( pEntry->GetUserData() );
pEntry = m_aCreation.Next(pEntry);
}
- m_aCreation.Clear();
+ m_aCreation.Clear();
}
//==================================================================
// class OApplicationDetailView
@@ -599,7 +599,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
,m_aContainer(this,0,WB_BORDER | WB_DIALOGCONTROL )
,m_rBorderWin(_rParent)
{
- DBG_CTOR(OApplicationDetailView,NULL);
+ DBG_CTOR(OApplicationDetailView,NULL);
SetUniqueId(UID_APP_DETAIL_VIEW);
ImplInitSettings( sal_True, sal_True, sal_True );
@@ -617,7 +617,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe
m_aContainer.SetUniqueId(UID_APP_CONTAINER_VIEW);
m_aContainer.Show();
- const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width();
+ const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width();
m_aHorzSplitter.SetPosSizePixel( Point(0,50), Size(0,nFrameWidth) );
// now set the components at the base class
set(&m_aContainer,&m_aTasks);
@@ -634,7 +634,7 @@ OApplicationDetailView::~OApplicationDetailView()
setSplitter(NULL);
m_pControlHelper = NULL;
}
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground )
{
DBG_CHKTHIS(OApplicationDetailView,NULL);
@@ -923,23 +923,23 @@ SvLBoxEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const
return m_pControlHelper->getEntry(_aPoint);
}
// -----------------------------------------------------------------------------
-sal_Bool OApplicationDetailView::isCutAllowed()
-{
+sal_Bool OApplicationDetailView::isCutAllowed()
+{
DBG_CHKTHIS(OApplicationDetailView,NULL);
- return m_pControlHelper->isCutAllowed();
+ return m_pControlHelper->isCutAllowed();
}
-sal_Bool OApplicationDetailView::isCopyAllowed()
-{
+sal_Bool OApplicationDetailView::isCopyAllowed()
+{
DBG_CHKTHIS(OApplicationDetailView,NULL);
- return m_pControlHelper->isCopyAllowed();
+ return m_pControlHelper->isCopyAllowed();
}
-sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); }
-void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); }
-void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); }
-void OApplicationDetailView::paste()
-{
+sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); }
+void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); }
+void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); }
+void OApplicationDetailView::paste()
+{
DBG_CHKTHIS(OApplicationDetailView,NULL);
- m_pControlHelper->paste();
+ m_pControlHelper->paste();
}
// -----------------------------------------------------------------------------
SvLBoxEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject )
@@ -986,7 +986,7 @@ void OApplicationDetailView::showPreview(const Reference< XContent >& _xContent)
m_pControlHelper->showPreview(_xContent);
}
// -----------------------------------------------------------------------------
-void OApplicationDetailView::showPreview( const ::rtl::OUString& _sDataSourceName,
+void OApplicationDetailView::showPreview( const ::rtl::OUString& _sDataSourceName,
const ::rtl::OUString& _sName,
sal_Bool _bTable)
{
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 5626db6dc157..38d1dfc5485c 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.hxx
@@ -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
@@ -27,7 +27,7 @@
#ifndef DBAUI_APPDETAILVIEW_HXX
#define DBAUI_APPDETAILVIEW_HXX
-#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_
+#ifndef _COM_SUN_STAR_FRAME_XCONTROLLER_HPP_
#include
#endif
#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
@@ -42,10 +42,10 @@
#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_
#include
#endif
-#ifndef _SV_SPLIT_HXX
+#ifndef _SV_SPLIT_HXX
#include
#endif
-#ifndef _SV_FIXED_HXX
+#ifndef _SV_FIXED_HXX
#include
#endif
#ifndef _SV_MNEMONIC_HXX
@@ -105,7 +105,7 @@ namespace dbaui
void updateHelpText();
protected:
- virtual void PreparePaint( SvLBoxEntry* _pEntry );
+ virtual void PreparePaint( SvLBoxEntry* _pEntry );
virtual Rectangle GetFocusRect( SvLBoxEntry* _pEntry, long _nLine );
virtual void ModelHasCleared();
@@ -133,7 +133,7 @@ namespace dbaui
TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled = false );
};
- typedef ::std::vector< TaskEntry > TaskEntryList;
+ typedef ::std::vector< TaskEntry > TaskEntryList;
struct TaskPaneData
{
@@ -145,13 +145,13 @@ namespace dbaui
class OTasksWindow : public Window
{
- OCreationList m_aCreation;
- FixedText m_aDescription;
- FixedText m_aHelpText;
- FixedLine m_aFL;
- OApplicationDetailView* m_pDetailView;
+ OCreationList m_aCreation;
+ FixedText m_aDescription;
+ FixedText m_aHelpText;
+ FixedLine m_aFL;
+ OApplicationDetailView* m_pDetailView;
- DECL_LINK( OnEntrySelectHdl, SvTreeListBox* );
+ DECL_LINK( OnEntrySelectHdl, SvTreeListBox* );
void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
@@ -162,7 +162,7 @@ namespace dbaui
// window overloads
virtual void Resize();
- OApplicationDetailView* getDetailView() const { return m_pDetailView; }
+ OApplicationDetailView* getDetailView() const { return m_pDetailView; }
/// fills the Creation listbox with the necessary strings and images
void fillTaskEntryList( const TaskEntryList& _rList );
@@ -179,11 +179,11 @@ namespace dbaui
class OApplicationDetailView : public OSplitterView
, public IClipboardTest
{
- Splitter m_aHorzSplitter;
- OTitleWindow m_aTasks;
- OTitleWindow m_aContainer;
- OAppBorderWindow& m_rBorderWin; // my parent
- OAppDetailPageHelper* m_pControlHelper;
+ Splitter m_aHorzSplitter;
+ OTitleWindow m_aTasks;
+ OTitleWindow m_aContainer;
+ OAppBorderWindow& m_rBorderWin; // my parent
+ OAppDetailPageHelper* m_pControlHelper;
::std::vector< TaskPaneData > m_aTaskPaneData;
MnemonicGenerator m_aExternalMnemonics;
@@ -196,19 +196,19 @@ namespace dbaui
OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode);
virtual ~OApplicationDetailView();
// window overloads
- // virtual void Resize();
+ // virtual void Resize();
virtual void GetFocus();
/** creates the tables page
- @param _xConnection
+ @param _xConnection
The connection to get the table names
*/
void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection);
/** creates the page for the specific type.
- @param _eType
+ @param _eType
The type which should be created. E_TABLE isn't allowed.
- @param _xContainer
+ @param _xContainer
The container of the elements to be inserted.
*/
void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer);
@@ -226,17 +226,17 @@ namespace dbaui
inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; }
inline OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks.getChildWindow() ); }
- sal_Bool isCutAllowed() ;
- sal_Bool isCopyAllowed() ;
- sal_Bool isPasteAllowed();
+ sal_Bool isCutAllowed() ;
+ sal_Bool isCopyAllowed() ;
+ sal_Bool isPasteAllowed();
virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
void copy();
void cut();
void paste();
/** return the qualified name.
- @param _pEntry
- The entry of a table, or query, form, report to get the qualified name.
+ @param _pEntry
+ The entry of a table, or query, form, report to get the qualified name.
If the entry is , the first selected is chosen.
@return
the qualified name
@@ -277,7 +277,7 @@ namespace dbaui
ElementType getElementType() const;
/** clears the detail pages.
- @param _bTaskAlso
+ @param _bTaskAlso
If the task window will also be cleared.
*/
void clearPages(sal_Bool _bTaskAlso = sal_True);
@@ -289,7 +289,7 @@ namespace dbaui
sal_Int32 getSelectionCount();
/** returns the element names which are selected
- @param _rNames
+ @param _rNames
The list will be filled.
*/
void getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames ) const;
@@ -315,13 +315,13 @@ namespace dbaui
void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames);
/** adds a new object to the detail page.
- @param _eType
+ @param _eType
The type where the entry shold be appended.
- @param _rName
+ @param _rName
The name of the object to be inserted
- @param _rObject
+ @param _rObject
The object to add.
- @param _rxConn
+ @param _rxConn
If we insert a table, the connection must be set.
*/
SvLBoxEntry* elementAdded(ElementType eType
@@ -329,13 +329,13 @@ namespace dbaui
,const ::com::sun::star::uno::Any& _rObject );
/** replaces a objects name with a new one
- @param _eType
+ @param _eType
The type where the entry shold be appended.
- @param _rOldName
+ @param _rOldName
The old name of the object to be replaced
- @param _rNewName
+ @param _rNewName
The new name of the object to be replaced
- @param _rxConn
+ @param _rxConn
If we insert a table, the connection must be set.
@param _xObject
The object which was replaced
@@ -345,11 +345,11 @@ namespace dbaui
,const ::rtl::OUString& _rNewName );
/** removes an element from the detail page.
- @param _eType
+ @param _eType
The type where the entry shold be appended.
- @param _rName
+ @param _rName
The name of the element to be removed.
- @param _rxConn
+ @param _rxConn
If we remove a table, the connection must be set.
*/
void elementRemoved(ElementType _eType
@@ -363,27 +363,27 @@ namespace dbaui
/** switches to the given preview mode
- @param _eMode
+ @param _eMode
the mode to set for the preview
*/
void switchPreview(PreviewMode _eMode);
/** shows the Preview of the content when it is enabled.
- @param _xContent
+ @param _xContent
The content which must support the "preview" command.
*/
void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent);
/** shows the Preview of a table or query
- @param _sDataSourceName
+ @param _sDataSourceName
the name of the data source
- @param _sName
+ @param _sName
the name of table or query
- @param _bTable
+ @param _bTable
if it is a table, otherwise
- @return void
+ @return void
*/
- void showPreview( const ::rtl::OUString& _sDataSourceName,
+ void showPreview( const ::rtl::OUString& _sDataSourceName,
const ::rtl::OUString& _sName,
sal_Bool _bTable);
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 0e553cc1ffee..8e993f9b8a6d 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -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
@@ -35,7 +35,7 @@
#endif
#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
+#endif
#ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
#endif
@@ -58,7 +58,7 @@ using namespace ::dbaui;
// class OApplicationIconControl
DBG_NAME(OApplicationIconControl)
//==================================================================
-OApplicationIconControl::OApplicationIconControl(Window* _pParent)
+OApplicationIconControl::OApplicationIconControl(Window* _pParent)
: SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/
WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER)
,DropTargetHelper(this)
@@ -84,7 +84,7 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
String( ModuleRes( aCategories[i].nLabelResId ) ),
Image( ModuleRes( aCategories[i].nImageResId ) ),
Image( ModuleRes( aCategories[i].nImageResIdHC ) ) );
- if ( pEntry )
+ if ( pEntry )
pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
}
@@ -113,8 +113,8 @@ sal_Int8 OApplicationIconControl::AcceptDrop( const AcceptDropEvent& _rEvt )
sal_Int8 nDropOption = DND_ACTION_NONE;
if ( m_pActionListener )
{
-
- SvxIconChoiceCtrlEntry* pEntry = GetEntry(_rEvt.maPosPixel);
+
+ SvxIconChoiceCtrlEntry* pEntry = GetEntry(_rEvt.maPosPixel);
if ( pEntry )
{
SetCursor(pEntry);
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index 0cd6bfdbbf76..cc27014e5df5 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.hxx
@@ -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
@@ -39,23 +39,23 @@ namespace dbaui
{
class IControlActionListener;
//==================================================================
- class OApplicationIconControl :public SvtIconChoiceCtrl
+ class OApplicationIconControl :public SvtIconChoiceCtrl
,public DropTargetHelper
{
- Point m_aMousePos;
- IControlActionListener* m_pActionListener;
+ Point m_aMousePos;
+ IControlActionListener* m_pActionListener;
public:
OApplicationIconControl(Window* _pParent);
virtual ~OApplicationIconControl();
- void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; }
- IControlActionListener* getControlActionListener( ) const { return m_pActionListener; }
+ void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; }
+ IControlActionListener* getControlActionListener( ) const { return m_pActionListener; }
protected:
// DropTargetHelper overridables
- virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt );
- virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt );
+ virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt );
+ virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt );
};
}
#endif // DBAUI_APPICONCONTROL_HXX
diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx
index ae9ca3f5d93e..bfacb7e26768 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.cxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.cxx
@@ -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
@@ -35,7 +35,7 @@
#endif
#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
+#endif
#ifndef _DBU_APP_HRC_
#include "dbu_app.hrc"
#endif
@@ -75,7 +75,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind
,m_rBorderWin( _rBorderWindow )
{
DBG_CTOR(OApplicationSwapWindow,NULL);
-// SetCompoundControl( TRUE );
+// SetCompoundControl( TRUE );
ImplInitSettings( sal_True, sal_True, sal_True );
@@ -101,7 +101,7 @@ void OApplicationSwapWindow::Resize()
Size aOutputSize = GetOutputSize();
- m_aIconControl.SetPosSizePixel( Point(static_cast((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height()));
+ m_aIconControl.SetPosSizePixel( Point(static_cast((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height()));
m_aIconControl.ArrangeIcons();
}
// -----------------------------------------------------------------------------
@@ -196,7 +196,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType )
IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl)
{
ULONG nPos = 0;
- SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos );
+ SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos );
ElementType eType = E_NONE;
if ( pEntry )
{
@@ -216,7 +216,7 @@ IMPL_LINK(OApplicationSwapWindow, ChangeToLastSelected, void*, EMPTYARG)
void OApplicationSwapWindow::selectContainer(ElementType _eType)
{
ULONG nCount = m_aIconControl.GetEntryCount();
- SvxIconChoiceCtrlEntry* pEntry = NULL;
+ SvxIconChoiceCtrlEntry* pEntry = NULL;
for (ULONG i=0; i < nCount; ++i)
{
pEntry = m_aIconControl.GetEntry(i);
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index 9ce25817993f..038161280524 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -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
@@ -44,16 +44,16 @@ namespace dbaui
{
class OAppBorderWindow;
//==================================================================
- class OApplicationSwapWindow : public Window,
+ class OApplicationSwapWindow : public Window,
public IClipboardTest
{
- OApplicationIconControl m_aIconControl;
- ElementType m_eLastType;
- OAppBorderWindow& m_rBorderWin;
+ OApplicationIconControl m_aIconControl;
+ ElementType m_eLastType;
+ OAppBorderWindow& m_rBorderWin;
void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
- DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* );
+ DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* );
DECL_LINK( ChangeToLastSelected, void* );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
@@ -64,17 +64,17 @@ namespace dbaui
virtual void Resize();
- inline sal_Bool isCutAllowed() { return sal_False; }
- inline sal_Bool isCopyAllowed() { return sal_False; }
- inline sal_Bool isPasteAllowed() { return sal_False; }
+ inline sal_Bool isCutAllowed() { return sal_False; }
+ inline sal_Bool isCopyAllowed() { return sal_False; }
+ inline sal_Bool isPasteAllowed() { return sal_False; }
virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); }
- inline void copy() { }
- inline void cut() { }
- inline void paste() { }
+ inline void copy() { }
+ inline void cut() { }
+ inline void paste() { }
- inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); }
- inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); }
- inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); }
+ inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); }
+ inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); }
+ inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); }
/** automatically creates mnemonics for the icon/texts in our left hand side panel
*/
@@ -97,7 +97,7 @@ namespace dbaui
void clearSelection();
/** changes the container which should be displayed. The select handler will also be called.
- @param _eType
+ @param _eType
Which container to show.
*/
void selectContainer(ElementType _eType);
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx
index ae0f65d9aade..708ff55a8250 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -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,7 +43,7 @@
namespace dbaui
{
-
+
DBG_NAME(OTitleWindow)
OTitleWindow::OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift)
: Window(_pParent,_nBits | WB_DIALOGCONTROL)
@@ -80,30 +80,30 @@ void OTitleWindow::setChildWindow(Window* _pChild)
{
m_pChild = _pChild;
}
-#define SPACE_BORDER 1
+#define SPACE_BORDER 1
// -----------------------------------------------------------------------------
void OTitleWindow::Resize()
{
//////////////////////////////////////////////////////////////////////
// Abmessungen parent window
Size aOutputSize( GetOutputSize() );
- long nOutputWidth = aOutputSize.Width();
- long nOutputHeight = aOutputSize.Height();
-
+ long nOutputWidth = aOutputSize.Width();
+ long nOutputHeight = aOutputSize.Height();
+
Size aTextSize = LogicToPixel( Size( 6, 3 ), MAP_APPFONT );
sal_Int32 nXOffset = aTextSize.Width();
sal_Int32 nYOffset = aTextSize.Height();
sal_Int32 nHeight = GetTextHeight() + 2*nYOffset;
- m_aSpace1.SetPosSizePixel( Point(SPACE_BORDER, SPACE_BORDER ),
+ m_aSpace1.SetPosSizePixel( Point(SPACE_BORDER, SPACE_BORDER ),
Size(nXOffset , nHeight - SPACE_BORDER) );
- m_aSpace2.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, SPACE_BORDER ),
+ m_aSpace2.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, SPACE_BORDER ),
Size(nOutputWidth - nXOffset - 2*SPACE_BORDER, nYOffset) );
- m_aTitle.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, nYOffset + SPACE_BORDER),
+ m_aTitle.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, nYOffset + SPACE_BORDER),
Size(nOutputWidth - nXOffset - 2*SPACE_BORDER, nHeight - nYOffset - SPACE_BORDER) );
if ( m_pChild )
{
- m_pChild->SetPosSizePixel( Point(m_bShift ? (nXOffset+SPACE_BORDER) : sal_Int32(SPACE_BORDER), nHeight + nXOffset + SPACE_BORDER),
+ m_pChild->SetPosSizePixel( Point(m_bShift ? (nXOffset+SPACE_BORDER) : sal_Int32(SPACE_BORDER), nHeight + nXOffset + SPACE_BORDER),
Size(nOutputWidth - ( m_bShift ? (2*nXOffset - 2*SPACE_BORDER) : sal_Int32(SPACE_BORDER) ), nOutputHeight - nHeight - 2*nXOffset - 2*SPACE_BORDER) );
}
}
@@ -152,7 +152,7 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
StyleSettings aStyle = aAllSettings.GetStyleSettings();
aStyle.SetMonoColor(aStyle.GetActiveBorderColor());//GetMenuBorderColor());
aAllSettings.SetStyleSettings(aStyle);
- SetSettings(aAllSettings);
+ SetSettings(aAllSettings);
const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
if( bFont )
@@ -181,7 +181,7 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B
pWindows[i]->SetFont(aFont);
pWindows[i]->SetTextColor( aStyle.GetLightColor() );
pWindows[i]->SetBackground( Wallpaper( aStyle.GetShadowColor() ) );
- }
+ }
}
// .............................................................
} // namespace dbaui
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 8efe8cd5dd9d..3e59dab0db69 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -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
@@ -35,44 +35,44 @@ namespace dbaui
{
class OTitleWindow : public Window
{
- FixedText m_aSpace1;
- FixedText m_aSpace2;
- FixedText m_aTitle;
- Window* m_pChild;
- BOOL m_bShift;
+ FixedText m_aSpace1;
+ FixedText m_aSpace2;
+ FixedText m_aTitle;
+ Window* m_pChild;
+ BOOL m_bShift;
void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
protected:
virtual void DataChanged(const DataChangedEvent& rDCEvt);
public:
OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift = TRUE);
virtual ~OTitleWindow();
-
+
// window overloads
virtual void Resize();
virtual void GetFocus();
/** sets the child window which should be displayed below the title. It will be destroyed at the end.
- @param _pChild
+ @param _pChild
The child window.
*/
void setChildWindow(Window* _pChild);
/** gets the child window.
-
+
@return
The child winodw.
*/
inline Window* getChildWindow() const { return m_pChild; }
/** sets the title text out of the resource
- @param _nTitleId
+ @param _nTitleId
The resource id of the title text.
*/
void setTitle(USHORT _nTitleId);
/** Gets the min Width in Pixel which is needed to display the whole
-
+
@return
the min width
*/
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index e049f60d0f13..f2e8c1ab8816 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -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
@@ -181,8 +181,8 @@ void OAppBorderWindow::Resize()
//////////////////////////////////////////////////////////////////////
// Abmessungen parent window
Size aOutputSize( GetOutputSize() );
- long nOutputWidth = aOutputSize.Width();
- long nOutputHeight = aOutputSize.Height();
+ long nOutputWidth = aOutputSize.Width();
+ long nOutputHeight = aOutputSize.Height();
long nX = 0;
Size aFLSize = LogicToPixel( Size( 3, 8 ), MAP_APPFONT );
@@ -248,13 +248,13 @@ OApplicationView* OAppBorderWindow::getView() const
}
// -----------------------------------------------------------------------------
-OApplicationSwapWindow* OAppBorderWindow::getPanel() const
+OApplicationSwapWindow* OAppBorderWindow::getPanel() const
{
return static_cast< OApplicationSwapWindow* >( m_pPanel->getChildWindow() );
}
// -----------------------------------------------------------------------------
-OApplicationDetailView* OAppBorderWindow::getDetailView() const
+OApplicationDetailView* OAppBorderWindow::getDetailView() const
{
return m_pDetailView;
}
@@ -581,7 +581,7 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent)
getDetailView()->showPreview(_xContent);
}
// -----------------------------------------------------------------------------
-void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName,
+void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
const ::rtl::OUString& _sName,
sal_Bool _bTable)
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 7de14399f8ed..085672c07fe6 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.hxx
@@ -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
@@ -42,7 +42,7 @@
#ifndef _COM_SUN_STAR_SDB_APPLICATION_NAMEDDATABASEOBJECT_HPP_
#include
#endif
-#ifndef _SV_FIXED_HXX
+#ifndef _SV_FIXED_HXX
#include
#endif
#ifndef _UNOTOOLS_EVENTLISTENERADAPTER_HXX_
@@ -72,9 +72,9 @@ namespace dbaui
//==================================================================
class OAppBorderWindow : public Window
{
- OTitleWindow* m_pPanel;
- OApplicationDetailView* m_pDetailView;
- OApplicationView* m_pView;
+ OTitleWindow* m_pPanel;
+ OApplicationDetailView* m_pDetailView;
+ OApplicationView* m_pView;
void ImplInitSettings();
protected:
@@ -85,12 +85,12 @@ namespace dbaui
virtual ~OAppBorderWindow();
// window overloads
- virtual void GetFocus();
+ virtual void GetFocus();
virtual void Resize();
- OApplicationView* getView() const;
- OApplicationSwapWindow* getPanel() const;
- OApplicationDetailView* getDetailView() const;
+ OApplicationView* getView() const;
+ OApplicationSwapWindow* getPanel() const;
+ OApplicationDetailView* getDetailView() const;
};
//==================================================================
@@ -105,18 +105,18 @@ namespace dbaui
NONE
};
private:
- ::com::sun::star::lang::Locale m_aLocale;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
+ ::com::sun::star::lang::Locale m_aLocale;
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >
m_xObject;
- OAppBorderWindow* m_pWin;
+ OAppBorderWindow* m_pWin;
IApplicationController& m_rAppController;
- ChildFocusState m_eChildFocus;
+ ChildFocusState m_eChildFocus;
IClipboardTest* getActiveChild() const;
void ImplInitSettings();
protected:
-
+
// return the Rectangle where I can paint myself
virtual void resizeDocumentView(Rectangle& rRect);
@@ -127,7 +127,7 @@ namespace dbaui
// Window
virtual void DataChanged( const DataChangedEvent& rDCEvt );
public:
- OApplicationView( Window* pParent
+ OApplicationView( Window* pParent
,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&
,IApplicationController& _rAppController
,PreviewMode _ePreviewMode
@@ -145,7 +145,7 @@ namespace dbaui
virtual void GetFocus();
inline IApplicationController& getAppController() const { return m_rAppController; }
- inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;}
+ inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;}
// IClipboardTest
virtual sal_Bool isCutAllowed();
@@ -157,13 +157,13 @@ namespace dbaui
virtual void paste();
/// get the left panel
- inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); }
+ inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); }
/// get the detail page
- inline OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); }
+ inline OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); }
/** return the qualified name.
- @param _pEntry
- The entry of a table, or query, form, report to get the qualified name.
+ @param _pEntry
+ The entry of a table, or query, form, report to get the qualified name.
If the entry is , the first selected is chosen.
@return
the qualified name
@@ -210,13 +210,13 @@ namespace dbaui
sal_Int32 getSelectionCount();
/** clears the detail page and the selection on the left side.
- @param _bTaskAlso
+ @param _bTaskAlso
If the task window will also be cleared.
*/
void clearPages(sal_Bool _bTaskAlso = sal_True);
/** returns the element names which are selected
- @param _rNames
+ @param _rNames
The list will be filled.
*/
void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const;
@@ -242,13 +242,13 @@ namespace dbaui
void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames);
/** adds a new object to the detail page.
- @param _eType
+ @param _eType
The type where the entry shold be appended.
- @param _rName
+ @param _rName
The name of the object to be inserted
- @param _rObject
+ @param _rObject
The object to add.
- @param _rxConn
+ @param _rxConn
If we insert a table, the connection must be set.
*/
SvLBoxEntry* elementAdded(ElementType _eType
@@ -256,13 +256,13 @@ namespace dbaui
,const ::com::sun::star::uno::Any& _rObject );
/** replaces a objects name with a new one
- @param _eType
+ @param _eType
The type where the entry shold be appended.
- @param _rOldName
+ @param _rOldName
The old name of the object to be replaced
- @param _rNewName
+ @param _rNewName
The new name of the object to be replaced
- @param _rxConn
+ @param _rxConn
If we insert a table, the connection must be set.
@param _xObject
The object which was replaced
@@ -272,11 +272,11 @@ namespace dbaui
,const ::rtl::OUString& _rNewName );
/** removes an element from the detail page.
- @param _eType
+ @param _eType
The type where the entry shold be appended.
- @param _rName
+ @param _rName
The name of the element to be removed.
- @param _rxConn
+ @param _rxConn
If we remove a table, the connection must be set.
*/
void elementRemoved(ElementType _eType
@@ -284,7 +284,7 @@ namespace dbaui
/** changes the container which should be displayed. The select handler will also be called.
- @param _eType
+ @param _eType
Which container to show.
*/
void selectContainer(ElementType _eType);
@@ -296,29 +296,29 @@ namespace dbaui
sal_Bool isPreviewEnabled();
/** switches to the given preview mode
- @param _eMode
+ @param _eMode
the mode to set for the preview
*/
void switchPreview(PreviewMode _eMode);
/** shows the Preview of the content when it is enabled.
- @param _xContent
+ @param _xContent
The content which must support the "preview" command.
*/
void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent);
/** shows the Preview of a table or query
- @param _sDataSourceName
+ @param _sDataSourceName
the name of the data source
- @param _xConnection
+ @param _xConnection
the connection which will be shared
- @param _sName
+ @param _sName
the name of table or query
- @param _bTable
+ @param _bTable
if it is a table, otherwise
- @return void
+ @return void
*/
- void showPreview( const ::rtl::OUString& _sDataSourceName,
+ void showPreview( const ::rtl::OUString& _sDataSourceName,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
const ::rtl::OUString& _sName,
sal_Bool _bTable);
diff --git a/dbaccess/source/ui/app/IApplicationController.hxx b/dbaccess/source/ui/app/IApplicationController.hxx
index 2e495a93a77b..9e30eb6a144f 100644
--- a/dbaccess/source/ui/app/IApplicationController.hxx
+++ b/dbaccess/source/ui/app/IApplicationController.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -48,7 +48,7 @@ namespace dbaui
{
public:
/** called when an entry in a tree list box has been double-clicked
- @param _rTree
+ @param _rTree
The tree list box.
@return
if the double click event has been handled by the called, and should not
@@ -57,7 +57,7 @@ namespace dbaui
virtual bool onEntryDoubleClick( SvTreeListBox& _rTree ) = 0;
/** called when a container (category) in the application view has been selected
- @param _pTree
+ @param _pTree
The tree list box.
@return
if the cotainer could be changed otherwise
@@ -65,7 +65,7 @@ namespace dbaui
virtual sal_Bool onContainerSelect(ElementType _eType) = 0;
/** called when an entry in a tree view has been selected
- @param _pEntry
+ @param _pEntry
the selected entry
*/
virtual void onSelectionChanged() = 0;
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 2dec9005f847..ab325968f68a 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -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,7 +43,7 @@
#include "toolbox.hrc"
#endif
-#define MN_PROPS 25
+#define MN_PROPS 25
String RID_STR_NEW_FORM
diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc
index 7412dd85786d..1fc719762a8f 100644
--- a/dbaccess/source/ui/app/dbu_app.hrc
+++ b/dbaccess/source/ui/app/dbu_app.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
@@ -31,42 +31,42 @@
#include "dbu_resource.hrc"
#endif
-#define TBI_SWITCH_PREVIEW RID_DBACCESS_START
+#define TBI_SWITCH_PREVIEW RID_DBACCESS_START
-#define RID_STR_NEW_FORM RID_STR_APP_START
-#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1
-#define RID_STR_NEW_REPORT RID_STR_APP_START + 2
-#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3
-#define RID_STR_NEW_TABLE RID_STR_APP_START + 4
-#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5
-#define RID_STR_NEW_VIEW RID_STR_APP_START + 6
-#define RID_STR_NEW_VIEW_AUTO RID_STR_APP_START + 7
-#define RID_STR_NEW_QUERY RID_STR_APP_START + 8
-#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9
-#define STR_QUERY_DELETE_DATASOURCE RID_STR_APP_START + 10
-#define STR_APP_TITLE RID_STR_APP_START + 11
-#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12
-#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13
-#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14
-#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15
-#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16
-#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17
-#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18
-#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19
-#define RID_STR_VIEWS_HELP_TEXT_WIZARD RID_STR_APP_START + 20
-#define STR_DATABASE RID_STR_APP_START + 21
-#define STR_TASKS RID_STR_APP_START + 22
-#define STR_DESCRIPTION RID_STR_APP_START + 23
-#define STR_PREVIEW RID_STR_APP_START + 24
-#define STR_DISABLEPREVIEW RID_STR_APP_START + 25
-#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26
-#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27
-#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28
-#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29
-#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30
+#define RID_STR_NEW_FORM RID_STR_APP_START
+#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1
+#define RID_STR_NEW_REPORT RID_STR_APP_START + 2
+#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3
+#define RID_STR_NEW_TABLE RID_STR_APP_START + 4
+#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5
+#define RID_STR_NEW_VIEW RID_STR_APP_START + 6
+#define RID_STR_NEW_VIEW_AUTO RID_STR_APP_START + 7
+#define RID_STR_NEW_QUERY RID_STR_APP_START + 8
+#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9
+#define STR_QUERY_DELETE_DATASOURCE RID_STR_APP_START + 10
+#define STR_APP_TITLE RID_STR_APP_START + 11
+#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12
+#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13
+#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14
+#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15
+#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16
+#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17
+#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18
+#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19
+#define RID_STR_VIEWS_HELP_TEXT_WIZARD RID_STR_APP_START + 20
+#define STR_DATABASE RID_STR_APP_START + 21
+#define STR_TASKS RID_STR_APP_START + 22
+#define STR_DESCRIPTION RID_STR_APP_START + 23
+#define STR_PREVIEW RID_STR_APP_START + 24
+#define STR_DISABLEPREVIEW RID_STR_APP_START + 25
+#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26
+#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27
+#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28
+#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29
+#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30
#define RID_STR_EMBEDDED_DATABASE RID_STR_APP_START + 31
-#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32
-#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33
+#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32
+#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33
// please adjust checking before insert new strings
diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx
index 56fbc30f46e7..251ba9b8dced 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.cxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx
index f7f93ab6a53b..d84cef2863e7 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.hxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/ui/browser/AsyncronousLink.cxx b/dbaccess/source/ui/browser/AsyncronousLink.cxx
index 157024f497f8..eabbe5e9cc85 100644
--- a/dbaccess/source/ui/browser/AsyncronousLink.cxx
+++ b/dbaccess/source/ui/browser/AsyncronousLink.cxx
@@ -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
@@ -30,7 +30,7 @@
#ifndef DBAUI_ASYNCRONOUSLINK_HXX
#include "AsyncronousLink.hxx"
#endif
-#ifndef _SV_SVAPP_HXX
+#ifndef _SV_SVAPP_HXX
#include
#endif
#ifndef _TOOLS_DEBUG_HXX
diff --git a/dbaccess/source/ui/browser/bcommon.src b/dbaccess/source/ui/browser/bcommon.src
index 8c79179eda20..41ccc595ff5a 100644
--- a/dbaccess/source/ui/browser/bcommon.src
+++ b/dbaccess/source/ui/browser/bcommon.src
@@ -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/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 6a2161b1c291..23bd7bd9919d 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -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
@@ -113,24 +113,24 @@ using namespace ::dbtools;
using namespace ::comphelper;
using namespace ::svt;
-#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \
- try \
- { \
- successflag = sal_False; \
- action; \
- successflag = sal_True; \
- } \
- catch(SQLException& e) \
- { \
+#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \
+ try \
+ { \
+ successflag = sal_False; \
+ action; \
+ successflag = sal_True; \
+ } \
+ catch(SQLException& e) \
+ { \
SQLException aError = ::dbtools::prependErrorInfo(e, *this, context); \
- ::com::sun::star::sdb::SQLErrorEvent aEvent; \
- aEvent.Reason <<= aError; \
- errorOccured(aEvent); \
- } \
- catch(Exception&) \
- { \
+ ::com::sun::star::sdb::SQLErrorEvent aEvent; \
+ aEvent.Reason <<= aError; \
+ errorOccured(aEvent); \
+ } \
+ catch(Exception&) \
+ { \
DBG_UNHANDLED_EXCEPTION(); \
- } \
+ } \
#define DO_SAFE( action, message ) try { action; } catch(Exception&) { DBG_ERROR(message); } ;
@@ -144,12 +144,12 @@ namespace dbaui
//==================================================================
class OParameterContinuation : public OInteraction< XInteractionSupplyParameters >
{
- Sequence< PropertyValue > m_aValues;
+ Sequence< PropertyValue > m_aValues;
public:
OParameterContinuation() { }
- Sequence< PropertyValue > getValues() const { return m_aValues; }
+ Sequence< PropertyValue > getValues() const { return m_aValues; }
// XInteractionSupplyParameters
virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException);
@@ -171,8 +171,8 @@ class SbaXDataBrowserController::FormControllerImpl
::com::sun::star::frame::XFrameActionListener >
{
friend class SbaXDataBrowserController;
- ::cppu::OInterfaceContainerHelper m_aActivateListeners;
- SbaXDataBrowserController* m_pOwner;
+ ::cppu::OInterfaceContainerHelper m_aActivateListeners;
+ SbaXDataBrowserController* m_pOwner;
public:
FormControllerImpl(SbaXDataBrowserController* pOwner);
@@ -240,7 +240,7 @@ public:
// XTabController, base of XFormController
virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > & Model) throw( ::com::sun::star::uno::RuntimeException );
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException );
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > & _Container) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer(void) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException );
@@ -578,7 +578,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const ::c
//= SbaXDataBrowserController
//==================================================================
//------------------------------------------------------------------
-Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException)
+Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getTypes" );
return ::comphelper::concatSequences(
@@ -656,7 +656,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
SbaXDataBrowserController::~SbaXDataBrowserController()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::~SbaXDataBrowserController" );
- // deleteView();
+ // deleteView();
// release the aggregated form controller
if (m_xFormControllerImpl.is())
{
@@ -673,7 +673,7 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >&
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::startFrameListening" );
SbaXDataBrowserController_Base::startFrameListening( _rxFrame );
- Reference< XFrameActionListener > xAggListener;
+ Reference< XFrameActionListener > xAggListener;
if ( m_xFormControllerImpl.is() )
m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener;
@@ -687,7 +687,7 @@ void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::stopFrameListening" );
SbaXDataBrowserController_Base::stopFrameListening( _rxFrame );
- Reference< XFrameActionListener > xAggListener;
+ Reference< XFrameActionListener > xAggListener;
if ( m_xFormControllerImpl.is() )
m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener;
@@ -854,7 +854,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
if (!bSuccess)
{
- // deleteView();
+ // deleteView();
return sal_False;
}
@@ -899,7 +899,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
if (m_xLoadable.is())
m_xLoadable->addLoadListener(this);
- Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY);
if (xFormParameter.is())
xFormParameter->addParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this);
@@ -996,7 +996,7 @@ void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun:
xBroadcaster->addModifyListener(static_cast(this));
// introduce ourself as dispatch provider for the grid
- Reference< XDispatchProviderInterception > xInterception(getBrowserView()->getGridControl(), UNO_QUERY);
+ Reference< XDispatchProviderInterception > xInterception(getBrowserView()->getGridControl(), UNO_QUERY);
if (xInterception.is())
xInterception->registerDispatchProviderInterceptor(static_cast(this));
@@ -1014,7 +1014,7 @@ void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::s
if (xBroadcaster.is())
xBroadcaster->removeModifyListener(static_cast(this));
- Reference< XDispatchProviderInterception > xInterception(_xGridControl, UNO_QUERY);
+ Reference< XDispatchProviderInterception > xInterception(_xGridControl, UNO_QUERY);
if (xInterception.is())
xInterception->releaseDispatchProviderInterceptor(static_cast(this));
@@ -1107,7 +1107,7 @@ void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang:
if (m_xLoadable.is())
m_xLoadable->removeLoadListener(this);
- Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY);
+ Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY);
if (xFormParameter.is())
xFormParameter->removeParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this);
}
@@ -1186,16 +1186,16 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
::vos::OGuard aGuard(Application::GetSolarMutex());
// the IsModified changed to sal_False ?
- if ( (evt.PropertyName.equals(PROPERTY_ISMODIFIED))
- && (::comphelper::getBOOL(evt.NewValue) == sal_False)
+ if ( (evt.PropertyName.equals(PROPERTY_ISMODIFIED))
+ && (::comphelper::getBOOL(evt.NewValue) == sal_False)
)
- { // -> the current field isn't modified anymore, too
+ { // -> the current field isn't modified anymore, too
setCurrentModified( sal_False );
}
// switching to a new record ?
- if ( (evt.PropertyName.equals(PROPERTY_ISNEW))
- && (::comphelper::getBOOL(evt.NewValue) == sal_True)
+ if ( (evt.PropertyName.equals(PROPERTY_ISNEW))
+ && (::comphelper::getBOOL(evt.NewValue) == sal_True)
)
{
if (::comphelper::getINT32(xSource->getPropertyValue(PROPERTY_ROWCOUNT)) == 0)
@@ -1204,7 +1204,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
InvalidateAll();
}
-
+
// the filter or the sort criterias have changed ? -> update our parser
if (evt.PropertyName.equals(PROPERTY_ACTIVECOMMAND))
{
@@ -1215,7 +1215,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
{
// if ( m_xParser.is() && m_xParser->getFilter() != ::comphelper::getString(evt.NewValue))
//{
- // DO_SAFE( m_xParser->setFilter(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" );
+ // DO_SAFE( m_xParser->setFilter(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" );
//}
InvalidateFeature(ID_BROWSER_REMOVEFILTER);
}
@@ -1223,7 +1223,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
{
//if ( m_xParser.is() && m_xParser->getHavingClause() != ::comphelper::getString(evt.NewValue))
//{
- // DO_SAFE( m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" );
+ // DO_SAFE( m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" );
//}
InvalidateFeature(ID_BROWSER_REMOVEFILTER);
}
@@ -1231,7 +1231,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
{
//if ( m_xParser.is() && m_xParser->getOrder() != ::comphelper::getString(evt.NewValue))
//{
- // DO_SAFE( m_xParser->setOrder(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new order to my parser !" );
+ // DO_SAFE( m_xParser->setOrder(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new order to my parser !" );
//}
InvalidateFeature(ID_BROWSER_REMOVEFILTER);
}
@@ -1331,7 +1331,7 @@ void SbaXDataBrowserController::disposing()
if (m_xLoadable.is())
m_xLoadable->removeLoadListener(this);
- Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY);
if (xFormParameter.is())
xFormParameter->removeParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this);
@@ -1360,9 +1360,9 @@ void SbaXDataBrowserController::disposing()
{
::comphelper::disposeComponent(m_xRowSet);
- m_xRowSet = NULL;
- m_xColumnsSupplier = NULL;
- m_xLoadable = NULL;
+ m_xRowSet = NULL;
+ m_xColumnsSupplier = NULL;
+ m_xLoadable = NULL;
}
catch(Exception&)
{
@@ -1453,7 +1453,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for
return sal_True;
}
- Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters;
+ Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters;
::vos::OGuard aSolarGuard(Application::GetSolarMutex());
// this may be executed in a non-main thread and we want to use vcl ...
Window* pParent = Application::GetDefDialogParent();
@@ -1485,7 +1485,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for
xHandler->handle(xParamRequest);
if (!pParamValues->wasSelected())
- { // canceled
+ { // canceled
setLoadingCancelled();
return sal_False;
}
@@ -1580,7 +1580,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
}
// no chance without valid models
if (isValid() && !isValidCursor())
- return aReturn;
+ return aReturn;
switch (nId)
{
@@ -1637,9 +1637,9 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
break;
}
// run through
- case ID_BROWSER_PASTE:
+ case ID_BROWSER_PASTE:
case ID_BROWSER_CUT:
- {
+ {
CellControllerRef xCurrentController = getBrowserView()->getVclControl()->Controller();
if (xCurrentController.Is() && xCurrentController->ISA(EditCellController))
{
@@ -1648,8 +1648,8 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
sal_Bool bIsReadOnly = rEdit.IsReadOnly();
switch (nId)
{
- case ID_BROWSER_CUT: aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen && !bIsReadOnly; break;
- case SID_COPY : aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen; break;
+ case ID_BROWSER_CUT: aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen && !bIsReadOnly; break;
+ case SID_COPY : aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen; break;
case ID_BROWSER_PASTE:
aReturn.bEnabled = m_aCurrentFrame.isActive() && !bIsReadOnly;
if(aReturn.bEnabled)
@@ -1709,7 +1709,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
break;
case ID_BROWSER_REDO:
- aReturn.bEnabled = sal_False; // simply forget it ;). no redo possible.
+ aReturn.bEnabled = sal_False; // simply forget it ;). no redo possible.
break;
case ID_BROWSER_UNDORECORD:
@@ -1732,17 +1732,17 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
// check if it is available
Reference< XPropertySet > xDataSourceSet(getRowSet(), UNO_QUERY);
if (!xDataSourceSet.is())
- break; // no datasource -> no edit mode
+ break; // no datasource -> no edit mode
sal_Int32 nDataSourcePrivileges = ::comphelper::getINT32(xDataSourceSet->getPropertyValue(PROPERTY_PRIVILEGES));
sal_Bool bInsertAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::INSERT) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowInserts")));
sal_Bool bUpdateAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::UPDATE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowUpdates")));
sal_Bool bDeleteAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::DELETE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowDeletes")));
if (!bInsertAllowedAndPossible && !bUpdateAllowedAndPossible && !bDeleteAllowedAndPossible)
- break; // no insert/update/delete -> no edit mode
+ break; // no insert/update/delete -> no edit mode
if (!isValidCursor() || !isLoaded())
- break; // no cursor -> no edit mode
+ break; // no cursor -> no edit mode
aReturn.bEnabled = sal_True;
@@ -1967,10 +1967,10 @@ void SbaXDataBrowserController::ExecuteSearch()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ExecuteSearch" );
// calculate the control source of the active field
- Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
DBG_ASSERT(xGrid.is(), "SbaXDataBrowserController::ExecuteSearch : the control should have an ::com::sun::star::form::XGrid interface !");
- Reference< ::com::sun::star::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY);
Reference< ::com::sun::star::container::XIndexContainer > xColumns = xGridPeer->getColumns();
DBG_ASSERT(xGridPeer.is() && xColumns.is(), "SbaXDataBrowserController::ExecuteSearch : invalid peer !");
@@ -1982,7 +1982,7 @@ void SbaXDataBrowserController::ExecuteSearch()
// the text within the current cell
String sInitialText;
- Reference< ::com::sun::star::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY);
+ Reference< ::com::sun::star::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY);
Reference< XInterface > xCurControl(xColControls->getByIndex(nViewCol),UNO_QUERY);
::rtl::OUString aInitialText;
if (IsSearchableControl(xCurControl, &aInitialText))
@@ -2050,7 +2050,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
}
break;
case SID_FM_DELETEROWS:
-
+
if (SaveModified())
{
SbaGridControl* pVclGrid = getBrowserView()->getVclControl();
@@ -2125,8 +2125,8 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
switch (nId)
{
case ID_BROWSER_CUT : rEdit.Cut(); break;
- case SID_COPY : rEdit.Copy(); break;
- case ID_BROWSER_PASTE : rEdit.Paste(); break;
+ case SID_COPY : rEdit.Copy(); break;
+ case ID_BROWSER_PASTE : rEdit.Paste(); break;
}
if (ID_BROWSER_CUT == nId || ID_BROWSER_PASTE == nId)
{
@@ -2358,7 +2358,7 @@ sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor)
}
}
- if ( !CommitCurrent() ) // das aktuelle Control committen lassen
+ if ( !CommitCurrent() ) // das aktuelle Control committen lassen
return sal_False;
Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY);
@@ -2397,7 +2397,7 @@ sal_Bool SbaXDataBrowserController::CommitCurrent()
return sal_True;
Reference< ::com::sun::star::awt::XControl > xActiveControl(getBrowserView()->getGridControl());
- Reference< ::com::sun::star::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY);
+ Reference< ::com::sun::star::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY);
sal_Bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock();
if (xActiveControl.is() && !bControlIsLocked)
{
@@ -2497,7 +2497,7 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n
// get the current column from the grid
if (nViewPos == (sal_uInt16)-1)
{
- Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
if (!xGrid.is())
return xEmptyReturn;
nViewPos = xGrid->getCurrentColumnPosition();
@@ -2519,10 +2519,10 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n
//------------------------------------------------------------------------------
IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, pContext)
{
- Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY);
+ Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY);
// check all grid columns for their control source
- Reference< ::com::sun::star::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY);
+ Reference< ::com::sun::star::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY);
DBG_ASSERT(xModelColumns.is(), "SbaXDataBrowserController::OnSearchContextRequest : there is a grid control without columns !");
// the case 'no columns' should be indicated with an empty container, I think ...
DBG_ASSERT(xModelColumns->getCount() >= xPeerContainer->getCount(), "SbaXDataBrowserController::OnSearchContextRequest : impossible : have more view than model columns !");
@@ -2581,7 +2581,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn
xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), aOld);
// and move to the field
- Reference< ::com::sun::star::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY);
+ Reference< ::com::sun::star::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY);
sal_uInt16 nViewPos;
for ( nViewPos = 0; nViewPos < aColumnControls->getCount(); ++nViewPos )
@@ -2596,7 +2596,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn
}
}
- Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
xGrid->setCurrentColumnPosition(nViewPos);
return 0;
@@ -2678,7 +2678,7 @@ void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
{
DBG_UNHANDLED_EXCEPTION();
}
-
+
// --------------------------------
// switch the control to alive mode
getBrowserView()->getGridControl()->setDesignMode(sal_False);
@@ -2704,7 +2704,7 @@ void SbaXDataBrowserController::initializeParser() const
{
const Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY);
if (::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING)))
- { // (only if the statement isn't native)
+ { // (only if the statement isn't native)
// (it is allowed to use the PROPERTY_ISPASSTHROUGH : _after_ loading a form it is valid)
xFormSet->getPropertyValue(PROPERTY_SINGLESELECTQUERYCOMPOSER) >>= m_xParser;
/*
@@ -2737,7 +2737,7 @@ void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( Run
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::loaded" );
// not interested in
- // we're loading within an separate thread and have a handling for it's "finished event"
+ // we're loading within an separate thread and have a handling for it's "finished event"
}
//------------------------------------------------------------------------------
@@ -2849,11 +2849,11 @@ class LoadFormHelper :public ::cppu::WeakImplHelper2< ::com::sun::star::form::XL
XRowSetListener>
{
enum STATE { STARTED, LOADED, POSITIONED, DISPOSED };
- STATE m_eState;
+ STATE m_eState;
- Reference< XRowSet > m_xForm;
+ Reference< XRowSet > m_xForm;
- ::osl::Mutex m_aAccessSafety;
+ ::osl::Mutex m_aAccessSafety;
public:
LoadFormHelper(const Reference< XRowSet > & _rxForm);
@@ -3016,7 +3016,7 @@ bool LoadFormHelper::WaitUntilReallyLoaded(bool _bOnlyIfLoaded)
sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getCurrentColumnPosition" );
- Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
sal_Int16 nViewPos = -1;
try
{
@@ -3030,7 +3030,7 @@ sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setCurrentColumnPosition" );
- Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
try
{
if ( -1 != _nPos )
@@ -3077,5 +3077,5 @@ sal_Bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com::
return sal_True;
}
//..................................................................
-} // namespace dbaui
+} // namespace dbaui
//..................................................................
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index 44a6b40e1f2f..4d4f6adaa6ec 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -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
@@ -70,17 +70,17 @@ using namespace dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::form;
-// using namespace ::com::sun::star::sdbcx;
+// using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::lang;
-namespace
+namespace
{
sal_Bool isGrabVclControlFocusAllowed(const UnoDataBrowserView* _pView)
{
- sal_Bool bGrabFocus = sal_False;
+ sal_Bool bGrabFocus = sal_False;
SbaGridControl* pVclControl = _pView->getVclControl();
Reference< ::com::sun::star::awt::XControl > xGrid = _pView->getGridControl();
if (pVclControl && xGrid.is())
@@ -104,7 +104,7 @@ namespace
DBG_NAME(UnoDataBrowserView)
// -------------------------------------------------------------------------
-UnoDataBrowserView::UnoDataBrowserView( Window* pParent,
+UnoDataBrowserView::UnoDataBrowserView( Window* pParent,
IController& _rController,
const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rFactory)
:ODataView(pParent,_rController,_rFactory)
@@ -144,7 +144,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont
// get the VCL-control
m_pVclControl = NULL;
- getVclControl();
+ getVclControl();
DBG_ASSERT(m_pVclControl != NULL, "UnoDataBrowserView::Construct : no real grid control !");
}
@@ -162,7 +162,7 @@ UnoDataBrowserView::~UnoDataBrowserView()
m_pSplitter = NULL;
}
setTreeView(NULL);
-
+
if ( m_pStatus )
{
delete m_pStatus;
@@ -238,17 +238,17 @@ void UnoDataBrowserView::hideStatus()
// -------------------------------------------------------------------------
void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground)
{
- Point aSplitPos;
- Size aSplitSize;
- Point aPlaygroundPos( _rPlayground.TopLeft() );
- Size aPlaygroundSize( _rPlayground.GetSize() );
+ Point aSplitPos;
+ Size aSplitSize;
+ Point aPlaygroundPos( _rPlayground.TopLeft() );
+ Size aPlaygroundSize( _rPlayground.GetSize() );
if (m_pTreeView && m_pTreeView->IsVisible() && m_pSplitter)
{
// calculate the splitter pos and size
- aSplitPos = m_pSplitter->GetPosPixel();
+ aSplitPos = m_pSplitter->GetPosPixel();
aSplitPos.Y() = aPlaygroundPos.Y();
- aSplitSize = m_pSplitter->GetOutputSizePixel();
+ aSplitSize = m_pSplitter->GetOutputSizePixel();
aSplitSize.Height() = aPlaygroundSize.Height();
if( ( aSplitPos.X() + aSplitSize.Width() ) > ( aPlaygroundSize.Width() ))
@@ -258,8 +258,8 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground)
aSplitPos.X() = aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.2);
// the tree pos and size
- Point aTreeViewPos( aPlaygroundPos );
- Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() );
+ Point aTreeViewPos( aPlaygroundPos );
+ Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() );
// the status pos and size
if (m_pStatus && m_pStatus->IsVisible())
@@ -272,7 +272,7 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground)
m_pStatus->SetPosSizePixel( aStatusPos, aStatusSize );
aTreeViewSize.Height() -= aStatusSize.Height();
}
-
+
// set the size of treelistbox
m_pTreeView->SetPosSizePixel( aTreeViewPos, aTreeViewSize );
@@ -299,8 +299,8 @@ sal_uInt16 UnoDataBrowserView::View2ModelPos(sal_uInt16 nPos) const
}
// -----------------------------------------------------------------------------
-SbaGridControl* UnoDataBrowserView::getVclControl() const
-{
+SbaGridControl* UnoDataBrowserView::getVclControl() const
+{
if ( !m_pVclControl )
{
OSL_ENSURE(m_xGrid.is(),"Grid not set!");
@@ -319,7 +319,7 @@ SbaGridControl* UnoDataBrowserView::getVclControl() const
}
}
}
- return m_pVclControl;
+ return m_pVclControl;
}
// -----------------------------------------------------------------------------
void UnoDataBrowserView::GetFocus()
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 382aac477727..9268866d67a0 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -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
@@ -31,7 +31,7 @@
#ifndef DBAUI_DATAVIEW_HXX
#include "dataview.hxx"
#endif
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
+#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include
#endif
#ifndef _COMPHELPER_TYPES_HXX_
@@ -41,10 +41,10 @@
#ifndef _SFXAPP_HXX //autogen wg. SFX_APP
#include
#endif
-#ifndef _SFXIMGMGR_HXX
+#ifndef _SFXIMGMGR_HXX
#include
#endif
-#ifndef _SV_FIXED_HXX
+#ifndef _SV_FIXED_HXX
#include
#endif
#ifndef DBAUI_ICONTROLLER_HXX
@@ -77,7 +77,7 @@ namespace dbaui
class ColorChanger
{
protected:
- OutputDevice* m_pDev;
+ OutputDevice* m_pDev;
public:
ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor )
@@ -96,9 +96,9 @@ namespace dbaui
DBG_NAME(ODataView)
// -------------------------------------------------------------------------
- ODataView::ODataView( Window* pParent,
+ ODataView::ODataView( Window* pParent,
IController& _rController,
- const Reference< XMultiServiceFactory >& _rFactory,
+ const Reference< XMultiServiceFactory >& _rFactory,
WinBits nStyle)
:Window(pParent,nStyle)
,m_xServiceFactory(_rFactory)
@@ -121,7 +121,7 @@ namespace dbaui
DBG_DTOR(ODataView,NULL);
enableSeparator( sal_False );
- m_rController.release();
+ m_rController.release();
}
// -------------------------------------------------------------------------
@@ -195,7 +195,7 @@ namespace dbaui
{
case EVENT_KEYINPUT:
{
- const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent();
+ const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent();
const KeyCode& aKeyCode = pKeyEvent->GetKeyCode();
if ( m_pAccel.get() && m_pAccel->execute( aKeyCode ) )
// the accelerator consumed the event
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 972f9be83934..48a466907722 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -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
@@ -53,7 +53,7 @@ namespace dbaui
using namespace ::com::sun::star::datatransfer;
using namespace ::svx;
- namespace
+ namespace
{
template void lcl_setListener(const Reference& _xComponent, const Reference< XEventListener >& i_rListener, const bool i_bAdd )
{
@@ -68,12 +68,12 @@ namespace dbaui
i_bAdd ? xCom->addEventListener( i_rListener ) : xCom->removeEventListener( i_rListener );
}
}
-
+
// -----------------------------------------------------------------------------
ODataClipboard::ODataClipboard(
- const ::rtl::OUString& _rDatasource,
- const sal_Int32 _nCommandType,
- const ::rtl::OUString& _rCommand,
+ const ::rtl::OUString& _rDatasource,
+ const sal_Int32 _nCommandType,
+ const ::rtl::OUString& _rCommand,
const Reference< XConnection >& _rxConnection,
const Reference< XNumberFormatter >& _rxFormatter,
const Reference< XMultiServiceFactory >& _rxORB)
@@ -92,9 +92,9 @@ namespace dbaui
// -----------------------------------------------------------------------------
ODataClipboard::ODataClipboard(
- const ::rtl::OUString& _rDatasource,
- const sal_Int32 _nCommandType,
- const ::rtl::OUString& _rCommand,
+ const ::rtl::OUString& _rDatasource,
+ const sal_Int32 _nCommandType,
+ const ::rtl::OUString& _rCommand,
const Reference< XNumberFormatter >& _rxFormatter,
const Reference< XMultiServiceFactory >& _rxORB)
:ODataAccessObjectTransferable( _rDatasource, ::rtl::OUString(),_nCommandType, _rCommand)
@@ -106,7 +106,7 @@ namespace dbaui
}
// -----------------------------------------------------------------------------
- ODataClipboard::ODataClipboard( const Reference< XPropertySet >& i_rAliveForm,
+ ODataClipboard::ODataClipboard( const Reference< XPropertySet >& i_rAliveForm,
const Sequence< Any >& i_rSelectedRows,
const sal_Bool i_bBookmarkSelection,
const Reference< XMultiServiceFactory >& i_rORB )
@@ -117,7 +117,7 @@ namespace dbaui
OSL_PRECOND( i_rORB.is(), "ODataClipboard::ODataClipboard: having no factory is not good ..." );
osl_incrementInterlockedCount( &m_refCount );
-
+
Reference xConnection;
getDescriptor()[ daConnection ] >>= xConnection;
lcl_setListener( xConnection, this, true );
@@ -131,8 +131,8 @@ namespace dbaui
OSL_ENSURE( xResultSetClone.is(), "ODataClipboard::ODataClipboard: could not clone the form's result set" );
lcl_setListener( xResultSetClone, this, true );
- getDescriptor()[daCursor] <<= xResultSetClone;
- getDescriptor()[daSelection] <<= i_rSelectedRows;
+ getDescriptor()[daCursor] <<= xResultSetClone;
+ getDescriptor()[daSelection] <<= i_rSelectedRows;
getDescriptor()[daBookmarkSelection]<<= i_bBookmarkSelection;
addCompatibleSelectionDescription( i_rSelectedRows );
diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx
index 69130da08609..15ee529953cc 100644
--- a/dbaccess/source/ui/browser/dbloader.cxx
+++ b/dbaccess/source/ui/browser/dbloader.cxx
@@ -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
@@ -74,22 +74,22 @@ using namespace dbaui;
class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader, XServiceInfo>
{
private:
- ::rtl::OUString m_aURL;
- Sequence< PropertyValue> m_aArgs;
- Reference< XLoadEventListener > m_xListener;
- Reference< XFrame > m_xFrame;
- Reference< XMultiServiceFactory > m_xServiceFactory;
+ ::rtl::OUString m_aURL;
+ Sequence< PropertyValue> m_aArgs;
+ Reference< XLoadEventListener > m_xListener;
+ Reference< XFrame > m_xFrame;
+ Reference< XMultiServiceFactory > m_xServiceFactory;
public:
DBContentLoader(const Reference< XMultiServiceFactory >&);
~DBContentLoader();
// XServiceInfo
- ::rtl::OUString SAL_CALL getImplementationName() throw( );
- sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( );
- Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( );
+ ::rtl::OUString SAL_CALL getImplementationName() throw( );
+ sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( );
+ Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( );
// static methods
- static ::rtl::OUString getImplementationName_Static() throw( )
+ static ::rtl::OUString getImplementationName_Static() throw( )
{
return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbu.DBContentLoader");
}
@@ -98,7 +98,7 @@ public:
SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&);
// XLoader
- virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL,
+ virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL,
const Sequence< PropertyValue >& _rArgs,
const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL cancel(void) throw();
@@ -141,8 +141,8 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult
sal_Bool SAL_CALL DBContentLoader::supportsService(const ::rtl::OUString& ServiceName) throw( )
{
Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames();
- const ::rtl::OUString * pBegin = aSNL.getConstArray();
- const ::rtl::OUString * pEnd = pBegin + aSNL.getLength();
+ const ::rtl::OUString * pBegin = aSNL.getConstArray();
+ const ::rtl::OUString * pEnd = pBegin + aSNL.getLength();
for( ; pBegin != pEnd; ++pBegin)
if( *pBegin == ServiceName )
return sal_True;
@@ -187,10 +187,10 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
const Sequence< PropertyValue >& rArgs,
const Reference< XLoadEventListener > & rListener) throw(::com::sun::star::uno::RuntimeException)
{
- m_xFrame = rFrame;
+ m_xFrame = rFrame;
m_xListener = rListener;
- m_aURL = rURL;
- m_aArgs = rArgs;
+ m_aURL = rURL;
+ m_aArgs = rArgs;
::comphelper::ComponentContext aContext( m_xServiceFactory );
@@ -309,9 +309,9 @@ void SAL_CALL DBContentLoader::load(const Reference< XFrame > & rFrame, const ::
Sequence< Any > aInitArgs(m_aArgs.getLength()+1);
Any* pBegin = aInitArgs.getArray();
- Any* pEnd = pBegin + aInitArgs.getLength();
+ Any* pEnd = pBegin + aInitArgs.getLength();
*pBegin <<= aFrame;
- const PropertyValue* pIter = m_aArgs.getConstArray();
+ const PropertyValue* pIter = m_aArgs.getConstArray();
for(++pBegin;pBegin != pEnd;++pBegin,++pIter)
{
*pBegin <<= *pIter;
diff --git a/dbaccess/source/ui/browser/dbtreemodel.cxx b/dbaccess/source/ui/browser/dbtreemodel.cxx
index 0c4942868d20..6083b7679ea2 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.cxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.cxx
@@ -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/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx
index 8894f85ce430..c2f5f9aaa28a 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.hxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.hxx
@@ -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
@@ -47,12 +47,12 @@
// syntax of the tree userdata
// datasource holds the connection
// queries holds the nameaccess for the queries
-// query holds the query
-// tables holds the nameaccess for the tables
-// table holds the table
+// query holds the query
+// tables holds the nameaccess for the tables
+// table holds the table
-#define CONTAINER_QUERIES ULONG( 0 )
-#define CONTAINER_TABLES ULONG( 1 )
+#define CONTAINER_QUERIES ULONG( 0 )
+#define CONTAINER_TABLES ULONG( 1 )
namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } }
@@ -68,7 +68,7 @@ namespace dbaui
xContainer;
/// if the entry denotes a data source, this is the connection for this data source (if already connection)
SharedConnection xConnection;
- SbaTableQueryBrowser::EntryType eType;
+ SbaTableQueryBrowser::EntryType eType;
String sAccessor;
DBTreeListUserData();
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 65185f9f3e73..e3c95e5407a1 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -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
@@ -54,8 +54,8 @@ DBG_NAME(DBTreeView)
//========================================================================
// class DBTreeView
//========================================================================
-DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nBits)
- : Window( pParent, nBits )
+DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nBits)
+ : Window( pParent, nBits )
, m_pTreeListBox(NULL)
{
DBG_CTOR(DBTreeView,NULL);
@@ -69,7 +69,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory >
}
// -----------------------------------------------------------------------------
-
+
DBTreeView::~DBTreeView()
{
DBG_DTOR(DBTreeView,NULL);
@@ -92,7 +92,7 @@ void DBTreeView::SetPreExpandHandler(const Link& _rHdl)
}
// -----------------------------------------------------------------------------
-void DBTreeView::setCopyHandler(const Link& _rHdl)
+void DBTreeView::setCopyHandler(const Link& _rHdl)
{
m_pTreeListBox->setCopyHandler(_rHdl);
}
@@ -125,7 +125,7 @@ void DBTreeView::GetFocus()
// .........................................................................
-} // namespace dbaui
+} // namespace dbaui
// .........................................................................
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
index b008a79a4195..fe0ec4ae8765 100644
--- a/dbaccess/source/ui/browser/dbtreeview.hxx
+++ b/dbaccess/source/ui/browser/dbtreeview.hxx
@@ -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
@@ -48,12 +48,12 @@ namespace dbaui
class DBTreeView : public Window
{
private:
- DBTreeListBox* m_pTreeListBox;
+ DBTreeListBox* m_pTreeListBox;
protected:
// window overridables
virtual void Resize();
- public:
-
+ public:
+
DBTreeView( Window* pParent,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
WinBits nBits );
@@ -63,16 +63,16 @@ namespace dbaui
When calling the link, the parameter is an SvLBoxEntry marking the entry to be expanded.
*/
- void SetPreExpandHandler(const Link& _rHdl);
+ void SetPreExpandHandler(const Link& _rHdl);
/// gets the currently set NodeExpansionHandler
- void setCopyHandler(const Link& _rHdl);
+ void setCopyHandler(const Link& _rHdl);
- void setModel(SvLBoxTreeList* _pTreeModel);
- void setSelChangeHdl(const Link& _rHdl);
+ void setModel(SvLBoxTreeList* _pTreeModel);
+ void setSelChangeHdl(const Link& _rHdl);
- DBTreeListBox& getListBox() const { return *m_pTreeListBox; }
+ DBTreeListBox& getListBox() const { return *m_pTreeListBox; }
virtual void GetFocus();
};
diff --git a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
index 5fb5b0f985c6..865503ac32ce 100644
--- a/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
+++ b/dbaccess/source/ui/browser/dsEntriesNoExp.cxx
@@ -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
@@ -65,7 +65,7 @@ namespace dbaui
{
// .........................................................................
// -----------------------------------------------------------------------------
-SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvLBoxEntry* _pEntry ) const
+SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getChildType( SvLBoxEntry* _pEntry ) const
{
DBG_ASSERT(isContainer(_pEntry), "SbaTableQueryBrowser::getChildType: invalid entry!");
switch (getEntryType(_pEntry))
@@ -92,10 +92,10 @@ SbaTableQueryBrowser::EntryType SbaTableQueryBrowser::getEntryType( SvLBoxEntry*
if (!_pEntry)
return etUnknown;
- SvLBoxEntry* pRootEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry);
- SvLBoxEntry* pEntryParent = m_pTreeView->getListBox().GetParent(_pEntry);
- SvLBoxEntry* pTables = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_TABLES);
- SvLBoxEntry* pQueries = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_QUERIES);
+ SvLBoxEntry* pRootEntry = m_pTreeView->getListBox().GetRootLevelParent(_pEntry);
+ SvLBoxEntry* pEntryParent = m_pTreeView->getListBox().GetParent(_pEntry);
+ SvLBoxEntry* pTables = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_TABLES);
+ SvLBoxEntry* pQueries = m_pTreeView->getListBox().GetEntry(pRootEntry, CONTAINER_QUERIES);
#ifdef DBG_UTIL
String sTest;
@@ -286,6 +286,6 @@ void SbaTableQueryBrowser::notifyHiContrastChanged()
}
// -----------------------------------------------------------------------------
// .........................................................................
-} // namespace dbaui
+} // namespace dbaui
// .........................................................................
diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
index 093bd2f35854..011279b3e31f 100644
--- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx
+++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx
@@ -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
@@ -151,20 +151,20 @@ namespace dbaui
m_nAsyncDrop = 0;
m_aAsyncDrop.aDroppedData.clear();
- m_aAsyncDrop.nType = E_TABLE;
- m_aAsyncDrop.nAction = _rEvt.mnAction;
- m_aAsyncDrop.bError = sal_False;
- m_aAsyncDrop.bHtml = sal_False;
- m_aAsyncDrop.pDroppedAt = NULL;
- m_aAsyncDrop.aUrl = ::rtl::OUString();
+ m_aAsyncDrop.nType = E_TABLE;
+ m_aAsyncDrop.nAction = _rEvt.mnAction;
+ m_aAsyncDrop.bError = sal_False;
+ m_aAsyncDrop.bHtml = sal_False;
+ m_aAsyncDrop.pDroppedAt = NULL;
+ m_aAsyncDrop.aUrl = ::rtl::OUString();
// loop through the available formats and see what we can do ...
// first we have to check if it is our own format, if not we have to copy the stream :-(
if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(aDroppedData.GetDataFlavorExVector()) )
{
- m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData);
- m_aAsyncDrop.pDroppedAt = pHitEntry;
+ m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData);
+ m_aAsyncDrop.pDroppedAt = pHitEntry;
// asyncron because we some dialogs and we aren't allowed to show them while in D&D
m_nAsyncDrop = Application::PostUserEvent(LINK(this, SbaTableQueryBrowser, OnAsyncDrop));
@@ -178,7 +178,7 @@ namespace dbaui
&& m_aTableCopyHelper.copyTagTable( aDroppedData, m_aAsyncDrop, xDestConnection )
)
{
- m_aAsyncDrop.pDroppedAt = pHitEntry;
+ m_aAsyncDrop.pDroppedAt = pHitEntry;
// asyncron because we some dialogs and we aren't allowed to show them while in D&D
m_nAsyncDrop = Application::PostUserEvent(LINK(this, SbaTableQueryBrowser, OnAsyncDrop));
@@ -232,8 +232,8 @@ namespace dbaui
TransferableHelper* pTransfer = NULL;
Reference< XTransferable> aEnsureDelete;
EntryType eType = getEntryType(_pEntry);
- pTransfer = implCopyObject( _pEntry, eType == etQuery ? CommandType::QUERY : CommandType::TABLE);
- aEnsureDelete = pTransfer;
+ pTransfer = implCopyObject( _pEntry, eType == etQuery ? CommandType::QUERY : CommandType::TABLE);
+ aEnsureDelete = pTransfer;
if (pTransfer)
pTransfer->CopyToClipboard(getView());
}
@@ -290,6 +290,6 @@ namespace dbaui
m_pCurrentlyDisplayed = NULL;
}
// .........................................................................
-} // namespace dbaui
+} // namespace dbaui
// .........................................................................
diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx
index 41200c7625ec..3587f07e52c7 100644
--- a/dbaccess/source/ui/browser/exsrcbrw.cxx
+++ b/dbaccess/source/ui/browser/exsrcbrw.cxx
@@ -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
@@ -217,7 +217,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
// create the col
Reference< ::com::sun::star::form::XGridColumnFactory > xColFactory(getControlModel(), UNO_QUERY);
- Reference< ::com::sun::star::beans::XPropertySet > xNewCol = xColFactory->createColumn(sControlType);
+ Reference< ::com::sun::star::beans::XPropertySet > xNewCol = xColFactory->createColumn(sControlType);
Reference< XPropertySetInfo > xNewColProperties;
if (xNewCol.is())
xNewColProperties = xNewCol->getPropertySetInfo();
@@ -235,9 +235,9 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U
catch(Exception&)
{
OSL_ENSURE(sal_False,
- ( ByteString("SbaExternalSourceBrowser::dispatch : could not set a column property (")
- += ByteString(pControlProps->Name.getStr(), (sal_uInt16)pControlProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US)
- += ByteString(")!")).GetBuffer());
+ ( ByteString("SbaExternalSourceBrowser::dispatch : could not set a column property (")
+ += ByteString(pControlProps->Name.getStr(), (sal_uInt16)pControlProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US)
+ += ByteString(")!")).GetBuffer());
}
}
}
@@ -293,22 +293,22 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaExternalSourceBrows
m_bInQueryDispatch = sal_True;
- if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AttachToForm")))
+ if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AttachToForm")))
// attach a new external form
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AddGridColumn")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/AddGridColumn")))
// add a column to the grid
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/ClearView")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/ClearView")))
// clear the grid
)
xReturn = (::com::sun::star::frame::XDispatch*)this;
- if ( !xReturn.is()
- && ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToFirst")))
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToPrev")))
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNext")))
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToLast")))
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNew")))
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/undoRecord")))
+ if ( !xReturn.is()
+ && ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToFirst")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToPrev")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNext")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToLast")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/moveToNew")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:FormSlots/undoRecord")))
)
)
{
@@ -382,8 +382,8 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster)
{
Any aOldPos;
sal_Bool bWasInsertRow = sal_False;
- sal_Bool bBeforeFirst = sal_True;
- sal_Bool bAfterLast = sal_True;
+ sal_Bool bBeforeFirst = sal_True;
+ sal_Bool bAfterLast = sal_True;
Reference< XResultSet > xResultSet(xMaster, UNO_QUERY);
Reference< XRowLocate > xCursor(xMaster, UNO_QUERY);
Reference< XPropertySet > xMasterProps(xMaster, UNO_QUERY);
@@ -399,7 +399,7 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster)
if (xCursor.is() && xResultSet.is())
{
bBeforeFirst = xResultSet->isBeforeFirst();
- bAfterLast = xResultSet->isAfterLast();
+ bAfterLast = xResultSet->isAfterLast();
if(!bBeforeFirst && !bAfterLast)
aOldPos = xCursor->getBookmark();
}
@@ -481,7 +481,7 @@ void SbaExternalSourceBrowser::startListening()
{
if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is())
{
- Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY);
xLoadable->addLoadListener((::com::sun::star::form::XLoadListener*)this);
}
}
@@ -491,7 +491,7 @@ void SbaExternalSourceBrowser::stopListening()
{
if (m_pDataSourceImpl && m_pDataSourceImpl->getAttachedForm().is())
{
- Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY);
+ Reference< ::com::sun::star::form::XLoadable > xLoadable(m_pDataSourceImpl->getAttachedForm(), UNO_QUERY);
xLoadable->removeLoadListener((::com::sun::star::form::XLoadListener*)this);
}
}
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index 2c0f5b978425..7be866504e0d 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -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
@@ -52,10 +52,10 @@
#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
#endif
-#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
+#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
#include
#endif
-#ifndef _COMPHELPER_SEQUENCE_HXX_
+#ifndef _COMPHELPER_SEQUENCE_HXX_
#include
#endif
@@ -1170,7 +1170,7 @@ void SAL_CALL SbaXFormAdapter::dispose() throw( RuntimeException )
m_aContainerListeners.disposeAndClear(aEvt);
// dispose all childs
- for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = m_aChildren.begin();
+ for ( ::std::vector< Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = m_aChildren.begin();
aIter != m_aChildren.end();
++aIter
)
@@ -1539,7 +1539,7 @@ void SbaXFormAdapter::implInsert(const Any& aElement, sal_Int32 nIndex, const ::
// -------------------------------------------------------------------------
sal_Int32 SbaXFormAdapter::implGetPos(const ::rtl::OUString& rName)
{
- ::std::vector< ::rtl::OUString>::iterator aIter = ::std::find_if( m_aChildNames.begin(),
+ ::std::vector< ::rtl::OUString>::iterator aIter = ::std::find_if( m_aChildNames.begin(),
m_aChildNames.end(),
::std::bind2nd(::std::equal_to< rtl::OUString>(),rName));
@@ -1762,7 +1762,7 @@ void SAL_CALL SbaXFormAdapter::propertyChange(const ::com::sun::star::beans::Pro
{
if (evt.PropertyName.equals(PROPERTY_NAME))
{
- ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(),
+ ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(),
m_aChildren.end(),
::std::bind2nd(::std::equal_to< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >(),evt.Source));
@@ -1783,7 +1783,7 @@ void SAL_CALL SbaXFormAdapter::disposing(const ::com::sun::star::lang::EventObje
if (Source.Source == m_xMainForm)
dispose();
- ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(),
+ ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > >::iterator aIter = ::std::find_if( m_aChildren.begin(),
m_aChildren.end(),
::std::bind2nd(::std::equal_to< ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > >(),Source.Source));
if(aIter != m_aChildren.end())
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 5935baafa2c0..d0b1ff925596 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -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
@@ -147,7 +147,7 @@ using namespace ::dbtools;
using namespace ::comphelper;
// -------------------------------------------------------------------------
-#define ALL_FEATURES -1
+#define ALL_FEATURES -1
#define FIRST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() - 1000 )
#define LAST_USER_DEFINED_FEATURE ( ::std::numeric_limits< sal_uInt16 >::max() )
@@ -335,7 +335,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
}
if (!m_xDatabaseContext.is())
- { // at least notify the user. Though the whole component does not make any sense without the database context ...
+ { // at least notify the user. Though the whole component does not make any sense without the database context ...
ShowServiceNotAvailableError(getView(), String(SERVICE_SDB_DATABASECONTEXT), sal_True);
}
return sal_True;
@@ -357,12 +357,12 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
vos::OGuard aSolarGuard( Application::GetSolarMutex() );
::osl::MutexGuard aGuard( getMutex() );
- Reference< XWindow > xParent;
+ Reference< XWindow > xParent;
Reference< XFrame > xFrame;
PropertyValue aValue;
- const Any* pIter = aArguments.getConstArray();
- const Any* pEnd = pIter + aArguments.getLength();
+ const Any* pIter = aArguments.getConstArray();
+ const Any* pEnd = pIter + aArguments.getLength();
for ( ; pIter != pEnd; ++pIter )
{
@@ -565,7 +565,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF
sal_uInt16 nFeat = m_aSupportedFeatures[ _rFeature ].nFeatureId;
FeatureState aFeatState( GetState( nFeat ) );
- FeatureState& rCachedState = m_aStateCache[nFeat]; // creates if neccessary
+ FeatureState& rCachedState = m_aStateCache[nFeat]; // creates if neccessary
if ( !_bIgnoreCache )
{
// check if we really need to notify the listeners : this method may be called much more often than needed, so check
@@ -585,8 +585,8 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF
aEvent.FeatureURL.Complete = _rFeature;
if (m_xUrlTransformer.is())
m_xUrlTransformer->parseStrict(aEvent.FeatureURL);
- aEvent.Source = (XDispatch*)this;
- aEvent.IsEnabled = aFeatState.bEnabled;
+ aEvent.Source = (XDispatch*)this;
+ aEvent.IsEnabled = aFeatState.bEnabled;
// collect all states to be notified
States aStates;
@@ -596,7 +596,7 @@ void OGenericUnoController::ImplBroadcastFeatureState(const ::rtl::OUString& _rF
if ( xListener.is() )
lcl_notifyMultipleStates( *xListener.get(), aEvent, aStates );
else
- { // no -> iterate through all listeners responsible for the URL
+ { // no -> iterate through all listeners responsible for the URL
StringBag aFeatureCommands;
::std::for_each(
m_aSupportedFeatures.begin(),
@@ -754,7 +754,7 @@ void OGenericUnoController::InvalidateAll_Impl()
}
// -----------------------------------------------------------------------
-Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
+Reference< XDispatch > OGenericUnoController::queryDispatch(const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
{
Reference< XDispatch > xReturn;
@@ -789,9 +789,9 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const
if ( nLen )
{
aReturn.realloc( nLen );
- Reference< XDispatch >* pReturn = aReturn.getArray();
- const Reference< XDispatch >* pReturnEnd = aReturn.getArray() + nLen;
- const DispatchDescriptor* pDescripts = aDescripts.getConstArray();
+ Reference< XDispatch >* pReturn = aReturn.getArray();
+ const Reference< XDispatch >* pReturnEnd = aReturn.getArray() + nLen;
+ const DispatchDescriptor* pDescripts = aDescripts.getConstArray();
for ( ; pReturn != pReturnEnd; ++ pReturn, ++pDescripts )
{
@@ -803,7 +803,7 @@ Sequence< Reference< XDispatch > > OGenericUnoController::queryDispatches(const
}
// -----------------------------------------------------------------------
-Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider(void) throw( RuntimeException )
+Reference< XDispatchProvider > OGenericUnoController::getSlaveDispatchProvider(void) throw( RuntimeException )
{
return m_xSlaveDispatcher;
}
@@ -815,7 +815,7 @@ void OGenericUnoController::setSlaveDispatchProvider(const Reference< XDispatchP
}
// -----------------------------------------------------------------------
-Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider(void) throw( RuntimeException )
+Reference< XDispatchProvider > OGenericUnoController::getMasterDispatchProvider(void) throw( RuntimeException )
{
return m_xMasterDispatcher;
}
@@ -872,9 +872,9 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene
while ( iterSearch != m_arrStatusListener.end() )
{
DispatchTarget& rCurrent = *iterSearch;
- if ( (rCurrent.xListener == aListener)
- && ( bRemoveForAll
- || (rCurrent.aURL.Complete.equals(_rURL.Complete))
+ if ( (rCurrent.xListener == aListener)
+ && ( bRemoveForAll
+ || (rCurrent.aURL.Complete.equals(_rURL.Complete))
)
)
{
@@ -893,7 +893,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene
SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find(_rURL.Complete);
if (aIter != m_aSupportedFeatures.end())
- { // clear the cache for that feature
+ { // clear the cache for that feature
StateCacheIterator aCachePos = m_aStateCache.find( aIter->second.nFeatureId );
if ( aCachePos != m_aStateCache.end() )
m_aStateCache.erase( aCachePos );
@@ -902,7 +902,7 @@ void OGenericUnoController::removeStatusListener(const Reference< XStatusListene
// now remove the listener from the deque
::osl::MutexGuard aGuard( m_aFeatureMutex );
m_aFeaturesToInvalidate.erase(
- ::std::remove_if( m_aFeaturesToInvalidate.begin(),
+ ::std::remove_if( m_aFeaturesToInvalidate.begin(),
m_aFeaturesToInvalidate.end(),
::std::bind2nd(FindFeatureListener(),aListener))
,m_aFeaturesToInvalidate.end());
@@ -1279,7 +1279,7 @@ namespace
Reference< XServiceInfo > xSI( xModel, UNO_QUERY );
if ( !xSI.is() )
- { // try to go up the frame hierarchy
+ { // try to go up the frame hierarchy
Reference< XFrame > xParentFrame;
if ( _rxFrame.is() )
@@ -1305,7 +1305,7 @@ namespace
static const sal_Char* pTransTable[] = {
"com.sun.star.sdb.OfficeDatabaseDocument","sdatabase",
"com.sun.star.report.ReportDefinition","sdatabase",
- "com.sun.star.text.TextDocument", "swriter",
+ "com.sun.star.text.TextDocument", "swriter",
"com.sun.star.sheet.SpreadsheetDocument", "scalc",
"com.sun.star.presentation.PresentationDocument", "simpress",
"com.sun.star.drawing.DrawingDocument", "sdraw",
@@ -1322,7 +1322,7 @@ namespace
for ( sal_Int32 j=0; jsupportsService( ::rtl::OUString::createFromAscii( *pDocumentService ) ) )
- { // found a table entry which matches the model's services
+ { // found a table entry which matches the model's services
pReturn = *pHelpModuleName;
break;
}
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 747a2d7ac8cf..fc28c1de325f 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -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
@@ -33,7 +33,7 @@
#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
#endif
-// #include
+// #include
#ifndef _GLOBLMN_HRC
#include
#endif
@@ -83,45 +83,45 @@ String RID_STR_TABLES_CONTAINER
Text [ en-US ] = "Tables";
};
-#define MID_EDIT_DATABASE \
- Identifier = ID_TREE_EDIT_DATABASE ; \
- HelpId = HID_BROWSER_EDIT_DATABASE; \
+#define MID_EDIT_DATABASE \
+ Identifier = ID_TREE_EDIT_DATABASE ; \
+ HelpId = HID_BROWSER_EDIT_DATABASE; \
Text [ en-US ] = "Edit ~Database File..." ;\
-#define MID_ADMINISTRATE \
- Identifier = ID_TREE_ADMINISTRATE ; \
- HelpId = HID_BROWSER_ADMINISTRATE; \
+#define MID_ADMINISTRATE \
+ Identifier = ID_TREE_ADMINISTRATE ; \
+ HelpId = HID_BROWSER_ADMINISTRATE; \
Text [ en-US ] = "Registered databases ..." ;\
-#define MID_CLOSECONN \
- Identifier = ID_TREE_CLOSE_CONN ; \
- HelpId = HID_BROWSER_CLOSECONN ; \
- Text [ en-US ] = "Disco~nnect" ; \
+#define MID_CLOSECONN \
+ Identifier = ID_TREE_CLOSE_CONN ; \
+ HelpId = HID_BROWSER_CLOSECONN ; \
+ Text [ en-US ] = "Disco~nnect" ; \
Menu MENU_BROWSER_DEFAULTCONTEXT
{
ItemList =
{
- MenuItem \
- { \
- MID_EDIT_DATABASE \
- }; \
- MenuItem \
- { \
- MID_CLOSECONN \
- }; \
- MenuItem \
- { \
- Separator = TRUE; \
+ MenuItem \
+ { \
+ MID_EDIT_DATABASE \
+ }; \
+ MenuItem \
+ { \
+ MID_CLOSECONN \
+ }; \
+ MenuItem \
+ { \
+ Separator = TRUE; \
}; \
- MenuItem { ITEM_EDIT_COPY };
- MenuItem \
- { \
- Separator = TRUE; \
+ MenuItem { ITEM_EDIT_COPY };
+ MenuItem \
+ { \
+ Separator = TRUE; \
}; \
- MenuItem \
- { \
- MID_ADMINISTRATE \
+ MenuItem \
+ { \
+ MID_ADMINISTRATE \
};
};
};
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index bb0784c0ce53..d8bb49710bab 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -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
@@ -36,12 +36,12 @@
#include
#endif
-#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY
-#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY
+#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY
+#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY
//#define ITEMID_ORIENTATION SID_ATTR_ALIGN_ORIENTATION
-#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK
-#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN
-#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO
+#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK
+#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN
+#define ITEMID_NUMBERINFO SID_ATTR_NUMBERFORMAT_INFO
#define _ZFORLIST_DECLARE_TABLE
@@ -219,7 +219,7 @@
#ifndef _SVTOOLS_STRINGTRANSFER_HXX_
#include
#endif
-#ifndef _VCL_STDTEXT_HXX
+#ifndef _VCL_STDTEXT_HXX
#include
#endif
#ifndef DBAUI_TOOLS_HXX
@@ -290,9 +290,9 @@ Sequence< ::rtl::OUString> SbaXGridControl::getSupportedServiceNames_Static(void
aSupported[2] = ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControl");
return aSupported;
}
-DBG_NAME(SbaXGridControl );
+DBG_NAME(SbaXGridControl );
//---------------------------------------------------------------------------------------
-SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM)
+SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM)
: FmXGridControl(_rM)
{
DBG_CTOR(SbaXGridControl ,NULL);
@@ -301,7 +301,7 @@ SbaXGridControl::SbaXGridControl(const Reference< XMultiServiceFactory >& _rM)
//---------------------------------------------------------------------------------------
SbaXGridControl::~SbaXGridControl()
{
- DBG_DTOR(SbaXGridControl ,NULL);
+ DBG_DTOR(SbaXGridControl ,NULL);
}
//---------------------------------------------------------------------------------------
@@ -322,7 +322,7 @@ FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent)
catch(Exception&)
{
}
-
+
}
pReturn->Create(pParent, nStyle);
@@ -330,7 +330,7 @@ FmXGridPeer* SbaXGridControl::imp_CreatePeer(Window* pParent)
}
//------------------------------------------------------------------------------
-Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType) throw (RuntimeException)
+Any SAL_CALL SbaXGridControl::queryInterface(const Type& _rType) throw (RuntimeException)
{
Any aRet = FmXGridControl::queryInterface(_rType);
return aRet.hasValue() ? aRet : ::cppu::queryInterface(_rType,(::com::sun::star::frame::XDispatch*)this);
@@ -375,10 +375,10 @@ void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt
// TODO: why the hell this whole class does not use any mutex?
-// if (0 == m_nPeerCreationLevel)
+// if (0 == m_nPeerCreationLevel)
{
Reference< ::com::sun::star::frame::XDispatch > xDisp(getPeer(), UNO_QUERY);
- for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin();
+ for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin();
aIter != m_aStatusMultiplexer.end();
++aIter)
{
@@ -412,12 +412,12 @@ void SAL_CALL SbaXGridControl::addStatusListener( const Reference< XStatusListen
if ( getPeer().is() )
{
if ( 1 == pMultiplexer->getLength() )
- { // the first external listener for this URL
+ { // the first external listener for this URL
Reference< XDispatch > xDisp( getPeer(), UNO_QUERY );
xDisp->addStatusListener( pMultiplexer, _rURL );
}
else
- { // already have other listeners for this URL
+ { // already have other listeners for this URL
_rxListener->statusChanged( pMultiplexer->getLastEvent() );
}
}
@@ -452,7 +452,7 @@ void SAL_CALL SbaXGridControl::dispose(void) throw( RuntimeException )
EventObject aEvt;
aEvt.Source = *this;
- for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin();
+ for ( StatusMultiplexerArray::iterator aIter = m_aStatusMultiplexer.begin();
aIter != m_aStatusMultiplexer.end();
++aIter)
{
@@ -483,7 +483,7 @@ SbaXGridPeer::SbaXGridPeer(const Reference< XMultiServiceFactory >& _rM)
//---------------------------------------------------------------------------------------
SbaXGridPeer::~SbaXGridPeer()
{
- DBG_DTOR(SbaXGridPeer ,NULL);
+ DBG_DTOR(SbaXGridPeer ,NULL);
}
//---------------------------------------------------------------------------------------
@@ -519,7 +519,7 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl,
else
{
::cppu::OInterfaceContainerHelper * pIter = m_aStatusListeners.getContainer(_rUrl);
-
+
if (pIter)
{
::cppu::OInterfaceIteratorHelper aListIter(*pIter);
@@ -530,7 +530,7 @@ void SbaXGridPeer::NotifyStatusChanged(const ::com::sun::star::util::URL& _rUrl,
}
//------------------------------------------------------------------------------
-Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException)
+Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeException)
{
Any aRet = ::cppu::queryInterface(_rType,(::com::sun::star::frame::XDispatch*)this);
if(aRet.hasValue())
@@ -541,10 +541,10 @@ Any SAL_CALL SbaXGridPeer::queryInterface(const Type& _rType) throw (RuntimeExce
//---------------------------------------------------------------------------------------
Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDispatch(const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( RuntimeException )
{
- if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/BrowserAttribs")))
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/RowHeight")))
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnAttribs")))
- || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnWidth")))
+ if ( (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/BrowserAttribs")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/RowHeight")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnAttribs")))
+ || (aURL.Complete.equals(::rtl::OUString::createFromAscii(".uno:GridSlots/ColumnWidth")))
)
{
return (::com::sun::star::frame::XDispatch*)this;
@@ -557,7 +557,7 @@ Reference< ::com::sun::star::frame::XDispatch > SAL_CALL SbaXGridPeer::queryDis
IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ )
{
SbaGridControl* pGrid = static_cast< SbaGridControl* >( GetWindow() );
- if ( pGrid ) // if this fails, we were disposing before arriving here
+ if ( pGrid ) // if this fails, we were disposing before arriving here
{
if ( Application::GetMainThreadIdentifier() != ::vos::OThread::getCurrentIdentifier() )
{
@@ -713,17 +713,17 @@ void SAL_CALL SbaXGridPeer::removeStatusListener(const Reference< ::com::sun::st
//---------------------------------------------------------------------------------------
const Sequence< sal_Int8 > & SbaXGridPeer::getUnoTunnelId()
{
- static Sequence< sal_Int8 > * pSeq = 0;
- if( !pSeq )
+ static Sequence< sal_Int8 > * pSeq = 0;
+ if( !pSeq )
{
::osl::Guard< ::osl::Mutex > aGuard( ::osl::Mutex::getGlobalMutex() );
- if( !pSeq )
+ if( !pSeq )
{
static Sequence< sal_Int8 > aSeq( 16 );
- rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0,sal_True );
- pSeq = &aSeq;
- }
- }
+ rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0,sal_True );
+ pSeq = &aSeq;
+ }
+ }
return *pSeq;
}
@@ -744,7 +744,7 @@ sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId
{
if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) )
return reinterpret_cast< sal_Int64 >( this );
-
+
return FmXGridPeer::getSomething(rId);
}
@@ -793,10 +793,10 @@ void SbaGridHeader::MouseButtonDown( const MouseEvent& _rMEvt )
// the base class will start a column move here, which we don't want to allow
// (at the moment. If we store relative positions with the columns, we can allow column moves ....)
-// sal_uInt16 nPos(0);
-// sal_uInt16 nHitTest = ImplHitTest( _rMEvt.GetPosPixel(), mnMouseOff, nPos );
-// if (!nHitTest & HEAD_HITTEST_DIVIDER)
-// return;
+// sal_uInt16 nPos(0);
+// sal_uInt16 nHitTest = ImplHitTest( _rMEvt.GetPosPixel(), mnMouseOff, nPos );
+// if (!nHitTest & HEAD_HITTEST_DIVIDER)
+// return;
}
FmGridHeader::MouseButtonDown(_rMEvt);
@@ -810,7 +810,7 @@ sal_Bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMo
if (HEADERBAR_ITEM_NOTFOUND != nId)
{
Rectangle aColRect = GetItemRect(nId);
- aColRect.Left() += nId ? 3 : 0; // the handle col (nId == 0) does not have a left margin for resizing
+ aColRect.Left() += nId ? 3 : 0; // the handle col (nId == 0) does not have a left margin for resizing
aColRect.Right() -= 3;
bResizingCol = !aColRect.IsInside(_rMousePos);
}
@@ -826,7 +826,7 @@ sal_Bool SbaGridHeader::ImplStartColumnDrag(sal_Int8 _nAction, const Point& _rMo
static_cast(GetParent())->StartDrag(_nAction,
Point(
- _rMousePos.X() + GetPosPixel().X(), // we aren't left-justified with our parent, in contrast to the data window
+ _rMousePos.X() + GetPosPixel().X(), // we aren't left-justified with our parent, in contrast to the data window
_rMousePos.Y() - GetSizePixel().Height()
)
);
@@ -858,7 +858,7 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, PopupMenu& rM
pShowColsMenu->EnableItem(SID_FM_SHOWALLCOLS, sal_False);
}
}
-
+
// prepend some new items
sal_Bool bColAttrs = (nColId != (sal_uInt16)-1) && (nColId != 0);
if ( bColAttrs && !bDBIsReadOnly)
@@ -929,7 +929,7 @@ void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupM
//==================================================================
// SbaGridControl
//==================================================================
-DBG_NAME(SbaGridControl );
+DBG_NAME(SbaGridControl );
//---------------------------------------------------------------------------------------
SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM,
Window* pParent, FmXGridPeer* _pPeer, WinBits nBits)
@@ -945,9 +945,9 @@ SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM,
//---------------------------------------------------------------------------------------
SbaGridControl::~SbaGridControl()
{
- DBG_DTOR(SbaGridControl ,NULL);
+ DBG_DTOR(SbaGridControl ,NULL);
if (m_nAsyncDropEvent)
- Application::RemoveUserEvent(m_nAsyncDropEvent);
+ Application::RemoveUserEvent(m_nAsyncDropEvent);
}
//---------------------------------------------------------------------------------------
@@ -982,7 +982,7 @@ void SbaGridControl::PreExecuteRowContextMenu(sal_uInt16 nRow, PopupMenu& rMenu)
rMenu.SetHelpId(ID_BROWSER_ROWHEIGHT, aNewItems.GetHelpId(ID_BROWSER_ROWHEIGHT));
rMenu.InsertSeparator(nPos++);
} // if (!IsReadOnlyDB())
-
+
if ( GetSelectRowCount() > 0 )
{
rMenu.InsertItem(ID_BROWSER_COPY, aNewItems.GetItemText(SID_COPY), 0, nPos++);
@@ -1020,13 +1020,13 @@ void SbaGridControl::SetColWidth(sal_uInt16 nColId)
Any aWidth = xAffectedCol->getPropertyValue(PROPERTY_WIDTH);
sal_Int32 nCurWidth = aWidth.hasValue() ? ::comphelper::getINT32(aWidth) : -1;
- DlgSize aDlgColWidth(this, nCurWidth, sal_False);
+ DlgSize aDlgColWidth(this, nCurWidth, sal_False);
if (aDlgColWidth.Execute())
{
sal_Int32 nValue = aDlgColWidth.GetValue();
Any aNewWidth;
if (-1 == nValue)
- { // set to default
+ { // set to default
Reference< XPropertyState > xPropState(xAffectedCol, UNO_QUERY);
if (xPropState.is())
{
@@ -1056,26 +1056,26 @@ void SbaGridControl::SetRowHeight()
sal_Int32 nValue = aDlgRowHeight.GetValue();
Any aNewHeight;
if ((sal_Int16)-1 == nValue)
- { // set to default
+ { // set to default
Reference< XPropertyState > xPropState(xCols, UNO_QUERY);
if (xPropState.is())
{
- try
- {
- aNewHeight = xPropState->getPropertyDefault(PROPERTY_ROW_HEIGHT);
- }
+ try
+ {
+ aNewHeight = xPropState->getPropertyDefault(PROPERTY_ROW_HEIGHT);
+ }
catch(Exception&)
{ }
}
}
else
aNewHeight <<= nValue;
- try
- {
- xCols->setPropertyValue(PROPERTY_ROW_HEIGHT, aNewHeight);
- }
- catch(Exception&)
- {
+ try
+ {
+ xCols->setPropertyValue(PROPERTY_ROW_HEIGHT, aNewHeight);
+ }
+ catch(Exception&)
+ {
OSL_ENSURE(0,"setPropertyValue: PROPERTY_ROW_HEIGHT throws a exception");
}
}
@@ -1176,7 +1176,7 @@ void SbaGridControl::CursorMoved()
}
//---------------------------------------------------------------------------------------
-void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus /*= sal_True*/ )
+void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus /*= sal_True*/ )
{
FmGridControl::ActivateCell(nRow, nCol, bSetCellFocus);
if (m_pMasterListener)
@@ -1240,7 +1240,7 @@ Reference< XPropertySet > SbaGridControl::getField(sal_uInt16 nModelPos)
{
OSL_ENSURE(0,"SbaGridControl::getField Exception occured!");
}
-
+
return xEmptyReturn;
}
@@ -1312,7 +1312,7 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
long nCorrectRowCount = GetRowCount();
if (GetOptions() & OPT_INSERT)
- --nCorrectRowCount; // there is a empty row for inserting records
+ --nCorrectRowCount; // there is a empty row for inserting records
if (bCurrentRowVirtual)
--nCorrectRowCount;
@@ -1322,20 +1322,20 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
sal_Bool bHitHandle = (nColPos == 0);
// check which kind of dragging has to be initiated
- if ( bHitHandle // the handle column
+ if ( bHitHandle // the handle column
// AND
- && ( GetSelectRowCount() // at least one row is selected
+ && ( GetSelectRowCount() // at least one row is selected
// OR
- || ( (nRow >= 0) // a row below the header
- && !bCurrentRowVirtual // we aren't appending a new record
- && (nRow != GetCurrentPos()) // a row which is not the current one
- ) // OR
- || ( (0 == GetSelectRowCount()) // no rows selected
- && (-1 == nRow) // hit the header
+ || ( (nRow >= 0) // a row below the header
+ && !bCurrentRowVirtual // we aren't appending a new record
+ && (nRow != GetCurrentPos()) // a row which is not the current one
+ ) // OR
+ || ( (0 == GetSelectRowCount()) // no rows selected
+ && (-1 == nRow) // hit the header
)
)
)
- { // => start dragging the row
+ { // => start dragging the row
if (GetDataWindow().IsMouseCaptured())
GetDataWindow().ReleaseMouse();
@@ -1349,11 +1349,11 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
bHandled = sal_True;
}
- else if ( (nRow < 0) // the header
- && (!bHitHandle) // non-handle column
- && (nViewPos < GetViewColCount()) // valid (existing) column
+ else if ( (nRow < 0) // the header
+ && (!bHitHandle) // non-handle column
+ && (nViewPos < GetViewColCount()) // valid (existing) column
)
- { // => start dragging the column
+ { // => start dragging the column
if (GetDataWindow().IsMouseCaptured())
GetDataWindow().ReleaseMouse();
@@ -1362,10 +1362,10 @@ void SbaGridControl::StartDrag( sal_Int8 _nAction, const Point& _rPosPixel )
bHandled = sal_True;
}
- else if ( !bHitHandle // non-handle column
- && (nRow >= 0) // non-header row
+ else if ( !bHitHandle // non-handle column
+ && (nRow >= 0) // non-header row
)
- { // => start dragging the field content
+ { // => start dragging the field content
if (GetDataWindow().IsMouseCaptured())
GetDataWindow().ReleaseMouse();
@@ -1418,7 +1418,7 @@ void SbaGridControl::DoColumnDrag(sal_uInt16 nColumnPos)
}
if (0 == sField.getLength())
return;
-
+
OColumnTransferable* pDataTransfer = new OColumnTransferable(xDataSource, sField, xAffectedField, xActiveConnection, CTF_FIELD_DESCRIPTOR | CTF_COLUMN_DESCRIPTOR);
Reference< XTransferable > xEnsureDelete = pDataTransfer;
pDataTransfer->StartDrag(this, DND_ACTION_COPY | DND_ACTION_LINK);
@@ -1503,10 +1503,10 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
}
/// unary_function Functor object for class ZZ returntype is void
- struct SbaGridControlPrec : ::std::unary_function
+ struct SbaGridControlPrec : ::std::unary_function
{
- sal_Bool bQueryDrop;
- SbaGridControlPrec(sal_Bool _bQueryDrop)
+ sal_Bool bQueryDrop;
+ SbaGridControlPrec(sal_Bool _bQueryDrop)
: bQueryDrop(_bQueryDrop)
{
}
@@ -1515,13 +1515,13 @@ void SbaGridControl::DoFieldDrag(sal_uInt16 nColumnPos, sal_Int16 nRowPos)
{
switch (_aType.mnSotId)
{
-// case SOT_FORMAT_RTF: // RTF data descriptions
-// case SOT_FORMATSTR_ID_HTML: // HTML data descriptions
- case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor
- case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor
- case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command
+// case SOT_FORMAT_RTF: // RTF data descriptions
+// case SOT_FORMATSTR_ID_HTML: // HTML data descriptions
+ case SOT_FORMATSTR_ID_DBACCESS_TABLE: // table descriptor
+ case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor
+ case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command
return true;
- }
+ }
return false;
}
};
@@ -1535,25 +1535,25 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
return nAction;
if ( IsDropFormatSupported( FORMAT_STRING ) ) do
- { // odd construction, but spares us a lot of (explicit ;) goto's
+ { // odd construction, but spares us a lot of (explicit ;) goto's
if (!GetEmptyRow().Is())
// without an empty row we're not in update mode
break;
- long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False);
- sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False);
+ long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False);
+ sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False);
long nCorrectRowCount = GetRowCount();
if (GetOptions() & OPT_INSERT)
- --nCorrectRowCount; // there is a empty row for inserting records
+ --nCorrectRowCount; // there is a empty row for inserting records
if (IsCurrentAppending())
- --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one
+ --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one
if ((nCol == BROWSER_INVALIDID) || (nRow >= nCorrectRowCount) || GetColumnId(nCol) == 0 )
// no valid cell under the mouse cursor
break;
-
+
Rectangle aRect = GetCellRect(nRow, nCol, sal_False);
if (!aRect.IsInside(rEvt.maPosPixel))
// not dropped within a cell (a cell isn't as wide as the column - the are small spaces)
@@ -1585,7 +1585,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt )
// assume RO
break;
}
-
+
try
{
// assume that text can be dropped into a field if the column has a ::com::sun::star::awt::XTextComponent interface
@@ -1649,14 +1649,14 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt )
if ( IsDropFormatSupported( FORMAT_STRING ) )
{
- long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False);
- sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False);
+ long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False);
+ sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False);
long nCorrectRowCount = GetRowCount();
if (GetOptions() & OPT_INSERT)
- --nCorrectRowCount; // there is a empty row for inserting records
+ --nCorrectRowCount; // there is a empty row for inserting records
if (IsCurrentAppending())
- --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one
+ --nCorrectRowCount; // the current data record doesn't really exist, we are appending a new one
DBG_ASSERT((nCol != BROWSER_INVALIDID) && (nRow < nCorrectRowCount), "SbaGridControl::Drop : dropped on an invalid position !");
// AcceptDrop should have caught this
@@ -1727,9 +1727,9 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/)
{
sal_Bool bCountFinal = sal_False;
xDataSource->getPropertyValue(PROPERTY_ISROWCOUNTFINAL) >>= bCountFinal;
- if ( !bCountFinal )
+ if ( !bCountFinal )
setDataSource(NULL); // deattach from grid control
- Reference< XResultSetUpdate > xResultSetUpdate(xDataSource,UNO_QUERY);
+ Reference< XResultSetUpdate > xResultSetUpdate(xDataSource,UNO_QUERY);
ODatabaseImportExport* pImExport = new ORowSetImportExport(this,xResultSetUpdate,m_aDataDescriptor,getServiceManager());
Reference xHolder = pImExport;
Hide();
@@ -1757,11 +1757,11 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/)
Show();
DBG_UNHANDLED_EXCEPTION();
}
- if ( !bCountFinal )
+ if ( !bCountFinal )
setDataSource(Reference< XRowSet >(xDataSource,UNO_QUERY));
}
- m_aDataDescriptor.clear();
-
+ m_aDataDescriptor.clear();
+
return 0L;
}
// -------------------------------------------------------------------------
@@ -1775,7 +1775,7 @@ IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/)
}
else
sRet = FmGridControl::GetAccessibleObjectDescription( eObjType,_nPosition);
- return sRet;
+ return sRet;
}
// -----------------------------------------------------------------------------
void SbaGridControl::DeleteSelectedRows()
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index 1362944d5847..6c53941d0be3 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -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/ui/browser/sbamultiplex.cxx b/dbaccess/source/ui/browser/sbamultiplex.cxx
index de304ebbe1dd..f3db0718ae92 100644
--- a/dbaccess/source/ui/browser/sbamultiplex.cxx
+++ b/dbaccess/source/ui/browser/sbamultiplex.cxx
@@ -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
@@ -47,7 +47,7 @@ void SAL_CALL SbaXStatusMultiplexer::statusChanged(const ::com::sun::star::frame
::cppu::OInterfaceIteratorHelper aIt( *this );
while ( aIt.hasMoreElements() )
static_cast< ::com::sun::star::frame::XStatusListener* >( aIt.next() )->statusChanged( m_aLastKnownStatus );
-} \
+} \
// LoadListener
IMPLEMENT_LISTENER_MULTIPLEXER_CORE(SbaXLoadMultiplexer, ::com::sun::star::form::XLoadListener)
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index c65055c582fc..451840e9a63b 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -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
@@ -380,7 +380,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
{
// create controls and set sizes
- const long nFrameWidth = getBrowserView()->LogicToPixel( ::Size( 3, 0 ), MAP_APPFONT ).Width();
+ const long nFrameWidth = getBrowserView()->LogicToPixel( ::Size( 3, 0 ), MAP_APPFONT ).Width();
m_pSplitter = new Splitter(getBrowserView(),WB_HSCROLL);
m_pSplitter->SetPosSizePixel( ::Point(0,0), ::Size(nFrameWidth,0) );
@@ -441,27 +441,27 @@ sal_Bool SbaTableQueryBrowser::InitializeForm(const Reference< ::com::sun::star:
{
sal_Int32 nPos = 0;
// is the filter intially applied ?
- aProperties.getArray()[nPos] = PROPERTY_APPLYFILTER;
- aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_APPLYFILTER);
+ aProperties.getArray()[nPos] = PROPERTY_APPLYFILTER;
+ aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_APPLYFILTER);
// the initial filter
- aProperties.getArray()[nPos] = PROPERTY_FILTER;
- aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_FILTER);
+ aProperties.getArray()[nPos] = PROPERTY_FILTER;
+ aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_FILTER);
if ( pData->xObjectProperties->getPropertySetInfo()->hasPropertyByName(PROPERTY_HAVING_CLAUSE) )
{
aProperties.realloc(aProperties.getLength()+1);
aValues.realloc(aValues.getLength()+1);
// the initial having clause
- aProperties.getArray()[nPos] = PROPERTY_HAVING_CLAUSE;
- aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_HAVING_CLAUSE);
+ aProperties.getArray()[nPos] = PROPERTY_HAVING_CLAUSE;
+ aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_HAVING_CLAUSE);
}
// the initial ordering
- aProperties.getArray()[nPos] = PROPERTY_ORDER;
- aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_ORDER);
+ aProperties.getArray()[nPos] = PROPERTY_ORDER;
+ aValues.getArray()[nPos++] = pData->xObjectProperties->getPropertyValue(PROPERTY_ORDER);
- Reference< XMultiPropertySet > xFormMultiSet(_rxForm, UNO_QUERY);
+ Reference< XMultiPropertySet > xFormMultiSet(_rxForm, UNO_QUERY);
xFormMultiSet->setPropertyValues(aProperties, aValues);
}
}
@@ -523,38 +523,38 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
Any* pValueIter = aValues.getArray();
if ( m_bPreview )
{
- *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor"));
- *pValueIter++ <<= sal_False;
- *pStringIter++ = PROPERTY_BORDER;
- *pValueIter++ <<= sal_Int16(0);
+ *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor"));
+ *pValueIter++ <<= sal_False;
+ *pStringIter++ = PROPERTY_BORDER;
+ *pValueIter++ <<= sal_Int16(0);
}
- *pStringIter++ = PROPERTY_FONT;
- *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_FONT);
- *pStringIter++ = PROPERTY_TEXTEMPHASIS;
- *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTEMPHASIS);
- *pStringIter++ = PROPERTY_TEXTRELIEF;
- *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTRELIEF);
+ *pStringIter++ = PROPERTY_FONT;
+ *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_FONT);
+ *pStringIter++ = PROPERTY_TEXTEMPHASIS;
+ *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTEMPHASIS);
+ *pStringIter++ = PROPERTY_TEXTRELIEF;
+ *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTRELIEF);
if ( m_bPreview )
{
- *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar"));
- *pValueIter++ <<= sal_False;
- *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker"));
- *pValueIter++ <<= sal_False;
+ *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar"));
+ *pValueIter++ <<= sal_False;
+ *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker"));
+ *pValueIter++ <<= sal_False;
}
- *pStringIter++ = PROPERTY_ROW_HEIGHT;
- *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_ROW_HEIGHT);
+ *pStringIter++ = PROPERTY_ROW_HEIGHT;
+ *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_ROW_HEIGHT);
if ( m_bPreview )
{
- *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop"));
- *pValueIter++ <<= sal_False;
+ *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop"));
+ *pValueIter++ <<= sal_False;
}
- *pStringIter++ = PROPERTY_TEXTCOLOR;
- *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTCOLOR);
- *pStringIter++ = PROPERTY_TEXTLINECOLOR;
- *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTLINECOLOR);
+ *pStringIter++ = PROPERTY_TEXTCOLOR;
+ *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTCOLOR);
+ *pStringIter++ = PROPERTY_TEXTLINECOLOR;
+ *pValueIter++ = pData->xObjectProperties->getPropertyValue(PROPERTY_TEXTLINECOLOR);
- Reference< XMultiPropertySet > xFormMultiSet(xGrid, UNO_QUERY);
+ Reference< XMultiPropertySet > xFormMultiSet(xGrid, UNO_QUERY);
xFormMultiSet->setPropertyValues(aProperties, aValues);
}
@@ -575,10 +575,10 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
// insert the column into the gridcontrol so that we see something :-)
::rtl::OUString aCurrentModelType;
Reference xSupCols(getRowSet(),UNO_QUERY);
- Reference xColumns = xSupCols->getColumns();
- Sequence< ::rtl::OUString> aNames = xColumns->getElementNames();
- const ::rtl::OUString* pIter = aNames.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aNames.getLength();
+ Reference xColumns = xSupCols->getColumns();
+ Sequence< ::rtl::OUString> aNames = xColumns->getElementNames();
+ const ::rtl::OUString* pIter = aNames.getConstArray();
+ const ::rtl::OUString* pEnd = pIter + aNames.getLength();
::rtl::OUString sDefaultProperty;
Reference< XPropertySet > xColumn;
@@ -596,7 +596,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
continue;
// use the result set column's type to determine the type of grid column to create
- sal_Bool bFormattedIsNumeric = sal_True;
+ sal_Bool bFormattedIsNumeric = sal_True;
sal_Int32 nType = ::comphelper::getINT32( xColumn->getPropertyValue( PROPERTY_TYPE ) );
::std::vector< NamedValue > aInitialValues;
@@ -687,7 +687,7 @@ sal_Bool SbaTableQueryBrowser::InitializeGridModel(const Reference< ::com::sun::
aDescription >>= sTemp;
if ( !sTemp.getLength() )
xColumn->getPropertyValue( PROPERTY_DESCRIPTION ) >>= sTemp;
-
+
aDescription <<= sTemp;
aInitialValues.push_back( NamedValue( PROPERTY_HELPTEXT, aDescription ) );
@@ -772,7 +772,7 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw(
// one of the many properties which require us to update the definition ?
// a column's width ?
else if (evt.PropertyName.equals(PROPERTY_WIDTH))
- { // a column width has changed -> update the model
+ { // a column width has changed -> update the model
// (the update of the view is done elsewhere)
Reference xProp = getColumnHelper(m_pCurrentlyDisplayed,xSource);
if(xProp.is())
@@ -819,8 +819,8 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw(
}
// a column's format ?
- else if ( (evt.PropertyName.equals(PROPERTY_FORMATKEY))
- && (TypeClass_LONG == evt.NewValue.getValueTypeClass())
+ else if ( (evt.PropertyName.equals(PROPERTY_FORMATKEY))
+ && (TypeClass_LONG == evt.NewValue.getValueTypeClass())
)
{
// update the model (means the definition object)
@@ -846,15 +846,15 @@ void SbaTableQueryBrowser::propertyChange(const PropertyChangeEvent& evt) throw(
}
}
- else if ( evt.PropertyName.equals(PROPERTY_FONT) // the font ?
- || evt.PropertyName.equals(PROPERTY_TEXTCOLOR) // the text color ?
- || evt.PropertyName.equals(PROPERTY_FILTER) // the filter ?
- || evt.PropertyName.equals(PROPERTY_HAVING_CLAUSE) // the having clause ?
- || evt.PropertyName.equals(PROPERTY_ORDER) // the sort ?
- || evt.PropertyName.equals(PROPERTY_APPLYFILTER) // the appliance of the filter ?
- || evt.PropertyName.equals(PROPERTY_TEXTLINECOLOR) // the text line color ?
- || evt.PropertyName.equals(PROPERTY_TEXTEMPHASIS) // the text emphasis ?
- || evt.PropertyName.equals(PROPERTY_TEXTRELIEF) // the text relief ?
+ else if ( evt.PropertyName.equals(PROPERTY_FONT) // the font ?
+ || evt.PropertyName.equals(PROPERTY_TEXTCOLOR) // the text color ?
+ || evt.PropertyName.equals(PROPERTY_FILTER) // the filter ?
+ || evt.PropertyName.equals(PROPERTY_HAVING_CLAUSE) // the having clause ?
+ || evt.PropertyName.equals(PROPERTY_ORDER) // the sort ?
+ || evt.PropertyName.equals(PROPERTY_APPLYFILTER) // the appliance of the filter ?
+ || evt.PropertyName.equals(PROPERTY_TEXTLINECOLOR) // the text line color ?
+ || evt.PropertyName.equals(PROPERTY_TEXTEMPHASIS) // the text emphasis ?
+ || evt.PropertyName.equals(PROPERTY_TEXTRELIEF) // the text relief ?
)
{
transferChangedControlProperty(evt.PropertyName, evt.NewValue);
@@ -954,14 +954,14 @@ void SbaTableQueryBrowser::checkDocumentDataSource()
if (!bKnownDocDataSource)
{
if (NULL != pDataSourceEntry)
- { // at least the data source is know
+ { // at least the data source is know
if (NULL != pContainerEntry)
bKnownDocDataSource = sal_True; // assume we know it.
// TODO: should we expand the object container? This may be too expensive just for checking ....
else
{
if ((NULL == pObjectEntry) && m_aDocumentDataSource.has(daCommandType) && m_aDocumentDataSource.has(daCommand))
- { // maybe we have a command to be displayed ?
+ { // maybe we have a command to be displayed ?
sal_Int32 nCommandType = CommandType::TABLE;
m_aDocumentDataSource[daCommandType] >>= nCommandType;
@@ -1005,7 +1005,7 @@ namespace
if ( aURL.GetProtocol() != INET_PROT_NOT_VALID )
{
_rDisplayName = aURL.getBase(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
- // _rDisplayName = aURL.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
+ // _rDisplayName = aURL.getName(INetURLObject::LAST_SEGMENT,true,INetURLObject::DECODE_WITH_CHARSET);
_rUniqueId = aURL.GetMainURL( INetURLObject::NO_DECODE );
return true;
}
@@ -1175,7 +1175,7 @@ SvLBoxEntry* SbaTableQueryBrowser::getObjectEntry(const ::svx::ODataAccessDescri
// -------------------------------------------------------------------------
void SbaTableQueryBrowser::connectExternalDispatches()
{
- Reference< XDispatchProvider > xProvider( getFrame(), UNO_QUERY );
+ Reference< XDispatchProvider > xProvider( getFrame(), UNO_QUERY );
DBG_ASSERT(xProvider.is(), "SbaTableQueryBrowser::connectExternalDispatches: no DispatchProvider !");
if (xProvider.is())
{
@@ -1298,7 +1298,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const EventObject& _rSource ) thr
{
Reference xCon(_rSource.Source, UNO_QUERY);
if ( xCon.is() && m_pTreeView )
- { // our connection is in dispose so we have to find the entry equal with this connection
+ { // our connection is in dispose so we have to find the entry equal with this connection
// and close it what means to collapse the entry
// get the top-level representing the removed data source
SvLBoxEntry* pDSLoop = m_pTreeView->getListBox().FirstChild(NULL);
@@ -1551,7 +1551,7 @@ void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch)
if (isValid() && !loadingCancelled())
{
// did we load a query?
- sal_Bool bTemporary; // needed because we m_bQueryEscapeProcessing is only one bit wide (and we want to pass it by reference)
+ sal_Bool bTemporary; // needed because we m_bQueryEscapeProcessing is only one bit wide (and we want to pass it by reference)
if ( implGetQuerySignature( m_sQueryCommand, bTemporary ) )
m_bQueryEscapeProcessing = bTemporary;
}
@@ -1617,8 +1617,8 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
SvLBoxEntry* pDataSourceEntry = m_pTreeView->getListBox().GetRootLevelParent( pCurrentEntry );
DBTreeListUserData* pDSData
= pDataSourceEntry
- ? static_cast< DBTreeListUserData* >( pDataSourceEntry->GetUserData() )
- : NULL;
+ ? static_cast< DBTreeListUserData* >( pDataSourceEntry->GetUserData() )
+ : NULL;
if ( nId == ID_TREE_CLOSE_CONN )
{
@@ -1737,7 +1737,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
case ID_BROWSER_COLATTRSET:
case ID_BROWSER_COLWIDTH:
aReturn.bEnabled = getBrowserView() && getBrowserView()->getVclControl() && isValid() && isValidCursor();
- // aReturn.bEnabled &= getDefinition() && !getDefinition()->GetDatabase()->IsReadOnly();
+ // aReturn.bEnabled &= getDefinition() && !getDefinition()->GetDatabase()->IsReadOnly();
break;
case ID_BROWSER_COPY:
@@ -1872,7 +1872,7 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
MultiSelection* pSelection = (MultiSelection*)pGrid->GetSelection();
Sequence< Any > aSelection;
if ( !pGrid->IsAllSelected() )
- { // transfer the selected rows only if not all rows are selected
+ { // transfer the selected rows only if not all rows are selected
// (all rows means the whole table)
// i3832 - 03.04.2002 - fs@openoffice.org
if (pSelection != NULL)
@@ -1913,14 +1913,14 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
xProp->getPropertyValue(PROPERTY_DATASOURCENAME) >>= sDataSourceName;
aDescriptor.setDataSource(sDataSourceName);
- aDescriptor[daCommand] = xProp->getPropertyValue(PROPERTY_COMMAND);
- aDescriptor[daCommandType] = xProp->getPropertyValue(PROPERTY_COMMAND_TYPE);
- aDescriptor[daConnection] = xProp->getPropertyValue(PROPERTY_ACTIVE_CONNECTION);
- aDescriptor[daCursor] <<= xCursorClone;
+ aDescriptor[daCommand] = xProp->getPropertyValue(PROPERTY_COMMAND);
+ aDescriptor[daCommandType] = xProp->getPropertyValue(PROPERTY_COMMAND_TYPE);
+ aDescriptor[daConnection] = xProp->getPropertyValue(PROPERTY_ACTIVE_CONNECTION);
+ aDescriptor[daCursor] <<= xCursorClone;
if ( aSelection.getLength() )
{
- aDescriptor[daSelection] <<= aSelection;
- aDescriptor[daBookmarkSelection] <<= sal_False;
+ aDescriptor[daSelection] <<= aSelection;
+ aDescriptor[daBookmarkSelection] <<= sal_False;
// these are selection indicies
// before we change this, all clients have to be adjusted
// so that they recognize the new BookmarkSelection property!
@@ -2030,8 +2030,8 @@ void SbaTableQueryBrowser::initializeTreeModel()
// fill the model with the names of the registered datasources
Sequence< ::rtl::OUString > aDatasources = m_xDatabaseContext->getElementNames();
- const ::rtl::OUString* pIter = aDatasources.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aDatasources.getLength();
+ const ::rtl::OUString* pIter = aDatasources.getConstArray();
+ const ::rtl::OUString* pEnd = pIter + aDatasources.getLength();
for (; pIter != pEnd; ++pIter)
implAddDatasource( *pIter, aDBImage, sQueriesName, aQueriesImage, sTablesName, aTablesImage, SharedConnection() );
}
@@ -2048,8 +2048,8 @@ void SbaTableQueryBrowser::populateTree(const Reference& _xNameAcce
try
{
Sequence< ::rtl::OUString > aNames = _xNameAccess->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)
{
if( !m_pTreeView->getListBox().GetEntryPosByName(*pIter,_pParent))
@@ -2180,7 +2180,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvLBoxEntry*, _pParent)
// 0 indicates that an error occured
}
else
- { // we have to expand the queries or bookmarks
+ { // we have to expand the queries or bookmarks
if (ensureEntryObject(_pParent))
{
DBTreeListUserData* pParentData = static_cast< DBTreeListUserData* >( _pParent->GetUserData() );
@@ -2235,7 +2235,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvLBoxEntry* _pEntry )
{
DBG_UNHANDLED_EXCEPTION();
}
-
+
bSuccess = pEntryData->xContainer.is();
}
else
@@ -2296,7 +2296,7 @@ sal_Bool SbaTableQueryBrowser::implLoadAnything(const ::rtl::OUString& _rDataSou
Reference xProp(getRowSet(),UNO_QUERY);
if(xProp.is())
{
- Reference< ::com::sun::star::form::XLoadable > xLoadable(xProp,UNO_QUERY);
+ Reference< ::com::sun::star::form::XLoadable > xLoadable(xProp,UNO_QUERY);
try
{
// the values allowing the RowSet to re-execute
@@ -2402,7 +2402,7 @@ sal_Bool SbaTableQueryBrowser::implSelect(const ::rtl::OUString& _rDataSourceNam
else if (!pCommandType)
{
if ( m_pCurrentlyDisplayed )
- { // tell the old entry (if any) it has been deselected
+ { // tell the old entry (if any) it has been deselected
selectPath(m_pCurrentlyDisplayed, sal_False);
m_pCurrentlyDisplayed = NULL;
}
@@ -2468,7 +2468,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
sal_Int32 nOldType = 0;
xRowSetProps->getPropertyValue(PROPERTY_COMMAND_TYPE) >>= nOldType;
Reference xOldConnection(xRowSetProps->getPropertyValue(PROPERTY_ACTIVE_CONNECTION),UNO_QUERY);
-
+
// the name of the table or query
SvLBoxString* pString = (SvLBoxString*)_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING);
OSL_ENSURE(pString,"There must be a string item!");
@@ -2488,16 +2488,16 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
}
::rtl::OUString aName = sNameBuffer.makeStringAndClear();
- sal_Int32 nCommandType = ( etTableContainer == pContainerData->eType)
- ? CommandType::TABLE
- : CommandType::QUERY;
+ sal_Int32 nCommandType = ( etTableContainer == pContainerData->eType)
+ ? CommandType::TABLE
+ : CommandType::QUERY;
// check if need to rebuild the rowset
sal_Bool bRebuild = ( xOldConnection != pConData->xConnection )
|| ( nOldType != nCommandType )
|| ( aName != aOldName );
- Reference< ::com::sun::star::form::XLoadable > xLoadable = getLoadable();
+ Reference< ::com::sun::star::form::XLoadable > xLoadable = getLoadable();
bRebuild |= !xLoadable->isLoaded();
bool bSuccess = true;
if ( bRebuild )
@@ -2611,7 +2611,7 @@ bool SbaTableQueryBrowser::implSelect( SvLBoxEntry* _pEntry )
String sDataSourceName( getDataSourceAcessor( pConnection ) );
bSuccess = implLoadAnything( sDataSourceName, aName, nCommandType, sal_True, pConData->xConnection );
if ( !bSuccess )
- { // clean up
+ { // clean up
criticalFail();
}
}
@@ -2651,18 +2651,18 @@ SvLBoxEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference(pContainer->GetUserData());
if ( pQueriesData && pQueriesData->xContainer == _rxNameAccess )
break;
- pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_TABLES);
+ pContainer = rListBox.GetEntry(pDSLoop, CONTAINER_TABLES);
DBTreeListUserData* pTablesData = static_cast(pContainer->GetUserData());
if ( pTablesData && pTablesData->xContainer == _rxNameAccess )
break;
- pDSLoop = rListBox.NextSibling(pDSLoop);
- pContainer = NULL;
+ pDSLoop = rListBox.NextSibling(pDSLoop);
+ pContainer = NULL;
}
return pContainer;
}
@@ -2676,7 +2676,7 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEve
// first search for a definition container where we can insert this element
SvLBoxEntry* pEntry = getEntryFromContainer(xNames);
- if(pEntry) // found one
+ if(pEntry) // found one
{
// insert the new entry into the tree
DBTreeListUserData* pContainerData = static_cast(pEntry->GetUserData());
@@ -2708,9 +2708,9 @@ void SAL_CALL SbaTableQueryBrowser::elementInserted( const ContainerEvent& _rEve
sal_Bool SbaTableQueryBrowser::isCurrentlyDisplayedChanged(const String& _sName,SvLBoxEntry* _pContainer)
{
return m_pCurrentlyDisplayed
- && getEntryType(m_pCurrentlyDisplayed) == getChildType(_pContainer)
- && m_pTreeView->getListBox().GetParent(m_pCurrentlyDisplayed) == _pContainer
- && m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed) == _sName;
+ && getEntryType(m_pCurrentlyDisplayed) == getChildType(_pContainer)
+ && m_pTreeView->getListBox().GetParent(m_pCurrentlyDisplayed) == _pContainer
+ && m_pTreeView->getListBox().GetEntryText(m_pCurrentlyDisplayed) == _sName;
}
// -------------------------------------------------------------------------
void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException)
@@ -2726,7 +2726,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven
String aName = ::comphelper::getString(_rEvent.Accessor).getStr();
if ( isCurrentlyDisplayedChanged( aName, pContainer) )
- { // the element displayed currently has been replaced
+ { // the element displayed currently has been replaced
// we need to remember the old value
SvLBoxEntry* pTemp = m_pCurrentlyDisplayed;
@@ -2773,11 +2773,11 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve
Reference< XNameAccess > xNames(_rEvent.Source, UNO_QUERY);
SvLBoxEntry* pContainer = getEntryFromContainer(xNames);
if ( pContainer )
- { // a table or query as been replaced
+ { // a table or query as been replaced
String aName = ::comphelper::getString(_rEvent.Accessor).getStr();
if ( isCurrentlyDisplayedChanged( aName, pContainer) )
- { // the element displayed currently has been replaced
+ { // the element displayed currently has been replaced
// we need to remember the old value
SvLBoxEntry* pTemp = m_pCurrentlyDisplayed;
@@ -2828,7 +2828,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve
checkDocumentDataSource();
}
else if (xNames.get() == m_xDatabaseContext.get())
- { // a datasource has been replaced in the context
+ { // a datasource has been replaced in the context
DBG_ERROR("SbaTableQueryBrowser::elementReplaced: no support for replaced data sources!");
// very suspicious: the database context should not allow to replace data source, only to register
// and revoke them
@@ -3063,20 +3063,20 @@ void SbaTableQueryBrowser::impl_initialize()
::rtl::OUString* pStringIter = aProperties.getArray();
Any* pValueIter = aValues.getArray();
- *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor"));
- *pValueIter++ <<= sal_False;
- *pStringIter++ = PROPERTY_BORDER;
- *pValueIter++ <<= sal_Int16(0);
+ *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AlwaysShowCursor"));
+ *pValueIter++ <<= sal_False;
+ *pStringIter++ = PROPERTY_BORDER;
+ *pValueIter++ <<= sal_Int16(0);
- *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar"));
- *pValueIter++ <<= sal_False;
- *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker"));
- *pValueIter++ <<= sal_False;
+ *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasNavigationBar"));
+ *pValueIter++ <<= sal_False;
+ *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HasRecordMarker"));
+ *pValueIter++ <<= sal_False;
- *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop"));
- *pValueIter++ <<= sal_False;
+ *pStringIter++ = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop"));
+ *pValueIter++ <<= sal_False;
- Reference< XMultiPropertySet > xFormMultiSet(getFormComponent(), UNO_QUERY);
+ Reference< XMultiPropertySet > xFormMultiSet(getFormComponent(), UNO_QUERY);
if ( xFormMultiSet.is() )
xFormMultiSet->setPropertyValues(aProperties, aValues);
}
@@ -3219,8 +3219,8 @@ sal_Bool SbaTableQueryBrowser::ensureConnection(SvLBoxEntry* _pAnyEntry, SharedC
SvLBoxEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent(_pAnyEntry);
DBTreeListUserData* pDSData =
pDSEntry
- ? static_cast(pDSEntry->GetUserData())
- : NULL;
+ ? static_cast(pDSEntry->GetUserData())
+ : NULL;
return ensureConnection( pDSEntry, pDSData, _rConnection );
}
@@ -3241,8 +3241,8 @@ sal_Bool SbaTableQueryBrowser::getExistentConnectionFor( SvLBoxEntry* _pAnyEntry
SvLBoxEntry* pDSEntry = m_pTreeView->getListBox().GetRootLevelParent( _pAnyEntry );
DBTreeListUserData* pDSData =
pDSEntry
- ? static_cast< DBTreeListUserData* >( pDSEntry->GetUserData() )
- : NULL;
+ ? static_cast< DBTreeListUserData* >( pDSEntry->GetUserData() )
+ : NULL;
if ( pDSData )
_rConnection = pDSData->xConnection;
return _rConnection.is();
@@ -3339,7 +3339,7 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa
String sLeftText = pLeftTextItem->GetText();
String sRightText = pRightTextItem->GetText();
- sal_Int32 nCompareResult = 0; // equal by default
+ sal_Int32 nCompareResult = 0; // equal by default
if (m_xCollator.is())
{
@@ -3502,12 +3502,12 @@ sal_Bool SbaTableQueryBrowser::implGetQuerySignature( ::rtl::OUString& _rCommand
// ontain the dss (data source signature) of the form
::rtl::OUString sDataSourceName;
::rtl::OUString sCommand;
- sal_Int32 nCommandType = CommandType::COMMAND;
+ sal_Int32 nCommandType = CommandType::COMMAND;
Reference< XPropertySet > xRowsetProps( getRowSet(), UNO_QUERY );
ODataAccessDescriptor aDesc( xRowsetProps );
sDataSourceName = aDesc.getDataSource();
- aDesc[ daCommand ] >>= sCommand;
- aDesc[ daCommandType ] >>= nCommandType;
+ aDesc[ daCommand ] >>= sCommand;
+ aDesc[ daCommandType ] >>= nCommandType;
// do we need to do anything?
if ( CommandType::QUERY != nCommandType )
@@ -3558,8 +3558,8 @@ void SbaTableQueryBrowser::clearGridColumns(const Reference< XNameContainer >& _
{
// first we have to clear the grid
Sequence< ::rtl::OUString > aNames = _xColContainer->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();
Reference< XInterface > xColumn;
for (; pIter != pEnd;++pIter)
{
@@ -3722,7 +3722,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour
return;
if ( isSelected( pDataSourceEntry ) )
- { // a table or query belonging to the deleted data source is currently beeing displayed.
+ { // a table or query belonging to the deleted data source is currently beeing displayed.
OSL_ENSURE( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) == pDataSourceEntry,
"SbaTableQueryBrowser::impl_cleanupDataSourceEntry: inconsistence (1)!" );
unloadAndCleanup( sal_True );
@@ -3730,7 +3730,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const String& _rDataSour
else
OSL_ENSURE(
( NULL == m_pCurrentlyDisplayed )
- || ( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) != pDataSourceEntry ),
+ || ( m_pTreeView->getListBox().GetRootLevelParent( m_pCurrentlyDisplayed ) != pDataSourceEntry ),
"SbaTableQueryBrowser::impl_cleanupDataSourceEntry: inconsistence (2)!");
// delete any user data of the child entries of the to-be-removed entry
@@ -3778,7 +3778,7 @@ void SAL_CALL SbaTableQueryBrowser::changedDatabaseLocation( const DatabaseRegis
// .........................................................................
-} // namespace dbaui
+} // namespace dbaui
// .........................................................................
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 69f31bc1bfc2..08fe15e188f9 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -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
@@ -61,7 +61,7 @@ DBG_NAME(OColumnControlWindow)
//========================================================================
OColumnControlWindow::OColumnControlWindow(Window* pParent
,const Reference& _rxFactory)
- : OFieldDescControl(pParent,NULL)
+ : OFieldDescControl(pParent,NULL)
, m_xORB(_rxFactory)
, m_sTypeNames(ModuleRes(STR_TABLEDESIGN_DBFIELDTYPES))
, m_bAutoIncrementEnabled(sal_True)
@@ -84,7 +84,7 @@ void OColumnControlWindow::ActivateAggregate( EControlType eType )
{
case tpFormat:
case tpDefault:
-// case tpAutoIncrement:
+// case tpAutoIncrement:
case tpColumnName:
break;
default:
@@ -98,7 +98,7 @@ void OColumnControlWindow::DeactivateAggregate( EControlType eType )
{
case tpFormat:
case tpDefault:
-// case tpAutoIncrement:
+// case tpAutoIncrement:
case tpColumnName:
break;
default:
@@ -111,7 +111,7 @@ void OColumnControlWindow::CellModified(long /*nRow*/, USHORT /*nColId*/ )
saveCurrentFieldDescData();
}
// -----------------------------------------------------------------------------
-::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const
+::com::sun::star::lang::Locale OColumnControlWindow::GetLocale() const
{
return m_aLocale;
}
@@ -142,7 +142,7 @@ TOTypeInfoSP OColumnControlWindow::getTypeInfo(sal_Int32 _nPos)
return ( _nPos >= 0 && _nPos < static_cast(m_aDestTypeInfoIndex.size())) ? m_aDestTypeInfoIndex[_nPos]->second : TOTypeInfoSP();
}
// -----------------------------------------------------------------------------
-const OTypeInfoMap* OColumnControlWindow::getTypeInfo() const
+const OTypeInfoMap* OColumnControlWindow::getTypeInfo() const
{
return &m_aDestTypeInfo;
}
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index c2c8affcd4a8..936d82eea081 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -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
@@ -28,11 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY
-#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY
+#define ITEMID_HORJUSTIFY SID_ATTR_ALIGN_HOR_JUSTIFY
+#define ITEMID_VERJUSTIFY SID_ATTR_ALIGN_VER_JUSTIFY
//#define ITEMID_ORIENTATION SID_ATTR_ALIGN_ORIENTATION
-#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK
-#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN
+#define ITEMID_LINEBREAK SID_ATTR_ALIGN_LINEBREAK
+#define ITEMID_MARGIN SID_ATTR_ALIGN_MARGIN
#include "FieldDescControl.hxx"
#include "FieldControls.hxx"
@@ -51,7 +51,7 @@
#include
#include
#include
-#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in
+#define _ZFORLIST_DECLARE_TABLE // ohne das bekomme ich einen Compiler-Fehler in
#include
#include
#include
@@ -84,18 +84,18 @@ using namespace ::com::sun::star::util;
//==================================================================
// fuer die Controls auf der OFieldDescGenPage
-#define CONTROL_SPACING_X 18 // 6
-#define CONTROL_SPACING_Y 4
-#define CONTROL_WIDTH_1 160 // 100
-#define CONTROL_WIDTH_2 100 // 60
-#define CONTROL_WIDTH_3 250
-#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5)
+#define CONTROL_SPACING_X 18 // 6
+#define CONTROL_SPACING_Y 4
+#define CONTROL_WIDTH_1 160 // 100
+#define CONTROL_WIDTH_2 100 // 60
+#define CONTROL_WIDTH_3 250
+#define CONTROL_WIDTH_4 (CONTROL_WIDTH_3 - 20 - 5)
-#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem
-#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format
-#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem
+#define SBA_DEF_RANGEFORMAT (100 + 143) // RangeItem
+#define SBA_DEF_FMTVALUE (100 + 144) // SfxULONG, Format
+#define SBA_ATTR_ALIGN_HOR_JUSTIFY (100 + 145) // SvxHorJustifyItem
-#define HSCROLL_STEP 20
+#define HSCROLL_STEP 20
namespace
@@ -105,7 +105,7 @@ namespace
{
double nValue = _nValue;
sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(_xNumberFormatter,_nFormatKey);
- if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE
+ if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE
|| (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME )
{
nValue = DBTypeConversion::toStandardDbDate(DBTypeConversion::getNULLDate(_xNumberFormatter->getNumberFormatsSupplier()),nValue);
@@ -263,11 +263,11 @@ OFieldDescControl::~OFieldDescControl()
{
::std::auto_ptr aTemp(m_pVertScroll);
- m_pVertScroll = NULL;
+ m_pVertScroll = NULL;
}
{
::std::auto_ptr aTemp(m_pHorzScroll);
- m_pHorzScroll = NULL;
+ m_pHorzScroll = NULL;
}
if ( m_bAdded )
::dbaui::notifySystemWindow(this,this,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
@@ -410,7 +410,7 @@ void OFieldDescControl::CheckScrollBars()
{
m_pVertScroll->Show();
m_pVertScroll->SetRangeMax(nActive - nLastVisible);
-// m_pVertScroll->SetThumbPos(0);
+// m_pVertScroll->SetThumbPos(0);
m_pVertScroll->SetPosSizePixel( Point(nNewHWidth, 0), Size(nVScrollWidth, szOverallSize.Height()) );
}
@@ -425,7 +425,7 @@ void OFieldDescControl::CheckScrollBars()
{
m_pHorzScroll->Show();
m_pHorzScroll->SetRangeMax((lMaxXPosition - lMaxXAvailable + HSCROLL_STEP - 1 )/HSCROLL_STEP);
-// m_pHorzScroll->SetThumbPos(0);
+// m_pHorzScroll->SetThumbPos(0);
m_pHorzScroll->SetPosSizePixel( Point(0, nNewVHeight), Size(bNeedVScrollBar ? nNewHWidth : szOverallSize.Width(), nHScrollHeight) );
}
@@ -475,12 +475,12 @@ void OFieldDescControl::ScrollAllAggregates()
if (nDeltaX || nDeltaY)
{
- Control* ppAggregates[] = { pRequired, pNumType
+ Control* ppAggregates[] = { pRequired, pNumType
, pAutoIncrement, pDefault
, pTextLen, pLength
, pScale, m_pColumnName
, m_pType, m_pAutoIncrementValue};
- Control* ppAggregatesText[] = { pRequiredText, pNumTypeText
+ Control* ppAggregatesText[] = { pRequiredText, pNumTypeText
, pAutoIncrementText, pDefaultText
, pTextLenText, pLengthText
, pScaleText, m_pColumnNameText
@@ -527,13 +527,13 @@ void OFieldDescControl::SetReadOnly( sal_Bool bReadOnly )
DBG_CHKTHIS(OFieldDescControl,NULL);
//////////////////////////////////////////////////////////////////////
// Controls enablen/disablen
- Control* ppAggregates[] = { pRequired, pNumType
+ Control* ppAggregates[] = { pRequired, pNumType
, pAutoIncrement, pDefault
, pTextLen, pLength
, pScale, m_pColumnName
, m_pType, m_pAutoIncrementValue
, pFormat};
- Control* ppAggregatesText[] = { pRequiredText, pNumTypeText
+ Control* ppAggregatesText[] = { pRequiredText, pNumTypeText
, pAutoIncrementText, pDefaultText
, pTextLenText, pLengthText
, pScaleText, m_pColumnNameText
@@ -729,7 +729,7 @@ IMPL_LINK( OFieldDescControl, FormatClickHdl, Button *, /*pButton*/ )
}
// -----------------------------------------------------------------------
-void OFieldDescControl::SetModified(sal_Bool /*bModified*/)
+void OFieldDescControl::SetModified(sal_Bool /*bModified*/)
{
}
//------------------------------------------------------------------------
@@ -814,9 +814,9 @@ void OFieldDescControl::ArrangeAggregates()
// die Beschreibung eines Controls
struct AGGREGATE_DESCRIPTION
{
- Control* pctrlInputControl; // das eigentliche Control zur Eingabe
- Control* pctrlTextControl; // das Label dazu
- USHORT nPosSizeArgument; // das zweite Argument fuer SetPosSize
+ Control* pctrlInputControl; // das eigentliche Control zur Eingabe
+ Control* pctrlTextControl; // das Label dazu
+ USHORT nPosSizeArgument; // das zweite Argument fuer SetPosSize
};
AGGREGATE_DESCRIPTION adAggregates[] = {
{ m_pColumnName, m_pColumnNameText, 1},
@@ -924,7 +924,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
pRequired->InsertEntry( aYes );
pRequired->InsertEntry( aNo );
pRequired->SelectEntryPos(1);
-
+
InitializeControl(pRequired,HID_TAB_ENT_REQUIRED,true);
}
}
@@ -1094,7 +1094,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s
OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER );
pControl->SetDecimalDigits(0);
pControl->SetMin(0);
- pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig
+ pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig
pControl->SetStrictFormat(TRUE);
InitializeControl(pControl,_nHelpId,false);
@@ -1170,7 +1170,7 @@ void OFieldDescControl::DeactivateAggregate( EControlType eType )
void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 nCol )
{
DBG_CHKTHIS(OFieldDescControl,NULL);
-
+
//////////////////////////////////////////////////////////////////////
// Groesse ermitteln
const sal_Int32 nControlHeight = GetMaxControlHeight();
@@ -1228,12 +1228,12 @@ void OFieldDescControl::SetPosSize( Control** ppControl, long nRow, sal_uInt16 n
const sal_Int32 nControl_Spacing_y = LogicToPixel(Size(0, CONTROL_SPACING_Y),MAP_APPFONT).Height();
aPosition.Y() += ((nRow+1)*nControl_Spacing_y) +
(nRow*nControlHeight);
-
+
//////////////////////////////////////////////////////////////////////
// Control anzeigen
(*ppControl)->SetPosSizePixel( aPosition, aSize );
aSize = (*ppControl)->GetSizePixel();
-
+
(*ppControl)->Show();
}
//------------------------------------------------------------------------------
@@ -1461,7 +1461,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
{
// disable autoincrement value because it should only be visible when autoincrement is to true
DeactivateAggregate( tpAutoIncrementValue );
- pAutoIncrement->SelectEntryPos( 1 ); // no
+ pAutoIncrement->SelectEntryPos( 1 ); // no
ActivateAggregate( tpDefault );
// hat Auswirkungen auf pRequired
if(!pFieldDescr->IsPrimaryKey())
@@ -1478,7 +1478,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
if( pBoolDefault )
{
// wenn pRequired auf sal_True gesetzt ist, dann darf das sal_Bool Feld nicht den Eintrag <> besitzen
- ::rtl::OUString sValue;
+ ::rtl::OUString sValue;
pFieldDescr->GetControlDefault() >>= sValue;
String sDef = BoolStringUI(sValue);
@@ -1507,9 +1507,9 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
if( pRequired )
{
if( pFieldDescr->IsNullable() )
- pRequired->SelectEntryPos( 1 ); // no
+ pRequired->SelectEntryPos( 1 ); // no
else
- pRequired->SelectEntryPos( 0 ); // yes
+ pRequired->SelectEntryPos( 0 ); // yes
}
if( pTextLen )
@@ -1540,7 +1540,7 @@ void OFieldDescControl::DisplayData(OFieldDescription* pFieldDescr )
USHORT nPos = pFieldType.get() ? m_pType->GetEntryPos(String(pFieldDescr->getTypeInfo()->aUIName)) : LISTBOX_ENTRY_NOTFOUND;
if(nPos == LISTBOX_ENTRY_NOTFOUND)
{
- const OTypeInfoMap* pMap = getTypeInfo();
+ const OTypeInfoMap* pMap = getTypeInfo();
OTypeInfoMap::const_iterator aIter = pMap->find(pFieldType.get() ? pFieldDescr->getTypeInfo()->nType : pFieldDescr->GetType());
if(aIter == pMap->end() && !pMap->empty())
{
@@ -1787,9 +1787,9 @@ void OFieldDescControl::LoseFocus()
sal_Bool OFieldDescControl::isCopyAllowed()
{
sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
- (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
- m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
- m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
+ (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
+ m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
+ m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
m_pActFocusWindow == m_pAutoIncrementValue) &&
static_cast(m_pActFocusWindow)->GetSelected().Len() != 0;
@@ -1799,9 +1799,9 @@ sal_Bool OFieldDescControl::isCopyAllowed()
sal_Bool OFieldDescControl::isCutAllowed()
{
sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
- (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
- m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
- m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
+ (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
+ m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
+ m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
m_pActFocusWindow == m_pAutoIncrementValue) &&
static_cast(m_pActFocusWindow)->GetSelected().Len() != 0;
return bAllowed;
@@ -1810,9 +1810,9 @@ sal_Bool OFieldDescControl::isCutAllowed()
sal_Bool OFieldDescControl::isPasteAllowed()
{
sal_Bool bAllowed = (m_pActFocusWindow != NULL) &&
- (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
- m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
- m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
+ (m_pActFocusWindow == pDefault || m_pActFocusWindow == pFormatSample ||
+ m_pActFocusWindow == pTextLen || m_pActFocusWindow == pLength ||
+ m_pActFocusWindow == pScale || m_pActFocusWindow == m_pColumnName ||
m_pActFocusWindow == m_pAutoIncrementValue);
if ( bAllowed )
{
@@ -1915,7 +1915,7 @@ String OFieldDescControl::getControlDefault( const OFieldDescription* _pFieldDes
::comphelper::getNumberFormatProperty(xNumberFormatter,nFormatKey,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= aLocale;
sal_Int32 nNumberFormat = ::comphelper::getNumberFormatType(xNumberFormatter,nFormatKey);
- if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE
+ if( (nNumberFormat & ::com::sun::star::util::NumberFormat::DATE) == ::com::sun::star::util::NumberFormat::DATE
|| (nNumberFormat & ::com::sun::star::util::NumberFormat::DATETIME) == ::com::sun::star::util::NumberFormat::DATETIME )
{
nValue = DBTypeConversion::toNullDate(DBTypeConversion::getNULLDate(xNumberFormatter->getNumberFormatsSupplier()),nValue);
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 14bbe171c613..5ac9da9845ad 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -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
@@ -82,8 +82,8 @@
#include
-#define SOURCE_COLUMN 1
-#define DEST_COLUMN 2
+#define SOURCE_COLUMN 1
+#define DEST_COLUMN 2
namespace dbaui
{
@@ -100,20 +100,20 @@ namespace dbaui
friend class OTableListBoxControl;
::std::auto_ptr< ::svt::ListBoxControl> m_pListCell;
- TTableConnectionData::value_type m_pConnData;
- const OJoinTableView::OTableWindowMap* m_pTableMap;
- OTableListBoxControl* m_pBoxControl;
- long m_nDataPos;
- Reference< XPropertySet> m_xSourceDef;
- Reference< XPropertySet> m_xDestDef;
+ TTableConnectionData::value_type m_pConnData;
+ const OJoinTableView::OTableWindowMap* m_pTableMap;
+ OTableListBoxControl* m_pBoxControl;
+ long m_nDataPos;
+ Reference< XPropertySet> m_xSourceDef;
+ Reference< XPropertySet> m_xDestDef;
void fillListBox(const Reference< XPropertySet>& _xDest,long nRow,USHORT nColumnId);
/** returns the column id for the editbrowsebox
- @param _nColId
+ @param _nColId
the column id SOURCE_COLUMN or DEST_COLUMN
- @return the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data
+ @return the current column id eihter SOURCE_COLUMN or DEST_COLUMN depends on the connection data
*/
USHORT getColumnIdent( USHORT _nColId ) const;
public:
@@ -121,9 +121,9 @@ namespace dbaui
virtual ~ORelationControl();
/** searches for a connection between these two tables
- @param _pSource
+ @param _pSource
the left table
- @param _pDest
+ @param _pDest
the right window
*/
void setWindowTables(const OTableWindow* _pSource,const OTableWindow* _pDest);
@@ -158,7 +158,7 @@ namespace dbaui
private:
DECL_LINK( AsynchActivate, void* );
-
+
};
//========================================================================
@@ -210,12 +210,12 @@ namespace dbaui
//////////////////////////////////////////////////////////////////////
// set browse mode
- SetMode( BROWSER_COLUMNSELECTION |
- BROWSER_HLINESFULL |
- BROWSER_VLINESFULL |
- BROWSER_HIDECURSOR |
- BROWSER_HIDESELECT |
- BROWSER_AUTO_HSCROLL |
+ SetMode( BROWSER_COLUMNSELECTION |
+ BROWSER_HLINESFULL |
+ BROWSER_VLINESFULL |
+ BROWSER_HIDECURSOR |
+ BROWSER_HIDESELECT |
+ BROWSER_AUTO_HSCROLL |
BROWSER_AUTO_VSCROLL);
}
else
@@ -242,7 +242,7 @@ namespace dbaui
PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate));
else if (rNEvt.GetType() == EVENT_GETFOCUS)
PostUserEvent(LINK(this, ORelationControl, AsynchActivate));
-
+
return EditBrowseBox::PreNotify(rNEvt);
}
@@ -267,8 +267,8 @@ namespace dbaui
long nRow = GetCurRow();
USHORT nCol = GetCurColumnId();
- BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1)))
- || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0)));
+ BOOL bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1)))
+ || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0)));
return bRet && EditBrowseBox::IsTabAllowed(bForward);
}
@@ -337,18 +337,18 @@ namespace dbaui
void ORelationControl::InitController( CellControllerRef& /*rController*/, long nRow, USHORT nColumnId )
{
DBG_CHKTHIS(ORelationControl,NULL);
-
+
ULONG nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL;
Reference< XPropertySet> xDef;
switch ( getColumnIdent(nColumnId) )
{
case SOURCE_COLUMN:
- xDef = m_xSourceDef;
+ xDef = m_xSourceDef;
nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL;
break;
case DEST_COLUMN:
- xDef = m_xDestDef;
+ xDef = m_xDestDef;
nHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL;
break;
default:
@@ -392,7 +392,7 @@ namespace dbaui
DBG_CHKTHIS(ORelationControl,NULL);
String aText =const_cast< ORelationControl*>(this)->GetCellText( m_nDataPos, nColumnId );
- Point aPos( rRect.TopLeft() );
+ Point aPos( rRect.TopLeft() );
Size aTextSize( GetDataWindow().GetTextHeight(),GetDataWindow().GetTextWidth( aText ));
if( aPos.X() < rRect.Right() || aPos.X() + aTextSize.Width() > rRect.Right() ||
@@ -442,7 +442,7 @@ namespace dbaui
{
m_xSourceDef = _pSource->GetTable();
SetColumnTitle(1, _pSource->GetName());
-
+
m_xDestDef = _pDest->GetTable();
SetColumnTitle(2, _pDest->GetName());
@@ -498,11 +498,11 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
,IRelationControlInterface* _pParentDialog)
: Window(_pParent,_rResId)
, m_aFL_InvolvedTables( this, ResId(FL_INVOLVED_TABLES,*_rResId.GetResMgr()))
- , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr()))
- , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr()))
+ , m_lmbLeftTable( this, ResId(LB_LEFT_TABLE,*_rResId.GetResMgr()))
+ , m_lmbRightTable( this, ResId(LB_RIGHT_TABLE,*_rResId.GetResMgr()))
, m_aFL_InvolvedFields( this, ResId(FL_INVOLVED_FIELDS,*_rResId.GetResMgr()))
, m_pTableMap(_pTableMap)
- , m_pParentDialog(_pParentDialog)
+ , m_pParentDialog(_pParentDialog)
{
m_pRC_Tables = new ORelationControl( this,m_pTableMap );
m_pRC_Tables->SetHelpId(HID_RELDLG_KEYFIELDS);
@@ -563,7 +563,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
m_pRC_Tables->setWindowTables(pInitialLeft,pInitialRight);
// die in einer ComboBox ausgewaehlte Tabelle darf nicht in der anderen zur Verfuegung stehen
-
+
if ( m_pTableMap->size() > 2 )
{
m_lmbLeftTable.RemoveEntry(m_strCurrentRight);
@@ -580,8 +580,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
IMPL_LINK( OTableListBoxControl, OnTableChanged, ListBox*, pListBox )
{
String strSelected(pListBox->GetSelectEntry());
- OTableWindow* pLeft = NULL;
- OTableWindow* pRight = NULL;
+ OTableWindow* pLeft = NULL;
+ OTableWindow* pRight = NULL;
// eine Sonderbehandlung : wenn es nur zwei Tabellen gibt, muss ich bei Wechsel in einer LB auch in der anderen umschalten
if ( m_pTableMap->size() == 2 )
@@ -600,13 +600,13 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
if ( m_lmbLeftTable.GetSelectEntry() == String(pFirst->GetName()) )
{
- pLeft = pFirst;
- pRight = pSecond;
+ pLeft = pFirst;
+ pRight = pSecond;
}
else
{
- pLeft = pSecond;
- pRight = pFirst;
+ pLeft = pSecond;
+ pRight = pFirst;
}
}
else
@@ -625,10 +625,10 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
m_lmbRightTable.InsertEntry(m_strCurrentLeft);
// und den jetzt selektierten raus
m_lmbRightTable.RemoveEntry(strSelected);
- m_strCurrentLeft = strSelected;
-
+ m_strCurrentLeft = strSelected;
+
pLeft = pLoop;
-
+
OJoinTableView::OTableWindowMap::const_iterator aIter = m_pTableMap->find(m_lmbRightTable.GetSelectEntry());
OSL_ENSURE( aIter != m_pTableMap->end(), "Invalid name");
if ( aIter != m_pTableMap->end() )
@@ -733,8 +733,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
return bRet;
}
// -----------------------------------------------------------------------------
- TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const
- {
+ TTableWindowData::value_type OTableListBoxControl::getReferencingTable() const
+ {
return m_pRC_Tables->getData()->getReferencingTable();
}
// -----------------------------------------------------------------------------
@@ -743,7 +743,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent
if ( !_bEnable )
PostUserEvent(LINK(m_pRC_Tables, ORelationControl, AsynchDeactivate));
m_pRC_Tables->Enable(_bEnable);
-
+
}
// -----------------------------------------------------------------------------
}
diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx
index c987610b12c8..0bf83affcc0d 100644
--- a/dbaccess/source/ui/control/ScrollHelper.cxx
+++ b/dbaccess/source/ui/control/ScrollHelper.cxx
@@ -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
@@ -35,7 +35,7 @@
#include
#endif
-#define LISTBOX_SCROLLING_AREA 12
+#define LISTBOX_SCROLLING_AREA 12
namespace dbaui
{
DBG_NAME(OScrollHelper)
@@ -50,7 +50,7 @@ DBG_NAME(OScrollHelper)
// -----------------------------------------------------------------------------
OScrollHelper::~OScrollHelper()
{
-
+
DBG_DTOR(OScrollHelper,NULL);
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/control/SqlNameEdit.cxx b/dbaccess/source/ui/control/SqlNameEdit.cxx
index 71c732c569b6..94bb41236a66 100644
--- a/dbaccess/source/ui/control/SqlNameEdit.cxx
+++ b/dbaccess/source/ui/control/SqlNameEdit.cxx
@@ -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
@@ -35,7 +35,7 @@ namespace dbaui
//------------------------------------------------------------------
sal_Bool isCharOk(sal_Unicode _cChar,sal_Bool _bFirstChar,sal_Bool _bUpperCase,const ::rtl::OUString& _sAllowedChars)
{
- return (
+ return (
(_cChar >= 'A' && _cChar <= 'Z') ||
_cChar == '_' ||
_sAllowedChars.indexOf(_cChar) != -1 ||
@@ -44,16 +44,16 @@ namespace dbaui
);
}
//------------------------------------------------------------------
- sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue,
+ sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue,
const ::rtl::OUString& _sToCheck,
::rtl::OUString& _rsCorrected)
{
sal_Bool bCorrected = sal_False;
if ( m_bCheck )
{
- XubString sSavedValue = _sOldValue;
- XubString sText = _sToCheck;
- xub_StrLen nMatch = 0;
+ XubString sSavedValue = _sOldValue;
+ XubString sText = _sToCheck;
+ xub_StrLen nMatch = 0;
for ( xub_StrLen i=nMatch;i < sText.Len(); ++i )
{
if ( !isCharOk( sText.GetBuffer()[i], i == 0, m_bOnlyUpperCase, m_sAllowedChars ) )
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index 679179f3f4ab..bed039f7d7d4 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -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
@@ -64,13 +64,13 @@ using namespace ::dbaui;
using namespace ::svt;
const USHORT COL_TABLE_NAME = 1;
-const USHORT COL_SELECT = 2;
-const USHORT COL_INSERT = 3;
-const USHORT COL_DELETE = 4;
-const USHORT COL_UPDATE = 5;
-const USHORT COL_ALTER = 6;
-const USHORT COL_REF = 7;
-const USHORT COL_DROP = 8;
+const USHORT COL_SELECT = 2;
+const USHORT COL_INSERT = 3;
+const USHORT COL_DELETE = 4;
+const USHORT COL_UPDATE = 5;
+const USHORT COL_ALTER = 6;
+const USHORT COL_REF = 7;
+const USHORT COL_DROP = 8;
DBG_NAME(OTableGrantControl)
@@ -89,7 +89,7 @@ OTableGrantControl::OTableGrantControl( Window* pParent,const ResId& _RsId)
//////////////////////////////////////////////////////////////////////
// Spalten einfuegen
USHORT i=1;
- InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75);
+ InsertDataColumn( i, String(ModuleRes(STR_TABLE_PRIV_NAME) ), 75);
FreezeColumn(i++);
InsertDataColumn( i++, String(ModuleRes(STR_TABLE_PRIV_SELECT)), 75);
InsertDataColumn( i++, String(ModuleRes(STR_TABLE_PRIV_INSERT)), 75);
@@ -116,7 +116,7 @@ OTableGrantControl::~OTableGrantControl()
delete m_pCheckCell;
delete m_pEdit;
- m_xTables = NULL;
+ m_xTables = NULL;
}
// -----------------------------------------------------------------------------
void OTableGrantControl::setTablesSupplier(const Reference< XTablesSupplier >& _xTablesSup)
@@ -148,7 +148,7 @@ void OTableGrantControl::UpdateTables()
if(m_xTables.is())
RowInserted(0, m_aTableNames.getLength());
- // m_bEnable = m_xDb->GetUser() != ((OUserAdmin*)GetParent())->GetUser();
+ // m_bEnable = m_xDb->GetUser() != ((OUserAdmin*)GetParent())->GetUser();
}
//------------------------------------------------------------------------
void OTableGrantControl::Init()
@@ -160,10 +160,10 @@ void OTableGrantControl::Init()
// ComboBox instanzieren
if(!m_pCheckCell)
{
- m_pCheckCell = new CheckBoxControl( &GetDataWindow() );
+ m_pCheckCell = new CheckBoxControl( &GetDataWindow() );
m_pCheckCell->GetBox().EnableTriState(FALSE);
- m_pEdit = new Edit( &GetDataWindow() );
+ m_pEdit = new Edit( &GetDataWindow() );
m_pEdit->SetReadOnly();
m_pEdit->Enable(FALSE);
}
@@ -172,7 +172,7 @@ void OTableGrantControl::Init()
//////////////////////////////////////////////////////////////////////
// Browser Mode setzen
BrowserMode nMode = BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL |
- BROWSER_HIDECURSOR | BROWSER_HIDESELECT;
+ BROWSER_HIDECURSOR | BROWSER_HIDESELECT;
SetMode(nMode);
}
@@ -236,10 +236,10 @@ BOOL OTableGrantControl::IsTabAllowed(BOOL bForward) const
return EditBrowseBox::IsTabAllowed(bForward);
}
//------------------------------------------------------------------------------
-#define GRANT_REVOKE_RIGHT(what) \
- if(m_pCheckCell->GetBox().IsChecked()) \
+#define GRANT_REVOKE_RIGHT(what) \
+ if(m_pCheckCell->GetBox().IsChecked()) \
xAuth->grantPrivileges(sTableName,PrivilegeObject::TABLE,what);\
- else \
+ else \
xAuth->revokePrivileges(sTableName,PrivilegeObject::TABLE,what)
//------------------------------------------------------------------------------
@@ -255,7 +255,7 @@ BOOL OTableGrantControl::SaveModified()
BOOL bErg = TRUE;
try
{
-
+
if ( m_xUsers->hasByName(m_sUserName) )
{
Reference xAuth(m_xUsers->getByName(m_sUserName),UNO_QUERY);
@@ -308,7 +308,7 @@ String OTableGrantControl::GetCellText( long nRow, USHORT nColId ) const
DBG_CHKTHIS(OTableGrantControl,NULL);
if(COL_TABLE_NAME == nColId)
return m_aTableNames[nRow];
-
+
sal_Int32 nPriv = 0;
TTablePrivilegeMap::const_iterator aFind = findPrivilege(nRow);
if(aFind != m_aPrivMap.end())
@@ -333,9 +333,9 @@ void OTableGrantControl::InitController( CellControllerRef& /*rController*/, lon
}
}
// -----------------------------------------------------------------------------
-void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const
+void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const
{
-
+
if ( m_xUsers->hasByName(m_sUserName) )
{
try
@@ -345,7 +345,7 @@ void OTableGrantControl::fillPrivilege(sal_Int32 _nRow) const
{
// get the privileges
TPrivileges nRights;
- nRights.nRights = xAuth->getPrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE);
+ nRights.nRights = xAuth->getPrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE);
if(m_xGrantUser.is())
nRights.nWithGrant = m_xGrantUser->getGrantablePrivileges(m_aTableNames[_nRow],PrivilegeObject::TABLE);
else
@@ -446,7 +446,7 @@ BOOL OTableGrantControl::SeekRow( long nRow )
void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColumnId ) const
{
DBG_CHKTHIS(OTableGrantControl,NULL);
-
+
if(nColumnId != COL_TABLE_NAME)
{
TTablePrivilegeMap::const_iterator aFind = findPrivilege(m_nDataPos);
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.src b/dbaccess/source/ui/control/TableGrantCtrl.src
index 8da72a1f9fe1..9ed55e529906 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.src
+++ b/dbaccess/source/ui/control/TableGrantCtrl.src
@@ -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/ui/control/VertSplitView.cxx b/dbaccess/source/ui/control/VertSplitView.cxx
index f72944848589..d1155ebb1ec2 100644
--- a/dbaccess/source/ui/control/VertSplitView.cxx
+++ b/dbaccess/source/ui/control/VertSplitView.cxx
@@ -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
@@ -35,7 +35,7 @@
#include
#endif
-#define SPLITTER_WIDTH 80
+#define SPLITTER_WIDTH 80
using namespace ::dbaui;
@@ -49,8 +49,8 @@ OSplitterView::OSplitterView(Window* _pParent,sal_Bool _bVertical) : Window(_pPa
,m_pRight(NULL)
,m_bVertical(_bVertical)
{
- DBG_CTOR(OSplitterView,NULL);
- ImplInitSettings( sal_True, sal_True, sal_True );
+ DBG_CTOR(OSplitterView,NULL);
+ ImplInitSettings( sal_True, sal_True, sal_True );
}
// -----------------------------------------------------------------------------
OSplitterView::~OSplitterView()
@@ -62,7 +62,7 @@ OSplitterView::~OSplitterView()
IMPL_LINK( OSplitterView, SplitHdl, Splitter*, /*pSplit*/ )
{
OSL_ENSURE(m_pSplitter, "Splitter is NULL!");
- if ( m_bVertical )
+ if ( m_bVertical )
{
long nPosY = m_pSplitter->GetPosPixel().Y();
m_pSplitter->SetPosPixel( Point( m_pSplitter->GetSplitPosPixel(), nPosY ) );
@@ -84,7 +84,7 @@ void OSplitterView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_
if ( IsControlFont() )
aFont.Merge( GetControlFont() );
SetPointFont( aFont );
-// Set/*Zoomed*/PointFont( aFont );
+// Set/*Zoomed*/PointFont( aFont );
}
if ( bFont || bForeground )
@@ -133,18 +133,18 @@ void OSplitterView::Resize()
Window::Resize();
OSL_ENSURE( m_pRight, "No init called!");
- Point aSplitPos;
- Size aSplitSize;
- Point aPlaygroundPos( 0,0 );
- Size aPlaygroundSize( GetOutputSizePixel() );
+ Point aSplitPos;
+ Size aSplitSize;
+ Point aPlaygroundPos( 0,0 );
+ Size aPlaygroundSize( GetOutputSizePixel() );
if ( m_pLeft && m_pLeft->IsVisible() && m_pSplitter )
{
- aSplitPos = m_pSplitter->GetPosPixel();
- aSplitSize = m_pSplitter->GetOutputSizePixel();
- if ( m_bVertical )
+ aSplitPos = m_pSplitter->GetPosPixel();
+ aSplitSize = m_pSplitter->GetOutputSizePixel();
+ if ( m_bVertical )
{
- // calculate the splitter pos and size
+ // calculate the splitter pos and size
aSplitPos.Y() = aPlaygroundPos.Y();
aSplitSize.Height() = aPlaygroundSize.Height();
@@ -155,8 +155,8 @@ void OSplitterView::Resize()
aSplitPos.X() = aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.3);
// the tree pos and size
- Point aTreeViewPos( aPlaygroundPos );
- Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() );
+ Point aTreeViewPos( aPlaygroundPos );
+ Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() );
// set the size of treelistbox
m_pLeft->SetPosSizePixel( aTreeViewPos, aTreeViewSize );
@@ -177,8 +177,8 @@ void OSplitterView::Resize()
aSplitPos.Y() = aPlaygroundPos.Y() + sal_Int32(aPlaygroundSize.Height() * 0.3);
// the tree pos and size
- Point aTreeViewPos( aPlaygroundPos );
- Size aTreeViewSize( aPlaygroundSize.Width() ,aSplitPos.Y());
+ Point aTreeViewPos( aPlaygroundPos );
+ Size aTreeViewSize( aPlaygroundSize.Width() ,aSplitPos.Y());
// set the size of treelistbox
m_pLeft->SetPosSizePixel( aTreeViewPos, aTreeViewSize );
@@ -191,7 +191,7 @@ void OSplitterView::Resize()
if ( m_pRight )
{
- if ( m_bVertical )
+ if ( m_bVertical )
m_pRight->SetPosSizePixel( aSplitPos.X() + aSplitSize.Width(), aPlaygroundPos.Y(),
aPlaygroundSize.Width() - aSplitSize.Width() - aSplitPos.X(), aPlaygroundSize.Height());
else
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index 89ce1e82e9dd..eb18dd865aec 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -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/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 7ef087172807..484e5901a983 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -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
@@ -60,7 +60,7 @@ OConnectionURLEdit::~OConnectionURLEdit()
Edit* pSubEdit = GetSubEdit();
SetSubEdit(NULL);
delete pSubEdit;
- delete m_pForcedPrefix;
+ delete m_pForcedPrefix;
}
//-------------------------------------------------------------------------
@@ -131,7 +131,7 @@ void OConnectionURLEdit::SetText(const String& _rStr, const Selection& /*_rNewSe
GetSubEdit()->Show();
// do the real SetTex
-// Edit::SetText(bIsEmpty ? _rStr : m_pTypeCollection->cutPrefix(_rStr), _rNewSelection);
+// Edit::SetText(bIsEmpty ? _rStr : m_pTypeCollection->cutPrefix(_rStr), _rNewSelection);
String sNewText( _rStr );
if ( !bIsEmpty )
sNewText = m_pTypeCollection->cutPrefix( _rStr );
@@ -153,6 +153,6 @@ void OConnectionURLEdit::ShowPrefix(BOOL _bShowPrefix)
m_pForcedPrefix->Show(m_bShowPrefix);
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 6664a96e3ec0..88861a5ac420 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -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
@@ -47,7 +47,7 @@
#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGGESTURELISTENER_HDL_
#include
#endif
-#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGGESTURERECOGNIZER_HPP_
+#ifndef _COM_SUN_STAR_DATATRANSFER_DND_XDRAGGESTURERECOGNIZER_HPP_
#include
#endif
#ifndef _COM_SUN_STAR_UI_XCONTEXTMENUINTERCEPTOR_HPP_
@@ -97,7 +97,7 @@ using namespace ::com::sun::star::ui;
using namespace ::com::sun::star::view;
DBG_NAME(DBTreeListBox)
-#define SPACEBETWEENENTRIES 4
+#define SPACEBETWEENENTRIES 4
//========================================================================
// class DBTreeListBox
//========================================================================
@@ -123,7 +123,7 @@ DBTreeListBox::DBTreeListBox( Window* pParent, const Reference< XMultiServiceFac
,m_xORB(_rxORB)
{
DBG_CTOR(DBTreeListBox,NULL);
- init();
+ init();
}
// -----------------------------------------------------------------------------
void DBTreeListBox::init()
@@ -150,7 +150,7 @@ DBTreeListBox::~DBTreeListBox()
//------------------------------------------------------------------------
SvLBoxEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvLBoxEntry* pStart, const IEntryFilter* _pFilter ) const
{
- SvLBoxTreeList* myModel = GetModel();
+ SvLBoxTreeList* myModel = GetModel();
SvTreeEntryList* pChilds = myModel->GetChildList(pStart);
SvLBoxEntry* pEntry = NULL;
if ( pChilds )
@@ -380,7 +380,7 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt )
void DBTreeListBox::KeyInput( const KeyEvent& rKEvt )
{
KeyFuncType eFunc = rKEvt.GetKeyCode().GetFunction();
- USHORT nCode = rKEvt.GetKeyCode().GetCode();
+ USHORT nCode = rKEvt.GetKeyCode().GetCode();
sal_Bool bHandled = sal_False;
if(eFunc != KEYFUNC_DONTKNOW)
@@ -438,7 +438,7 @@ void DBTreeListBox::KeyInput( const KeyEvent& rKEvt )
// 2002-12-02 - 105831 - fs@openoffice.org
}
- if ( !bHandled )
+ if ( !bHandled )
SvTreeListBox::KeyInput(rKEvt);
}
// -----------------------------------------------------------------------------
@@ -458,7 +458,7 @@ BOOL DBTreeListBox::EditedEntry( SvLBoxEntry* pEntry, const XubString& rNewText
m_aSelectedEntries.erase( pEntry );
}
SetEntryText(pEntry,aEntry.aNewText);
-
+
return FALSE; // we never want that the base change our text
}
@@ -623,20 +623,20 @@ namespace
throw IllegalArgumentException();
// API bug: this should be a NoSupportException
}
-
+
//--------------------------------------------------------------------
Any SAL_CALL SelectionSupplier::getSelection( ) throw (RuntimeException)
{
return m_aSelection;
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SelectionSupplier::addSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException)
{
OSL_ENSURE( false, "SelectionSupplier::removeSelectionChangeListener: no support!" );
// API bug: this should be a NoSupportException
}
-
+
//--------------------------------------------------------------------
void SAL_CALL SelectionSupplier::removeSelectionChangeListener( const Reference< XSelectionChangeListener >& /*_Listener*/ ) throw (RuntimeException)
{
@@ -742,7 +742,7 @@ IMPL_LINK(DBTreeListBox, OnTimeOut, void*, /*EMPTY_ARG*/)
{
implStopSelectionTimer();
- m_aSelChangeHdl.Call( NULL );
+ m_aSelChangeHdl.Call( NULL );
return 0L;
}
// -----------------------------------------------------------------------------
@@ -752,5 +752,5 @@ void DBTreeListBox::StateChanged( StateChangedType nStateChange )
implStopSelectionTimer();
}
// .........................................................................
-} // namespace dbaui
+} // namespace dbaui
// .........................................................................
diff --git a/dbaccess/source/ui/control/listviewitems.cxx b/dbaccess/source/ui/control/listviewitems.cxx
index 51cbd39cbb42..df9ef6ca7d86 100644
--- a/dbaccess/source/ui/control/listviewitems.cxx
+++ b/dbaccess/source/ui/control/listviewitems.cxx
@@ -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
@@ -79,6 +79,6 @@ namespace dbaui
}
//........................................................................
-} // namespace dbaui
+} // namespace dbaui
//........................................................................
diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx
index 448803ca1e80..7fe51cbc011f 100644
--- a/dbaccess/source/ui/control/marktree.cxx
+++ b/dbaccess/source/ui/control/marktree.cxx
@@ -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
@@ -44,13 +44,13 @@ namespace dbaui
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
//.........................................................................
-#define SPACEBETWEENENTRIES 4
+#define SPACEBETWEENENTRIES 4
//========================================================================
//= OMarkableTreeListBox
//========================================================================
DBG_NAME(OMarkableTreeListBox)
//------------------------------------------------------------------------
-OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle )
+OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, WinBits nWinStyle )
: DBTreeListBox(pParent,_rxORB,nWinStyle)
{
DBG_CTOR(OMarkableTreeListBox,NULL);
@@ -58,7 +58,7 @@ OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XM
InitButtonData();
}
//------------------------------------------------------------------------
-OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, const ResId& rResId)
+OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const Reference< XMultiServiceFactory >& _rxORB, const ResId& rResId)
: DBTreeListBox(pParent,_rxORB,rResId)
{
DBG_CTOR(OMarkableTreeListBox,NULL);
@@ -210,7 +210,7 @@ void OMarkableTreeListBox::CheckButtonHdl()
void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
{
SvButtonState eState = GetCheckButtonState( _pEntry);
- if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken
+ if (GetModel()->HasChilds(_pEntry)) // Falls Kinder, dann diese auch checken
{
SvLBoxEntry* pChildEntry = GetModel()->Next(_pEntry);
SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry);
@@ -225,7 +225,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
while(pEntry)
{
SetCheckButtonState(pEntry,eState);
- if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken
+ if(GetModel()->HasChilds(pEntry)) // Falls Kinder, dann diese auch checken
{
SvLBoxEntry* pChildEntry = GetModel()->Next(pEntry);
SvLBoxEntry* pSiblingEntry = GetModel()->NextSibling(pEntry);
@@ -242,6 +242,6 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvLBoxEntry* _pEntry)
//------------------------------------------------------------------------
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/control/opendoccontrols.cxx b/dbaccess/source/ui/control/opendoccontrols.cxx
index a97130c74dff..4e76e0e062bd 100644
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@ -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/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 89cdc855a0cd..b812f585f647 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -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
@@ -174,7 +174,7 @@ void OSqlEdit::SetText(const String& rNewText)
{
DBG_CHKTHIS(OSqlEdit,NULL);
if (m_timerUndoActionCreation.IsActive())
- { // die noch anstehenden Undo-Action erzeugen
+ { // die noch anstehenden Undo-Action erzeugen
m_timerUndoActionCreation.Stop();
LINK(this, OSqlEdit, OnUndoActionTimer).Call(NULL);
}
diff --git a/dbaccess/source/ui/control/statusbarontroller.cxx b/dbaccess/source/ui/control/statusbarontroller.cxx
index 63a7406d436f..3a66154dda5f 100644
--- a/dbaccess/source/ui/control/statusbarontroller.cxx
+++ b/dbaccess/source/ui/control/statusbarontroller.cxx
@@ -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/ui/control/tabletree.cxx b/dbaccess/source/ui/control/tabletree.cxx
index 72db2ee129df..601eac3419b2 100644
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@ -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
@@ -361,7 +361,7 @@ void OTableTreeListBox::UpdateTableList( const Reference< XConnection >& _rxConn
TNames::const_iterator aEnd = _rTables.end();
Reference< XDatabaseMetaData > xMeta( _rxConnection->getMetaData(), UNO_QUERY_THROW );
- for ( ; aIter != aEnd; ++aIter )
+ for ( ; aIter != aEnd; ++aIter )
{
// add the entry
implAddEntry(
@@ -452,8 +452,8 @@ void OTableTreeListBox::implEmphasize(SvLBoxEntry* _pEntry, sal_Bool _bChecked,
// special emphasizing handling for the "all objects" entry
// 89709 - 16.07.2001 - frank.schoenheit@sun.com
sal_Bool bAllObjectsEntryAffected = haveVirtualRoot() && (getAllObjectsEntry() == _pEntry);
- if ( GetModel()->HasChilds(_pEntry) // the entry has children
- || bAllObjectsEntryAffected // or it is the "all objects" entry
+ if ( GetModel()->HasChilds(_pEntry) // the entry has children
+ || bAllObjectsEntryAffected // or it is the "all objects" entry
)
{
OBoldListboxString* pTextItem = static_cast(_pEntry->GetFirstItem(SV_ITEM_ID_BOLDLBSTRING));
@@ -733,6 +733,6 @@ void OTableTreeListBox::removedTable( const ::rtl::OUString& _rName )
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/control/tabletree.hrc b/dbaccess/source/ui/control/tabletree.hrc
index 1566e1ec10ce..b5450948e978 100644
--- a/dbaccess/source/ui/control/tabletree.hrc
+++ b/dbaccess/source/ui/control/tabletree.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
@@ -31,7 +31,7 @@
//------------------------------------------------------------------------
//- menu ids
-#define MID_SORT_ASCENDING 1
-#define MID_SORT_DECENDING 2
+#define MID_SORT_ASCENDING 1
+#define MID_SORT_DECENDING 2
#endif // _DBAUI_TABLETREE_HRC_
diff --git a/dbaccess/source/ui/control/tabletree.src b/dbaccess/source/ui/control/tabletree.src
index d08535f3e8da..26342fe28ba2 100644
--- a/dbaccess/source/ui/control/tabletree.src
+++ b/dbaccess/source/ui/control/tabletree.src
@@ -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/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index 4806ca814c0c..35e6de41d2b0 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -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
@@ -161,7 +161,7 @@ namespace dbaui
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewViewSQL")) ,sal_True));
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuery")) ,sal_True));
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewQuerySql")) ,sal_True));
- m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True));
+ m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReport")) ,sal_True));
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewReportAutoPilot")),sal_True));
m_aStates.insert(TCommandState::value_type(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:DBNewTable")) ,sal_True));
}
diff --git a/dbaccess/source/ui/control/undosqledit.cxx b/dbaccess/source/ui/control/undosqledit.cxx
index d649220141bd..152559f65d46 100644
--- a/dbaccess/source/ui/control/undosqledit.cxx
+++ b/dbaccess/source/ui/control/undosqledit.cxx
@@ -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/ui/control/undosqledit.src b/dbaccess/source/ui/control/undosqledit.src
index 814a304d18c0..09884a24b906 100644
--- a/dbaccess/source/ui/control/undosqledit.src
+++ b/dbaccess/source/ui/control/undosqledit.src
@@ -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/ui/dlg/AdabasPage.hrc b/dbaccess/source/ui/dlg/AdabasPage.hrc
index a36dbb25da27..52b14304d910 100644
--- a/dbaccess/source/ui/dlg/AdabasPage.hrc
+++ b/dbaccess/source/ui/dlg/AdabasPage.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
@@ -27,23 +27,23 @@
#ifndef DBAUI_ADABASPAGE_HRC
#define DBAUI_ADABASPAGE_HRC
-#define FT_CACHE_SIZE 1
-#define FT_DATA_INCREMENT 2
-#define FT_CTRLPASSWORD 3
-#define FT_CTRLUSERNAME 4
+#define FT_CACHE_SIZE 1
+#define FT_DATA_INCREMENT 2
+#define FT_CTRLPASSWORD 3
+#define FT_CTRLUSERNAME 4
-#define NF_DATA_INCREMENT 1
-#define NF_CACHE_SIZE 2
+#define NF_DATA_INCREMENT 1
+#define NF_CACHE_SIZE 2
-#define CB_SHUTDB 1
+#define CB_SHUTDB 1
-#define FL_1 1
+#define FL_1 1
-#define PB_STAT 1
+#define PB_STAT 1
-#define ET_CTRLPASSWORD 1
-#define ET_CTRLUSERNAME 2
+#define ET_CTRLPASSWORD 1
+#define ET_CTRLUSERNAME 2
#endif // DBAUI_ADABASPAGE_HRC
diff --git a/dbaccess/source/ui/dlg/AdabasStat.cxx b/dbaccess/source/ui/dlg/AdabasStat.cxx
index a17de64c5891..e522c26ed33d 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.cxx
+++ b/dbaccess/source/ui/dlg/AdabasStat.cxx
@@ -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
@@ -92,20 +92,20 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent,
const Reference< XMultiServiceFactory >& _xFactory)
: ModalDialog( pParent, ModuleRes(DLG_ADABASSTAT) )
,m_FL_FILES( this , ModuleRes(FL_FILES))
- ,m_FT_SYSDEVSPACE( this , ModuleRes(FT_SYSDEVSPACE))
- ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ModuleRes(ET_SYSDEVSPACE))
- ,m_FT_TRANSACTIONLOG( this , ModuleRes(FT_TRANSACTIONLOG))
- ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ModuleRes(ET_TRANSACTIONLOG))
- ,m_FT_DATADEVSPACE( this , ModuleRes(FT_DATADEVSPACE))
- ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ModuleRes(LB_DATADEVS))
+ ,m_FT_SYSDEVSPACE( this , ModuleRes(FT_SYSDEVSPACE))
+ ,m_ET_SYSDEVSPACE( this , STR_ADABAS_HELP_SYSDEVSPACE,ModuleRes(ET_SYSDEVSPACE))
+ ,m_FT_TRANSACTIONLOG( this , ModuleRes(FT_TRANSACTIONLOG))
+ ,m_ET_TRANSACTIONLOG( this , STR_ADABAS_HELP_TRANSACT,ModuleRes(ET_TRANSACTIONLOG))
+ ,m_FT_DATADEVSPACE( this , ModuleRes(FT_DATADEVSPACE))
+ ,m_LB_DATADEVS( this , STR_ADABAS_HELP_DATADEVSPACES,ModuleRes(LB_DATADEVS))
,m_FL_SIZES( this , ModuleRes(FL_SIZES))
- ,m_FT_SIZE( this , ModuleRes(FT_SIZE))
- ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ModuleRes(ET_SIZE))
- ,m_FT_FREESIZE( this , ModuleRes(FT_FREESIZE))
- ,m_ET_FREESIZE( this , STR_ADABAS_HELP_FREESIZE,ModuleRes(ET_FREESIZE))
- ,m_FT_MEMORYUSING( this , ModuleRes(FT_MEMORYUSING))
- ,m_ET_MEMORYUSING( this , STR_ADABAS_HELP_MEMORYUSING,ModuleRes(ET_MEMORYUSING))
- ,m_PB_OK( this , ModuleRes(PB_OK))
+ ,m_FT_SIZE( this , ModuleRes(FT_SIZE))
+ ,m_ET_SIZE( this , STR_ADABAS_HELP_SIZE,ModuleRes(ET_SIZE))
+ ,m_FT_FREESIZE( this , ModuleRes(FT_FREESIZE))
+ ,m_ET_FREESIZE( this , STR_ADABAS_HELP_FREESIZE,ModuleRes(ET_FREESIZE))
+ ,m_FT_MEMORYUSING( this , ModuleRes(FT_MEMORYUSING))
+ ,m_ET_MEMORYUSING( this , STR_ADABAS_HELP_MEMORYUSING,ModuleRes(ET_MEMORYUSING))
+ ,m_PB_OK( this , ModuleRes(PB_OK))
,m_xConnection(_xCurrentConnection)
,m_bErrorShown(sal_False)
{
@@ -119,17 +119,17 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent,
Reference xStmt;
Reference xRes;
- sal_Bool bCanSelect = sal_False;
+ sal_Bool bCanSelect = sal_False;
::rtl::OUString aStmt;
::rtl::OUString sSchema = _rUser.toAsciiUpperCase();
Reference xMetaData;
- // first read the sizes
+ // first read the sizes
try
{
xMetaData = m_xConnection->getMetaData();
bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("SERVERDBSTATISTICS"),sSchema);
-
+
if(bCanSelect)
{
aStmt = ::rtl::OUString::createFromAscii("SELECT SERVERDBSIZE, UNUSEDPAGES FROM ");
@@ -183,7 +183,7 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent,
try
{
bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("DATADEVSPACES"),sSchema);
-
+
if(bCanSelect)
{
// then the db files
@@ -227,7 +227,7 @@ OAdabasStatistics::OAdabasStatistics( Window* pParent,
try
{
bCanSelect = checkSystemTable(::rtl::OUString::createFromAscii("CONFIGURATION"),sSchema);
-
+
if(bCanSelect)
{
aStmt = ::rtl::OUString::createFromAscii("SELECT * FROM ");
diff --git a/dbaccess/source/ui/dlg/AdabasStat.hrc b/dbaccess/source/ui/dlg/AdabasStat.hrc
index 32734ea9075a..d2bb95c38b2e 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.hrc
+++ b/dbaccess/source/ui/dlg/AdabasStat.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
@@ -28,22 +28,22 @@
#define DBAUI_ADABASSTAT_HRC
-#define FT_SYSDEVSPACE 1
-#define FT_TRANSACTIONLOG 2
-#define FT_DATADEVSPACE 3
-#define FT_SIZE 4
-#define FT_FREESIZE 5
-#define FT_MEMORYUSING 6
+#define FT_SYSDEVSPACE 1
+#define FT_TRANSACTIONLOG 2
+#define FT_DATADEVSPACE 3
+#define FT_SIZE 4
+#define FT_FREESIZE 5
+#define FT_MEMORYUSING 6
-#define ET_SYSDEVSPACE 1
-#define ET_TRANSACTIONLOG 2
-#define ET_MEMORYUSING 3
-#define ET_SIZE 4
-#define ET_FREESIZE 5
+#define ET_SYSDEVSPACE 1
+#define ET_TRANSACTIONLOG 2
+#define ET_MEMORYUSING 3
+#define ET_SIZE 4
+#define ET_FREESIZE 5
-#define LB_DATADEVS 1
+#define LB_DATADEVS 1
-#define PB_OK 1
+#define PB_OK 1
#define FL_FILES 1
#define FL_SIZES 2
diff --git a/dbaccess/source/ui/dlg/AdabasStat.hxx b/dbaccess/source/ui/dlg/AdabasStat.hxx
index 2f222462d4df..b9e7bcdb127e 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.hxx
+++ b/dbaccess/source/ui/dlg/AdabasStat.hxx
@@ -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
@@ -60,32 +60,32 @@ namespace dbaui
protected:
FixedLine m_FL_FILES;
- FixedText m_FT_SYSDEVSPACE;
- OPropEditCtrl m_ET_SYSDEVSPACE;
- FixedText m_FT_TRANSACTIONLOG;
- OPropEditCtrl m_ET_TRANSACTIONLOG;
- FixedText m_FT_DATADEVSPACE;
- OPropListBoxCtrl m_LB_DATADEVS;
+ FixedText m_FT_SYSDEVSPACE;
+ OPropEditCtrl m_ET_SYSDEVSPACE;
+ FixedText m_FT_TRANSACTIONLOG;
+ OPropEditCtrl m_ET_TRANSACTIONLOG;
+ FixedText m_FT_DATADEVSPACE;
+ OPropListBoxCtrl m_LB_DATADEVS;
FixedLine m_FL_SIZES;
- FixedText m_FT_SIZE;
- OPropEditCtrl m_ET_SIZE;
- FixedText m_FT_FREESIZE;
- OPropEditCtrl m_ET_FREESIZE;
- FixedText m_FT_MEMORYUSING;
- OPropNumericEditCtrl m_ET_MEMORYUSING;
+ FixedText m_FT_SIZE;
+ OPropEditCtrl m_ET_SIZE;
+ FixedText m_FT_FREESIZE;
+ OPropEditCtrl m_ET_FREESIZE;
+ FixedText m_FT_MEMORYUSING;
+ OPropNumericEditCtrl m_ET_MEMORYUSING;
- OKButton m_PB_OK;
+ OKButton m_PB_OK;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
- m_xConnection; /// valid as long as the page is active
- sal_Bool m_bErrorShown; // true when we shown already the error
+ m_xConnection; /// valid as long as the page is active
+ sal_Bool m_bErrorShown; // true when we shown already the error
// check if the given table is accessable by the connected user
sal_Bool checkSystemTable(const ::rtl::OUString& _rsSystemTable, ::rtl::OUString& _rsSchemaName );
void showError();
public:
- OAdabasStatistics( Window* pParent,
+ OAdabasStatistics( Window* pParent,
const ::rtl::OUString& _rUser,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCurrentConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory);
diff --git a/dbaccess/source/ui/dlg/AdabasStat.src b/dbaccess/source/ui/dlg/AdabasStat.src
index ff29ac12383d..77472536425e 100644
--- a/dbaccess/source/ui/dlg/AdabasStat.src
+++ b/dbaccess/source/ui/dlg/AdabasStat.src
@@ -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
@@ -37,129 +37,129 @@
ModalDialog DLG_ADABASSTAT
{
- OutputSize = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+ OutputSize = TRUE ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
FixedLine FL_FILES
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 12, 8 ) ;
Text [ en-US ] = "Database files";
};
FixedText FT_SYSDEVSPACE
{
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 14 ) ;
+ Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "S~YSDEVSPACE:";
};
Edit ET_SYSDEVSPACE
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 120 , 14 ) ;
- Size = MAP_APPFONT ( 128 , 12 ) ;
- TabStop = TRUE ;
- ReadOnly = TRUE;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 120 , 14 ) ;
+ Size = MAP_APPFONT ( 128 , 12 ) ;
+ TabStop = TRUE ;
+ ReadOnly = TRUE;
};
FixedText FT_TRANSACTIONLOG
{
- Pos = MAP_APPFONT ( 12 , 32 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 32 ) ;
+ Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "~TRANSACTIONLOG:";
};
Edit ET_TRANSACTIONLOG
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 120 , 31 ) ;
- Size = MAP_APPFONT ( 128 , 12 ) ;
- TabStop = TRUE ;
- ReadOnly = TRUE;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 120 , 31 ) ;
+ Size = MAP_APPFONT ( 128 , 12 ) ;
+ TabStop = TRUE ;
+ ReadOnly = TRUE;
};
FixedText FT_DATADEVSPACE
{
- Pos = MAP_APPFONT ( 12 , 49 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 49 ) ;
+ Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "DATAD~EVSPACE:";
};
ListBox LB_DATADEVS
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 120 , 48 ) ;
- Size = MAP_APPFONT ( 128 , 42 ) ;
- TabStop = TRUE;
- AutoHScroll = TRUE;
- VScroll = TRUE;
- HScroll = TRUE;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 120 , 48 ) ;
+ Size = MAP_APPFONT ( 128 , 42 ) ;
+ TabStop = TRUE;
+ AutoHScroll = TRUE;
+ VScroll = TRUE;
+ HScroll = TRUE;
};
FixedLine FL_SIZES
{
- Pos = MAP_APPFONT ( 6 , 99 ) ;
+ Pos = MAP_APPFONT ( 6 , 99 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ;
Text [ en-US ] = "Database sizes";
};
FixedText FT_SIZE
{
- Pos = MAP_APPFONT ( 12 , 110 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 110 ) ;
+ Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "S~ize (MB):";
};
Edit ET_SIZE
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 120 , 109 ) ;
- Size = MAP_APPFONT ( 60 , 12 ) ;
- TabStop = TRUE ;
- ReadOnly = TRUE;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 120 , 109 ) ;
+ Size = MAP_APPFONT ( 60 , 12 ) ;
+ TabStop = TRUE ;
+ ReadOnly = TRUE;
};
FixedText FT_FREESIZE
{
- Pos = MAP_APPFONT ( 12 , 127 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 127 ) ;
+ Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "~Free memory space (MB):";
};
Edit ET_FREESIZE
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 120 , 126 ) ;
- Size = MAP_APPFONT ( 60 , 12 ) ;
- TabStop = TRUE ;
- ReadOnly = TRUE;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 120 , 126 ) ;
+ Size = MAP_APPFONT ( 60 , 12 ) ;
+ TabStop = TRUE ;
+ ReadOnly = TRUE;
};
FixedText FT_MEMORYUSING
{
- Pos = MAP_APPFONT ( 12 , 144 ) ;
- Size = MAP_APPFONT ( 102 , 10 ) ;
+ Pos = MAP_APPFONT ( 12 , 144 ) ;
+ Size = MAP_APPFONT ( 102 , 10 ) ;
Text [ en-US ] = "~Memory utilization (in %):";
};
NumericField ET_MEMORYUSING
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 120 , 144 ) ;
- Size = MAP_APPFONT ( 60 , 12 ) ;
- TabStop = TRUE ;
- ReadOnly = TRUE;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 120 , 144 ) ;
+ Size = MAP_APPFONT ( 60 , 12 ) ;
+ TabStop = TRUE ;
+ ReadOnly = TRUE;
};
OKButton PB_OK
{
- Pos = MAP_APPFONT ( WINDOW_SIZE_X - 56,WINDOW_SIZE_Y - 20 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
+ Pos = MAP_APPFONT ( WINDOW_SIZE_X - 56,WINDOW_SIZE_Y - 20 ) ;
+ Size = MAP_APPFONT ( 50, 14 ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
};
Text [ en-US ] = "Database Statistics";
diff --git a/dbaccess/source/ui/dlg/AutoControls.src b/dbaccess/source/ui/dlg/AutoControls.src
index 1bfe3c0233a9..9036489b37ea 100644
--- a/dbaccess/source/ui/dlg/AutoControls.src
+++ b/dbaccess/source/ui/dlg/AutoControls.src
@@ -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
@@ -69,7 +69,7 @@ String STR_MSACCESS_MDB_FILE
Text[ en-US ] = "Microsoft Access database file";
};
-
+
String STR_NO_ADDITIONAL_SETTINGS
{
Text[ en-US ] = "No more settings are necessary. To verify that the connection is working, click the '%test' button.";
diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
index 425e713094f3..5ec09c3ae5c7 100644
--- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.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
@@ -43,12 +43,12 @@
#endif
-#define CHECKBOX_HEIGHT 8
-#define FIXEDTEXT_HEIGHT 8
-#define RELATED_CONTROLS 4
-#define UNRELATED_CONTROLS 7
-#define EDIT_HEIGHT 12
-#define EDIT_X 101
+#define CHECKBOX_HEIGHT 8
+#define FIXEDTEXT_HEIGHT 8
+#define RELATED_CONTROLS 4
+#define UNRELATED_CONTROLS 7
+#define EDIT_HEIGHT 12
+#define EDIT_X 101
#define FT_AUTOJDBCDRIVERCLASS 80
#define FT_AUTOFIELDSEPARATOR 81
@@ -107,55 +107,55 @@
#define AUTO_WIZARDHELPTEXT( AUTO_LINECOUNT ) \
- FixedText FT_AUTOWIZARDHEADER \
- { \
+ FixedText FT_AUTOWIZARDHEADER \
+ { \
Pos = MAP_APPFONT ( START_X , 8 ) ; \
Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ; \
Text[ en-US ] = ""; \
- WordBreak = TRUE; \
+ WordBreak = TRUE; \
}; \
\
- FixedText FT_AUTOWIZARDHELPTEXT \
- { \
+ FixedText FT_AUTOWIZARDHELPTEXT \
+ { \
Pos = MAP_APPFONT ( START_X , INIT_Y ) ; \
Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6 , AUTO_LINECOUNT * FIXEDTEXT_HEIGHT ) ; \
Text[ en-US ] = ""; \
- WordBreak = TRUE; \
+ WordBreak = TRUE; \
};
// -------------------------------------------------------------------------------------------------
-#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \
- FixedText FT_AUTOBROWSEURL { \
- Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \
- Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \
- Text[ en-US ] = ""; \
- }; \
+#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \
+ FixedText FT_AUTOBROWSEURL { \
+ Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \
+ Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \
+ Text[ en-US ] = ""; \
+ }; \
\
\
Edit ET_AUTOBROWSEURL \
- { \
- Pos = MAP_APPFONT ( AUTO_X , AUTO_Y + FIXEDTEXT_HEIGHT + 3) ; \
- Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 - 3 - BUTTON_WIDTH , EDIT_HEIGHT ) ; \
- HelpId = AUTO_HID; \
- TabStop = TRUE ; \
- Border = TRUE ; \
- }; \
+ { \
+ Pos = MAP_APPFONT ( AUTO_X , AUTO_Y + FIXEDTEXT_HEIGHT + 3) ; \
+ Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 - 3 - BUTTON_WIDTH , EDIT_HEIGHT ) ; \
+ HelpId = AUTO_HID; \
+ TabStop = TRUE ; \
+ Border = TRUE ; \
+ }; \
\
- PushButton PB_AUTOBROWSEURL \
- { \
- Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \
- HelpId = (AUTO_HID + 1); \
- TabStop = TRUE ; \
+ PushButton PB_AUTOBROWSEURL \
+ { \
+ Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \
+ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \
+ HelpId = (AUTO_HID + 1); \
+ TabStop = TRUE ; \
Text[ en-US ] = "Browse"; \
};
// --------------------------------------------------------------------------------------------------
-#define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \
+#define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \
FixedText FT_AUTODATABASENAME \
{ \
Pos = MAP_APPFONT ( START_X , AUTO_Y + 2) ; \
@@ -163,39 +163,39 @@
Text[ en-US ] = "Database name"; \
}; \
\
- Edit ET_AUTODATABASENAME \
- { \
- Pos = MAP_APPFONT ( EDIT_X, AUTO_Y) ; \
- Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \
- HelpId = AUTO_HID; \
- TabStop = TRUE ; \
- Border = TRUE ; \
+ Edit ET_AUTODATABASENAME \
+ { \
+ Pos = MAP_APPFONT ( EDIT_X, AUTO_Y) ; \
+ Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \
+ HelpId = AUTO_HID; \
+ TabStop = TRUE ; \
+ Border = TRUE ; \
};
// --------------------------------------------------------------------------------------------------
#define AUTO_HOSTCONTROLGROUP(AUTO_Y, AUTO_HID) \
- FixedText FT_AUTOHOSTNAME \
+ FixedText FT_AUTOHOSTNAME \
{ \
Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \
Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ); \
Text [ en-US ] = "Server" ; \
}; \
\
- Edit ET_AUTOHOSTNAME \
+ Edit ET_AUTOHOSTNAME \
{ \
- Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
- Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \
- HelpId = AUTO_HID; \
+ Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
+ Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \
+ HelpId = AUTO_HID; \
TabStop = TRUE ; \
- Border = TRUE ; \
- };
+ Border = TRUE ; \
+ };
// --------------------------------------------------------------------------------------------------
-#define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \
+#define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \
FixedText FT_AUTOBASEDN \
{ \
Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \
@@ -207,9 +207,9 @@
{ \
HelpId = AUTO_HID ; \
Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
- Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \
- TabStop = TRUE ; \
- Border = TRUE ; \
+ Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \
+ TabStop = TRUE ; \
+ Border = TRUE ; \
}; \
// --------------------------------------------------------------------------------------------------
@@ -225,18 +225,18 @@
\
NumericField NF_AUTOPORTNUMBER \
{ \
- HelpId = AUTO_HID ; \
- Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
+ HelpId = AUTO_HID ; \
+ Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
Size = MAP_APPFONT ( 22 , EDIT_HEIGHT ) ; \
- TabStop = TRUE ; \
- Border = TRUE ; \
+ TabStop = TRUE ; \
+ Border = TRUE ; \
NoThousandSep = TRUE; \
}; \
\
FixedText FT_AUTOPORTNUMBERDEFAULT \
{ \
- HelpId = AUTO_HID + 1 ; \
- Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \
+ HelpId = AUTO_HID + 1 ; \
+ Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \
Size = MAP_APPFONT ( WIZARD_PAGE_X - EDIT_X - 22 - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
Text[ en-US ] = "" ; \
};
@@ -267,12 +267,12 @@
CurPos = 0 ; \
}; \
-// --------------------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------------------
#define AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X) \
\
FixedText FT_AUTOEXTENSIONHEADER \
{ \
- Pos = MAP_APPFONT ( START_X , AUTO_Y) ; \
+ Pos = MAP_APPFONT ( START_X , AUTO_Y) ; \
Size = MAP_APPFONT ( AUTOPAGE_X - 2*START_X , FIXEDTEXT_HEIGHT ) ; \
Text[ en-US ] = "Specify the type of files you want to access" ; \
}; \
@@ -305,9 +305,9 @@
{ \
HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION; \
Pos = MAP_APPFONT (START_X + 66, AUTO_Y + 3*FIXEDTEXT_HEIGHT + 3*RELATED_CONTROLS - 2 ) ; \
- Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \
- TabStop = TRUE ; \
- Border = TRUE ; \
+ Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \
+ TabStop = TRUE ; \
+ Border = TRUE ; \
}; \
\
FIXEDTEXT FT_AUTOOWNEXTENSIONAPPENDIX \
@@ -332,7 +332,7 @@
}; \
ComboBox CM_AUTOFIELDSEPARATOR \
{ \
- Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT - 2 ) ; \
+ Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + 50 + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT - 2 ) ; \
Size = MAP_APPFONT ( 32 , 60 ) ; \
Text = ";" ; \
TabStop = TRUE ; \
@@ -437,7 +437,7 @@
String STR_AUTONO_WILDCARDS \
{ \
Text[ en-US ] = "Wildcards such as ?,* are not allowed in #1." ; \
- };
+ };
#define NAMECONTROLGROUP_HEIGHT (FIXEDTEXT_HEIGHT + 2 + EDIT_HEIGHT)
@@ -445,8 +445,8 @@
// --------------------------------------------------------------------------------------------------
-#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \
- AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \
+#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \
+ AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \
AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID)
@@ -455,11 +455,11 @@
// --------------------------------------------------------------------------------------------------
-#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \
+#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \
\
FixedText FT_AUTOJDBCDRIVERCLASS \
{ \
- Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \
+ Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \
Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ; \
Text [ en-US ] = "JDBC d~river class"; \
}; \
@@ -470,7 +470,7 @@
Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - BUTTON_WIDTH - RELATED_CONTROLS - UNRELATED_CONTROLS , EDIT_HEIGHT ) ; \
TabStop = TRUE ; \
Border = TRUE ; \
- HelpId = AUTO_HID; \
+ HelpId = AUTO_HID; \
}; \
\
PushButton PB_AUTOTESTDRIVERCLASS \
@@ -478,8 +478,8 @@
TabStop = TRUE ; \
Pos = MAP_APPFONT ( WIZARD_PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , AUTO_Y + FIXEDTEXT_HEIGHT + 2) ; \
Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \
- Size = MAP_APPFONT (50, 14); \
- HelpId = AUTO_HID + 1; \
+ Size = MAP_APPFONT (50, 14); \
+ HelpId = AUTO_HID + 1; \
Text[ en-US ] = "Test class" ; \
};
@@ -493,22 +493,22 @@
Text [ en-US ] = "Socket" ; \
}; \
\
- Edit ET_SOCKET \
+ Edit ET_SOCKET \
{ \
- Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
- Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \
+ Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
+ Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \
TabStop = TRUE ; \
- Border = TRUE ; \
- };
+ Border = TRUE ; \
+ };
-#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \
+#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \
AUTO_WIZARDHELPTEXT( 6 ) \
AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID ) \
- AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \
- AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \
+ AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \
+ AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \
AUTO_SOCKETCONTROLGROUP(129) \
- AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3)
+ AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3)
// --------------------------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index f9762833641e..154534640c69 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -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
@@ -112,7 +112,7 @@
#include
#endif
-#define FILEDIALOG_DEF_IMAGEBORDER 10
+#define FILEDIALOG_DEF_IMAGEBORDER 10
//.........................................................................
namespace dbaui
{
@@ -134,17 +134,17 @@ OCollectionView::OCollectionView( Window * pParent
,const ::rtl::OUString& _sDefaultName
,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB)
: ModalDialog( pParent, ModuleRes(DLG_COLLECTION_VIEW))
- , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) )
- , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) )
- , m_aUp( this, ModuleRes( BTN_EXPLORERFILE_UP ) )
- , m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE )
- , m_aFTName( this, ModuleRes( FT_EXPLORERFILE_FILENAME ) )
- , m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) )
- , m_aFL( this, ModuleRes( FL_1 ) )
- , m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) )
- , m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) )
- , m_aPB_HELP( this, ModuleRes( PB_HELP ) )
- , m_sPath( ModuleRes( STR_PATHNAME ) )
+ , m_aFTCurrentPath( this, ModuleRes( FT_EXPLORERFILE_CURRENTPATH ) )
+ , m_aNewFolder( this, ModuleRes( BTN_EXPLORERFILE_NEWFOLDER ) )
+ , m_aUp( this, ModuleRes( BTN_EXPLORERFILE_UP ) )
+ , m_aView( this, ModuleRes( CTRL_VIEW ) ,FILEVIEW_SHOW_TITLE )
+ , m_aFTName( this, ModuleRes( FT_EXPLORERFILE_FILENAME ) )
+ , m_aName( this, ModuleRes( ED_EXPLORERFILE_FILENAME ) )
+ , m_aFL( this, ModuleRes( FL_1 ) )
+ , m_aPB_OK( this, ModuleRes( BTN_EXPLORERFILE_SAVE ) )
+ , m_aPB_CANCEL( this, ModuleRes( PB_CANCEL ) )
+ , m_aPB_HELP( this, ModuleRes( PB_HELP ) )
+ , m_sPath( ModuleRes( STR_PATHNAME ) )
, m_xContent(_xContent)
, m_xORB(_xORB)
, m_bCreateForm(sal_True)
@@ -391,7 +391,7 @@ void OCollectionView::initCurrentPath()
}
// -----------------------------------------------------------------------------
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/CollectionView.hrc b/dbaccess/source/ui/dlg/CollectionView.hrc
index 0a385ff7f23c..8c43b4c0c5a5 100644
--- a/dbaccess/source/ui/dlg/CollectionView.hrc
+++ b/dbaccess/source/ui/dlg/CollectionView.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
@@ -28,23 +28,23 @@
#ifndef DBAUI_COLLECTIONVIEW_HRC
#define DBAUI_COLLECTIONVIEW_HRC
-#define CTRL_VIEW 1
+#define CTRL_VIEW 1
-#define PB_CANCEL 1
-#define PB_HELP 1
+#define PB_CANCEL 1
+#define PB_HELP 1
-#define ED_EXPLORERFILE_FILENAME 1
+#define ED_EXPLORERFILE_FILENAME 1
-#define FT_EXPLORERFILE_CURRENTPATH 1
-#define FT_EXPLORERFILE_FILENAME 2
+#define FT_EXPLORERFILE_CURRENTPATH 1
+#define FT_EXPLORERFILE_FILENAME 2
-#define BTN_EXPLORERFILE_NEWFOLDER 1
-#define BTN_EXPLORERFILE_UP 2
-#define BTN_EXPLORERFILE_SAVE 3
+#define BTN_EXPLORERFILE_NEWFOLDER 1
+#define BTN_EXPLORERFILE_UP 2
+#define BTN_EXPLORERFILE_SAVE 3
-#define STR_PATHNAME 1
+#define STR_PATHNAME 1
-#define FL_1 1
+#define FL_1 1
#endif //DBAUI_COLLECTIONVIEW_HRC
diff --git a/dbaccess/source/ui/dlg/CollectionView.src b/dbaccess/source/ui/dlg/CollectionView.src
index 018893384dab..3b82d565a7ac 100644
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@ -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
@@ -34,14 +34,14 @@
#define WIN_X 200
#define WIN_Y 192
-#define CHECKBOX_HEIGHT 8
-#define FIXEDTEXT_HEIGHT 8
-#define RELATED_CONTROLS 4
-#define UNRELATED_CONTROLS 7
-#define EDIT_HEIGHT 12
-#define BUTTON_HEIGHT 14
-#define FIXEDLINE_HEIGHT 1
-#define IMG_SIZE 15
+#define CHECKBOX_HEIGHT 8
+#define FIXEDTEXT_HEIGHT 8
+#define RELATED_CONTROLS 4
+#define UNRELATED_CONTROLS 7
+#define EDIT_HEIGHT 12
+#define BUTTON_HEIGHT 14
+#define FIXEDLINE_HEIGHT 1
+#define IMG_SIZE 15
ModalDialog DLG_COLLECTION_VIEW
@@ -55,7 +55,7 @@ ModalDialog DLG_COLLECTION_VIEW
Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
Text [ en-US ] = "Save" ;
-
+
FixedText FT_EXPLORERFILE_CURRENTPATH
{
Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS ) ;
@@ -76,7 +76,7 @@ ModalDialog DLG_COLLECTION_VIEW
Size = MAP_APPFONT ( IMG_SIZE , IMG_SIZE ) ;
QuickHelpText [ en-US ] = "Up One Level" ;
};
-
+
Control CTRL_VIEW
{
TabStop = TRUE ;
@@ -98,13 +98,13 @@ ModalDialog DLG_COLLECTION_VIEW
Border = TRUE ;
TabStop = TRUE ;
};
-
+
FixedLine FL_1
{
Pos = MAP_APPFONT ( 0 , WIN_Y - 2*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT) ;
Size = MAP_APPFONT ( WIN_X , FIXEDLINE_HEIGHT ) ;
};
-
+
PushButton BTN_EXPLORERFILE_SAVE
{
Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
@@ -113,22 +113,22 @@ ModalDialog DLG_COLLECTION_VIEW
TabStop = TRUE ;
Text [ en-US ] = "Save" ;
};
-
+
CancelButton PB_CANCEL
{
TabStop = TRUE ;
- Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - 100, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
};
-
+
HelpButton PB_HELP
{
TabStop = TRUE ;
- Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( WIN_X - UNRELATED_CONTROLS - 50, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
};
-
-
+
+
String STR_PATHNAME
{
Text [ en-US ] = "~Path:" ;
@@ -141,7 +141,7 @@ String STR_NEW_FOLDER
};
Image IMG_NAVIGATION_BTN_UP_SC
{
- ImageBitmap = Bitmap { File = "fp010"; };
+ ImageBitmap = Bitmap { File = "fp010"; };
MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; };
};
Image IMG_NAVIGATION_BTN_UP_SCH
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 1d1277f49301..088d97cfb77a 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -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
@@ -390,28 +390,28 @@ DBG_NAME(OConnectionHelper)
sal_Bool bOldFashion = sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength();
if(!bOldFashion) // we have a normal adabas installation
- { // so we check the local database names in $DBROOT/config
- sAdabasConfigDir = sRootDir;
- sAdabasWorkDir = sRootDir;
+ { // so we check the local database names in $DBROOT/config
+ sAdabasConfigDir = sRootDir;
+ sAdabasWorkDir = sRootDir;
}
if(sAdabasConfigDir.getLength() && sAdabasWorkDir.getLength() && sRootDir.getLength())
{
- aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir);
+ aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir);
if(!aInstalledDBs.size() && bOldFashion)
{
- sAdabasConfigDir = sRootDir;
- sAdabasWorkDir = sRootDir;
- aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir);
+ sAdabasConfigDir = sRootDir;
+ sAdabasWorkDir = sRootDir;
+ aInstalledDBs = getInstalledAdabasDBs(sAdabasConfigDir,sAdabasWorkDir);
}
ODatasourceSelectDialog aSelector(GetParent(), aInstalledDBs, true,m_pItemSetHelper->getWriteOutputSet());
if (RET_OK == aSelector.Execute())
{
setURLNoPrefix(aSelector.GetSelected());
- // checkCreateDatabase( ::dbaccess::DST_ADABAS);
+ // checkCreateDatabase( ::dbaccess::DST_ADABAS);
SetRoadmapStateValue(sal_True);
callModifiedHdl();
}
@@ -643,7 +643,7 @@ DBG_NAME(OConnectionHelper)
do
{
if ( !createDirectoryDeep(_rURL) )
- { // could not create the directory
+ { // could not create the directory
sQuery = String(ModuleRes(STR_COULD_NOT_CREATE_DIRECTORY));
sQuery.SearchAndReplaceAscii("$name$", aTransformer.get(OFileNotation::N_SYSTEM));
@@ -717,7 +717,7 @@ DBG_NAME(OConnectionHelper)
{
}
if (bIsFolder && aAdabasConfigDir.get().is())
- { // we have a content for the directory, loop through all entries
+ { // we have a content for the directory, loop through all entries
Sequence< ::rtl::OUString > aProperties(1);
aProperties[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title"));
@@ -761,8 +761,8 @@ DBG_NAME(OConnectionHelper)
StringBag aInstalledDBs;
// collect the names of the installed databases
StringBag aConfigDBs,aWrkDBs;
- aConfigDBs = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY);
- aWrkDBs = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY);
+ aConfigDBs = getInstalledAdabasDBDirs(sAdabasConfigDir,::ucbhelper::INCLUDE_DOCUMENTS_ONLY);
+ aWrkDBs = getInstalledAdabasDBDirs(sAdabasWorkDir,::ucbhelper::INCLUDE_FOLDERS_ONLY);
ConstStringBagIterator aOuter = aConfigDBs.begin();
ConstStringBagIterator aOuterEnd = aConfigDBs.end();
for(;aOuter != aOuterEnd;++aOuter)
@@ -813,16 +813,16 @@ DBG_NAME(OConnectionHelper)
{
case EVENT_GETFOCUS:
if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus)
- { // a descendant of the URL edit field got the focus
+ { // a descendant of the URL edit field got the focus
m_aConnectionURL.SaveValueNoPrefix();
}
break;
case EVENT_LOSEFOCUS:
if (m_aConnectionURL.IsWindowOrChild(_rNEvt.GetWindow()) && m_bUserGrabFocus)
- { // a descendant of the URL edit field lost the focus
+ { // a descendant of the URL edit field lost the focus
if (!commitURL())
- return 1L; // handled
+ return 1L; // handled
}
break;
} // switch (_rNEvt.GetType())
@@ -843,15 +843,15 @@ DBG_NAME(OConnectionHelper)
INetProtocol eProtocol = aParser.GetProtocol();
- ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels
+ ::std::vector< ::rtl::OUString > aToBeCreated; // the to-be-created levels
// search a level which exists
// #106016# ---------------------
IS_PATH_EXIST eParentExists = PATH_NOT_EXIST;
while ( eParentExists == PATH_NOT_EXIST && aParser.getSegmentCount())
{
- aToBeCreated.push_back(aParser.getName()); // remember the local name for creation
- aParser.removeSegment(); // cut the local name
+ aToBeCreated.push_back(aParser.getName()); // remember the local name for creation
+ aParser.removeSegment(); // cut the local name
eParentExists = pathExists(aParser.GetMainURL(INetURLObject::NO_DECODE), sal_False);
}
@@ -885,7 +885,7 @@ DBG_NAME(OConnectionHelper)
Sequence< Any > aNewDirectoryAttributes(1);
// loop
- for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin();
+ for ( ::std::vector< ::rtl::OUString >::reverse_iterator aLocalName = aToBeCreated.rbegin();
aLocalName != aToBeCreated.rend();
++aLocalName
)
@@ -930,7 +930,7 @@ DBG_NAME(OConnectionHelper)
if ( m_pCollection->isFileSystemBased(m_eType) )
{
if ( ( sURL != sOldPath ) && ( 0 != sURL.Len() ) )
- { // the text changed since entering the control
+ { // the text changed since entering the control
// the path may be in system notation ....
OFileNotation aTransformer(sURL);
@@ -990,5 +990,5 @@ DBG_NAME(OConnectionHelper)
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index 94c2678f9714..f843dabefb85 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -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
@@ -42,11 +42,11 @@
#endif
-#define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \
- if (editcontrol.GetText() != editcontrol.GetSavedValue()) \
- { \
- itemset.Put(SfxStringItem(itemid, editcontrol.GetText())); \
- modifiedflag = sal_True; \
+#define FILL_STRING_ITEM(editcontrol, itemset, itemid, modifiedflag) \
+ if (editcontrol.GetText() != editcontrol.GetSavedValue()) \
+ { \
+ itemset.Put(SfxStringItem(itemid, editcontrol.GetText())); \
+ modifiedflag = sal_True; \
}
//.........................................................................
@@ -66,21 +66,21 @@ namespace dbaui
class OConnectionHelper : public OGenericAdministrationPage
{
- sal_Bool m_bUserGrabFocus : 1;
+ sal_Bool m_bUserGrabFocus : 1;
public:
OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs);
virtual ~OConnectionHelper();
- FixedText m_aFT_Connection;
- OConnectionURLEdit m_aConnectionURL;
- PushButton m_aPB_Connection;
+ FixedText m_aFT_Connection;
+ OConnectionURLEdit m_aConnectionURL;
+ PushButton m_aPB_Connection;
::rtl::OUString m_eType; // the type can't be changed in this class, so we hold it as member.
public:
// setting/retrieving the current connection URL
// necessary because for some types, the URL must be decoded for display purposes
- ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance
+ ::dbaccess::ODsnTypeCollection* m_pCollection; /// the DSN type collection instance
virtual long PreNotify( NotifyEvent& _rNEvt );
// OGenericAdministrationPage::fillControls
@@ -92,25 +92,25 @@ namespace dbaui
// setting/retrieving the current connection URL
// necessary because for some types, the URL must be decoded for display purposes
- //String getURL( OConnectionURLEdit* _m_pConnection ) const;
- //void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection );
+ //String getURL( OConnectionURLEdit* _m_pConnection ) const;
+ //void setURL( const String& _rURL, OConnectionURLEdit* _m_pConnection );
- String getURLNoPrefix( ) const;
- void setURLNoPrefix( const String& _rURL );
+ String getURLNoPrefix( ) const;
+ void setURLNoPrefix( const String& _rURL );
/** checks if the path is existence
- @param _rURL
+ @param _rURL
The URL to check.
- */
- sal_Int32 checkPathExistence(const String& _rURL);
-
+ */
+ sal_Int32 checkPathExistence(const String& _rURL);
- IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const;
- sal_Bool createDirectoryDeep(const String& _rPathNormalized);
- sal_Bool commitURL();
+
+ IS_PATH_EXIST pathExists(const ::rtl::OUString& _rURL, sal_Bool bIsFile) const;
+ sal_Bool createDirectoryDeep(const String& _rPathNormalized);
+ sal_Bool commitURL();
/** opens the FileOpen dialog and asks for a FileName
- @param _aFileOpen
+ @param _aFileOpen
Executes the file open dialog, which must be filled from caller.
*/
void askForFileName(::sfx2::FileDialogHelper& _aFileOpen);
@@ -120,21 +120,21 @@ namespace dbaui
OGenericAdministrationPage::SetServiceFactory(_rxORB);
}
- protected:
- void setURL( const String& _rURL );
+ protected:
+ void setURL( const String& _rURL );
virtual bool checkTestConnection();
private:
DECL_LINK(OnBrowseConnections, PushButton*);
StringBag getInstalledAdabasDBDirs(const String &_rPath,const ::ucbhelper::ResultSetInclude& _reResultSetInclude);
StringBag getInstalledAdabasDBs(const String &_rConfigDir,const String &_rWorkDir);
- String impl_getURL( sal_Bool _bPrefix ) const;
- void impl_setURL( const String& _rURL, sal_Bool _bPrefix );
+ String impl_getURL( sal_Bool _bPrefix ) const;
+ void impl_setURL( const String& _rURL, sal_Bool _bPrefix );
void implUpdateURLDependentStates() const;
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // DBAUI_CONNECTIONHELPER_HXX
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index dac80070a640..3fd7b6df011c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -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
@@ -187,7 +187,7 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
- SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* OConnectionTabPage::Create( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OConnectionTabPage( pParent, _rAttrSet ) );
}
@@ -461,6 +461,6 @@ namespace dbaui
return 0L;
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hrc b/dbaccess/source/ui/dlg/ConnectionPage.hrc
index 347b0f0bac28..6c18a3e42ced 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hrc
+++ b/dbaccess/source/ui/dlg/ConnectionPage.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
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 2d6fef74c598..9454542841cf 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -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
@@ -55,24 +55,24 @@ namespace dbaui
*/
class OConnectionTabPage : public OConnectionHelper
{
- sal_Bool m_bUserGrabFocus : 1;
+ sal_Bool m_bUserGrabFocus : 1;
protected:
- // connection
- FixedLine m_aFL1;
+ // connection
+ FixedLine m_aFL1;
// user authentification
- FixedLine m_aFL2;
- FixedText m_aUserNameLabel;
- Edit m_aUserName;
- CheckBox m_aPasswordRequired;
+ FixedLine m_aFL2;
+ FixedText m_aUserNameLabel;
+ Edit m_aUserName;
+ CheckBox m_aPasswordRequired;
// jdbc driver
- FixedLine m_aFL3;
- FixedText m_aJavaDriverLabel;
- Edit m_aJavaDriver;
- PushButton m_aTestJavaDriver;
+ FixedLine m_aFL3;
+ FixedText m_aJavaDriverLabel;
+ Edit m_aJavaDriver;
+ PushButton m_aTestJavaDriver;
// connection test
- PushButton m_aTestConnection;
+ PushButton m_aTestConnection;
// called when the test connection button was clicked
@@ -80,10 +80,10 @@ namespace dbaui
DECL_LINK(OnEditModified,Edit*);
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
- virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs);
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
+ virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs);
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
inline void enableConnectionURL() { m_aConnectionURL.SetReadOnly(sal_False); }
inline void disableConnectionURL() { m_aConnectionURL.SetReadOnly(); }
@@ -108,7 +108,7 @@ namespace dbaui
virtual bool checkTestConnection();
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_DETAILPAGES_HXX_
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src
index 8ead374bdef4..22eed5dee2fa 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@ -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/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index f53054d37339..632ffa2f668c 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -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
@@ -163,7 +163,7 @@ namespace dbaui
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_DBASE, _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE);
oDBWizardPage->FreeResource();
@@ -171,35 +171,35 @@ namespace dbaui
}
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_MSACCESS, _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE);
oDBWizardPage->FreeResource();
return oDBWizardPage;
}
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADABAS, _rAttrSet, STR_ADABAS_HELPTEXT, STR_ADABAS_HEADERTEXT, STR_ADABAS_DATABASE_NAME);
oDBWizardPage->FreeResource();
return oDBWizardPage;
}
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ADO, _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL);
oDBWizardPage->FreeResource();
return oDBWizardPage;
}
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_ODBC, _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE);
oDBWizardPage->FreeResource();
return oDBWizardPage;
}
- OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( pParent, PAGE_DBWIZARD_USERDEFINED, _rAttrSet, USHRT_MAX, USHRT_MAX, STR_COMMONURL);
oDBWizardPage->FreeResource();
@@ -278,12 +278,12 @@ namespace dbaui
//! TODO
//if ( m_eType >= ::dbaccess::DST_USERDEFINE1 )
//{
- // String sDisplayName = m_pCollection->getTypeDisplayName(m_eType);
- // FixedText* ppTextControls[] ={&m_aFT_Connection};
- // for (size_t i = 0; i < sizeof(ppTextControls)/sizeof(ppTextControls[0]); ++i)
- // {
- // ppTextControls[i]->SetText(sDisplayName);
- // }
+ // String sDisplayName = m_pCollection->getTypeDisplayName(m_eType);
+ // FixedText* ppTextControls[] ={&m_aFT_Connection};
+ // for (size_t i = 0; i < sizeof(ppTextControls)/sizeof(ppTextControls[0]); ++i)
+ // {
+ // ppTextControls[i]->SetText(sDisplayName);
+ // }
//}
callModifiedHdl();
@@ -315,7 +315,7 @@ namespace dbaui
return 0L;
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 79a16c880c54..487015ade406 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -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
@@ -42,7 +42,7 @@
#include "curledit.hxx"
#endif
-#ifndef _SV_FIELD_HXX
+#ifndef _SV_FIELD_HXX
#include
#endif
@@ -51,7 +51,7 @@
namespace dbaui
{
//.........................................................................
-/* // #106016# --------------
+/* // #106016# --------------
enum IS_PATH_EXIST
{
PATH_NOT_EXIST = 0,
@@ -69,7 +69,7 @@ namespace dbaui
*/
class OConnectionTabPageSetup : public OConnectionHelper
{
- sal_Bool m_bUserGrabFocus : 1;
+ sal_Bool m_bUserGrabFocus : 1;
protected:
FixedText m_aFT_HelpText;
@@ -78,17 +78,17 @@ namespace dbaui
DECL_LINK(OnEditModified,Edit*);
public:
- static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateMSAccessTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateAdabasTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateADOTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateODBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateUserDefinedTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs);
+ virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs);
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
virtual sal_Bool commitPage( ::svt::WizardTypes::CommitPageReason _eReason );
@@ -99,8 +99,8 @@ namespace dbaui
The new URL must be of the type which is currently selected, only the parts which do not
affect the type may be changed (compared to the previous URL).
*/
- void changeConnectionURL( const String& _rNewDSN );
- String getConnectionURL( ) const;
+ void changeConnectionURL( const String& _rNewDSN );
+ String getConnectionURL( ) const;
protected:
@@ -111,7 +111,7 @@ namespace dbaui
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
-#endif
+#endif
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index c340e3576f34..2365a9779374 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -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
@@ -116,16 +116,16 @@ namespace dbaui
{
//.........................................................................
using namespace ::com::sun::star;
-// using namespace ::com::sun::star::ucb;
-// using namespace ::com::sun::star::ui::dialogs;
-// using namespace ::com::sun::star::sdbc;
-// using namespace ::com::sun::star::beans;
-// using namespace ::com::sun::star::lang;
-// using namespace ::com::sun::star::container;
-// using namespace ::dbtools;
-// using namespace ::svt;
+// using namespace ::com::sun::star::ucb;
+// using namespace ::com::sun::star::ui::dialogs;
+// using namespace ::com::sun::star::sdbc;
+// using namespace ::com::sun::star::beans;
+// using namespace ::com::sun::star::lang;
+// using namespace ::com::sun::star::container;
+// using namespace ::dbtools;
+// using namespace ::svt;
- OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OTextConnectionPageSetup::CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OTextConnectionPageSetup( pParent, _rAttrSet ) );
}
@@ -208,7 +208,7 @@ DBG_NAME(OTextConnectionPageSetup)
}
- OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OLDAPConnectionPageSetup::CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OLDAPConnectionPageSetup( pParent, _rAttrSet ) );
}
@@ -221,12 +221,12 @@ DBG_NAME(OTextConnectionPageSetup)
:OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_LDAP), _rCoreAttrs)
,m_aFTHeaderText (this, ModuleRes(FT_LDAP_HEADERTEXT))
,m_aFTHelpText (this, ModuleRes(FT_LDAP_HELPTEXT))
- ,m_aFTHostServer (this, ModuleRes(FT_AUTOHOSTNAME))
- ,m_aETHostServer (this, ModuleRes(ET_AUTOHOSTNAME))
- ,m_aFTBaseDN (this, ModuleRes(FT_AUTOBASEDN))
- ,m_aETBaseDN (this, ModuleRes(ET_AUTOBASEDN))
- ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER))
- ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER))
+ ,m_aFTHostServer (this, ModuleRes(FT_AUTOHOSTNAME))
+ ,m_aETHostServer (this, ModuleRes(ET_AUTOHOSTNAME))
+ ,m_aFTBaseDN (this, ModuleRes(FT_AUTOBASEDN))
+ ,m_aETBaseDN (this, ModuleRes(ET_AUTOBASEDN))
+ ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER))
+ ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER))
,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT))
,m_aCBUseSSL (this, ModuleRes(CB_WIZ_USESSL))
{
@@ -476,16 +476,16 @@ DBG_NAME(OMySQLIntroPageSetup)
OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId, USHORT _nDefaultPortResId, USHORT _nHelpTextResId, USHORT _nHeaderTextResId, USHORT _nDriverClassId)
:OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs)
,m_aFTHelpText (this, ModuleRes(FT_AUTOWIZARDHELPTEXT))
- ,m_aFTDatabasename (this, ModuleRes(FT_AUTODATABASENAME))
- ,m_aETDatabasename (this, ModuleRes(ET_AUTODATABASENAME))
- ,m_aFTHostname (this, ModuleRes(FT_AUTOHOSTNAME))
- ,m_aETHostname (this, ModuleRes(ET_AUTOHOSTNAME))
- ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER))
+ ,m_aFTDatabasename (this, ModuleRes(FT_AUTODATABASENAME))
+ ,m_aETDatabasename (this, ModuleRes(ET_AUTODATABASENAME))
+ ,m_aFTHostname (this, ModuleRes(FT_AUTOHOSTNAME))
+ ,m_aETHostname (this, ModuleRes(ET_AUTOHOSTNAME))
+ ,m_aFTPortNumber (this, ModuleRes(FT_AUTOPORTNUMBER))
,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT))
- ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER))
- ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS))
- ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS))
- ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS))
+ ,m_aNFPortNumber (this, ModuleRes(NF_AUTOPORTNUMBER))
+ ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS))
+ ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS))
+ ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS))
,m_nPortId(_nPortId)
{
m_aFTDriverClass.SetText(String(ModuleRes(_nDriverClassId)));
@@ -517,7 +517,7 @@ DBG_NAME(OMySQLIntroPageSetup)
// -----------------------------------------------------------------------
- OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent,
PAGE_DBWIZARD_MYSQL_JDBC,
@@ -530,7 +530,7 @@ DBG_NAME(OMySQLIntroPageSetup)
}
// -----------------------------------------------------------------------
- OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OGeneralSpecialJDBCConnectionPageSetup( pParent,
PAGE_DBWIZARD_ORACLE,
@@ -649,7 +649,7 @@ DBG_NAME(OMySQLIntroPageSetup)
}
// -----------------------------------------------------------------------
- OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OJDBCConnectionPageSetup::CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OJDBCConnectionPageSetup( pParent, _rAttrSet));
}
@@ -660,9 +660,9 @@ DBG_NAME(OMySQLIntroPageSetup)
//========================================================================
OJDBCConnectionPageSetup::OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs)
:OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_JDBC, _rCoreAttrs, STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL)
- ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS))
- ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS))
- ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS))
+ ,m_aFTDriverClass (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS))
+ ,m_aETDriverClass (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS))
+ ,m_aPBTestJavaDriver (this, ModuleRes(PB_AUTOTESTDRIVERCLASS))
{
m_aETDriverClass.SetModifyHdl(LINK(this, OJDBCConnectionPageSetup, OnEditModified));
m_aPBTestJavaDriver.SetClickHdl(LINK(this,OJDBCConnectionPageSetup,OnTestJavaClickHdl));
@@ -729,7 +729,7 @@ DBG_NAME(OMySQLIntroPageSetup)
BOOL bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
bEnableTestConnection = bEnableTestConnection && (m_aETDriverClass.GetText().Len() != 0);
return bEnableTestConnection;
-// m_aTestConnection.Enable(bEnableTestConnection);
+// m_aTestConnection.Enable(bEnableTestConnection);
}
@@ -769,7 +769,7 @@ DBG_NAME(OMySQLIntroPageSetup)
}
- OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OSpreadSheetConnectionPageSetup( pParent, _rAttrSet ) );
}
@@ -821,7 +821,7 @@ DBG_NAME(OSpreadSheetConnectionPageSetup)
return bChangedSomething;
}
- OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
+ OGenericAdministrationPage* OAuthentificationPageSetup::CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OAuthentificationPageSetup( pParent, _rAttrSet) );
}
@@ -900,7 +900,7 @@ DBG_NAME(OAuthentificationPageSetup)
}
- OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet)
+ OGenericAdministrationPage* OFinalDBPageSetup::CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet)
{
return ( new OFinalDBPageSetup( pParent, _rAttrSet) );
}
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 1ba67e19b9e2..943fd93a3ad4 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -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
@@ -49,7 +49,7 @@ namespace dbaui
//.........................................................................
class IDatabaseSettingsDialog;
-// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+// static OGenericAdministrationPage* CreateDbaseTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
//========================================================================
@@ -58,8 +58,8 @@ namespace dbaui
class OSpreadSheetConnectionPageSetup : public OConnectionTabPageSetup
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
- static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ static OGenericAdministrationPage* CreateSpreadSheetTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
protected:
@@ -79,12 +79,12 @@ namespace dbaui
class OTextConnectionPageSetup : public OConnectionTabPageSetup
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
- static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ static OGenericAdministrationPage* CreateTextTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
OTextConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
OTextConnectionHelper* m_pTextConnectionHelper;
private:
-
+
protected:
virtual ~OTextConnectionPageSetup();
virtual sal_Bool prepareLeave();
@@ -103,8 +103,8 @@ namespace dbaui
class OLDAPConnectionPageSetup : public OGenericAdministrationPage
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
- static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ static OGenericAdministrationPage* CreateLDAPTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
OLDAPConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
virtual Link getControlModifiedLink() { return LINK(this, OLDAPConnectionPageSetup, OnEditModified); }
@@ -119,11 +119,11 @@ namespace dbaui
FixedText m_aFTHelpText;
FixedText m_aFTHostServer;
Edit m_aETHostServer;
- FixedText m_aFTBaseDN;
- Edit m_aETBaseDN;
- FixedText m_aFTPortNumber;
- NumericField m_aNFPortNumber;
- FixedText m_aFTDefaultPortNumber;
+ FixedText m_aFTBaseDN;
+ Edit m_aETBaseDN;
+ FixedText m_aFTPortNumber;
+ NumericField m_aNFPortNumber;
+ FixedText m_aFTDefaultPortNumber;
CheckBox m_aCBUseSSL;
};
@@ -146,7 +146,7 @@ namespace dbaui
virtual void fillControls( ::std::vector< ISaveValueWrapper* >& _rControlList );
virtual void fillWindows( ::std::vector< ISaveValueWrapper* >& _rControlList );
- virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
virtual Link getControlModifiedLink();
@@ -169,11 +169,11 @@ namespace dbaui
, USHORT _nHelpTextResId
, USHORT _nHeaderTextResId
, USHORT _nDriverClassId );
- static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
- static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateMySQLJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateOracleJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
protected:
- virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -184,19 +184,19 @@ namespace dbaui
FixedText m_aFTHelpText;
FixedText m_aFTDatabasename;
Edit m_aETDatabasename;
- FixedText m_aFTHostname;
- Edit m_aETHostname;
- FixedText m_aFTPortNumber;
- FixedText m_aFTDefaultPortNumber;
- NumericField m_aNFPortNumber;
-
-
- FixedText m_aFTDriverClass;
- Edit m_aETDriverClass;
- PushButton m_aPBTestJavaDriver;
-
- String m_sDefaultJdbcDriverName;
- USHORT m_nPortId;
+ FixedText m_aFTHostname;
+ Edit m_aETHostname;
+ FixedText m_aFTPortNumber;
+ FixedText m_aFTDefaultPortNumber;
+ NumericField m_aNFPortNumber;
+
+
+ FixedText m_aFTDriverClass;
+ Edit m_aETDriverClass;
+ PushButton m_aPBTestJavaDriver;
+
+ String m_sDefaultJdbcDriverName;
+ USHORT m_nPortId;
};
@@ -207,21 +207,21 @@ namespace dbaui
{
public:
OJDBCConnectionPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs );
- static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ static OGenericAdministrationPage* CreateJDBCTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
protected:
virtual bool checkTestConnection();
- virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
DECL_LINK(OnTestJavaClickHdl,PushButton*);
DECL_LINK(OnEditModified,Edit*);
- FixedText m_aFTDriverClass;
- Edit m_aETDriverClass;
- PushButton m_aPBTestJavaDriver;
+ FixedText m_aFTDriverClass;
+ Edit m_aETDriverClass;
+ PushButton m_aPBTestJavaDriver;
};
@@ -241,7 +241,7 @@ namespace dbaui
OMySQLIntroPageSetup( Window* pParent, const SfxItemSet& _rCoreAttrs);
- static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static OMySQLIntroPageSetup* CreateMySQLIntroTabPage( Window* _pParent, const SfxItemSet& _rAttrSet );
ConnectionType getMySQLMode();
Link maClickHdl;
void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; }
@@ -249,7 +249,7 @@ namespace dbaui
DECL_LINK(ImplClickHdl, OMySQLIntroPageSetup*);
-
+
protected:
virtual BOOL FillItemSet(SfxItemSet& _rSet);
@@ -279,8 +279,8 @@ namespace dbaui
class OAuthentificationPageSetup : public OGenericAdministrationPage
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
- static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ static OGenericAdministrationPage* CreateAuthentificationTabPage( Window* pParent, const SfxItemSet& _rAttrSet );
OAuthentificationPageSetup(Window* pParent, const SfxItemSet& _rCoreAttrs);
protected:
@@ -306,8 +306,8 @@ namespace dbaui
class OFinalDBPageSetup : public OGenericAdministrationPage
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
- static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet);
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ static OGenericAdministrationPage* CreateFinalDBTabPageSetup( Window* pParent, const SfxItemSet& _rAttrSet);
FixedText m_aFTFinalHeader;
FixedText m_aFTFinalHelpText;
@@ -338,7 +338,7 @@ namespace dbaui
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 797cb73eb021..816d3d5e9881 100755
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -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
@@ -56,7 +56,7 @@
#include
#include
#include
-#include
+#include
#include
#include
/** === end UNO includes === **/
@@ -140,7 +140,7 @@ namespace
String lcl_createHostWithPort(const SfxStringItem* _pHostName,const SfxInt32Item* _pPortNumber)
{
String sNewUrl;
-
+
if ( _pHostName && _pHostName->GetValue().Len() )
sNewUrl = _pHostName->GetValue();
@@ -253,7 +253,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert
SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pUser, SfxStringItem, DSID_USER, sal_True);
if (pUser && pUser->GetValue().Len())
aReturn.push_back(
- PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), 0,
+ PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("user")), 0,
makeAny(::rtl::OUString(pUser->GetValue())), PropertyState_DIRECT_VALUE));
// check if the connection type requires a password
@@ -279,7 +279,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert
if ( !xHandler.is() )
ShowServiceNotAvailableError(m_pParent->GetParent(), String(SERVICE_TASK_INTERACTION_HANDLER), sal_True);
}
-
+
String sName = pName ? pName->GetValue() : String();
String sLoginRequest(ModuleRes(STR_ENTER_CONNECTION_PASSWORD));
::rtl::OUString sTemp = sName;
@@ -332,7 +332,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert
}
if (!pAuthenticate->wasSelected())
return sal_False;
-
+
sPassword = pAuthenticate->getPassword();
if (pAuthenticate->getRememberPassword())
m_pItemSetHelper->getWriteOutputSet()->Put(SfxStringItem(DSID_PASSWORD, sPassword));
@@ -340,7 +340,7 @@ sal_Bool ODbDataSourceAdministrationHelper::getCurrentSettings(Sequence< Propert
if (sPassword.Len())
aReturn.push_back(
- PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")), 0,
+ PropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("password")), 0,
makeAny(::rtl::OUString(sPassword)), PropertyState_DIRECT_VALUE));
}
@@ -475,7 +475,7 @@ Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSourc
}
}
-
+
DBG_ASSERT(m_xDatasource.is(), "ODbDataSourceAdministrationHelper::getCurrentDataSource: no data source!");
return m_xDatasource;
}
@@ -585,7 +585,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
break;
case ::dbaccess::DST_LDAP:
{
- // SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
+ // SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pHostName, SfxStringItem, DSID_CONN_HOSTNAME, sal_True);
SFX_ITEMSET_GET(*m_pItemSetHelper->getOutputSet(), pPortNumber, SfxInt32Item, DSID_CONN_LDAP_PORTNUMBER, sal_True);
sNewUrl = pCollection->cutPrefix(pUrlItem->GetValue());
sNewUrl += lcl_createHostWithPort(NULL,pPortNumber);
@@ -611,7 +611,7 @@ String ODbDataSourceAdministrationHelper::getConnectionURL() const
struct PropertyValueLess
{
bool operator() (const PropertyValue& x, const PropertyValue& y) const
- { return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning
+ { return x.Name < y.Name ? true : false; } // construct prevents a MSVC6 warning
};
DECLARE_STL_SET( PropertyValue, PropertyValueLess, PropertyValueSet);
@@ -623,7 +623,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
if (_rxSource.is())
{
- for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin();
+ for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin();
aDirect != m_aDirectPropTranslator.end();
++aDirect
)
@@ -661,7 +661,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
for (sal_Int32 i=0; iName.compareToAscii("JDBCDRV"))
- { // compatibility
+ { // compatibility
PropertyValue aCompatibility(*pAdditionalInfo);
aCompatibility.Name = ::rtl::OUString::createFromAscii("JavaDriverClass");
aInfos.insert(aCompatibility);
@@ -675,7 +675,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr
{
PropertyValue aSearchFor;
ConstMapInt2StringIterator aEnd = m_aIndirectPropTranslator.end();
- for ( ConstMapInt2StringIterator aIndirect = m_aIndirectPropTranslator.begin();
+ for ( ConstMapInt2StringIterator aIndirect = m_aIndirectPropTranslator.begin();
aIndirect != aEnd;
++aIndirect)
{
@@ -714,11 +714,11 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r
Reference< XPropertySetInfo > xInfo;
try { xInfo = _rxDest->getPropertySetInfo(); }
catch(Exception&) { }
-
+
const ::rtl::OUString sUrlProp(RTL_CONSTASCII_USTRINGPARAM("URL"));
// -----------------------------
// transfer the direct properties
- for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin();
+ for ( ConstMapInt2StringIterator aDirect = m_aDirectPropTranslator.begin();
aDirect != m_aDirectPropTranslator.end();
++aDirect
)
@@ -737,7 +737,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const SfxItemSet& _r
if ( sUrlProp == aDirect->second )
{
Any aValue(makeAny(::rtl::OUString(getConnectionURL())));
- // aValue <<= ::rtl::OUString();
+ // aValue <<= ::rtl::OUString();
lcl_putProperty(_rxDest, aDirect->second,aValue);
}
else
@@ -799,7 +799,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
}
// settings to preserve
- MapInt2String aPreservedSettings;
+ MapInt2String aPreservedSettings;
// now aRelevantSettings contains all the property values relevant for the current data source type,
// check the original sequence if it already contains any of these values (which have to be overwritten, then)
@@ -812,13 +812,13 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
aSearchFor.Name = pInfo->Name;
PropertyValueSetIterator aOverwrittenSetting = aRelevantSettings.find(aSearchFor);
if (aRelevantSettings.end() != aOverwrittenSetting)
- { // the setting was present in the original sequence, and it is to be overwritten -> replace it
+ { // the setting was present in the original sequence, and it is to be overwritten -> replace it
if ( !::comphelper::compare(pInfo->Value,aOverwrittenSetting->Value) )
*pInfo = *aOverwrittenSetting;
aRelevantSettings.erase(aOverwrittenSetting);
}
else if (0 == pInfo->Name.compareToAscii("JDBCDRV"))
- { // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass)
+ { // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass)
nObsoleteSetting = i;
}
else
@@ -828,7 +828,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
::comphelper::removeElementAt(_rInfo, nObsoleteSetting);
if ( !aPreservedSettings.empty() )
- { // check if there are settings which
+ { // check if there are settings which
// * are known as indirect properties
// * but not relevant for the current data source type
// These settings have to be removed: If they're not relevant, we have no UI for changing them.
@@ -845,7 +845,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
::std::vector< sal_Int32 > aRemoveIndexes;
sal_Int32 nPositionCorrector = 0;
ConstMapInt2StringIterator aPreservedEnd = aPreservedSettings.end();
- for ( ConstMapInt2StringIterator aPreserved = aPreservedSettings.begin();
+ for ( ConstMapInt2StringIterator aPreserved = aPreservedSettings.begin();
aPreserved != aPreservedEnd;
++aPreserved
)
@@ -861,7 +861,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
}
// now finally remove all such props
::std::vector< sal_Int32 >::const_iterator aRemoveEnd = aRemoveIndexes.end();
- for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin();
+ for ( ::std::vector< sal_Int32 >::const_iterator aRemoveIndex = aRemoveIndexes.begin();
aRemoveIndex != aRemoveEnd;
++aRemoveIndex
)
@@ -893,7 +893,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS
_rInfo.realloc(nOldLength + aRelevantSettings.size());
PropertyValue* pAppendValues = _rInfo.getArray() + nOldLength;
ConstPropertyValueSetIterator aRelevantEnd = aRelevantSettings.end();
- for ( ConstPropertyValueSetIterator aLoop = aRelevantSettings.begin();
+ for ( ConstPropertyValueSetIterator aLoop = aRelevantSettings.begin();
aLoop != aRelevantEnd;
++aLoop, ++pAppendValues
)
@@ -996,9 +996,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet
}
else {
DBG_ERROR(
- ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" )
- += ::rtl::OString( translatePropertyId( _nId ) )
- += ::rtl::OString( " should be no string)!" )
+ ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" )
+ += ::rtl::OString( translatePropertyId( _nId ) )
+ += ::rtl::OString( " should be no string)!" )
).getStr()
);
}
@@ -1026,9 +1026,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet
}
else {
DBG_ERROR(
- ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" )
- += ::rtl::OString( translatePropertyId( _nId ) )
- += ::rtl::OString( " should be no boolean)!" )
+ ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" )
+ += ::rtl::OString( translatePropertyId( _nId ) )
+ += ::rtl::OString( " should be no boolean)!" )
).getStr()
);
}
@@ -1043,9 +1043,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet
}
else {
DBG_ERROR(
- ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" )
- += ::rtl::OString( translatePropertyId( _nId ) )
- += ::rtl::OString( " should be no int)!" )
+ ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" )
+ += ::rtl::OString( translatePropertyId( _nId ) )
+ += ::rtl::OString( " should be no int)!" )
).getStr()
);
}
@@ -1076,9 +1076,9 @@ void ODbDataSourceAdministrationHelper::implTranslateProperty( SfxItemSet& _rSet
}
else {
DBG_ERROR(
- ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" )
- += ::rtl::OString( translatePropertyId( _nId ) )
- += ::rtl::OString( " should be no string sequence)!" )
+ ( ::rtl::OString( "ODbDataSourceAdministrationHelper::implTranslateProperty: invalid property value (" )
+ += ::rtl::OString( translatePropertyId( _nId ) )
+ += ::rtl::OString( " should be no string sequence)!" )
).getStr()
);
}
@@ -1115,8 +1115,8 @@ void ODbDataSourceAdministrationHelper::convertUrl(SfxItemSet& _rDest)
::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
DBG_ASSERT(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!");
- USHORT nPortNumberId = 0;
- sal_Int32 nPortNumber = -1;
+ USHORT nPortNumberId = 0;
+ sal_Int32 nPortNumber = -1;
String sNewHostName;
//String sUrl = pCollection->cutPrefix(pUrlItem->GetValue());
String sUrlPart;
@@ -1174,8 +1174,8 @@ sal_Bool ODbDataSourceAdministrationHelper::saveChanges(const SfxItemSet& _rSour
return sal_True;
}
// -----------------------------------------------------------------------------
-void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName )
-{
+void ODbDataSourceAdministrationHelper::setDataSourceOrName( const Any& _rDataSourceOrName )
+{
DBG_ASSERT( !m_aDataSourceOrName.hasValue(), "ODbDataSourceAdministrationHelper::setDataSourceOrName: already have one!" );
// hmm. We could reset m_xDatasource/m_xModel, probably, and continue working
m_aDataSourceOrName = _rDataSourceOrName;
@@ -1212,7 +1212,7 @@ SfxPoolItem* DbuTypeCollectionItem::Clone(SfxItemPool* /*_pPool*/) const
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index 4ed86867618e..f470bd5c1945 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -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
@@ -89,23 +89,23 @@ namespace dbaui
private:
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
- m_xORB; /// service factory
+ m_xORB; /// service factory
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >
- m_xDatabaseContext; /// database context we're working in
+ m_xDatabaseContext; /// database context we're working in
::com::sun::star::uno::Reference< ::com::sun::star::uno::XNamingService >
- m_xDynamicContext; /// just another interface of the context ...
+ m_xDynamicContext; /// just another interface of the context ...
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDatasource;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xModel;
- ::com::sun::star::uno::Any m_aDataSourceOrName;
- typedef ::std::set< ::rtl::OUString > StringSet;
- typedef StringSet::const_iterator ConstStringSetIterator;
-
+ ::com::sun::star::uno::Any m_aDataSourceOrName;
+ typedef ::std::set< ::rtl::OUString > StringSet;
+ typedef StringSet::const_iterator ConstStringSetIterator;
- MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source)
- MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source)
- Window* m_pParent;
- IItemSetHelper* m_pItemSetHelper;
+
+ MapInt2String m_aDirectPropTranslator; /// translating property id's into names (direct properties of a data source)
+ MapInt2String m_aIndirectPropTranslator; /// translating property id's into names (indirect properties of a data source)
+ Window* m_pParent;
+ IItemSetHelper* m_pItemSetHelper;
public:
ODbDataSourceAdministrationHelper(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB
@@ -115,15 +115,15 @@ namespace dbaui
/** translate the current dialog SfxItems into driver relevant PropertyValues
@see successfullyConnected
*/
- sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams);
+ sal_Bool getCurrentSettings(::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rDriverParams);
/** to be called if the settings got from getCurrentSettings have been used for successfully connecting
@see getCurrentSettings
*/
- void successfullyConnected();
+ void successfullyConnected();
/// clear the password in the current data source's item set
- void clearPassword();
+ void clearPassword();
inline ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() const { return m_xORB; }
@@ -132,16 +132,16 @@ namespace dbaui
/** creates a new connection. The caller is responsible to dispose it !!!!
*/
- ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection();
+ ::std::pair< ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >,sal_Bool> createConnection();
/** return the corresponding driver for the selected URL
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver();
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(const ::rtl::OUString& _sURL);
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver();
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDriver > getDriver(const ::rtl::OUString& _sURL);
/** returns the data source the dialog is currently working with
*/
- ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource();
+ ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getCurrentDataSource();
// returns the Url of a database document
String getDocumentUrl(SfxItemSet& _rDest);
@@ -164,9 +164,9 @@ namespace dbaui
const MapInt2String& getIndirectProperties() const { return m_aIndirectPropTranslator; }
/** translates properties of an UNO data source into SfxItems
- @param _rxSource
+ @param _rxSource
The data source
- @param _rDest
+ @param _rDest
The item set to fill.
*/
void translateProperties(
@@ -174,9 +174,9 @@ namespace dbaui
SfxItemSet& _rDest);
/** translate SfxItems into properties of an UNO data source
- @param _rSource
+ @param _rSource
The item set to read from.
- @param _rxDest
+ @param _rxDest
The data source to fill.
*/
void translateProperties(
@@ -190,18 +190,18 @@ namespace dbaui
void fillDatasourceInfo(const SfxItemSet& _rSource, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rInfo);
/// translate the given value into an SfxPoolItem, put this into the given set under the given id
- void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue);
-
+ void implTranslateProperty(SfxItemSet& _rSet, sal_Int32 _nId, const ::com::sun::star::uno::Any& _rValue);
+
/// translate the given SfxPoolItem into an uno
::com::sun::star::uno::Any implTranslateProperty(const SfxPoolItem* _pItem);
/// translate the given SfxPoolItem into an uno, set it (under the given name) on the given property set
- void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const ::rtl::OUString& _rName, const SfxPoolItem* _pItem);
+ void implTranslateProperty(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSet, const ::rtl::OUString& _rName, const SfxPoolItem* _pItem);
/** check if the data source described by the given set needs authentication
The return value depends on the data source type only.
*/
- sal_Bool hasAuthentication(const SfxItemSet& _rSet) const;
+ sal_Bool hasAuthentication(const SfxItemSet& _rSet) const;
#ifdef DBG_UTIL
::rtl::OString translatePropertyId( sal_Int32 _nId );
@@ -209,7 +209,7 @@ namespace dbaui
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_DBADMINIMPL_HXX_
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx
index cecdc49aff8e..20e5b08efecf 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.cxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.cxx
@@ -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/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index c09977f276a7..61d4f1c9a7c8 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.hxx
@@ -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
@@ -45,66 +45,66 @@ namespace dbaui
/** filles the IDs of the settings which are reflected in indirect data source properties
(aka properties in the css.sdb.DataSource.Info sequence)
- @param _eType
+ @param _eType
The Type of the data source.
- @param _out_rDetailsIds
+ @param _out_rDetailsIds
Will be filled.
*/
static void getSupportedIndirectSettings( const ::rtl::OUString& _sURLPrefix,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xFactory,::std::vector< sal_Int32>& _out_rDetailsIds );
/** Creates the detail page for Dbase
*/
- static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateDbase2( Window* _pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for ado
*/
- static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateDbase( Window* _pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for ado
*/
- static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateAdo( Window* _pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for ODBC
*/
- static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateODBC( Window* _pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for user
*/
- static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateUser( Window* _pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for MySQLODBC
*/
- static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateMySQLODBC( Window* _pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for MySQLJDBC
*/
- static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateMySQLJDBC( Window* _pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for MySQLNATIVE
*/
- static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateMySQLNATIVE( Window* _pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for Oracle JDBC
*/
- static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for Adabas
*/
- static SfxTabPage* CreateAdabas( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateAdabas( Window* _pParent, const SfxItemSet& _rAttrSet );
/** Creates the detail page for LDAP
*/
- static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateLDAP( Window* _pParent, const SfxItemSet& _rAttrSet );
/// Creates the detail page for Text
- static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateText( Window* _pParent, const SfxItemSet& _rAttrSet );
/// creates the GeneratedValues page
- static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet );
/// creates the "Special Settings" page of the "Advanced Settings" dialog
- static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet );
+ static SfxTabPage* CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet );
};
}
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
index 49d4182d9ef8..472263ba0850 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
@@ -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
@@ -64,9 +64,9 @@ DBG_NAME( dbu_OExtensionNotPresentDialog )
OExtensionNotPresentDialog::OExtensionNotPresentDialog( Window* _pParent, uno::Reference< lang::XMultiServiceFactory > _xORB)
: ModalDialog( _pParent, ModuleRes(RID_EXTENSION_NOT_PRESENT_DLG) )
,m_aFI_WARNING(this, ModuleRes(FI_WARNING))
- ,m_aFT_TEXT(this, ModuleRes(FT_TEXT ) )
- ,m_aPB_DOWNLOAD(this, ModuleRes(PB_DOWNLOAD))
- ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL))
+ ,m_aFT_TEXT(this, ModuleRes(FT_TEXT ) )
+ ,m_aPB_DOWNLOAD(this, ModuleRes(PB_DOWNLOAD))
+ ,m_aPB_CANCEL(this, ModuleRes(PB_CANCEL))
,m_xMultiServiceFactory(_xORB)
{
DBG_CTOR( dbu_OExtensionNotPresentDialog, NULL);
@@ -82,10 +82,10 @@ DBG_NAME( dbu_OExtensionNotPresentDialog )
// set a ClickHandler for the 'Download' button
m_aPB_DOWNLOAD.SetClickHdl( LINK( this, OExtensionNotPresentDialog, Download_Click ) );
-
+
// get message string out of the resource
String sText = String( ModuleRes( RID_STR_EXTENSION_NOT_PRESENT ) );
- // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) );
+ // String sExtensionName = String( ModuleRes( RID_STR_EXTENSION_NAME ) );
String sExtensionName = getFromConfigurationExtension("Name");
sText.SearchAndReplaceAscii("%RPT_EXTENSION_NAME", sExtensionName);
@@ -135,12 +135,12 @@ DBG_NAME( dbu_OExtensionNotPresentDialog )
// WinBits aBits = m_aFI_WARNING.GetStyle();
// aBits |= WB_SCALE;
// m_aFI_WARNING.SetStyle(aBits);
- //
+ //
// Size aImageSize = m_aFI_WARNING.GetSizePixel();
// (void) aImageSize;
// m_aFI_WARNING.Resize();
-
+
Resize();
FreeResource();
}
@@ -172,9 +172,9 @@ rtl::OUString OExtensionNotPresentDialog::getFromConfigurationExtension(rtl::OUS
{
// get the URL to open in a browser from Configuration
static const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign/Extension" ) );
-
+
::utl::OConfigurationTreeRoot aConfiguration( ::utl::OConfigurationTreeRoot::createWithServiceFactory( m_xMultiServiceFactory, sConfigName ) );
-
+
rtl::OUString aValue;
aConfiguration.getNodeValue( _sPropertyName ) >>= aValue;
return aValue;
@@ -193,14 +193,14 @@ IMPL_LINK( OExtensionNotPresentDialog, Download_Click, PushButton*, EMPTYARG )
try
{
EndDialog( TRUE );
-
+
rtl::OUString suDownloadURL = getFromConfigurationExtension("DownloadURL");
if (suDownloadURL.getLength() == 0)
{
// fallback
suDownloadURL = UNISTRING("http://extensions.services.openoffice.org");
}
-
+
// open such URL in a browser
uno::Reference< com::sun::star::system::XSystemShellExecute > xShellExecute( getShellExecuter() );
xShellExecute->execute( suDownloadURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::DEFAULTS );
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc b/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
index 69794e3a76bc..cb314b9f7683 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.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
@@ -27,22 +27,22 @@
#ifndef DBU_EXTENSIONNOTPRESENT_HRC
#define DBU_EXTENSIONNOTPRESENT_HRC
-#define FT_TEXT (1)
-#define FI_WARNING (2)
-#define PB_DOWNLOAD (10)
-#define PB_CANCEL (11)
+#define FT_TEXT (1)
+#define FI_WARNING (2)
+#define PB_DOWNLOAD (10)
+#define PB_CANCEL (11)
-#define FIXEDTEXT_HEIGHT 8
+#define FIXEDTEXT_HEIGHT 8
#define CELL_PADDING 8
-#define BUTTON_HEIGHT 14
-#define BUTTON_WIDTH 55
-#define BROWSER_HEIGHT 75
-// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING)
+#define BUTTON_HEIGHT 14
+#define BUTTON_WIDTH 55
+#define BROWSER_HEIGHT 75
+// #define PAGE_WIDTH ( CELL_PADDING + BUTTON_WIDTH + CELL_PADDING + BUTTON_WIDTH + CELL_PADDING)
#define LEFT_PADDING 32 /* size for the icon */
#define RIGHT_PADDING 16
-#define DLG_WIDTH ( 250 )
+#define DLG_WIDTH ( 250 )
#define ACTION_LINE_START (CELL_PADDING + ( 3 * FIXEDTEXT_HEIGHT ) + 2 * CELL_PADDING + 1 )
-#define DLG_HEIGHT (ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING)
+#define DLG_HEIGHT (ACTION_LINE_START + BUTTON_HEIGHT + CELL_PADDING)
#endif /* DBU_EXTENSIONNOTPRESENT_HRC */
diff --git a/dbaccess/source/ui/dlg/ExtensionNotPresent.src b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
index 9507c4256360..9944278cd359 100644
--- a/dbaccess/source/ui/dlg/ExtensionNotPresent.src
+++ b/dbaccess/source/ui/dlg/ExtensionNotPresent.src
@@ -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
@@ -40,7 +40,7 @@ String RID_STR_EXTENSION_NOT_PRESENT
// To open a report you require the extension Sun Report Designer weiss der Geier Hauptsache extra langer Name
// String RID_STR_EXTENSION_NAME
// {
-// Text = "Sun(TM) Report Builder";
+// Text = "Sun(TM) Report Builder";
// };
ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
@@ -52,7 +52,7 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
HelpId = HID_EXTENSION_NOT_PRESENT_DLG;
Moveable = TRUE ;
Closeable = TRUE ;
-
+
// most of the calulated values here are overridden by the ExtensionNotPresent ctor itself.
FixedImage FI_WARNING
{
@@ -60,12 +60,12 @@ ModalDialog RID_EXTENSION_NOT_PRESENT_DLG
Size = (32, 32);
Fixed=BMP_EXCEPTION_WARNING;
};
-
+
FixedText FT_TEXT
{
- Pos = MAP_APPFONT ( 32 , CELL_PADDING ) ;
- Size = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ;
+ Pos = MAP_APPFONT ( 32 , CELL_PADDING ) ;
+ Size = MAP_APPFONT ( DLG_WIDTH - LEFT_PADDING - RIGHT_PADDING , 3 * (FIXEDTEXT_HEIGHT + 2) ) ;
// Border = TRUE ;
// Text will set outside from RID_STR_EXTENSION_NOT_PRESENT
};
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index d24a1d87dee1..a46966744fcd 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -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
@@ -102,15 +102,15 @@ ORelationDialog::ORelationDialog( OJoinTableView* pParent,
,m_pTableMap(pParent->GetTabWinMap())
,aFL_CascUpd( this, ModuleRes(FL_CASC_UPD) )
- ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) )
- ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) )
- ,aRB_CascUpdNull( this, ModuleRes(RB_CASC_UPD_NULL) )
- ,aRB_CascUpdDefault( this, ModuleRes(RB_CASC_UPD_DEFAULT) )
+ ,aRB_NoCascUpd( this, ModuleRes(RB_NO_CASC_UPD) )
+ ,aRB_CascUpd( this, ModuleRes(RB_CASC_UPD) )
+ ,aRB_CascUpdNull( this, ModuleRes(RB_CASC_UPD_NULL) )
+ ,aRB_CascUpdDefault( this, ModuleRes(RB_CASC_UPD_DEFAULT) )
,aFL_CascDel( this, ModuleRes(FL_CASC_DEL) )
- ,aRB_NoCascDel( this, ModuleRes(RB_NO_CASC_DEL) )
- ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) )
- ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) )
- ,aRB_CascDelDefault( this, ModuleRes(RB_CASC_DEL_DEFAULT) )
+ ,aRB_NoCascDel( this, ModuleRes(RB_NO_CASC_DEL) )
+ ,aRB_CascDel( this, ModuleRes(RB_CASC_DEL) )
+ ,aRB_CascDelNull( this, ModuleRes(RB_CASC_DEL_NULL) )
+ ,aRB_CascDelDefault( this, ModuleRes(RB_CASC_DEL_DEFAULT) )
,aPB_OK( this, ModuleRes( PB_OK ) )
,aPB_CANCEL( this, ModuleRes( PB_CANCEL ) )
@@ -252,7 +252,7 @@ IMPL_LINK( ORelationDialog, OKClickHdl, Button*, /*pButton*/ )
}
catch( const SQLException& )
{
- ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ),
+ ::dbaui::showError( SQLExceptionInfo( ::cppu::getCaughtException() ),
this,
static_cast(GetParent())->getDesignView()->getController().getORB());
}
diff --git a/dbaccess/source/ui/dlg/RelationDlg.hrc b/dbaccess/source/ui/dlg/RelationDlg.hrc
index b0d14aa6d93a..0e1f57174b3b 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.hrc
+++ b/dbaccess/source/ui/dlg/RelationDlg.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
@@ -34,18 +34,18 @@
#define FL_CASC_DEL 3
#define FL_CASC_UPD 4
-#define RB_NO_CASC_DEL 1
-#define RB_NO_CASC_UPD 2
-#define RB_CASC_DEL 3
-#define RB_CASC_UPD 4
-#define RB_CASC_DEL_NULL 5
-#define RB_CASC_DEL_DEFAULT 6
-#define RB_CASC_UPD_NULL 7
+#define RB_NO_CASC_DEL 1
+#define RB_NO_CASC_UPD 2
+#define RB_CASC_DEL 3
+#define RB_CASC_UPD 4
+#define RB_CASC_DEL_NULL 5
+#define RB_CASC_DEL_DEFAULT 6
+#define RB_CASC_UPD_NULL 7
#define RB_CASC_UPD_DEFAULT 8
-#define PB_OK 1
-#define PB_CANCEL 2
-#define PB_HELP 3
+#define PB_OK 1
+#define PB_CANCEL 2
+#define PB_HELP 3
#define WND_CONTROL 1
diff --git a/dbaccess/source/ui/dlg/RelationDlg.src b/dbaccess/source/ui/dlg/RelationDlg.src
index 68399ca52619..f0517f5c989e 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@ -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
@@ -86,8 +86,8 @@ ModalDialog DLG_REL_PROPERTIES
};
};
-
-
+
+
FixedLine FL_CASC_UPD
{
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index 4a12a0dd13ea..9708f4b17106 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -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
@@ -144,7 +144,7 @@ SfxItemSet* OTableSubscriptionDialog::getWriteOutputSet()
}
// -----------------------------------------------------------------------------
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index e7847e48ef89..de619a87eb57 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -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,22 +162,22 @@ DBG_NAME(OTextConnectionHelper)
,m_aRBAccessOtherFiles (this, ModuleRes(RB_AUTOACCESSOTHERS))
,m_aETOwnExtension (this, ModuleRes(ET_AUTOOWNEXTENSION))
,m_aFTExtensionExample (this, ModuleRes(FT_AUTOOWNEXTENSIONAPPENDIX))
- ,m_aLineFormat (this, ModuleRes(FL_AUTOSEPARATOR2))
- ,m_aFieldSeparatorLabel (this, ModuleRes(FT_AUTOFIELDSEPARATOR))
- ,m_aFieldSeparator (this, ModuleRes(CM_AUTOFIELDSEPARATOR))
- ,m_aTextSeparatorLabel (this, ModuleRes(FT_AUTOTEXTSEPARATOR))
- ,m_aTextSeparator (this, ModuleRes(CM_AUTOTEXTSEPARATOR))
- ,m_aDecimalSeparatorLabel (this, ModuleRes(FT_AUTODECIMALSEPARATOR))
- ,m_aDecimalSeparator (this, ModuleRes(CM_AUTODECIMALSEPARATOR))
- ,m_aThousandsSeparatorLabel (this, ModuleRes(FT_AUTOTHOUSANDSSEPARATOR))
- ,m_aThousandsSeparator (this, ModuleRes(CM_AUTOTHOUSANDSSEPARATOR))
+ ,m_aLineFormat (this, ModuleRes(FL_AUTOSEPARATOR2))
+ ,m_aFieldSeparatorLabel (this, ModuleRes(FT_AUTOFIELDSEPARATOR))
+ ,m_aFieldSeparator (this, ModuleRes(CM_AUTOFIELDSEPARATOR))
+ ,m_aTextSeparatorLabel (this, ModuleRes(FT_AUTOTEXTSEPARATOR))
+ ,m_aTextSeparator (this, ModuleRes(CM_AUTOTEXTSEPARATOR))
+ ,m_aDecimalSeparatorLabel (this, ModuleRes(FT_AUTODECIMALSEPARATOR))
+ ,m_aDecimalSeparator (this, ModuleRes(CM_AUTODECIMALSEPARATOR))
+ ,m_aThousandsSeparatorLabel (this, ModuleRes(FT_AUTOTHOUSANDSSEPARATOR))
+ ,m_aThousandsSeparator (this, ModuleRes(CM_AUTOTHOUSANDSSEPARATOR))
,m_aRowHeader (this, ModuleRes(CB_AUTOHEADER))
,m_aCharSetHeader (this, ModuleRes(FL_DATACONVERT))
,m_aCharSetLabel (this, ModuleRes(FT_CHARSET))
,m_aCharSet (this, ModuleRes(LB_CHARSET))
- ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST))
- ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST))
- ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE))
+ ,m_aFieldSeparatorList (ModuleRes(STR_AUTOFIELDSEPARATORLIST))
+ ,m_aTextSeparatorList (ModuleRes(STR_AUTOTEXTSEPARATORLIST))
+ ,m_aTextNone (ModuleRes(STR_AUTOTEXT_FIELD_SEP_NONE))
,m_nAvailableSections( _nAvailableSections )
{
DBG_CTOR(OTextConnectionHelper,NULL);
@@ -404,59 +404,59 @@ DBG_NAME(OTextConnectionHelper)
String sExtension = GetExtension();
String aErrorText;
Control* pErrorWin = NULL;
- // if (!m_aFieldSeparator.GetText().Len())
+ // if (!m_aFieldSeparator.GetText().Len())
// bug (#42168) if this line is compiled under OS2 (in a product environent)
// -> use a temporary variable
String aDelText(m_aFieldSeparator.GetText());
if(!aDelText.Len())
- { // Kein FeldTrenner
+ { // Kein FeldTrenner
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING));
aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText());
pErrorWin = &m_aFieldSeparator;
}
else if (!m_aDecimalSeparator.GetText().Len())
- { // kein Decimaltrenner
+ { // kein Decimaltrenner
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MISSING));
aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText());
pErrorWin = &m_aDecimalSeparator;
}
else if (m_aTextSeparator.GetText() == m_aFieldSeparator.GetText())
- { // Feld und TextTrenner duerfen nicht gleich sein
+ { // Feld und TextTrenner duerfen nicht gleich sein
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER));
aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText());
aErrorText.SearchAndReplaceAscii("#2",m_aFieldSeparatorLabel.GetText());
pErrorWin = &m_aTextSeparator;
}
else if (m_aDecimalSeparator.GetText() == m_aThousandsSeparator.GetText())
- { // Tausender und DecimalTrenner duerfen nicht gleich sein
+ { // Tausender und DecimalTrenner duerfen nicht gleich sein
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER));
aErrorText.SearchAndReplaceAscii("#1",m_aDecimalSeparatorLabel.GetText());
aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText());
pErrorWin = &m_aDecimalSeparator;
}
else if (m_aFieldSeparator.GetText() == m_aThousandsSeparator.GetText())
- { // Tausender und FeldTrenner duerfen nicht gleich sein
+ { // Tausender und FeldTrenner duerfen nicht gleich sein
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER));
aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText());
aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText());
pErrorWin = &m_aFieldSeparator;
}
else if (m_aFieldSeparator.GetText() == m_aDecimalSeparator.GetText())
- { // Zehner und FeldTrenner duerfen nicht gleich sein
+ { // Zehner und FeldTrenner duerfen nicht gleich sein
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER));
aErrorText.SearchAndReplaceAscii("#1",m_aFieldSeparatorLabel.GetText());
aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText());
pErrorWin = &m_aFieldSeparator;
}
else if (m_aTextSeparator.GetText() == m_aThousandsSeparator.GetText())
- { // Tausender und TextTrenner duerfen nicht gleich sein
+ { // Tausender und TextTrenner duerfen nicht gleich sein
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER));
aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText());
aErrorText.SearchAndReplaceAscii("#2",m_aThousandsSeparatorLabel.GetText());
pErrorWin = &m_aTextSeparator;
}
else if (m_aTextSeparator.GetText() == m_aDecimalSeparator.GetText())
- { // Zehner und TextTrenner duerfen nicht gleich sein
+ { // Zehner und TextTrenner duerfen nicht gleich sein
aErrorText = String(ModuleRes(STR_AUTODELIMITER_MUST_DIFFER));
aErrorText.SearchAndReplaceAscii("#1",m_aTextSeparatorLabel.GetText());
aErrorText.SearchAndReplaceAscii("#2",m_aDecimalSeparatorLabel.GetText());
@@ -569,8 +569,8 @@ DBG_NAME(OTextConnectionHelper)
//------------------------------------------------------------------------
String OTextConnectionHelper::GetSeparator( const ComboBox& rBox, const String& rList )
{
- sal_Unicode nTok = '\t';
- xub_StrLen nPos(rBox.GetEntryPos( rBox.GetText() ));
+ sal_Unicode nTok = '\t';
+ xub_StrLen nPos(rBox.GetEntryPos( rBox.GetText() ));
if( nPos == COMBOBOX_ENTRY_NOTFOUND )
return rBox.GetText().Copy(0);
@@ -586,13 +586,13 @@ DBG_NAME(OTextConnectionHelper)
//------------------------------------------------------------------------
void OTextConnectionHelper::SetSeparator( ComboBox& rBox, const String& rList, const String& rVal )
{
- char nTok = '\t';
- xub_StrLen nCnt(rList.GetTokenCount( nTok ));
- xub_StrLen i;
+ char nTok = '\t';
+ xub_StrLen nCnt(rList.GetTokenCount( nTok ));
+ xub_StrLen i;
for( i=0 ; i(
rList.GetToken( (i+1), nTok ).ToInt32()));
@@ -613,5 +613,5 @@ DBG_NAME(OTextConnectionHelper)
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index 911994553a4c..f4c6bff6f1df 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -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
@@ -75,7 +75,7 @@ namespace dbaui
{
OTextConnectionHelper();
- Link m_aModifiedHandler; /// to be called if something on the page has been modified
+ Link m_aModifiedHandler; /// to be called if something on the page has been modified
public:
OTextConnectionHelper( Window* pParent, const short _nAvailableSections );
@@ -88,24 +88,24 @@ namespace dbaui
RadioButton m_aRBAccessOtherFiles;
Edit m_aETOwnExtension;
FixedText m_aFTExtensionExample;
- FixedLine m_aLineFormat;
- FixedText m_aFieldSeparatorLabel;
- ComboBox m_aFieldSeparator;
- FixedText m_aTextSeparatorLabel;
- ComboBox m_aTextSeparator;
- FixedText m_aDecimalSeparatorLabel;
- ComboBox m_aDecimalSeparator;
- FixedText m_aThousandsSeparatorLabel;
- ComboBox m_aThousandsSeparator;
- CheckBox m_aRowHeader;
+ FixedLine m_aLineFormat;
+ FixedText m_aFieldSeparatorLabel;
+ ComboBox m_aFieldSeparator;
+ FixedText m_aTextSeparatorLabel;
+ ComboBox m_aTextSeparator;
+ FixedText m_aDecimalSeparatorLabel;
+ ComboBox m_aDecimalSeparator;
+ FixedText m_aThousandsSeparatorLabel;
+ ComboBox m_aThousandsSeparator;
+ CheckBox m_aRowHeader;
FixedLine m_aCharSetHeader;
FixedText m_aCharSetLabel;
CharSetListBox m_aCharSet;
- String m_aFieldSeparatorList;
- String m_aTextSeparatorList;
- String m_aTextNone;
+ String m_aFieldSeparatorList;
+ String m_aTextSeparatorList;
+ String m_aTextNone;
String m_aOldExtension;
- Link m_aGetExtensionHandler; /// to be called if a new type is selected
+ Link m_aGetExtensionHandler; /// to be called if a new type is selected
short m_nAvailableSections;
@@ -117,11 +117,11 @@ namespace dbaui
DECL_LINK(OnEditModified,Edit*);
private:
- String GetSeparator( const ComboBox& rBox, const String& rList );
- void SetSeparator( ComboBox& rBox, const String& rList, const String& rVal );
+ String GetSeparator( const ComboBox& rBox, const String& rList );
+ void SetSeparator( ComboBox& rBox, const String& rList, const String& rVal );
void SetExtension(const String& _rVal);
-
+
public:
void implInitControls(const SfxItemSet& _rSet, sal_Bool _bValid);
void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -133,7 +133,7 @@ namespace dbaui
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // DBAUI_DBWIZ2_HXX
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 0d9254f74390..8b35c27ab2c5 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -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
@@ -105,16 +105,16 @@ using namespace comphelper;
class OPasswordDialog : public ModalDialog
{
- FixedLine aFLUser;
- FixedText aFTOldPassword;
- Edit aEDOldPassword;
- FixedText aFTPassword;
- Edit aEDPassword;
- FixedText aFTPasswordRepeat;
- Edit aEDPasswordRepeat;
- OKButton aOKBtn;
- CancelButton aCancelBtn;
- HelpButton aHelpBtn;
+ FixedLine aFLUser;
+ FixedText aFTOldPassword;
+ Edit aEDOldPassword;
+ FixedText aFTPassword;
+ Edit aEDPassword;
+ FixedText aFTPasswordRepeat;
+ Edit aEDPasswordRepeat;
+ OKButton aOKBtn;
+ CancelButton aCancelBtn;
+ HelpButton aHelpBtn;
DECL_LINK( OKHdl_Impl, OKButton * );
@@ -123,24 +123,24 @@ class OPasswordDialog : public ModalDialog
public:
OPasswordDialog( Window* pParent,const String& _sUserName);
- String GetOldPassword() const { return aEDOldPassword.GetText(); }
- String GetNewPassword() const { return aEDPassword.GetText(); }
+ String GetOldPassword() const { return aEDOldPassword.GetText(); }
+ String GetNewPassword() const { return aEDPassword.GetText(); }
};
OPasswordDialog::OPasswordDialog(Window* _pParent,const String& _sUserName) :
ModalDialog( _pParent, ModuleRes( DLG_PASSWORD) ),
- aFLUser ( this, ModuleRes( FL_USER ) ),
- aFTOldPassword ( this, ModuleRes( FT_OLDPASSWORD ) ),
- aEDOldPassword ( this, ModuleRes( ED_OLDPASSWORD ) ),
- aFTPassword ( this, ModuleRes( FT_PASSWORD ) ),
- aEDPassword ( this, ModuleRes( ED_PASSWORD ) ),
- aFTPasswordRepeat ( this, ModuleRes( FT_PASSWORD_REPEAT ) ),
- aEDPasswordRepeat ( this, ModuleRes( ED_PASSWORD_REPEAT ) ),
- aOKBtn ( this, ModuleRes( BTN_PASSWORD_OK ) ),
- aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ),
- aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) )
+ aFLUser ( this, ModuleRes( FL_USER ) ),
+ aFTOldPassword ( this, ModuleRes( FT_OLDPASSWORD ) ),
+ aEDOldPassword ( this, ModuleRes( ED_OLDPASSWORD ) ),
+ aFTPassword ( this, ModuleRes( FT_PASSWORD ) ),
+ aEDPassword ( this, ModuleRes( ED_PASSWORD ) ),
+ aFTPasswordRepeat ( this, ModuleRes( FT_PASSWORD_REPEAT ) ),
+ aEDPasswordRepeat ( this, ModuleRes( ED_PASSWORD_REPEAT ) ),
+ aOKBtn ( this, ModuleRes( BTN_PASSWORD_OK ) ),
+ aCancelBtn ( this, ModuleRes( BTN_PASSWORD_CANCEL ) ),
+ aHelpBtn ( this, ModuleRes( BTN_PASSWORD_HELP ) )
{
// hide until a help is avalable
aHelpBtn.Hide();
@@ -183,14 +183,14 @@ DBG_NAME(OUserAdmin);
//================================================================================
OUserAdmin::OUserAdmin(Window* pParent,const SfxItemSet& _rAttrSet)
: OGenericAdministrationPage( pParent, ModuleRes(TAB_PAGE_USERADMIN), _rAttrSet)
- ,m_FL_USER( this , ModuleRes(FL_USER))
- ,m_FT_USER( this , ModuleRes(FT_USER))
- ,m_LB_USER( this , ModuleRes(LB_USER))
- ,m_PB_NEWUSER( this , ModuleRes(PB_NEWUSER))
- ,m_PB_CHANGEPWD( this , ModuleRes(PB_CHANGEPWD))
- ,m_PB_DELETEUSER( this , ModuleRes(PB_DELETEUSER))
+ ,m_FL_USER( this , ModuleRes(FL_USER))
+ ,m_FT_USER( this , ModuleRes(FT_USER))
+ ,m_LB_USER( this , ModuleRes(LB_USER))
+ ,m_PB_NEWUSER( this , ModuleRes(PB_NEWUSER))
+ ,m_PB_CHANGEPWD( this , ModuleRes(PB_CHANGEPWD))
+ ,m_PB_DELETEUSER( this , ModuleRes(PB_DELETEUSER))
,m_FL_TABLE_GRANTS( this , ModuleRes(FL_TABLE_GRANTS))
- ,m_TableCtrl( this , ModuleRes(CTRL_TABLE_GRANTS))
+ ,m_TableCtrl( this , ModuleRes(CTRL_TABLE_GRANTS))
{
DBG_CTOR(OUserAdmin,NULL);
m_LB_USER.SetSelectHdl(LINK(this, OUserAdmin, ListDblClickHdl));
@@ -227,7 +227,7 @@ void OUserAdmin::FillUserNames()
m_aUserNames = m_xUsers->getElementNames();
const ::rtl::OUString* pBegin = m_aUserNames.getConstArray();
- const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength();
+ const ::rtl::OUString* pEnd = pBegin + m_aUserNames.getLength();
::rtl::OUString sUserName = m_UserName;
for(;pBegin != pEnd;++pBegin)
m_LB_USER.InsertEntry(*pBegin);
@@ -256,7 +256,7 @@ void OUserAdmin::FillUserNames()
}
// -----------------------------------------------------------------------
-SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet )
+SfxTabPage* OUserAdmin::Create( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OUserAdmin( pParent, _rAttrSet ) );
}
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hrc b/dbaccess/source/ui/dlg/UserAdmin.hrc
index 6a012724f49a..35ae40db6632 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hrc
+++ b/dbaccess/source/ui/dlg/UserAdmin.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
@@ -27,33 +27,33 @@
#ifndef DBAUI_USERADMIN_HRC
#define DBAUI_USERADMIN_HRC
-#define FT_USER 1
-
-#define LB_USER 1
-
-#define NF_TIMEOUT 1
+#define FT_USER 1
-#define FL_TABLE_GRANTS 1
-#define FL_USER 2
+#define LB_USER 1
+
+#define NF_TIMEOUT 1
+
+#define FL_TABLE_GRANTS 1
+#define FL_USER 2
-#define CTRL_TABLE_GRANTS 1
+#define CTRL_TABLE_GRANTS 1
-#define PB_NEWUSER 2
-#define PB_CHANGEPWD 3
-#define PB_DELETEUSER 4
+#define PB_NEWUSER 2
+#define PB_CHANGEPWD 3
+#define PB_DELETEUSER 4
-#define FT_OLDPASSWORD 19
-#define ED_OLDPASSWORD 19
-#define FT_PASSWORD 20
-#define ED_PASSWORD 21
-#define FT_PASSWORD_REPEAT 22
-#define ED_PASSWORD_REPEAT 23
+#define FT_OLDPASSWORD 19
+#define ED_OLDPASSWORD 19
+#define FT_PASSWORD 20
+#define ED_PASSWORD 21
+#define FT_PASSWORD_REPEAT 22
+#define ED_PASSWORD_REPEAT 23
-#define BTN_PASSWORD_OK 50
-#define BTN_PASSWORD_CANCEL 51
-#define BTN_PASSWORD_HELP 52
+#define BTN_PASSWORD_OK 50
+#define BTN_PASSWORD_CANCEL 51
+#define BTN_PASSWORD_HELP 52
#endif // DBAUI_USERADMIN_HRC
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 13700201a5c1..c205cbe49ec3 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -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
@@ -65,32 +65,32 @@ namespace dbaui
class OUserAdmin : public OGenericAdministrationPage
{
protected:
- FixedLine m_FL_USER;
- FixedText m_FT_USER;
- ListBox m_LB_USER;
- PushButton m_PB_NEWUSER;
- PushButton m_PB_CHANGEPWD;
- PushButton m_PB_DELETEUSER;
- FixedLine m_FL_TABLE_GRANTS;
- OTableGrantControl m_TableCtrl; // show the grant rights of one user
-
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers;
- ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames;
-
- String m_UserName;
+ FixedLine m_FL_USER;
+ FixedText m_FT_USER;
+ ListBox m_LB_USER;
+ PushButton m_PB_NEWUSER;
+ PushButton m_PB_CHANGEPWD;
+ PushButton m_PB_DELETEUSER;
+ FixedLine m_FL_TABLE_GRANTS;
+ OTableGrantControl m_TableCtrl; // show the grant rights of one user
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xUsers;
+ ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aUserNames;
+ String m_UserName;
+
// methods
DECL_LINK( ListDblClickHdl, ListBox * );
- DECL_LINK( CloseHdl, PushButton * );
- DECL_LINK( UserHdl, PushButton * );
+ DECL_LINK( CloseHdl, PushButton * );
+ DECL_LINK( UserHdl, PushButton * );
- void FillUserNames();
+ void FillUserNames();
OUserAdmin( Window* pParent, const SfxItemSet& _rCoreAttrs);
public:
- static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
-
+ static SfxTabPage* Create( Window* pParent, const SfxItemSet& _rAttrSet );
+
~OUserAdmin();
String GetUser();
diff --git a/dbaccess/source/ui/dlg/UserAdmin.src b/dbaccess/source/ui/dlg/UserAdmin.src
index 2cab4f9e89f0..7ec8120b51b1 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.src
+++ b/dbaccess/source/ui/dlg/UserAdmin.src
@@ -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
@@ -40,82 +40,82 @@
TabPage TAB_PAGE_USERADMIN
{
- SVLook = TRUE ;
- HelpId = HID_TAB_PAGE_USERADMIN ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+ SVLook = TRUE ;
+ HelpId = HID_TAB_PAGE_USERADMIN ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
Hide = TRUE;
FixedLine FL_USER
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ;
- Text [ en-US ] = "User selection";
+ Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ;
+ Text [ en-US ] = "User selection";
};
FixedText FT_USER
{
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 90 , 10 ) ;
- Text [ en-US ] = "Us~er:";
+ Pos = MAP_APPFONT ( 12 , 14 ) ;
+ Size = MAP_APPFONT ( 90 , 10 ) ;
+ Text [ en-US ] = "Us~er:";
};
ListBox LB_USER
{
- Border = TRUE ;
- Pos = MAP_APPFONT ( 108 , 13) ;
- Size = MAP_APPFONT ( 105 , 97 ) ;
- TabStop = TRUE ;
- HScroll = TRUE ;
- Sort = TRUE ;
- DropDown = TRUE ;
- HelpId = HID_TAB_PAGE_LBUSER ;
+ Border = TRUE ;
+ Pos = MAP_APPFONT ( 108 , 13) ;
+ Size = MAP_APPFONT ( 105 , 97 ) ;
+ TabStop = TRUE ;
+ HScroll = TRUE ;
+ Sort = TRUE ;
+ DropDown = TRUE ;
+ HelpId = HID_TAB_PAGE_LBUSER ;
};
PushButton PB_NEWUSER
{
- Pos = MAP_APPFONT ( 12 , 29 ) ;
- Size = MAP_APPFONT ( 70 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- HelpId = HID_TAB_PAGE_PBUSER ;
+ Pos = MAP_APPFONT ( 12 , 29 ) ;
+ Size = MAP_APPFONT ( 70 , 14 ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
+ HelpId = HID_TAB_PAGE_PBUSER ;
Text [ en-US ] = "~Add User...";
};
PushButton PB_CHANGEPWD
{
- Pos = MAP_APPFONT ( 95 , 29 ) ;
- Size = MAP_APPFONT ( 70 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- HelpId = HID_TAB_PAGE_PBCHGPWD ;
+ Pos = MAP_APPFONT ( 95 , 29 ) ;
+ Size = MAP_APPFONT ( 70 , 14 ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
+ HelpId = HID_TAB_PAGE_PBCHGPWD ;
Text [ en-US ] = "Change ~Password...";
};
PushButton PB_DELETEUSER
{
- Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ;
- Size = MAP_APPFONT ( 70 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- HelpId = HID_TAB_PAGE_PBUSERDELETE ;
+ Pos = MAP_APPFONT ( WINDOW_SIZE_X - 82 , 29 ) ;
+ Size = MAP_APPFONT ( 70 , 14 ) ;
+ TabStop = TRUE ;
+ DefButton = TRUE ;
+ HelpId = HID_TAB_PAGE_PBUSERDELETE ;
Text [ en-US ] = "~Delete User...";
};
FixedLine FL_TABLE_GRANTS
{
- Pos = MAP_APPFONT ( 6 , 52 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ;
+ Pos = MAP_APPFONT ( 6 , 52 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 8, 8) ;
Text [ en-US ] = "Access rights for selected user";
};
Control CTRL_TABLE_GRANTS
{
- Pos = MAP_APPFONT ( 12 , 63 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 22, WINDOW_SIZE_Y - 75 );
- Border = TRUE ;
- TabStop = TRUE ;
- HelpId = HID_TAB_PAGE_TBLGRANTS ;
+ Pos = MAP_APPFONT ( 12 , 63 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 22, WINDOW_SIZE_Y - 75 );
+ Border = TRUE ;
+ TabStop = TRUE ;
+ HelpId = HID_TAB_PAGE_TBLGRANTS ;
};
};
@@ -130,10 +130,10 @@ String STR_USERADMIN_NOT_AVAILABLE
Text [ en-US ] = "The database does not support user administration." ;
};
-#define EDIT_SIZE_X 50
-#define FT_SIZE_X 90
-#define WIN_X 220
-#define WIN_Y 72
+#define EDIT_SIZE_X 50
+#define FT_SIZE_X 90
+#define WIN_X 220
+#define WIN_Y 72
ModalDialog DLG_PASSWORD
{
@@ -191,7 +191,7 @@ ModalDialog DLG_PASSWORD
Size = MAP_APPFONT ( EDIT_SIZE_X , 12 ) ;
PassWord = TRUE ;
};
-
+
OKButton BTN_PASSWORD_OK
{
Pos = MAP_APPFONT ( WIN_X - 56 , 6 ) ;
@@ -207,7 +207,7 @@ ModalDialog DLG_PASSWORD
{
Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- };
+ };
Text [ en-US ] = "Change Password";
};
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index 37f28bcaa828..a5f029108b5d 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -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
@@ -177,7 +177,7 @@ DBG_NAME(OUserAdminDlg)
return m_pImpl->getDriver();
}
// -----------------------------------------------------------------------------
- ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const
+ ::rtl::OUString OUserAdminDlg::getDatasourceType(const SfxItemSet& _rSet) const
{
return m_pImpl->getDatasourceType(_rSet);
}
@@ -202,5 +202,5 @@ DBG_NAME(OUserAdminDlg)
return PrepareLeaveCurrentPage();
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.hrc b/dbaccess/source/ui/dlg/UserAdminDlg.hrc
index c1e023cfc9b7..dd1bdd5b57af 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.hrc
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.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
@@ -27,7 +27,7 @@
#ifndef DBAUI_USERADMINDLG_HRC
#define DBAUI_USERADMINDLG_HRC
-#define STR_PAGETITLE_USERADMIN 1
+#define STR_PAGETITLE_USERADMIN 1
#endif // DBAUI_USERADMINDLG_HRC
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.src b/dbaccess/source/ui/dlg/UserAdminDlg.src
index faa7f33302d7..bed16e575dc1 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.src
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.src
@@ -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
@@ -37,14 +37,14 @@
TabDialog DLG_DATABASE_USERADMIN
-{
+{
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
Hide = TRUE;
HelpId = HID_DSADMIN_USERADMIN;
-
+
TabControl 1
{
OutputSize = TRUE ;
@@ -55,6 +55,6 @@ TabDialog DLG_DATABASE_USERADMIN
{
Text[ en-US ] = "User Settings";
};
-
+
Text [ en-US ] = "User administration" ;
};
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 463358e179d5..1cb606a0c1e4 100755
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -151,18 +151,18 @@ namespace dbaui
//--------------------------------------------------------------------
MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink )
:Control( &_rParent, ModuleRes( RID_MYSQL_NATIVE_SETTINGS ).SetAutoRelease( FALSE ) )
- ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) )
- ,m_aDatabaseName ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) )
+ ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) )
+ ,m_aDatabaseName ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) )
,m_aHostPortRadio ( this, ModuleRes( RB_MYSQL_HOST_PORT ) )
- ,m_aSocketRadio ( this, ModuleRes( RB_MYSQL_SOCKET ) )
- ,m_aNamedPipeRadio ( this, ModuleRes( RB_MYSQL_NAMED_PIPE ) )
- ,m_aHostNameLabel ( this, ModuleRes( FT_COMMON_HOST_NAME ) )
- ,m_aHostName ( this, ModuleRes( ED_COMMON_HOST_NAME ) )
- ,m_aPortLabel ( this, ModuleRes( FT_COMMON_PORT ) )
- ,m_aPort ( this, ModuleRes( NF_COMMON_PORT ) )
+ ,m_aSocketRadio ( this, ModuleRes( RB_MYSQL_SOCKET ) )
+ ,m_aNamedPipeRadio ( this, ModuleRes( RB_MYSQL_NAMED_PIPE ) )
+ ,m_aHostNameLabel ( this, ModuleRes( FT_COMMON_HOST_NAME ) )
+ ,m_aHostName ( this, ModuleRes( ED_COMMON_HOST_NAME ) )
+ ,m_aPortLabel ( this, ModuleRes( FT_COMMON_PORT ) )
+ ,m_aPort ( this, ModuleRes( NF_COMMON_PORT ) )
,m_aDefaultPort ( this, ModuleRes( FT_COMMON_PORT_DEFAULT ) )
- ,m_aSocket ( this, ModuleRes( ED_MYSQL_SOCKET ) )
- ,m_aNamedPipe ( this, ModuleRes( ED_MYSQL_NAMED_PIPE ) )
+ ,m_aSocket ( this, ModuleRes( ED_MYSQL_SOCKET ) )
+ ,m_aNamedPipe ( this, ModuleRes( ED_MYSQL_NAMED_PIPE ) )
{
FreeResource();
diff --git a/dbaccess/source/ui/dlg/admincontrols.hrc b/dbaccess/source/ui/dlg/admincontrols.hrc
index 8286bc7f8b25..01eadee58e83 100755
--- a/dbaccess/source/ui/dlg/admincontrols.hrc
+++ b/dbaccess/source/ui/dlg/admincontrols.hrc
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx
index e4526dffb8d2..c7d1b0407052 100755
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -54,10 +54,10 @@ namespace dbaui
FixedText m_aHostNameLabel;
Edit m_aHostName;
FixedText m_aPortLabel;
- NumericField m_aPort;
- FixedText m_aDefaultPort;
- Edit m_aSocket;
- Edit m_aNamedPipe;
+ NumericField m_aPort;
+ FixedText m_aDefaultPort;
+ Edit m_aSocket;
+ Edit m_aNamedPipe;
::svt::ControlDependencyManager
m_aControlDependencies;
diff --git a/dbaccess/source/ui/dlg/admincontrols.src b/dbaccess/source/ui/dlg/admincontrols.src
index 8ce3bb4030dc..5e5ceda60428 100755
--- a/dbaccess/source/ui/dlg/admincontrols.src
+++ b/dbaccess/source/ui/dlg/admincontrols.src
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -45,7 +45,7 @@ Control RID_MYSQL_NATIVE_SETTINGS
Size = MAP_APPFONT ( COLUMN_WIDTH_1 - UNRELATED_CONTROLS, FIXEDTEXT_HEIGHT );
Text[ en-US ] = "~Database name";
};
-
+
Edit ED_MYSQL_DATABASE_NAME
{
Pos = MAP_APPFONT ( COLUMN_WIDTH_1, 0 );
@@ -84,7 +84,7 @@ Control RID_MYSQL_NATIVE_SETTINGS
Text [ en-US ] = "~Port" ;
Group = TRUE;
};
-
+
NumericField NF_COMMON_PORT
{
Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + LINE_HEIGHT );
@@ -93,7 +93,7 @@ Control RID_MYSQL_NATIVE_SETTINGS
NoThousandSep = TRUE;
Value = 3306;
};
-
+
FixedText FT_COMMON_PORT_DEFAULT
{
Pos = MAP_APPFONT ( COLUMN_WIDTH_1 + 25 + RELATED_CONTROLS, OPTION_GROUP_START + LINE_HEIGHT + 2 );
@@ -107,7 +107,7 @@ Control RID_MYSQL_NATIVE_SETTINGS
Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS, FIXEDTEXT_HEIGHT );
Text [ en-US ] = "So~cket";
};
-
+
Edit ED_MYSQL_SOCKET
{
Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 * LINE_HEIGHT );
@@ -121,7 +121,7 @@ Control RID_MYSQL_NATIVE_SETTINGS
Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS, FIXEDTEXT_HEIGHT );
Text [ en-US ] = "Named p~ipe";
};
-
+
Edit ED_MYSQL_NAMED_PIPE
{
Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 * LINE_HEIGHT );
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 8e5b61dc9076..de84881165e1 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -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
@@ -91,7 +91,7 @@ namespace dbaui
OGenericAdministrationPage::~OGenericAdministrationPage()
{
DELETEZ(m_pFT_HeaderText);
-
+
DBG_DTOR(OGenericAdministrationPage,NULL);
}
@@ -185,7 +185,7 @@ namespace dbaui
fillControls(aControlList);
::std::for_each(aControlList.begin(),aControlList.end(),TSaveValueWrapperFunctor());
}
-
+
if ( bReadonly )
{
fillWindows(aControlList);
@@ -263,7 +263,7 @@ namespace dbaui
// -----------------------------------------------------------------------
IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/)
- {
+ {
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
sal_Bool bSuccess = sal_False;
if ( m_pAdminDialog )
@@ -293,7 +293,7 @@ namespace dbaui
else
{
eImage = OSQLMessageBox::Error;
- aMessage = String(ModuleRes(STR_CONNECTION_NO_SUCCESS));
+ aMessage = String(ModuleRes(STR_CONNECTION_NO_SUCCESS));
}
OSQLMessageBox aMsg( this, sTitle, aMessage, WB_OK, eImage );
aMsg.Execute();
@@ -332,6 +332,6 @@ namespace dbaui
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 32ba0064a824..4b38685acf15 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -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
@@ -61,10 +61,10 @@ namespace dbaui
virtual bool SaveValue() = 0;
virtual bool Disable() = 0;
};
-
+
template < class T > class OSaveValueWrapper : public ISaveValueWrapper
{
- T* m_pSaveValue;
+ T* m_pSaveValue;
public:
OSaveValueWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue)
{ OSL_ENSURE(m_pSaveValue,"Illegal argument!"); }
@@ -75,7 +75,7 @@ namespace dbaui
template < class T > class ODisableWrapper : public ISaveValueWrapper
{
- T* m_pSaveValue;
+ T* m_pSaveValue;
public:
ODisableWrapper(T* _pSaveValue) : m_pSaveValue(_pSaveValue)
{ OSL_ENSURE(m_pSaveValue,"Illegal argument!"); }
@@ -86,14 +86,14 @@ namespace dbaui
struct TSaveValueWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool>
{
- bool operator() (ISaveValueWrapper* lhs)
+ bool operator() (ISaveValueWrapper* lhs)
{
return lhs->SaveValue();
}
};
struct TDisableWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool>
{
- bool operator() (ISaveValueWrapper* lhs)
+ bool operator() (ISaveValueWrapper* lhs)
{
return lhs->Disable();
}
@@ -101,7 +101,7 @@ namespace dbaui
struct TDeleteWrapperFunctor : public ::std::unary_function< ISaveValueWrapper, bool>
{
- bool operator() (ISaveValueWrapper* lhs)
+ bool operator() (ISaveValueWrapper* lhs)
{
delete lhs;
return true;
@@ -112,12 +112,12 @@ namespace dbaui
//= OGenericAdministrationPage
//=========================================================================
class IDatabaseSettingsDialog;
- class IItemSetHelper;
+ class IItemSetHelper;
class OGenericAdministrationPage :public SfxTabPage
,public ::svt::IWizardPageController
{
private:
- Link m_aModifiedHandler; /// to be called if something on the page has been modified
+ Link m_aModifiedHandler; /// to be called if something on the page has been modified
sal_Bool m_abEnableRoadmap;
protected:
IDatabaseSettingsDialog* m_pAdminDialog;
@@ -134,32 +134,32 @@ namespace dbaui
void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; }
/** Sets the ParentDialog
- @param _pAdminDialog
+ @param _pAdminDialog
the ParentDialog
- @param _pItemSetHelper
+ @param _pItemSetHelper
the itemset helper
*/
- inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper)
- {
+ inline void SetAdminDialog(IDatabaseSettingsDialog* _pDialog,IItemSetHelper* _pItemSetHelper)
+ {
OSL_ENSURE(_pDialog && _pItemSetHelper,"Values are NULL!");
- m_pAdminDialog = _pDialog;
+ m_pAdminDialog = _pDialog;
m_pItemSetHelper = _pItemSetHelper;
}
/** Sets the ServiceFactory
- @param _rxORB
+ @param _rxORB
The service factory.
*/
virtual void SetServiceFactory(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > _rxORB)
- {
- m_xORB = _rxORB;
+ {
+ m_xORB = _rxORB;
}
/** opens a dialog filled with all data sources available for this type and
returns the selected on.
- @param _eType
+ @param _eType
The type for which the data source dialog should be opened.
- @param _sReturn
+ @param _sReturn
contains the selected name.
@return
if an error occured, otherwise
@@ -179,12 +179,12 @@ namespace dbaui
virtual int DeactivatePage(SfxItemSet* pSet);
using SfxTabPage::DeactivatePage;
/// default implementation: call implInitControls with the given item set and _bSaveValue = sal_False
- virtual void Reset(const SfxItemSet& _rCoreAttrs);
+ virtual void Reset(const SfxItemSet& _rCoreAttrs);
/// default implementation: call implInitControls with the given item set and _bSaveValue = sal_True
virtual void ActivatePage(const SfxItemSet& _rSet);
// TabPage overridables
- virtual void ActivatePage();
+ virtual void ActivatePage();
protected:
void callModifiedHdl() const { if (m_aModifiedHandler.IsSet()) m_aModifiedHandler.Call((void*)this); }
@@ -193,7 +193,7 @@ namespace dbaui
virtual sal_Bool prepareLeave() { return sal_True; }
/** called from within Reset and ActivatePage, use to initialize the controls with the items from the given set
- @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls
+ @param _bSaveValue if set to sal_True, the implementation should call SaveValue on all relevant controls
*/
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
@@ -201,28 +201,28 @@ namespace dbaui
void getFlags(const SfxItemSet& _rSet, sal_Bool& _rValid, sal_Bool& _rReadonly);
/** will be called inside implInitControls to save the value if necessary
- @param _rControlList
- The list must be filled with the controls.
+ @param _rControlList
+ The list must be filled with the controls.
It is not allowed to clear the list before pusching data into it.
*/
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) = 0;
/** will be called inside implInitControls to disable if necessary
- @param _rControlList
- The list must be filled with the controls.
+ @param _rControlList
+ The list must be filled with the controls.
It is not allowed to clear the list before pusching data into it.
*/
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) = 0;
public:
/** fills the Boolean value into the item set when the value changed.
- @param _rSet
+ @param _rSet
The item set where to put the new value into.
- @param _pCheckBox
+ @param _pCheckBox
The check box which is checked.
- @param _nID
+ @param _nID
The id in the itemset to set whith the new value.
- @param _bChangedSomething
+ @param _bChangedSomething
if something changed otherwise
@param _bRevertValue
set to if the display value should be reverted before putting it into the set
@@ -230,25 +230,25 @@ namespace dbaui
static void fillBool( SfxItemSet& _rSet, CheckBox* _pCheckBox, USHORT _nID, sal_Bool& _bChangedSomething, bool _bRevertValue = false);
/** fills the int value into the item set when the value changed.
- @param _rSet
+ @param _rSet
The item set where to put the new value into.
- @param _pEdit
+ @param _pEdit
The check box which is checked.
- @param _nID
+ @param _nID
The id in the itemset to set whith the new value.
- @param _bChangedSomething
+ @param _bChangedSomething
if something changed otherwise
*/
static void fillInt32(SfxItemSet& _rSet,NumericField* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething);
/** fills the String value into the item set when the value changed.
- @param _rSet
+ @param _rSet
The item set where to put the new value into.
- @param _pEdit
+ @param _pEdit
The check box which is checked.
- @param _nID
+ @param _nID
The id in the itemset to set whith the new value.
- @param _bChangedSomething
+ @param _bChangedSomething
if something changed otherwise
*/
static void fillString(SfxItemSet& _rSet,Edit* _pEdit,USHORT _nID,sal_Bool& _bChangedSomething);
@@ -291,7 +291,7 @@ namespace dbaui
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_ADMINPAGES_HXX_
diff --git a/dbaccess/source/ui/dlg/adodatalinks.cxx b/dbaccess/source/ui/dlg/adodatalinks.cxx
index 30dddc0bb793..97942a04cfbb 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.cxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.cxx
@@ -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
@@ -72,14 +72,14 @@ BSTR PromptNew(long hWnd)
// Initialize COM
::CoInitialize( NULL );
-
+
// Instantiate DataLinks object.
hr = CoCreateInstance(
- CLSID_DataLinks, //clsid -- Data Links UI
- NULL, //pUnkOuter
- CLSCTX_INPROC_SERVER, //dwClsContext
- IID_IDataSourceLocator, //riid
- (void**)&dlPrompt //ppvObj
+ CLSID_DataLinks, //clsid -- Data Links UI
+ NULL, //pUnkOuter
+ CLSCTX_INPROC_SERVER, //dwClsContext
+ IID_IDataSourceLocator, //riid
+ (void**)&dlPrompt //ppvObj
);
if( FAILED( hr ) )
{
@@ -87,7 +87,7 @@ BSTR PromptNew(long hWnd)
dlPrompt->Release( );
return connstr;
}
-
+
dlPrompt->put_hWnd(hWnd);
if( FAILED( hr ) )
{
@@ -99,7 +99,7 @@ BSTR PromptNew(long hWnd)
// Prompt for connection information.
hr = dlPrompt->PromptNew((IDispatch **)&piTmpConnection);
- if( FAILED( hr ) || !piTmpConnection )
+ if( FAILED( hr ) || !piTmpConnection )
{
dlPrompt->Release( );
return connstr;
@@ -129,7 +129,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr)
// Initialize COM
::CoInitialize( NULL );
- hr = CoCreateInstance(CLSID_CADOConnection,
+ hr = CoCreateInstance(CLSID_CADOConnection,
NULL,
CLSCTX_INPROC_SERVER,
IID_IADOConnection,
@@ -140,21 +140,21 @@ BSTR PromptEdit(long hWnd,BSTR connstr)
return connstr;
}
-
+
hr = piTmpConnection->put_ConnectionString(connstr);
if( FAILED( hr ) )
{
piTmpConnection->Release( );
return connstr;
}
-
+
// Instantiate DataLinks object.
hr = CoCreateInstance(
- CLSID_DataLinks, //clsid -- Data Links UI
- NULL, //pUnkOuter
- CLSCTX_INPROC_SERVER, //dwClsContext
- IID_IDataSourceLocator, //riid
- (void**)&dlPrompt //ppvObj
+ CLSID_DataLinks, //clsid -- Data Links UI
+ NULL, //pUnkOuter
+ CLSCTX_INPROC_SERVER, //dwClsContext
+ IID_IDataSourceLocator, //riid
+ (void**)&dlPrompt //ppvObj
);
if( FAILED( hr ) )
{
@@ -162,7 +162,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr)
dlPrompt->Release( );
return connstr;
}
-
+
dlPrompt->put_hWnd(hWnd);
if( FAILED( hr ) )
{
@@ -172,7 +172,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr)
}
VARIANT_BOOL pbSuccess;
-
+
// Prompt for connection information.
hr = dlPrompt->PromptEdit((IDispatch **)&piTmpConnection,&pbSuccess);
if( SUCCEEDED( hr ) && FALSE == pbSuccess ) //if user press cancel then FALSE == pbSuccess
@@ -182,7 +182,7 @@ BSTR PromptEdit(long hWnd,BSTR connstr)
return connstr;
}
- if( FAILED( hr ) )
+ if( FAILED( hr ) )
{
// Prompt for new connection information.
piTmpConnection->Release( );
diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx
index 7daf5cda61e0..b236eebba995 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.hxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.hxx
@@ -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/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index a4914cd45cc5..46599fc26894 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -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
@@ -80,7 +80,7 @@ class TableListFacade : public ::cppu::BaseMutex
{
OTableTreeListBox& m_rTableList;
Reference< XConnection > m_xConnection;
- ::rtl::Reference< comphelper::OContainerListenerAdapter>
+ ::rtl::Reference< comphelper::OContainerListenerAdapter>
m_pContainerListener;
bool m_bAllowViews;
@@ -93,7 +93,7 @@ public:
{
}
virtual ~TableListFacade();
-
+
private:
virtual void updateTableObjectList( bool _bAllowViews );
@@ -132,8 +132,8 @@ String TableListFacade::getSelectedName( String& _out_rAliasName ) const
try
{
Reference< XDatabaseMetaData > xMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW );
- if ( !aCatalog.getLength()
- && aSchema.getLength()
+ if ( !aCatalog.getLength()
+ && aSchema.getLength()
&& xMeta->supportsCatalogsInDataManipulation()
&& !xMeta->supportsSchemasInDataManipulation() )
{
@@ -174,7 +174,7 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
try
{
Reference< XTablesSupplier > xTableSupp( m_xConnection, UNO_QUERY_THROW );
-
+
Reference< XViewsSupplier > xViewSupp;
Reference< XNameAccess > xTables, xViews;
Sequence< ::rtl::OUString > sTables, sViews;
@@ -202,12 +202,12 @@ void TableListFacade::updateTableObjectList( bool _bAllowViews )
// if no views are allowed remove the views also out the table name filter
if ( !_bAllowViews )
{
- const ::rtl::OUString* pTableBegin = sTables.getConstArray();
- const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength();
+ const ::rtl::OUString* pTableBegin = sTables.getConstArray();
+ const ::rtl::OUString* pTableEnd = pTableBegin + sTables.getLength();
::std::vector< ::rtl::OUString > aTables(pTableBegin,pTableEnd);
const ::rtl::OUString* pViewBegin = sViews.getConstArray();
- const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength();
+ const ::rtl::OUString* pViewEnd = pViewBegin + sViews.getLength();
::comphelper::TStringMixEqualFunctor aEqualFunctor;
for(;pViewBegin != pViewEnd;++pViewBegin)
aTables.erase(::std::remove_if(aTables.begin(),aTables.end(),::std::bind2nd(aEqualFunctor,*pViewBegin)),aTables.end());
@@ -248,7 +248,7 @@ class QueryListFacade : public ::cppu::BaseMutex
{
SvTreeListBox& m_rQueryList;
Reference< XConnection > m_xConnection;
- ::rtl::Reference< comphelper::OContainerListenerAdapter>
+ ::rtl::Reference< comphelper::OContainerListenerAdapter>
m_pContainerListener;
public:
@@ -512,7 +512,7 @@ BOOL OAddTableDlg::Close()
//------------------------------------------------------------------------------
bool OAddTableDlg::impl_isAddAllowed()
{
- return m_rContext.allowAddition();
+ return m_rContext.allowAddition();
}
//------------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/adtabdlg.hrc b/dbaccess/source/ui/dlg/adtabdlg.hrc
index 3c0e348abfaa..ce0a9ba4f227 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.hrc
+++ b/dbaccess/source/ui/dlg/adtabdlg.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
@@ -28,13 +28,13 @@
#define DBAUI_ADTABDLG_HRC
#define LB_TABLE_OR_QUERY 1
-#define LB_DATABASE 2
+#define LB_DATABASE 2
-#define FT_DATABASE 1
+#define FT_DATABASE 1
-#define PB_ADDTABLE 1
-#define PB_CLOSE 2
-#define PB_HELP 3
+#define PB_ADDTABLE 1
+#define PB_CLOSE 2
+#define PB_HELP 3
#define RB_CASE_TABLES 1
#define RB_CASE_QUERIES 2
diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src
index af1d861a0faa..69b202644a6c 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@ -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/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index a2e82e50757d..8c1c795577ab 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -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
@@ -446,7 +446,7 @@ namespace dbaui
// auto-generated values?
if ( rFeatures.supportsGeneratedValues() )
AddTabPage( PAGE_GENERATED_VALUES, String( ModuleRes( STR_GENERATED_VALUE ) ), ODriversSettings::CreateGeneratedValuesPage, NULL );
-
+
// any "special settings"?
if ( rFeatures.supportsAnySpecialSetting() )
AddTabPage( PAGE_ADVANCED_SETTINGS_SPECIAL, String( ModuleRes( STR_DS_BEHAVIOUR ) ), ODriversSettings::CreateSpecialSettingsPage, NULL );
@@ -531,7 +531,7 @@ namespace dbaui
}
// -----------------------------------------------------------------------------
- ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const
+ ::rtl::OUString AdvancedSettingsDialog::getDatasourceType(const SfxItemSet& _rSet) const
{
return m_pImpl->getDatasourceType(_rSet);
}
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hrc b/dbaccess/source/ui/dlg/advancedsettings.hrc
index 8abc5d8810d2..8a09c0adcf7a 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hrc
+++ b/dbaccess/source/ui/dlg/advancedsettings.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
@@ -31,7 +31,7 @@
#define ADVANCED_CHECKBOX_OPTIONS 15
#define ADVANCED_LISTBOX_OPTIONS 1
-#define ADVANCED_PAGE_X 200
+#define ADVANCED_PAGE_X 200
#define ADVANCED_PAGE_Y \
/* top space */ START_Y + \
/* label */ FIXEDTEXT_HEIGHT + RELATED_CONTROLS + \
@@ -40,23 +40,23 @@
/* bottom space */ START_Y
-#define STR_GENERATED_VALUE 1
-#define STR_DS_BEHAVIOUR 2
+#define STR_GENERATED_VALUE 1
+#define STR_DS_BEHAVIOUR 2
-#define FL_SEPARATORAUTO 1
-#define FL_DATAHANDLING 2
+#define FL_SEPARATORAUTO 1
+#define FL_DATAHANDLING 2
-#define CB_SUPPRESVERSIONCL 1
-#define CB_SQL92CHECK 2
-#define CB_RETRIEVE_AUTO 3
-#define CB_APPENDTABLEALIAS 4
+#define CB_SUPPRESVERSIONCL 1
+#define CB_SQL92CHECK 2
+#define CB_RETRIEVE_AUTO 3
+#define CB_APPENDTABLEALIAS 4
#define CB_IGNOREDRIVER_PRIV 5
-#define CB_PARAMETERNAMESUBST 6
-#define CB_ENABLEOUTERJOIN 7
-#define CB_SCHEMA 8
-#define CB_CATALOG 9
-#define CB_IGNOREINDEXAPPENDIX 10
-#define CB_DOSLINEENDS 11
+#define CB_PARAMETERNAMESUBST 6
+#define CB_ENABLEOUTERJOIN 7
+#define CB_SCHEMA 8
+#define CB_CATALOG 9
+#define CB_IGNOREINDEXAPPENDIX 10
+#define CB_DOSLINEENDS 11
#define CB_AS_BEFORE_CORR_NAME 12
#define CB_CHECK_REQUIRED 13
#define CB_IGNORECURRENCY 14
@@ -64,12 +64,12 @@
#define CB_PRIMARY_KEY_SUPPORT 16
#define ET_AUTOINCREMENTVALUE 1
-#define ET_RETRIEVE_AUTO 2
+#define ET_RETRIEVE_AUTO 2
-#define FT_AUTOINCREMENTVALUE 1
-#define FT_RETRIEVE_AUTO 2
-#define FT_BOOLEANCOMPARISON 3
+#define FT_AUTOINCREMENTVALUE 1
+#define FT_RETRIEVE_AUTO 2
+#define FT_BOOLEANCOMPARISON 3
-#define LB_BOOLEANCOMPARISON 1
+#define LB_BOOLEANCOMPARISON 1
#endif // DBAUI_ADVANCEDSETTINGS_HRC
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 7e58f260f4e6..31e1b49c72ce 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -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
@@ -69,7 +69,7 @@ namespace dbaui
CheckBox* m_pIndexAppendix;
CheckBox* m_pDosLineEnds;
CheckBox* m_pCheckRequiredFields;
- CheckBox* m_pIgnoreCurrency;
+ CheckBox* m_pIgnoreCurrency;
CheckBox* m_pEscapeDateTime;
CheckBox* m_pPrimaryKeySupport;
@@ -126,7 +126,7 @@ namespace dbaui
GeneratedValuesPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
-
+
// nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
virtual ~GeneratedValuesPage();
diff --git a/dbaccess/source/ui/dlg/advancedsettings.src b/dbaccess/source/ui/dlg/advancedsettings.src
index 4c5a7d924d33..a4eb47133f63 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.src
+++ b/dbaccess/source/ui/dlg/advancedsettings.src
@@ -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
@@ -174,14 +174,14 @@
};
//-------------------------------------------------------------------------
-#define AUTO_IGNORECURRENCY(AUTO_Y) \
- CheckBox CB_IGNORECURRENCY \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_IGNORECURRENCY; \
- Text [ en-US ] = "Ignore currency field information"; \
+#define AUTO_IGNORECURRENCY(AUTO_Y) \
+ CheckBox CB_IGNORECURRENCY \
+ { \
+ Pos = MAP_APPFONT ( 6 , AUTO_Y ) ; \
+ Size = MAP_APPFONT ( ADVANCED_PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
+ TabStop = TRUE ; \
+ HelpId = HID_DSADMIN_IGNORECURRENCY; \
+ Text [ en-US ] = "Ignore currency field information"; \
};
//-------------------------------------------------------------------------
@@ -227,7 +227,7 @@
< "SQL" ; Default ; > ; \
< "Mixed" ; Default ; > ; \
< "MS Access" ; Default ; > ; \
- };
+ };
#define AUTO_BOOLEANCOMPARISON(AUTO_Y) \
@@ -337,30 +337,30 @@ TabPage PAGE_ADVANCED_SETTINGS_SPECIAL
//-------------------------------------------------------------------------
TabDialog DLG_DATABASE_ADVANCED
-{
+{
OutputSize = TRUE ;
SVLook = TRUE ;
Moveable = TRUE ;
Closeable = TRUE ;
Hide = TRUE;
HelpId = HID_DSADMIN_ADVANCED;
-
+
TabControl 1
{
OutputSize = TRUE ;
HelpId = HID_DSADMIN_TABCONTROL;
SingleLine=TRUE;
};
-
+
String STR_GENERATED_VALUE
{
Text [ en-US ] = "Generated Values";
};
-
+
String STR_DS_BEHAVIOUR
{
Text [ en-US ] = "Special Settings";
};
-
+
Text [ en-US ] = "Advanced Properties" ;
};
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 1d5bb1cb167c..481ee3981389 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -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
@@ -148,7 +148,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD
{
case ::dbaccess::DST_DBASE:
addDetailPage(PAGE_DBASE, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateDbase);
- // bResetPasswordRequired = sal_True;
+ // bResetPasswordRequired = sal_True;
break;
case ::dbaccess::DST_ADO:
@@ -157,7 +157,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD
case ::dbaccess::DST_FLAT:
addDetailPage(PAGE_TEXT, STR_PAGETITLE_ADVANCED, ODriversSettings::CreateText);
- // bResetPasswordRequired = sal_True;
+ // bResetPasswordRequired = sal_True;
break;
case ::dbaccess::DST_ODBC:
@@ -187,7 +187,7 @@ void ODbAdminDialog::impl_selectDataSource(const ::com::sun::star::uno::Any& _aD
case ::dbaccess::DST_LDAP:
addDetailPage(PAGE_LDAP,STR_PAGETITLE_ADVANCED,ODriversSettings::CreateLDAP);
break;
- case ::dbaccess::DST_USERDEFINE1: /// first user defined driver
+ case ::dbaccess::DST_USERDEFINE1: /// first user defined driver
case ::dbaccess::DST_USERDEFINE2:
case ::dbaccess::DST_USERDEFINE3:
case ::dbaccess::DST_USERDEFINE4:
@@ -227,7 +227,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou
// are set. Select another data source of the same type, where the indirect props are not set (yet). Then,
// the indirect property values of the first ds are shown in the second ds ...)
const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties();
- for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin();
+ for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin();
aIndirect != rMap.end();
++aIndirect
)
@@ -281,7 +281,7 @@ sal_Bool ODbAdminDialog::saveDatasource()
ODbAdminDialog::ApplyResult ODbAdminDialog::implApplyChanges()
{
if (!PrepareLeaveCurrentPage())
- { // the page did not allow us to leave
+ { // the page did not allow us to leave
return AR_KEEP;
}
@@ -330,7 +330,7 @@ Reference< XDriver > ODbAdminDialog::getDriver()
return m_pImpl->getDriver();
}
// -----------------------------------------------------------------------------
-::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const
+::rtl::OUString ODbAdminDialog::getDatasourceType(const SfxItemSet& _rSet) const
{
return m_pImpl->getDatasourceType(_rSet);
}
@@ -350,7 +350,7 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp
const ::rtl::OUString sFilterAll( "%", 1, RTL_TEXTENCODING_ASCII_US );
// create and initialize the defaults
_rppDefaults = new SfxPoolItem*[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1];
- SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults
+ SfxPoolItem** pCounter = _rppDefaults; // want to modify this without affecting the out param _rppDefaults
*pCounter++ = new SfxStringItem(DSID_NAME, String());
*pCounter++ = new SfxStringItem(DSID_ORIGINALNAME, String());
*pCounter++ = new SfxStringItem(DSID_CONNECTURL, String());
@@ -508,8 +508,8 @@ void ODbAdminDialog::destroyItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rpPool,
_rppDefaults = NULL;
// no need to explicitly delete the defaults, this has been done by the ReleaseDefaults
}
-
+
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
index 88ed5aea8d47..d49537cfdab2 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.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
@@ -72,7 +72,7 @@
#define CB_PASSWORD_REQUIRED 1
#define CB_SHOWDELETEDROWS 2
#define CB_USESSL 3
-#define CB_USECATALOG 4
+#define CB_USECATALOG 4
#define FL_SEPARATOR2 1
@@ -103,9 +103,9 @@
//========================================================================
// menu item ids
-#define MID_NEW_DATASOURCE 1
-#define MID_DELETE_DATASOURCE 2
-#define MID_RESTORE_DATASOURCE 3
+#define MID_NEW_DATASOURCE 1
+#define MID_DELETE_DATASOURCE 2
+#define MID_RESTORE_DATASOURCE 3
#endif // _DBAUI_DBADMIN_HRC_
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index c4457c62eec0..02389611a993 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -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
@@ -48,55 +48,55 @@
//-------------------------------------------------------------------------
#define AUTO_USECATALOG(AUTO_Y) \
- CheckBox CB_USECATALOG \
- { \
- Pos = MAP_APPFONT ( 6 ,AUTO_Y) ; \
- Size = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_USECATALOG; \
- Text[ en-US ] = "Use catalog for file-based databases"; \
+ CheckBox CB_USECATALOG \
+ { \
+ Pos = MAP_APPFONT ( 6 ,AUTO_Y) ; \
+ Size = MAP_APPFONT ( PAGE_X -12 , CHECKBOX_HEIGHT ) ; \
+ TabStop = TRUE ; \
+ HelpId = HID_DSADMIN_USECATALOG; \
+ Text[ en-US ] = "Use catalog for file-based databases"; \
};
//-------------------------------------------------------------------------
#define AUTO_FIXEDLINE_CONNSETTINGS(AUTO_Y) \
- FixedLine FL_SEPARATOR1 \
- { \
- Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; \
- Text[ en-US ] = "Connection Settings"; \
- }; \
-
-#define AUTO_HOST_AND_PORT(AUTO_Y) \
- FixedText FT_HOSTNAME \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y + 2 ) ; \
- Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \
- Text[ en-US ] = "~Host name"; \
- }; \
- Edit ET_HOSTNAME \
- { \
- TabStop = TRUE ; \
- Border = TRUE ; \
- HelpId = HID_DSADMIN_HOSTNAME; \
- Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ; \
- Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \
- }; \
+ FixedLine FL_SEPARATOR1 \
+ { \
+ Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \
+ Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ; \
+ Text[ en-US ] = "Connection Settings"; \
+ }; \
+
+#define AUTO_HOST_AND_PORT(AUTO_Y) \
+ FixedText FT_HOSTNAME \
+ { \
+ Pos = MAP_APPFONT ( 6 , AUTO_Y + 2 ) ; \
+ Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \
+ Text[ en-US ] = "~Host name"; \
+ }; \
+ Edit ET_HOSTNAME \
+ { \
+ TabStop = TRUE ; \
+ Border = TRUE ; \
+ HelpId = HID_DSADMIN_HOSTNAME; \
+ Pos = MAP_APPFONT ( EDIT_X , AUTO_Y ) ; \
+ Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \
+ }; \
\
- FixedText FT_PORTNUMBER \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ; \
- Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \
- Text[ en-US ] = "~Port number"; \
- }; \
- NumericField NF_PORTNUMBER \
- { \
- TabStop = TRUE ; \
- Border = TRUE ; \
- HelpId = HID_DSADMIN_PORTNUMBER; \
+ FixedText FT_PORTNUMBER \
+ { \
+ Pos = MAP_APPFONT ( 6 , AUTO_Y + UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + 2 ) ; \
+ Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \
+ Text[ en-US ] = "~Port number"; \
+ }; \
+ NumericField NF_PORTNUMBER \
+ { \
+ TabStop = TRUE ; \
+ Border = TRUE ; \
+ HelpId = HID_DSADMIN_PORTNUMBER; \
NoThousandSep = TRUE; \
Pos = MAP_APPFONT ( EDIT_X , AUTO_Y +UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT ) ; \
- Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \
+ Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; \
};
//-------------------------------------------------------------------------
@@ -393,7 +393,7 @@ TabPage PAGE_ODBC
HelpId = HID_DSADMIN_ODBC_OPTIONS;
};
- AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS )
+ AUTO_USECATALOG( 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS )
};
TabPage PAGE_ADABAS
@@ -434,11 +434,11 @@ TabPage PAGE_ADABAS
};
NumericField NF_CACHE_SIZE
{
- Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ;
- Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
+ Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT -1 ) ;
+ Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
SpinSize = 1;
StrictFormat = TRUE;
};
@@ -451,11 +451,11 @@ TabPage PAGE_ADABAS
};
NumericField NF_DATA_INCREMENT
{
- Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ;
- Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
- Border = TRUE ;
- TabStop = TRUE ;
- Spin = TRUE ;
+ Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 ) ;
+ Size = MAP_APPFONT ( 40 , EDIT_HEIGHT ) ;
+ Border = TRUE ;
+ TabStop = TRUE ;
+ Spin = TRUE ;
SpinSize = 1;
StrictFormat = TRUE;
};
@@ -502,8 +502,8 @@ TabPage PAGE_ADABAS
PushButton PB_STAT
{
- Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ;
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
+ Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS ) ;
+ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
Text[ en-US ] = "E~xtended...";
};
@@ -511,9 +511,9 @@ TabPage PAGE_ADABAS
};
//.........................................................................
-#define MYSQL_YDIST 53
-#define MYSQL_FL_Y 8
-#define MYSQL_DRIVERCLASS_Y 8
+#define MYSQL_YDIST 53
+#define MYSQL_FL_Y 8
+#define MYSQL_DRIVERCLASS_Y 8
TabPage PAGE_MYSQL_ODBC
{
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index 50b796541872..2a7c0abb178a 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -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
@@ -102,10 +102,10 @@ String STR_HINT_CONNECTION_NOT_CAPABLE
Text [ en-US ] = "(Not supported by this connection)";
};
-#define EDIT_SIZE_X 50
-#define FT_SIZE_X 90
-#define WIN_X 220
-#define WIN_Y 72
+#define EDIT_SIZE_X 50
+#define FT_SIZE_X 90
+#define WIN_X 220
+#define WIN_Y 72
ModalDialog DLG_DOMAINPASSWORD
{
@@ -145,7 +145,7 @@ ModalDialog DLG_DOMAINPASSWORD
{
Pos = MAP_APPFONT ( WIN_X - 56 , 43 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
- };
+ };
};
#define PAGE_X_T (PAGE_X -80)
@@ -158,7 +158,7 @@ TabPage PAGE_TABLESUBSCRIPTION
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( PAGE_X_T, PAGE_Y_T) ;
HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION;
-
+
Text [ en-US ] = "Tables Filter" ;
FixedLine FL_SEPARATOR1
@@ -169,17 +169,17 @@ TabPage PAGE_TABLESUBSCRIPTION
};
Control CTL_TABLESUBSCRIPTION
{
- Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ;
- Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ;
- Group = TRUE;
- Border = TRUE ;
+ Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ;
+ Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ;
+ Group = TRUE;
+ Border = TRUE ;
TabStop = TRUE ;
HelpId = HID_DSADMIN_TABLE_SELECTOR;
};
FixedText FT_FILTER_EXPLANATION
{
Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 2*UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + 81 ) ;
- Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ;
+ Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ;
HelpId = HID_DSADMIN_FILTER_EXPLANATION;
WordBreak = TRUE;
Text [ en-US ] = "Mark the tables that should be visible for the applications.";
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index b53e12425af7..0725772ad2d1 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.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
@@ -40,46 +40,46 @@
#endif
-#define STR_DBASE_HELPTEXT 28
-#define STR_MSACCESS_HELPTEXT 29
-#define STR_TEXT_HELPTEXT 30
+#define STR_DBASE_HELPTEXT 28
+#define STR_MSACCESS_HELPTEXT 29
+#define STR_TEXT_HELPTEXT 30
// FREE
-#define STR_ADO_HELPTEXT 32
-#define STR_JDBC_HELPTEXT 33
-#define STR_ODBC_HELPTEXT 34
-#define STR_MYSQLJDBC_HELPTEXT 35
-#define STR_SPREADSHEET_HELPTEXT 36
+#define STR_ADO_HELPTEXT 32
+#define STR_JDBC_HELPTEXT 33
+#define STR_ODBC_HELPTEXT 34
+#define STR_MYSQLJDBC_HELPTEXT 35
+#define STR_SPREADSHEET_HELPTEXT 36
// FREE
-#define STR_FINAL_HELPTEXT 38
-#define STR_ADABAS_HELPTEXT 39
-#define STR_ORACLE_HELPTEXT 40
-#define STR_DBASE_HEADERTEXT 41
-#define STR_MSACCESS_HEADERTEXT 42
-#define STR_TEXT_HEADERTEXT 43
+#define STR_FINAL_HELPTEXT 38
+#define STR_ADABAS_HELPTEXT 39
+#define STR_ORACLE_HELPTEXT 40
+#define STR_DBASE_HEADERTEXT 41
+#define STR_MSACCESS_HEADERTEXT 42
+#define STR_TEXT_HEADERTEXT 43
// FREE
-#define STR_ADO_HEADERTEXT 45
-#define STR_JDBC_HEADERTEXT 46
-#define STR_ODBC_HEADERTEXT 47
+#define STR_ADO_HEADERTEXT 45
+#define STR_JDBC_HEADERTEXT 46
+#define STR_ODBC_HEADERTEXT 47
#define STR_MYSQLJDBC_HEADERTEXT 48
// FREE
-#define STR_SPREADSHEET_HEADERTEXT 50
-#define STR_FINAL_HEADERTEXT 52
-#define STR_ADABAS_HEADERTEXT 53
-#define STR_ORACLE_HEADERTEXT 54
+#define STR_SPREADSHEET_HEADERTEXT 50
+#define STR_FINAL_HEADERTEXT 52
+#define STR_ADABAS_HEADERTEXT 53
+#define STR_ORACLE_HEADERTEXT 54
#define STR_GENERAL_HEADERTEXT 55
#define STR_DBWIZARDTITLE 56
-#define STR_DEFAULTLDAPPORTNUMBER 60
+#define STR_DEFAULTLDAPPORTNUMBER 60
-#define STR_ADABASNAME 61
-//#define STR_ADOURL 62
-#define STR_ODBCDATASOURCENAME 63
-#define STR_SPREADSHEETPATH 64
-#define STR_DBLOCATIONLABEL 65
-#define STR_ADMIN_HELPTEXT 66
+#define STR_ADABASNAME 61
+//#define STR_ADOURL 62
+#define STR_ODBCDATASOURCENAME 63
+#define STR_SPREADSHEETPATH 64
+#define STR_DBLOCATIONLABEL 65
+#define STR_ADMIN_HELPTEXT 66
#define STR_ORACLE_DEFAULT 67
-#define STR_PAGETITLE_INTROPAGE 69
+#define STR_PAGETITLE_INTROPAGE 69
#define STR_PAGETITLE_DBASE 70
#define STR_PAGETITLE_TEXT 71
#define STR_PAGETITLE_MSACCESS 72
@@ -101,15 +101,15 @@
#define FT_PORTNUMBERDEFAULT 1
-#define FT_LDAP_HELPTEXT 2
-#define FT_MYSQL_HELPTEXT 3
-#define FT_MYSQL_HEADERTEXT 4
-#define FT_MYSQLCONNECTIONMODE 5
-#define FT_BROWSEURL 6
-#define FT_AUTHENTIFICATIONHELPTEXT 7
+#define FT_LDAP_HELPTEXT 2
+#define FT_MYSQL_HELPTEXT 3
+#define FT_MYSQL_HEADERTEXT 4
+#define FT_MYSQLCONNECTIONMODE 5
+#define FT_BROWSEURL 6
+#define FT_AUTHENTIFICATIONHELPTEXT 7
#define FT_AUTHENTIFICATIONHEADERTEXT 8
-#define FT_LDAP_HEADERTEXT 9
-#define FT_GENERALUSERNAME 10
+#define FT_LDAP_HEADERTEXT 9
+#define FT_GENERALUSERNAME 10
#define FT_FINALHEADER 11
#define FT_FINALTEXT 12
#define FT_FINALHELPTEXT 13
@@ -117,19 +117,19 @@
#define FT_SETUP_WIZARD_HEADER 15
#define FT_SETUP_WIZARD_HELP 16
-#define ET_GENERALUSERNAME 1
+#define ET_GENERALUSERNAME 1
-#define PB_TESTCONNECTION 1
+#define PB_TESTCONNECTION 1
-#define RB_CONNECTVIAODBC 1
-#define RB_CONNECTVIAJDBC 2
+#define RB_CONNECTVIAODBC 1
+#define RB_CONNECTVIAJDBC 2
#define RB_REGISTERDATASOURCE 3
#define RB_DONTREGISTERDATASOURCE 4
#define RB_CONNECTVIANATIVE 5
#define CB_WIZ_USESSL 1
-#define CB_STARTTABLEWIZARD 2
-#define CB_OPENAFTERWARDS 3
+#define CB_STARTTABLEWIZARD 2
+#define CB_OPENAFTERWARDS 3
#define CB_SPREADSHEETPASSWORDREQUIRED 4
#define CB_GENERALPASSWORDREQUIRED 5
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index 7b0dbe011342..00fa1b3cd3e5 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -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
@@ -34,12 +34,12 @@
#endif
-#define CHECKBOX_HEIGHT 8
-#define FIXEDTEXT_HEIGHT 8
-#define RELATED_CONTROLS 4
-#define UNRELATED_CONTROLS 7
-#define EDIT_HEIGHT 12
-#define EDIT_X 101
+#define CHECKBOX_HEIGHT 8
+#define FIXEDTEXT_HEIGHT 8
+#define RELATED_CONTROLS 4
+#define UNRELATED_CONTROLS 7
+#define EDIT_HEIGHT 12
+#define EDIT_X 101
// -----------------------------------------------------------------------------
@@ -214,7 +214,7 @@ TabPage PAGE_DBWIZARD_AUTHENTIFICATION
Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
Hide = TRUE ;
- FixedText FT_AUTHENTIFICATIONHEADERTEXT
+ FixedText FT_AUTHENTIFICATIONHEADERTEXT
{
Pos = MAP_APPFONT ( START_X , 8 ) ;
Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ;
@@ -387,7 +387,7 @@ TabPage PAGE_DBWIZARD_MYSQL_NATIVE
Text[ en-US ] = "Set up connection to a MySQL database" ;
WordBreak = TRUE;
};
-
+
FixedText FT_SETUP_WIZARD_HELP
{
Pos = MAP_APPFONT ( START_X , INIT_Y ) ;
@@ -492,9 +492,9 @@ TabPage PAGE_DBWIZARD_LDAP
Text[ en-US ] = "Please enter the required information to connect to an LDAP directory.\nPlease contact your system administrator if you are unsure about the following settings." ;
WordBreak = TRUE ;
};
- AUTO_HOSTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER)
- AUTO_BASEDNCONTROLGROUP(INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + EDIT_HEIGHT + RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_BASEDN)
- AUTO_PORTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 2 * EDIT_HEIGHT + 2 * RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER)
+ AUTO_HOSTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER)
+ AUTO_BASEDNCONTROLGROUP(INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + EDIT_HEIGHT + RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_BASEDN)
+ AUTO_PORTCONTROLGROUP( INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 2 * EDIT_HEIGHT + 2 * RELATED_CONTROLS, HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER)
String STR_LDAP_DEFAULT{
Text[ en-US ] = "Default: 389" ;
@@ -503,7 +503,7 @@ TabPage PAGE_DBWIZARD_LDAP
CheckBox CB_WIZ_USESSL
{
HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ;
- Pos = MAP_APPFONT (START_X , INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 3 * EDIT_HEIGHT + 4 * RELATED_CONTROLS ) ;
+ Pos = MAP_APPFONT (START_X , INIT_Y + 7 * FIXEDTEXT_HEIGHT + UNRELATED_CONTROLS + 3 * EDIT_HEIGHT + 4 * RELATED_CONTROLS ) ;
Size = MAP_APPFONT ( 212 , 8 ) ;
Text[ en-US ] = "Use ~secure connection (SSL)" ;
};
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 020e23eb87ce..1032af21d938 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -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
@@ -84,16 +84,16 @@ DBG_NAME(ODbaseIndexDialog)
//-------------------------------------------------------------------------
ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName )
: ModalDialog( pParent, ModuleRes(DLG_DBASE_INDEXES) ),
- aPB_OK( this, ModuleRes( PB_OK ) ),
- aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ),
- aPB_HELP( this, ModuleRes( PB_HELP ) ),
- m_FT_Tables( this, ModuleRes( FT_TABLES ) ),
- aCB_Tables( this, ModuleRes( CB_TABLES ) ),
+ aPB_OK( this, ModuleRes( PB_OK ) ),
+ aPB_CANCEL( this, ModuleRes( PB_CANCEL ) ),
+ aPB_HELP( this, ModuleRes( PB_HELP ) ),
+ m_FT_Tables( this, ModuleRes( FT_TABLES ) ),
+ aCB_Tables( this, ModuleRes( CB_TABLES ) ),
m_FL_Indexes( this, ModuleRes( FL_INDEXES ) ),
- m_FT_TableIndexes( this, ModuleRes( FT_TABLEINDEXES ) ),
- aLB_TableIndexes( this, ModuleRes( LB_TABLEINDEXES ) ),
- m_FT_AllIndexes( this, ModuleRes( FT_ALLINDEXES ) ),
- aLB_FreeIndexes( this, ModuleRes( LB_FREEINDEXES ) ),
+ m_FT_TableIndexes( this, ModuleRes( FT_TABLEINDEXES ) ),
+ aLB_TableIndexes( this, ModuleRes( LB_TABLEINDEXES ) ),
+ m_FT_AllIndexes( this, ModuleRes( FT_ALLINDEXES ) ),
+ aLB_FreeIndexes( this, ModuleRes( LB_FREEINDEXES ) ),
aIB_Add( this, ModuleRes( IB_ADD ) ),
aIB_Remove( this, ModuleRes( IB_REMOVE ) ),
aIB_AddAll( this, ModuleRes( IB_ADDALL ) ),
@@ -119,10 +119,10 @@ ODbaseIndexDialog::ODbaseIndexDialog( Window * pParent, String aDataSrcName )
FreeResource();
// set Hi contrast bitmaps
- aIB_Add.SetModeImage( ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST);
- aIB_AddAll.SetModeImage( ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST);
- aIB_Remove.SetModeImage( ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
- aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
+ aIB_Add.SetModeImage( ModuleRes(IMG_ONE_LEFT_H),BMP_COLOR_HIGHCONTRAST);
+ aIB_AddAll.SetModeImage( ModuleRes(IMG_ALL_LEFT_H),BMP_COLOR_HIGHCONTRAST);
+ aIB_Remove.SetModeImage( ModuleRes(IMG_ONE_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
+ aIB_RemoveAll.SetModeImage( ModuleRes(IMG_ALL_RIGHT_H),BMP_COLOR_HIGHCONTRAST);
}
//-------------------------------------------------------------------------
@@ -135,7 +135,7 @@ ODbaseIndexDialog::~ODbaseIndexDialog()
//-------------------------------------------------------------------------
sal_Bool ODbaseIndexDialog::GetTable(const String& _rName, TableInfoListIterator& _rPosition)
{
- for ( _rPosition = m_aTableInfoList.begin();
+ for ( _rPosition = m_aTableInfoList.begin();
_rPosition != m_aTableInfoList.end();
++_rPosition
)
@@ -172,7 +172,7 @@ OTableIndex ODbaseIndexDialog::implRemoveIndex(const String& _rName, TableIndexL
sal_Int32 nPos = 0;
TableIndexListIterator aSearch;
- for ( aSearch = _rList.begin();
+ for ( aSearch = _rList.begin();
aSearch != _rList.end();
++aSearch, ++nPos
)
@@ -235,7 +235,7 @@ IMPL_LINK( ODbaseIndexDialog, OKClickHdl, PushButton*, /*pButton*/ )
{
// let all tables write their INF file
- for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin();
+ for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin();
aLoop != m_aTableInfoList.end();
++aLoop
)
@@ -314,7 +314,7 @@ IMPL_LINK( ODbaseIndexDialog, TableSelectHdl, ComboBox*, pComboBox )
// fill the listbox for the indexes
aLB_TableIndexes.Clear();
- for ( ConstTableIndexListIterator aLoop = aTablePos->aIndexList.begin();
+ for ( ConstTableIndexListIterator aLoop = aTablePos->aIndexList.begin();
aLoop != aTablePos->aIndexList.end();
++aLoop
)
@@ -358,7 +358,7 @@ void ODbaseIndexDialog::Init()
aURL.SetSmartURL(m_aDSN);
- // String aFileName = aURL.PathToFileName();
+ // String aFileName = aURL.PathToFileName();
m_aDSN = aURL.GetMainURL(INetURLObject::NO_DECODE);
::ucbhelper::Content aFile;
sal_Bool bFolder=sal_True;
@@ -436,7 +436,7 @@ void ODbaseIndexDialog::Init()
}
}
- for ( ::std::vector< String >::const_iterator aUsedIndex = aUsedIndexes.begin();
+ for ( ::std::vector< String >::const_iterator aUsedIndex = aUsedIndexes.begin();
aUsedIndex != aUsedIndexes.end();
++aUsedIndex
)
@@ -459,7 +459,7 @@ void ODbaseIndexDialog::Init()
void ODbaseIndexDialog::SetCtrls()
{
// ComboBox Tabellen
- for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin();
+ for ( ConstTableInfoListIterator aLoop = m_aTableInfoList.begin();
aLoop != m_aTableInfoList.end();
++aLoop
)
@@ -472,7 +472,7 @@ void ODbaseIndexDialog::SetCtrls()
aCB_Tables.SetText( rTabInfo.aTableName );
// ListBox der Tabellenindizes aufbauen
- for ( ConstTableIndexListIterator aIndex = rTabInfo.aIndexList.begin();
+ for ( ConstTableIndexListIterator aIndex = rTabInfo.aIndexList.begin();
aIndex != rTabInfo.aIndexList.end();
++aIndex
)
@@ -484,7 +484,7 @@ void ODbaseIndexDialog::SetCtrls()
}
// ListBox freie Indizes
- for ( ConstTableIndexListIterator aFree = m_aFreeIndexList.begin();
+ for ( ConstTableIndexListIterator aFree = m_aFreeIndexList.begin();
aFree != m_aFreeIndexList.end();
++aFree
)
@@ -545,13 +545,13 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
// Jetzt alle gespeicherten Indizes hinzufuegen
sal_uInt16 nPos = 0;
- for ( ConstTableIndexListIterator aIndex = aIndexList.begin();
+ for ( ConstTableIndexListIterator aIndex = aIndexList.begin();
aIndex != aIndexList.end();
++aIndex, ++nPos
)
{
aKeyName = "NDX";
- if( nPos > 0 ) // Erster Index erhaelt keine Ziffer
+ if( nPos > 0 ) // Erster Index erhaelt keine Ziffer
aKeyName += ByteString::CreateFromInt32( nPos );
aInfFile.WriteKey( aKeyName, ByteString(aIndex->GetIndexFileName(), gsl_getSystemTextEncoding()) );
}
@@ -578,6 +578,6 @@ void OTableInfo::WriteInfFile( const String& rDSN ) const
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/dbfindex.hrc b/dbaccess/source/ui/dlg/dbfindex.hrc
index 0d67da065568..988cedbe2a3b 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hrc
+++ b/dbaccess/source/ui/dlg/dbfindex.hrc
@@ -1,20 +1,20 @@
#ifndef _DBAUI_DBF_INDEXES_HRC_
#define _DBAUI_DBF_INDEXES_HRC_
-#define CB_TABLES 1
+#define CB_TABLES 1
-#define FT_TABLES 1
-#define FT_TABLEINDEXES 2
-#define FT_ALLINDEXES 3
+#define FT_TABLES 1
+#define FT_TABLEINDEXES 2
+#define FT_ALLINDEXES 3
#define FL_INDEXES 1
-#define LB_TABLEINDEXES 1
-#define LB_FREEINDEXES 2
+#define LB_TABLEINDEXES 1
+#define LB_FREEINDEXES 2
-#define PB_OK 1
-#define PB_CANCEL 1
-#define PB_HELP 1
+#define PB_OK 1
+#define PB_CANCEL 1
+#define PB_HELP 1
#define IB_ADD 1
#define IB_REMOVE 2
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 5189bb34810d..3f1a3b9fe22c 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -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
@@ -74,7 +74,7 @@ public:
};
//-------------------------------------------------------------------------
-typedef ::std::list< OTableIndex > TableIndexList;
+typedef ::std::list< OTableIndex > TableIndexList;
DECLARE_STL_ITERATORS(TableIndexList);
//=========================================================================
@@ -98,7 +98,7 @@ public:
};
//-------------------------------------------------------------------------
-typedef ::std::list< OTableInfo > TableInfoList;
+typedef ::std::list< OTableInfo > TableInfoList;
DECLARE_STL_ITERATORS(TableInfoList);
//////////////////////////////////////////////////////////////////////////
@@ -106,20 +106,20 @@ DECLARE_STL_ITERATORS(TableInfoList);
class ODbaseIndexDialog : public ModalDialog
{
protected:
- OKButton aPB_OK;
- CancelButton aPB_CANCEL;
- HelpButton aPB_HELP;
+ OKButton aPB_OK;
+ CancelButton aPB_CANCEL;
+ HelpButton aPB_HELP;
- FixedText m_FT_Tables;
- ComboBox aCB_Tables;
+ FixedText m_FT_Tables;
+ ComboBox aCB_Tables;
FixedLine m_FL_Indexes;
- FixedText m_FT_TableIndexes;
- ListBox aLB_TableIndexes;
+ FixedText m_FT_TableIndexes;
+ ListBox aLB_TableIndexes;
- FixedText m_FT_AllIndexes;
- ListBox aLB_FreeIndexes;
+ FixedText m_FT_AllIndexes;
+ ListBox aLB_FreeIndexes;
ImageButton aIB_Add;
ImageButton aIB_Remove;
@@ -134,22 +134,22 @@ protected:
DECL_LINK( OKClickHdl, PushButton* );
DECL_LINK( OnListEntrySelected, ListBox* );
- String m_aDSN;
- TableInfoList m_aTableInfoList;
- TableIndexList m_aFreeIndexList;
- BOOL m_bCaseSensitiv;
+ String m_aDSN;
+ TableInfoList m_aTableInfoList;
+ TableIndexList m_aFreeIndexList;
+ BOOL m_bCaseSensitiv;
- void Init();
- void SetCtrls();
- sal_Bool GetTable(const String& rName, TableInfoListIterator& _rPosition);
+ void Init();
+ void SetCtrls();
+ sal_Bool GetTable(const String& rName, TableInfoListIterator& _rPosition);
- OTableIndex implRemoveIndex(const String& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist);
- void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay);
+ OTableIndex implRemoveIndex(const String& _rName, TableIndexList& _rList, ListBox& _rDisplay, sal_Bool _bMustExist);
+ void implInsertIndex(const OTableIndex& _rIndex, TableIndexList& _rList, ListBox& _rDisplay);
- OTableIndex RemoveFreeIndex( const String& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, aLB_FreeIndexes, _bMustExist); }
- void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, aLB_FreeIndexes); }
- OTableIndex RemoveTableIndex( const String& _rTableName, const String& _rIndexName, sal_Bool _bMustExist );
- void InsertTableIndex( const String& _rTableName, const OTableIndex& _rIndex );
+ OTableIndex RemoveFreeIndex( const String& _rName, sal_Bool _bMustExist ) { return implRemoveIndex(_rName, m_aFreeIndexList, aLB_FreeIndexes, _bMustExist); }
+ void InsertFreeIndex( const OTableIndex& _rIndex ) { implInsertIndex(_rIndex, m_aFreeIndexList, aLB_FreeIndexes); }
+ OTableIndex RemoveTableIndex( const String& _rTableName, const String& _rIndexName, sal_Bool _bMustExist );
+ void InsertTableIndex( const String& _rTableName, const OTableIndex& _rIndex );
void checkButtons();
@@ -159,7 +159,7 @@ public:
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_DBFINDEX_HXX_
diff --git a/dbaccess/source/ui/dlg/dbfindex.src b/dbaccess/source/ui/dlg/dbfindex.src
index ad401102601d..8f6ef6e49697 100644
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@ -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
@@ -170,7 +170,7 @@ ModalDialog DLG_DBASE_INDEXES
{
Pos = MAP_APPFONT ( 94 , 60 ) ;
Size = MAP_APPFONT ( 20 , 14 ) ;
- TabStop = TRUE ;
+ TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
@@ -189,7 +189,7 @@ ModalDialog DLG_DBASE_INDEXES
{
Pos = MAP_APPFONT ( 94 , 77 ) ;
Size = MAP_APPFONT ( 20 , 14 ) ;
- TabStop = TRUE ;
+ TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
@@ -208,7 +208,7 @@ ModalDialog DLG_DBASE_INDEXES
{
Pos = MAP_APPFONT ( 94 , 98 ) ;
Size = MAP_APPFONT ( 20 , 14 ) ;
- TabStop = TRUE ;
+ TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
@@ -227,7 +227,7 @@ ModalDialog DLG_DBASE_INDEXES
{
Pos = MAP_APPFONT ( 94, 114 ) ;
Size = MAP_APPFONT ( 20 , 14 ) ;
- TabStop = TRUE ;
+ TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 7fcf2ae8429d..53e3f928dc11 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -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
@@ -99,14 +99,14 @@ using namespace com::sun::star::util;
using namespace com::sun::star::beans;
using namespace com::sun::star::container;
-#define START_PAGE 0
-#define CONNECTION_PAGE 1
-#define ADDITIONAL_PAGE_DBASE 2
+#define START_PAGE 0
+#define CONNECTION_PAGE 1
+#define ADDITIONAL_PAGE_DBASE 2
#define ADDITIONAL_PAGE_FLAT 3
#define ADDITIONAL_PAGE_LDAP 4
#define ADDITIONAL_PAGE_ADABAS 5
#define ADDITIONAL_PAGE_MYSQL_JDBC 6
-#define ADDITIONAL_PAGE_MYSQL_ODBC 7
+#define ADDITIONAL_PAGE_MYSQL_ODBC 7
#define ADDITIONAL_PAGE_ORACLE_JDBC 8
#define ADDITIONAL_PAGE_ADO 9
#define ADDITIONAL_PAGE_ODBC 10
@@ -130,7 +130,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
,m_bApplied(sal_False)
,m_bUIEnabled( sal_True )
{
- DBG_CTOR(ODbTypeWizDialog,NULL);
+ DBG_CTOR(ODbTypeWizDialog,NULL);
m_pImpl = ::std::auto_ptr(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
@@ -162,8 +162,8 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
//-------------------------------------------------------------------------
ODbTypeWizDialog::~ODbTypeWizDialog()
{
- DBG_DTOR(ODbTypeWizDialog,NULL);
- delete m_pOutSet;
+ DBG_DTOR(ODbTypeWizDialog,NULL);
+ delete m_pOutSet;
}
//-------------------------------------------------------------------------
IMPL_LINK(ODbTypeWizDialog, OnTypeSelected, OGeneralPage*, _pTabPage)
@@ -282,7 +282,7 @@ Reference< XDriver > ODbTypeWizDialog::getDriver()
return m_pImpl->getDriver();
}
// -----------------------------------------------------------------------------
-::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const
+::rtl::OUString ODbTypeWizDialog::getDatasourceType(const SfxItemSet& _rSet) const
{
return m_pImpl->getDatasourceType(_rSet);
}
@@ -353,7 +353,7 @@ TabPage* ODbTypeWizDialog::createPage(WizardState _nState)
// register ourself as modified listener
if ( pPage )
- {
+ {
static_cast(pPage)->SetServiceFactory(m_pImpl->getORB());
static_cast(pPage)->SetAdminDialog(this,this);
// open our own resource block, as the page titles are strings local to this block
@@ -417,5 +417,5 @@ sal_Bool ODbTypeWizDialog::onFinish()
return m_pImpl->saveChanges(*m_pOutSet) ? OWizardMachine::onFinish() : sal_False;
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index b09c691864a3..b43f6b7abb83 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -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
@@ -199,8 +199,8 @@ using namespace ::com::sun::star::document;
using namespace ::comphelper;
using namespace ::cppu;
-#define START_PAGE 0
-#define CONNECTION_PAGE 1
+#define START_PAGE 0
+#define CONNECTION_PAGE 1
@@ -224,7 +224,7 @@ using namespace ::cppu;
//#define EVOLUTION_PATH_GROUPWISE 17
//#define EVOLUTION_PATH_LDAP 18
//#define KAB_PATH 19
-//#define MACAB_PATH 20
+//#define MACAB_PATH 20
//#define THUNDERBIRD_PATH 21
//#define CREATENEW_PATH 22
//#define USERDEFINED_PATH 23
@@ -292,7 +292,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
m_pOutSet = new SfxItemSet( *_pItems->GetPool(), _pItems->GetRanges() );
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
-// eType = m_pImpl->getDatasourceType(*m_pOutSet);
+// eType = m_pImpl->getDatasourceType(*m_pOutSet);
SetPageSizePixel(LogicToPixel(::Size(WIZARD_PAGE_X, WIZARD_PAGE_Y), MAP_APPFONT));
ShowButtonFixedLine(sal_True);
@@ -541,7 +541,7 @@ void ODbTypeWizDialogSetup::resetPages(const Reference< XPropertySet >& _rxDatas
// are set. Select another data source of the same type, where the indirect props are not set (yet). Then,
// the indirect property values of the first ds are shown in the second ds ...)
const ODbDataSourceAdministrationHelper::MapInt2String& rMap = m_pImpl->getIndirectProperties();
- for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin();
+ for ( ODbDataSourceAdministrationHelper::ConstMapInt2StringIterator aIndirect = rMap.begin();
aIndirect != rMap.end();
++aIndirect
)
@@ -601,7 +601,7 @@ Reference< XDriver > ODbTypeWizDialogSetup::getDriver()
// -----------------------------------------------------------------------------
-::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const
+::rtl::OUString ODbTypeWizDialogSetup::getDatasourceType(const SfxItemSet& _rSet) const
{
::rtl::OUString sRet = m_pImpl->getDatasourceType(_rSet);
if (m_pMySQLIntroPage != NULL && m_pMySQLIntroPage->IsVisible() )
@@ -687,11 +687,11 @@ TabPage* ODbTypeWizDialogSetup::createPage(WizardState _nState)
pPage = OConnectionTabPageSetup::CreateAdabasTabPage( this, *m_pOutSet);
break;
- case PAGE_DBSETUPWIZARD_LDAP :
+ case PAGE_DBSETUPWIZARD_LDAP :
pPage = OLDAPConnectionPageSetup::CreateLDAPTabPage(this,*m_pOutSet);
break;
- case PAGE_DBSETUPWIZARD_SPREADSHEET: /// first user defined driver
+ case PAGE_DBSETUPWIZARD_SPREADSHEET: /// first user defined driver
pPage = OSpreadSheetConnectionPageSetup::CreateSpreadSheetTabPage(this,*m_pOutSet);
break;
@@ -1246,6 +1246,6 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument()
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index d90dbd8bc296..b3e928e1619b 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -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
@@ -135,7 +135,7 @@ namespace dbaui
m_pCharset->SetSelectHdl(getControlModifiedLink());
}
- Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine,
+ Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine,
m_pAutoIncrementLabel, m_pAutoIncrement,
m_pAutoRetrievingLabel, m_pAutoRetrieving };
@@ -256,10 +256,10 @@ namespace dbaui
//------------------------------------------------------------------------
ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, CBTP_USE_CHARSET ,false)
- ,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS))
- ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) )
- ,m_aFT_Message (this, ModuleRes( FT_SPECIAL_MESSAGE) )
- ,m_aIndexes (this, ModuleRes(PB_INDICIES))
+ ,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS))
+ ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) )
+ ,m_aFT_Message (this, ModuleRes( FT_SPECIAL_MESSAGE) )
+ ,m_aIndexes (this, ModuleRes(PB_INDICIES))
{
DBG_CTOR(ODbaseDetailsPage,NULL);
@@ -280,7 +280,7 @@ namespace dbaui
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateDbase( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new ODbaseDetailsPage( pParent, _rAttrSet ) );
}
@@ -371,7 +371,7 @@ namespace dbaui
DBG_DTOR(OAdoDetailsPage,NULL);
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateAdo( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OAdoDetailsPage( pParent, _rAttrSet ) );
}
@@ -382,8 +382,8 @@ namespace dbaui
//========================================================================
OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS,false)
- ,m_aFL_1 (this, ModuleRes(FL_SEPARATOR1))
- ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG))
+ ,m_aFL_1 (this, ModuleRes(FL_SEPARATOR1))
+ ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG))
{
m_aUseCatalog.SetToggleHdl(getControlModifiedLink());
FreeResource();
@@ -398,7 +398,7 @@ namespace dbaui
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OOdbcDetailsPage( pParent, _rAttrSet ) );
}
@@ -442,18 +442,18 @@ namespace dbaui
OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, PAGE_USERDRIVER, _rCoreAttrs,
CBTP_USE_CHARSET | CBTP_USE_OPTIONS ,false)
- ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME))
- ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME))
- ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER))
- ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER))
- ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG))
+ ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME))
+ ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME))
+ ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER))
+ ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER))
+ ,m_aUseCatalog (this, ModuleRes(CB_USECATALOG))
{
m_aUseCatalog.SetToggleHdl(getControlModifiedLink());
FreeResource();
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OUserDriverDetailsPage( pParent, _rAttrSet ) );
}
@@ -517,7 +517,7 @@ namespace dbaui
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateMySQLODBC( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OMySQLODBCDetailsPage( pParent, _rAttrSet ) );
}
@@ -527,16 +527,16 @@ namespace dbaui
//========================================================================
OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent,USHORT _nResId, const SfxItemSet& _rCoreAttrs ,USHORT _nPortId)
:OCommonBehaviourTabPage(pParent, _nResId, _rCoreAttrs, CBTP_USE_CHARSET ,false)
- ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) )
- ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME))
- ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME))
- ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER))
- ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER))
- ,m_aFTSocket (this, ModuleRes(FT_SOCKET))
- ,m_aEDSocket (this, ModuleRes(ET_SOCKET))
- ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS))
- ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS))
- ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS))
+ ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) )
+ ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME))
+ ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME))
+ ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER))
+ ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER))
+ ,m_aFTSocket (this, ModuleRes(FT_SOCKET))
+ ,m_aEDSocket (this, ModuleRes(ET_SOCKET))
+ ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS))
+ ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS))
+ ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS))
,m_nPortId(_nPortId)
,m_bUseClass(true)
{
@@ -563,7 +563,7 @@ namespace dbaui
m_aFTSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass);
m_aEDSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass);
-
+
m_aEDHostname.SetModifyHdl(getControlModifiedLink());
m_aNFPortNumber.SetModifyHdl(getControlModifiedLink());
m_aEDSocket.SetModifyHdl(getControlModifiedLink());
@@ -775,18 +775,18 @@ namespace dbaui
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_MYSQL_JDBC, _rAttrSet,DSID_MYSQL_PORTNUMBER ) );
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new MySQLNativePage( pParent, _rAttrSet ) );
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_ORACLE_JDBC, _rAttrSet,DSID_ORACLE_PORTNUMBER) );
}
@@ -797,35 +797,35 @@ namespace dbaui
//========================================================================
OAdabasDetailsPage::OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, PAGE_ADABAS, _rCoreAttrs, CBTP_USE_CHARSET ,false)
- ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME))
- ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME))
- ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) )
- ,m_FT_CACHE_SIZE( this, ModuleRes( FT_CACHE_SIZE ) )
- ,m_NF_CACHE_SIZE( this, ModuleRes( NF_CACHE_SIZE ) )
- ,m_FT_DATA_INCREMENT( this, ModuleRes( FT_DATA_INCREMENT ) )
- ,m_NF_DATA_INCREMENT( this, ModuleRes( NF_DATA_INCREMENT ) )
- ,m_aFL_2( this, ModuleRes( FL_SEPARATOR2 ) )
- ,m_FT_CTRLUSERNAME( this, ModuleRes( FT_CTRLUSERNAME ) )
- ,m_ET_CTRLUSERNAME( this, ModuleRes( ET_CTRLUSERNAME ) )
- ,m_FT_CTRLPASSWORD( this, ModuleRes( FT_CTRLPASSWORD ) )
- ,m_ET_CTRLPASSWORD( this, ModuleRes( ET_CTRLPASSWORD ) )
- ,m_CB_SHUTDB( this, ModuleRes( CB_SHUTDB ) )
- ,m_PB_STAT( this, ModuleRes( PB_STAT ) )
+ ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME))
+ ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME))
+ ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) )
+ ,m_FT_CACHE_SIZE( this, ModuleRes( FT_CACHE_SIZE ) )
+ ,m_NF_CACHE_SIZE( this, ModuleRes( NF_CACHE_SIZE ) )
+ ,m_FT_DATA_INCREMENT( this, ModuleRes( FT_DATA_INCREMENT ) )
+ ,m_NF_DATA_INCREMENT( this, ModuleRes( NF_DATA_INCREMENT ) )
+ ,m_aFL_2( this, ModuleRes( FL_SEPARATOR2 ) )
+ ,m_FT_CTRLUSERNAME( this, ModuleRes( FT_CTRLUSERNAME ) )
+ ,m_ET_CTRLUSERNAME( this, ModuleRes( ET_CTRLUSERNAME ) )
+ ,m_FT_CTRLPASSWORD( this, ModuleRes( FT_CTRLPASSWORD ) )
+ ,m_ET_CTRLPASSWORD( this, ModuleRes( ET_CTRLPASSWORD ) )
+ ,m_CB_SHUTDB( this, ModuleRes( CB_SHUTDB ) )
+ ,m_PB_STAT( this, ModuleRes( PB_STAT ) )
{
m_aEDHostname.SetModifyHdl(getControlModifiedLink());
FreeResource();
- m_PB_STAT.SetClickHdl( LINK(this,OAdabasDetailsPage,PBClickHdl));
+ m_PB_STAT.SetClickHdl( LINK(this,OAdabasDetailsPage,PBClickHdl));
- m_CB_SHUTDB.SetClickHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
- m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
- m_NF_DATA_INCREMENT.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
- m_ET_CTRLUSERNAME.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
- m_ET_CTRLPASSWORD.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
+ m_CB_SHUTDB.SetClickHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
+ m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
+ m_NF_DATA_INCREMENT.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
+ m_ET_CTRLUSERNAME.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
+ m_ET_CTRLPASSWORD.SetModifyHdl( LINK(this,OAdabasDetailsPage,AttributesChangedHdl));
- m_ET_CTRLUSERNAME.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl));
- m_ET_CTRLPASSWORD.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl));
+ m_ET_CTRLUSERNAME.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl));
+ m_ET_CTRLPASSWORD.SetLoseFocusHdl( LINK(this,OAdabasDetailsPage,LoseFocusHdl));
m_NF_DATA_INCREMENT.SetMin(20);
m_NF_DATA_INCREMENT.SetMax(LONG_MAX);
@@ -851,7 +851,7 @@ namespace dbaui
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateAdabas( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateAdabas( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OAdabasDetailsPage( pParent, _rAttrSet ) );
}
@@ -966,14 +966,14 @@ namespace dbaui
//========================================================================
OLDAPDetailsPage::OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
:OCommonBehaviourTabPage(pParent, PAGE_LDAP, _rCoreAttrs,0,false)
- ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) )
- ,m_aBaseDN (this, ModuleRes(FT_BASEDN))
- ,m_aETBaseDN (this, ModuleRes(ET_BASEDN))
+ ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) )
+ ,m_aBaseDN (this, ModuleRes(FT_BASEDN))
+ ,m_aETBaseDN (this, ModuleRes(ET_BASEDN))
,m_aCBUseSSL (this, ModuleRes(CB_USESSL))
- ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER))
- ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER))
- ,m_aFTRowCount (this, ModuleRes(FT_LDAPROWCOUNT))
- ,m_aNFRowCount (this, ModuleRes(NF_LDAPROWCOUNT))
+ ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER))
+ ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER))
+ ,m_aFTRowCount (this, ModuleRes(FT_LDAPROWCOUNT))
+ ,m_aNFRowCount (this, ModuleRes(NF_LDAPROWCOUNT))
{
m_aETBaseDN.SetModifyHdl(getControlModifiedLink());
m_aCBUseSSL.SetToggleHdl(getControlModifiedLink());
@@ -988,7 +988,7 @@ namespace dbaui
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateLDAP( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OLDAPDetailsPage( pParent, _rAttrSet ) );
}
@@ -1090,7 +1090,7 @@ namespace dbaui
}
// -----------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateText( Window* pParent, const SfxItemSet& _rAttrSet )
{
return ( new OTextDetailsPage( pParent, _rAttrSet ) );
}
@@ -1134,18 +1134,18 @@ namespace dbaui
}
//------------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateGeneratedValuesPage( Window* _pParent, const SfxItemSet& _rAttrSet )
{
return new GeneratedValuesPage( _pParent, _rAttrSet );
}
//------------------------------------------------------------------------
- SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet )
+ SfxTabPage* ODriversSettings::CreateSpecialSettingsPage( Window* _pParent, const SfxItemSet& _rAttrSet )
{
::rtl::OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( _rAttrSet );
DataSourceMetaData aMetaData( eType );
- return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData );
+ return new SpecialSettingsPage( _pParent, _rAttrSet, aMetaData );
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index e93fa9b201c4..42eb45122df5 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -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
@@ -37,7 +37,7 @@
#ifndef CHARSETLISTBOX_HXX
#include "charsetlistbox.hxx"
#endif
-#ifndef _SV_FIELD_HXX
+#ifndef _SV_FIELD_HXX
#include
#endif
#ifndef _SV_FIXED_HXX
@@ -67,9 +67,9 @@ namespace dbaui
//=========================================================================
//= OCommonBehaviourTabPage
//=========================================================================
- #define CBTP_NONE 0x00000000
- #define CBTP_USE_CHARSET 0x00000002
- #define CBTP_USE_OPTIONS 0x00000004
+ #define CBTP_NONE 0x00000000
+ #define CBTP_USE_CHARSET 0x00000002
+ #define CBTP_USE_OPTIONS 0x00000004
/** eases the implementation of tab pages handling user/password and/or character
set and/or generic options input
@@ -81,33 +81,33 @@ namespace dbaui
{
protected:
- FixedText* m_pOptionsLabel;
- Edit* m_pOptions;
+ FixedText* m_pOptionsLabel;
+ Edit* m_pOptions;
- FixedLine* m_pDataConvertFixedLine;
- FixedText* m_pCharsetLabel;
+ FixedLine* m_pDataConvertFixedLine;
+ FixedText* m_pCharsetLabel;
CharSetListBox* m_pCharset;
- FixedLine* m_pAutoFixedLine;
- CheckBox* m_pAutoRetrievingEnabled;
- FixedText* m_pAutoIncrementLabel;
- Edit* m_pAutoIncrement;
- FixedText* m_pAutoRetrievingLabel;
- Edit* m_pAutoRetrieving;
+ FixedLine* m_pAutoFixedLine;
+ CheckBox* m_pAutoRetrievingEnabled;
+ FixedText* m_pAutoIncrementLabel;
+ Edit* m_pAutoIncrement;
+ FixedText* m_pAutoRetrievingLabel;
+ Edit* m_pAutoRetrieving;
- sal_uInt32 m_nControlFlags;
+ sal_uInt32 m_nControlFlags;
public:
- virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs);
+ virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs);
OCommonBehaviourTabPage(Window* pParent, USHORT nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true);
protected:
-
+
// nControlFlags ist eine Kombination der CBTP_xxx-Konstanten
virtual ~OCommonBehaviourTabPage();
// must be overloaded by subclasses, but it isn't pure virtual
- virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
+ virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
// OGenericAdministrationPage::fillControls
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -122,20 +122,20 @@ namespace dbaui
class ODbaseDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
ODbaseDetailsPage(Window* pParent, const SfxItemSet& _rCoreAttrs);
private:
// please add new controls also to fillControls or fillWindows
- CheckBox m_aShowDeleted;
- FixedLine m_aFL_1;
- FixedText m_aFT_Message;
- PushButton m_aIndexes;
+ CheckBox m_aShowDeleted;
+ FixedLine m_aFL_1;
+ FixedText m_aFT_Message;
+ PushButton m_aIndexes;
- String m_sDsn;
+ String m_sDsn;
protected:
-
+
virtual ~ODbaseDetailsPage();
protected:
@@ -165,7 +165,7 @@ namespace dbaui
class OOdbcDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
OOdbcDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
@@ -173,8 +173,8 @@ namespace dbaui
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
private:
- FixedLine m_aFL_1;
- CheckBox m_aUseCatalog;
+ FixedLine m_aFL_1;
+ CheckBox m_aUseCatalog;
};
@@ -184,7 +184,7 @@ namespace dbaui
class OUserDriverDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
@@ -192,11 +192,11 @@ namespace dbaui
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
private:
- FixedText m_aFTHostname;
- Edit m_aEDHostname;
- FixedText m_aPortNumber;
- NumericField m_aNFPortNumber;
- CheckBox m_aUseCatalog;
+ FixedText m_aFTHostname;
+ Edit m_aEDHostname;
+ FixedText m_aPortNumber;
+ NumericField m_aNFPortNumber;
+ CheckBox m_aUseCatalog;
};
//========================================================================
@@ -216,35 +216,35 @@ namespace dbaui
public:
OGeneralSpecialJDBCDetailsPage( Window* pParent
, USHORT _nResId
- , const SfxItemSet& _rCoreAttrs
+ , const SfxItemSet& _rCoreAttrs
, USHORT _nPortId
);
protected:
+
-
- virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
DECL_LINK(OnTestJavaClickHdl,PushButton*);
DECL_LINK(OnEditModified,Edit*);
-
- FixedLine m_aFL_1;
- FixedText m_aFTHostname;
- Edit m_aEDHostname;
- FixedText m_aPortNumber;
- NumericField m_aNFPortNumber;
- FixedText m_aFTSocket;
- Edit m_aEDSocket;
-
- FixedText m_aFTDriverClass;
- Edit m_aEDDriverClass;
- PushButton m_aTestJavaDriver;
-
- String m_sDefaultJdbcDriverName;
- USHORT m_nPortId;
+
+ FixedLine m_aFL_1;
+ FixedText m_aFTHostname;
+ Edit m_aEDHostname;
+ FixedText m_aPortNumber;
+ NumericField m_aNFPortNumber;
+ FixedText m_aFTSocket;
+ Edit m_aEDSocket;
+
+ FixedText m_aFTDriverClass;
+ Edit m_aEDDriverClass;
+ PushButton m_aTestJavaDriver;
+
+ String m_sDefaultJdbcDriverName;
+ USHORT m_nPortId;
bool m_bUseClass;
};
@@ -258,16 +258,16 @@ namespace dbaui
const SfxItemSet& _rCoreAttrs );
private:
- FixedLine m_aSeparator1;
+ FixedLine m_aSeparator1;
MySQLNativeSettings m_aMySQLSettings;
- FixedLine m_aSeparator2;
- FixedText m_aUserNameLabel;
- Edit m_aUserName;
- CheckBox m_aPasswordRequired;
+ FixedLine m_aSeparator2;
+ FixedText m_aUserNameLabel;
+ Edit m_aUserName;
+ CheckBox m_aPasswordRequired;
protected:
- virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet( SfxItemSet& _rCoreAttrs );
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
@@ -279,7 +279,7 @@ namespace dbaui
class OAdabasDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs);
+ virtual BOOL FillItemSet (SfxItemSet& _rCoreAttrs);
OAdabasDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
@@ -288,30 +288,30 @@ namespace dbaui
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
private:
- FixedText m_aFTHostname;
- Edit m_aEDHostname;
- FixedLine m_aFL_1;
- FixedText m_FT_CACHE_SIZE;
- NumericField m_NF_CACHE_SIZE;
-
- FixedText m_FT_DATA_INCREMENT;
- NumericField m_NF_DATA_INCREMENT;
-
- FixedLine m_aFL_2;
- FixedText m_FT_CTRLUSERNAME;
- Edit m_ET_CTRLUSERNAME;
- FixedText m_FT_CTRLPASSWORD;
- Edit m_ET_CTRLPASSWORD;
-
- CheckBox m_CB_SHUTDB;
- PushButton m_PB_STAT;
- String m_sUser;
- BOOL bAttrsChanged;
-
- DECL_LINK( AttributesChangedHdl, void * );
- DECL_LINK( UserSettingsHdl, void * );
- DECL_LINK( LoseFocusHdl, Edit * );
- DECL_LINK( PBClickHdl, Button *);
+ FixedText m_aFTHostname;
+ Edit m_aEDHostname;
+ FixedLine m_aFL_1;
+ FixedText m_FT_CACHE_SIZE;
+ NumericField m_NF_CACHE_SIZE;
+
+ FixedText m_FT_DATA_INCREMENT;
+ NumericField m_NF_DATA_INCREMENT;
+
+ FixedLine m_aFL_2;
+ FixedText m_FT_CTRLUSERNAME;
+ Edit m_ET_CTRLUSERNAME;
+ FixedText m_FT_CTRLPASSWORD;
+ Edit m_ET_CTRLPASSWORD;
+
+ CheckBox m_CB_SHUTDB;
+ PushButton m_PB_STAT;
+ String m_sUser;
+ BOOL bAttrsChanged;
+
+ DECL_LINK( AttributesChangedHdl, void * );
+ DECL_LINK( UserSettingsHdl, void * );
+ DECL_LINK( LoseFocusHdl, Edit * );
+ DECL_LINK( PBClickHdl, Button *);
};
//========================================================================
@@ -320,7 +320,7 @@ namespace dbaui
class OLDAPDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
OLDAPDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
protected:
@@ -328,17 +328,17 @@ namespace dbaui
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList);
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
private:
- FixedLine m_aFL_1;
- FixedText m_aBaseDN;
- Edit m_aETBaseDN;
- CheckBox m_aCBUseSSL;
- FixedText m_aPortNumber;
- NumericField m_aNFPortNumber;
- FixedText m_aFTRowCount;
- NumericField m_aNFRowCount;
-
- sal_Int32 m_iSSLPort;
- sal_Int32 m_iNormalPort;
+ FixedLine m_aFL_1;
+ FixedText m_aBaseDN;
+ Edit m_aETBaseDN;
+ CheckBox m_aCBUseSSL;
+ FixedText m_aPortNumber;
+ NumericField m_aNFPortNumber;
+ FixedText m_aFTRowCount;
+ NumericField m_aNFRowCount;
+
+ sal_Int32 m_iSSLPort;
+ sal_Int32 m_iNormalPort;
DECL_LINK( OnCheckBoxClick, CheckBox * );
};
@@ -360,16 +360,16 @@ namespace dbaui
class OTextDetailsPage : public OCommonBehaviourTabPage
{
public:
- virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
+ virtual BOOL FillItemSet ( SfxItemSet& _rCoreAttrs );
OTextDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs );
OTextConnectionHelper* m_pTextConnectionHelper;
private:
- String m_aFieldSeparatorList;
- String m_aTextSeparatorList;
- String m_aTextNone;
+ String m_aFieldSeparatorList;
+ String m_aTextSeparatorList;
+ String m_aTextNone;
protected:
virtual ~OTextDetailsPage();
virtual sal_Bool prepareLeave();
@@ -382,7 +382,7 @@ namespace dbaui
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_DETAILPAGES_HXX_
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index 9465cfa58fed..253fdef0cc56 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -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
@@ -37,19 +37,19 @@
#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
#endif
-#ifndef _SV_MSGBOX_HXX
+#ifndef _SV_MSGBOX_HXX
#include
#endif
#ifndef _COMPHELPER_TYPES_HXX_
#include
#endif
-#ifndef _SV_MSGBOX_HXX
+#ifndef _SV_MSGBOX_HXX
#include
#endif
-#ifndef _SV_SVAPP_HXX
+#ifndef _SV_SVAPP_HXX
#include
#endif
-#ifndef _VOS_MUTEX_HXX_
+#ifndef _VOS_MUTEX_HXX_
#include
#endif
#ifndef TOOLS_DIAGNOSE_EX_H
@@ -74,7 +74,7 @@ namespace dbaui
LargeEntryListBox( Window* _pParent, const ResId& _rId );
protected:
- virtual void UserDraw( const UserDrawEvent& rUDEvt );
+ virtual void UserDraw( const UserDrawEvent& rUDEvt );
};
//--------------------------------------------------------------------
@@ -100,17 +100,17 @@ DBG_NAME(DirectSQLDialog)
//--------------------------------------------------------------------
DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference< XConnection >& _rxConn )
:ModalDialog(_pParent, ModuleRes(DLG_DIRECTSQL))
- ,m_aFrame (this, ModuleRes(FL_SQL))
- ,m_aSQLLabel (this, ModuleRes(FT_SQL))
- ,m_aSQL (this, ModuleRes(ME_SQL))
- ,m_aExecute (this, ModuleRes(PB_EXECUTE))
- ,m_aHistoryLabel (this, ModuleRes(FT_HISTORY))
+ ,m_aFrame (this, ModuleRes(FL_SQL))
+ ,m_aSQLLabel (this, ModuleRes(FT_SQL))
+ ,m_aSQL (this, ModuleRes(ME_SQL))
+ ,m_aExecute (this, ModuleRes(PB_EXECUTE))
+ ,m_aHistoryLabel (this, ModuleRes(FT_HISTORY))
,m_pSQLHistory(new LargeEntryListBox(this, ModuleRes(LB_HISTORY)))
- ,m_aStatusFrame (this, ModuleRes(FL_STATUS))
- ,m_aStatus (this, ModuleRes(ME_STATUS))
- ,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS))
- ,m_aHelp (this, ModuleRes(PB_HELP))
- ,m_aClose (this, ModuleRes(PB_CLOSE))
+ ,m_aStatusFrame (this, ModuleRes(FL_STATUS))
+ ,m_aStatus (this, ModuleRes(ME_STATUS))
+ ,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS))
+ ,m_aHelp (this, ModuleRes(PB_HELP))
+ ,m_aClose (this, ModuleRes(PB_CLOSE))
,m_nHistoryLimit(20)
,m_nStatusCount(1)
,m_xConnection(_rxConn)
@@ -144,7 +144,7 @@ DBG_NAME(DirectSQLDialog)
stopAllComponentListening();
}
delete m_pSQLHistory;
-
+
DBG_DTOR(DirectSQLDialog,NULL);
}
@@ -362,6 +362,6 @@ DBG_NAME(DirectSQLDialog)
}
//........................................................................
-} // namespace dbaui
+} // namespace dbaui
//........................................................................
diff --git a/dbaccess/source/ui/dlg/directsql.hrc b/dbaccess/source/ui/dlg/directsql.hrc
index 23f19a350ab4..ee09db68e896 100644
--- a/dbaccess/source/ui/dlg/directsql.hrc
+++ b/dbaccess/source/ui/dlg/directsql.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
@@ -28,16 +28,16 @@
#ifndef _DBACCESS_UI_DIRECTSQL_HRC_
#define _DBACCESS_UI_DIRECTSQL_HRC_
-#define FL_SQL 1
-#define FT_SQL 2
-#define ME_SQL 3
-#define PB_EXECUTE 4
-#define FT_HISTORY 5
-#define LB_HISTORY 6
-#define FL_STATUS 7
-#define ME_STATUS 8
-#define FL_BUTTONS 9
-#define PB_HELP 10
-#define PB_CLOSE 11
+#define FL_SQL 1
+#define FT_SQL 2
+#define ME_SQL 3
+#define PB_EXECUTE 4
+#define FT_HISTORY 5
+#define LB_HISTORY 6
+#define FL_STATUS 7
+#define ME_STATUS 8
+#define FL_BUTTONS 9
+#define PB_HELP 10
+#define PB_CLOSE 11
#endif // _DBACCESS_UI_DIRECTSQL_HRC_
diff --git a/dbaccess/source/ui/dlg/directsql.src b/dbaccess/source/ui/dlg/directsql.src
index 230fe4dac320..1fa897b80da6 100644
--- a/dbaccess/source/ui/dlg/directsql.src
+++ b/dbaccess/source/ui/dlg/directsql.src
@@ -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,19 +32,19 @@
#include "dbu_dlg.hrc"
#endif
-#define BUTTON_SIZE_X 50
-#define BUTTON_SIZE_Y 14
+#define BUTTON_SIZE_X 50
+#define BUTTON_SIZE_Y 14
-#define WINDOW_SIZE_X 200
-#define WINDOW_SIZE_Y 210 + BUTTON_SIZE_Y + BUTTON_SIZE_Y
+#define WINDOW_SIZE_X 200
+#define WINDOW_SIZE_Y 210 + BUTTON_SIZE_Y + BUTTON_SIZE_Y
ModalDialog DLG_DIRECTSQL
{
- OutputSize = TRUE ;
- Moveable = TRUE ;
- Closeable = TRUE ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
+ OutputSize = TRUE ;
+ Moveable = TRUE ;
+ Closeable = TRUE ;
+ SVLook = TRUE ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
FixedLine FL_SQL
{
@@ -119,7 +119,7 @@ ModalDialog DLG_DIRECTSQL
Text [ en-US ] = "Close";
};
- Text [ en-US ] = "Execute SQL Statement" ;
+ Text [ en-US ] = "Execute SQL Statement" ;
};
String STR_COMMAND_EXECUTED_SUCCESSFULLY
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 0608997ef0c1..79d2c2416a2e 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -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
@@ -70,7 +70,7 @@
#include
#endif
#include //CHINA001
-#include //CHINA001
+#include //CHINA001
#ifndef _SFXINTITEM_HXX //CHINA001
#include //CHINA001
#endif //CHINA001
@@ -97,9 +97,9 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs, SvNumb
DBG_ERROR( "found flag TP_ATTR_CHAR" );
}
if( nFlags & TP_ATTR_NUMBER )
- AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ModuleRes(TP_ATTR_NUMBER)) ); //CHINA001 AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ModuleRes(TP_ATTR_NUMBER)),SvxNumberFormatTabPage::Create, 0 );
+ AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ModuleRes(TP_ATTR_NUMBER)) ); //CHINA001 AddTabPage( RID_SVXPAGE_NUMBERFORMAT,String(ModuleRes(TP_ATTR_NUMBER)),SvxNumberFormatTabPage::Create, 0 );
if( nFlags & TP_ATTR_ALIGN )
- AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ModuleRes(TP_ATTR_ALIGN)) );//CHINA001 AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ModuleRes(TP_ATTR_ALIGN)),SvxAlignmentTabPage::Create, 0 );
+ AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ModuleRes(TP_ATTR_ALIGN)) );//CHINA001 AddTabPage( RID_SVXPAGE_ALIGNMENT,String(ModuleRes(TP_ATTR_ALIGN)),SvxAlignmentTabPage::Create, 0 );
FreeResource();
}
@@ -128,7 +128,7 @@ void SbaSbAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage )
case RID_SVXPAGE_CHAR_STD:
{
- // ((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem());
+ // ((SvxCharStdPage&)rTabPage).SetFontList(SBA_MOD_EXT()->FontListItem());
}
break;
diff --git a/dbaccess/source/ui/dlg/dlgattr.src b/dbaccess/source/ui/dlg/dlgattr.src
index 8dce0835aa69..6c793ac524e1 100644
--- a/dbaccess/source/ui/dlg/dlgattr.src
+++ b/dbaccess/source/ui/dlg/dlgattr.src
@@ -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/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index 7a287829057d..f8ae40b615f6 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -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
@@ -70,7 +70,7 @@
#ifndef _EDIT_HXX //autogen
#include
#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
+#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
#include
#endif
#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMEACCESS_HPP_
@@ -101,34 +101,34 @@ namespace dbaui
class OSaveAsDlgImpl
{
public:
- FixedText m_aDescription;
- FixedText m_aCatalogLbl;
- OSQLNameComboBox m_aCatalog;
- FixedText m_aSchemaLbl;
- OSQLNameComboBox m_aSchema;
- FixedText m_aLabel;
- OSQLNameEdit m_aTitle;
- OKButton m_aPB_OK;
- CancelButton m_aPB_CANCEL;
- HelpButton m_aPB_HELP;
- String m_aQryLabel;
- String m_sTblLabel;
+ FixedText m_aDescription;
+ FixedText m_aCatalogLbl;
+ OSQLNameComboBox m_aCatalog;
+ FixedText m_aSchemaLbl;
+ OSQLNameComboBox m_aSchema;
+ FixedText m_aLabel;
+ OSQLNameEdit m_aTitle;
+ OKButton m_aPB_OK;
+ CancelButton m_aPB_CANCEL;
+ HelpButton m_aPB_HELP;
+ String m_aQryLabel;
+ String m_sTblLabel;
rtl::OUString m_sCatalog;
- rtl::OUString m_sSchema;
- String m_aName;
+ rtl::OUString m_sSchema;
+ String m_aName;
const IObjectNameCheck&
m_rObjectNameCheck;
- String m_sParentURL;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData;
- sal_Int32 m_nType;
- sal_Int32 m_nFlags;
+ String m_sParentURL;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData;
+ sal_Int32 m_nType;
+ sal_Int32 m_nFlags;
- OSaveAsDlgImpl( Window * pParent,const sal_Int32& _rType,
+ OSaveAsDlgImpl( Window * pParent,const sal_Int32& _rType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection,
const String& rDefault,
const IObjectNameCheck& _rObjectNameCheck,
sal_Int32 _nFlags);
- OSaveAsDlgImpl( Window * pParent,
+ OSaveAsDlgImpl( Window * pParent,
const String& rDefault,
const IObjectNameCheck& _rObjectNameCheck,
sal_Int32 _nFlags);
@@ -303,15 +303,15 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
::rtl::OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(m_pImpl->m_xMetaData,
m_pImpl->m_aName,
- sCatalog,
- sSchema,
+ sCatalog,
+ sSchema,
sTable,
::dbtools::eInDataManipulation);
USHORT nPos = m_pImpl->m_aCatalog.GetEntryPos(String(sCatalog));
if ( nPos != COMBOBOX_ENTRY_NOTFOUND )
m_pImpl->m_aCatalog.SelectEntryPos(nPos);
-
+
if ( sSchema.getLength() )
{
nPos = m_pImpl->m_aSchema.GetEntryPos(String(sSchema));
@@ -339,7 +339,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
m_pImpl->m_aTitle.setCheck(bCheck); // enable non valid sql chars as well
m_pImpl->m_aSchema.setCheck(bCheck); // enable non valid sql chars as well
m_pImpl->m_aCatalog.setCheck(bCheck); // enable non valid sql chars as well
-
+
Size aSize = GetSizePixel();
aSize.Height() =
aPos.Y() + m_pImpl->m_aPB_OK.GetSizePixel().Height() + m_pImpl->m_aTitle.GetSizePixel().Height() / 2;
@@ -365,7 +365,7 @@ OSaveAsDlg::OSaveAsDlg( Window * pParent,
{
m_pImpl = new OSaveAsDlgImpl(this,rDefault,_rObjectNameCheck,_nFlags);
implInitOnlyTitle(_sLabel);
- implInit();
+ implInit();
}
// -----------------------------------------------------------------------------
OSaveAsDlg::~OSaveAsDlg()
@@ -447,7 +447,7 @@ void OSaveAsDlg::implInit()
sal_Int32 nMoveUp = m_pImpl->m_aCatalog.GetPosPixel().Y() - m_pImpl->m_aDescription.GetPosPixel().Y();
// loop to all controls and move them ...
- for ( Window* pChildControl = GetWindow( WINDOW_FIRSTCHILD );
+ for ( Window* pChildControl = GetWindow( WINDOW_FIRSTCHILD );
pChildControl;
pChildControl= pChildControl->GetWindow( WINDOW_NEXT )
)
@@ -473,14 +473,14 @@ void OSaveAsDlg::implInit()
SetText( String( ModuleRes( STR_TITLE_RENAME ) ) );
m_pImpl->m_aTitle.SetHelpId(HID_DLG_RENAME);
}
-
+
m_pImpl->m_aPB_OK.SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl));
m_pImpl->m_aTitle.SetModifyHdl(LINK(this,OSaveAsDlg,EditModifyHdl));
m_pImpl->m_aTitle.GrabFocus();
FreeResource();
}
// -----------------------------------------------------------------------------
-String OSaveAsDlg::getName() const { return m_pImpl->m_aName; }
-String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); }
-String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); }
+String OSaveAsDlg::getName() const { return m_pImpl->m_aName; }
+String OSaveAsDlg::getCatalog() const { return m_pImpl->m_aCatalog.IsVisible() ? m_pImpl->m_aCatalog.GetText() : String(); }
+String OSaveAsDlg::getSchema() const { return m_pImpl->m_aSchema.IsVisible() ? m_pImpl->m_aSchema.GetText() : String(); }
diff --git a/dbaccess/source/ui/dlg/dlgsave.hrc b/dbaccess/source/ui/dlg/dlgsave.hrc
index 7a36319ef4de..7778745d9991 100644
--- a/dbaccess/source/ui/dlg/dlgsave.hrc
+++ b/dbaccess/source/ui/dlg/dlgsave.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
@@ -30,24 +30,24 @@
// defines ------------------------------------------------------------------
-#define PB_OK 1
-#define PB_CANCEL 1
-#define PB_HELP 1
+#define PB_OK 1
+#define PB_CANCEL 1
+#define PB_HELP 1
-#define ET_CATALOG 1
-#define ET_SCHEMA 2
-#define ET_TITLE 3
+#define ET_CATALOG 1
+#define ET_SCHEMA 2
+#define ET_TITLE 3
-#define FT_DESCRIPTION 1
-#define FT_CATALOG 2
-#define FT_SCHEMA 3
-#define FT_TITLE 4
+#define FT_DESCRIPTION 1
+#define FT_CATALOG 2
+#define FT_SCHEMA 3
+#define FT_TITLE 4
-#define STR_TBL_LABEL 1
-#define STR_VW_LABEL 2
-#define STR_QRY_LABEL 3
-#define STR_TITLE_RENAME 4
-#define STR_TITLE_PASTE_AS 6
+#define STR_TBL_LABEL 1
+#define STR_VW_LABEL 2
+#define STR_QRY_LABEL 3
+#define STR_TITLE_RENAME 4
+#define STR_TITLE_PASTE_AS 6
#endif // DBAUI_DLGSAVE_HRC
diff --git a/dbaccess/source/ui/dlg/dlgsave.src b/dbaccess/source/ui/dlg/dlgsave.src
index d550704b85f8..a6c036ec2831 100644
--- a/dbaccess/source/ui/dlg/dlgsave.src
+++ b/dbaccess/source/ui/dlg/dlgsave.src
@@ -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
@@ -64,9 +64,9 @@ ModalDialog DLG_SAVE_AS
Border = TRUE ;
Pos = MAP_APPFONT ( 77 , 25 ) ;
Size = MAP_APPFONT ( 89 , 12 ) ;
- SVLook = TRUE ;
- TabStop = TRUE ;
- DropDown = TRUE ;
+ SVLook = TRUE ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
AutoHScroll = TRUE ;
};
FixedText FT_SCHEMA
@@ -80,9 +80,9 @@ ModalDialog DLG_SAVE_AS
Border = TRUE ;
Pos = MAP_APPFONT ( 77 , 42 ) ;
Size = MAP_APPFONT ( 89 , 12 ) ;
- SVLook = TRUE ;
- TabStop = TRUE ;
- DropDown = TRUE ;
+ SVLook = TRUE ;
+ TabStop = TRUE ;
+ DropDown = TRUE ;
AutoHScroll = TRUE ;
};
FixedText FT_TITLE
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index 474d292bfe5d..827071b7d7e3 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -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
@@ -55,12 +55,12 @@ DlgSize::DlgSize( Window* pParent, sal_Int32 nVal, sal_Bool bRow, sal_Int32 _nAl
:ModalDialog( pParent, ModuleRes(bRow ? DLG_ROWHEIGHT : DLG_COLWIDTH))
,m_nPrevValue(nVal)
,m_nStandard(bRow ? DEF_ROW_HEIGHT : DEF_COL_WIDTH)
- ,aFT_VALUE(this, ModuleRes( FT_VALUE))
- ,aMF_VALUE(this, ModuleRes( MF_VALUE))
+ ,aFT_VALUE(this, ModuleRes( FT_VALUE))
+ ,aMF_VALUE(this, ModuleRes( MF_VALUE))
,aCB_STANDARD(this, ModuleRes(CB_STANDARD))
- ,aPB_OK(this, ModuleRes(PB_OK))
- ,aPB_CANCEL(this, ModuleRes(PB_CANCEL))
- ,aPB_HELP(this, ModuleRes(PB_HELP))
+ ,aPB_OK(this, ModuleRes(PB_OK))
+ ,aPB_CANCEL(this, ModuleRes(PB_CANCEL))
+ ,aPB_HELP(this, ModuleRes(PB_HELP))
{
DBG_CTOR(DlgSize,NULL);
@@ -124,7 +124,7 @@ IMPL_LINK( DlgSize, CbClickHdl, Button *, pButton )
}
// -----------------------------------------------------------------------------
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/dlgsize.hrc b/dbaccess/source/ui/dlg/dlgsize.hrc
index 3eef0951a0dd..2a83edf70e04 100644
--- a/dbaccess/source/ui/dlg/dlgsize.hrc
+++ b/dbaccess/source/ui/dlg/dlgsize.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
@@ -28,12 +28,12 @@
#ifndef DBAUI_DLGSIZE_HRC
#define DBAUI_DLGSIZE_HRC
-#define FT_VALUE 1
-#define MF_VALUE 1
-#define CB_STANDARD 2
-#define PB_OK 1
-#define PB_CANCEL 1
-#define PB_HELP 1
+#define FT_VALUE 1
+#define MF_VALUE 1
+#define CB_STANDARD 2
+#define PB_OK 1
+#define PB_CANCEL 1
+#define PB_HELP 1
#endif //DBAUI_DLGSIZE_HRC
diff --git a/dbaccess/source/ui/dlg/dlgsize.src b/dbaccess/source/ui/dlg/dlgsize.src
index ade6f3ff1222..b690e7e50afd 100644
--- a/dbaccess/source/ui/dlg/dlgsize.src
+++ b/dbaccess/source/ui/dlg/dlgsize.src
@@ -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,10 +29,10 @@
// (c) Copyright 1996 - 2000 by Star Division GmbH, Hamburg, Germany
//
// Ersterstellung:
- // JN
+ // JN
//
// Letzte Aenderung:
- // $Author: rt $ $Date: 2008-04-10 14:52:17 $ $Revision: 1.32 $
+ // $Author: rt $ $Date: 2008-04-10 14:52:17 $ $Revision: 1.32 $
//
//---------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx
index ac66e4386bf9..24a46d193dbd 100644
--- a/dbaccess/source/ui/dlg/dsnItem.hxx
+++ b/dbaccess/source/ui/dlg/dsnItem.hxx
@@ -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
@@ -49,20 +49,20 @@ namespace dbaui
*/
class DbuTypeCollectionItem : public SfxPoolItem
{
- ::dbaccess::ODsnTypeCollection* m_pCollection;
+ ::dbaccess::ODsnTypeCollection* m_pCollection;
public:
TYPEINFO();
DbuTypeCollectionItem(sal_Int16 nWhich = 0, ::dbaccess::ODsnTypeCollection* _pCollection = NULL);
DbuTypeCollectionItem(const DbuTypeCollectionItem& _rSource);
- virtual int operator==(const SfxPoolItem& _rItem) const;
- virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const;
+ virtual int operator==(const SfxPoolItem& _rItem) const;
+ virtual SfxPoolItem* Clone(SfxItemPool* _pPool = NULL) const;
- ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; }
+ ::dbaccess::ODsnTypeCollection* getCollection() const { return m_pCollection; }
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_DSNITEM_HXX_
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index b710cf990047..ea9cc8b85d5d 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -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
@@ -56,7 +56,7 @@
#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSETINFO_HPP_
#include
#endif
-#ifndef _COM_SUN_STAR_UI_DIALOGS_XEXECUTABLEDIALOG_HPP_
+#ifndef _COM_SUN_STAR_UI_DIALOGS_XEXECUTABLEDIALOG_HPP_
#include
#endif
#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_
@@ -106,19 +106,19 @@ using namespace ::comphelper;
//==================================================================
ODatasourceSelectDialog::ODatasourceSelectDialog(Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet)
:ModalDialog(_pParent, ModuleRes(DLG_DATASOURCE_SELECTION))
- ,m_aDescription (this, ModuleRes(FT_DESCRIPTION))
- ,m_aDatasource (this, ModuleRes(LB_DATASOURCE))
- ,m_aOk (this, ModuleRes(PB_OK))
- ,m_aCancel (this, ModuleRes(PB_CANCEL))
- ,m_aHelp (this, ModuleRes(PB_HELP))
+ ,m_aDescription (this, ModuleRes(FT_DESCRIPTION))
+ ,m_aDatasource (this, ModuleRes(LB_DATASOURCE))
+ ,m_aOk (this, ModuleRes(PB_OK))
+ ,m_aCancel (this, ModuleRes(PB_CANCEL))
+ ,m_aHelp (this, ModuleRes(PB_HELP))
#ifdef HAVE_ODBC_ADMINISTRATION
- ,m_aManageDatasources (this, ModuleRes(PB_MANAGE))
+ ,m_aManageDatasources (this, ModuleRes(PB_MANAGE))
#endif
- ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE))
+ ,m_aCreateAdabasDB (this, ModuleRes(PB_CREATE))
,m_pOutputSet(_pOutputSet)
{
if ( _bAdabas )
- { // set a new title (indicating that we're browsing local data sources only)
+ { // set a new title (indicating that we're browsing local data sources only)
SetText(ModuleRes(STR_LOCAL_DATASOURCES));
m_aDescription.SetText(ModuleRes(STR_DESCRIPTION2));
@@ -196,7 +196,7 @@ IMPL_LINK( ODatasourceSelectDialog, CreateDBClickHdl, PushButton*, /*pButton*/ )
xORB->createInstanceWithArguments(SERVICE_SDB_ADABASCREATIONDIALOG, aArgs), UNO_QUERY);
if (!xDialog.is())
{
- // ShowServiceNotAvailableError(this, String(SERVICE_SDB_ADABASCREATIONDIALOG), sal_True);
+ // ShowServiceNotAvailableError(this, String(SERVICE_SDB_ADABASCREATIONDIALOG), sal_True);
return 0L;
}
@@ -289,13 +289,13 @@ IMPL_LINK( ODatasourceSelectDialog, ManageProcessFinished, void*, /**/ )
#endif
// -----------------------------------------------------------------------------
void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources)
-{
+{
::rtl::OUString sSelected;
if (m_aDatasource.GetEntryCount())
sSelected = m_aDatasource.GetSelectEntry();
m_aDatasource.Clear();
// fill the list
- for ( ConstStringBagIterator aDS = _rDatasources.begin();
+ for ( ConstStringBagIterator aDS = _rDatasources.begin();
aDS != _rDatasources.end();
++aDS
)
@@ -307,12 +307,12 @@ void ODatasourceSelectDialog::fillListBox(const StringBag& _rDatasources)
{
if (sSelected.getLength())
m_aDatasource.SelectEntry(sSelected);
- else // select the first entry
+ else // select the first entry
m_aDatasource.SelectEntryPos(0);
}
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/dsselect.hrc b/dbaccess/source/ui/dlg/dsselect.hrc
index 5deffeeef102..47aed265ec26 100644
--- a/dbaccess/source/ui/dlg/dsselect.hrc
+++ b/dbaccess/source/ui/dlg/dsselect.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
@@ -28,14 +28,14 @@
#ifndef _DBAUI_DSSELECT_HRC_
#define _DBAUI_DSSELECT_HRC_
-#define LB_DATASOURCE 1
-#define PB_OK 2
-#define PB_CANCEL 3
-#define PB_HELP 4
-#define PB_MANAGE 5
-#define FT_DESCRIPTION 6
-#define STR_LOCAL_DATASOURCES 7
-#define PB_CREATE 9
-#define STR_DESCRIPTION2 10
+#define LB_DATASOURCE 1
+#define PB_OK 2
+#define PB_CANCEL 3
+#define PB_HELP 4
+#define PB_MANAGE 5
+#define FT_DESCRIPTION 6
+#define STR_LOCAL_DATASOURCES 7
+#define PB_CREATE 9
+#define STR_DESCRIPTION2 10
#endif // _DBAUI_DSSELECT_HRC_
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index d2ac059827e9..8adf7c3553c2 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -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
@@ -53,16 +53,16 @@ namespace dbaui
class ODatasourceSelectDialog : public ModalDialog
{
protected:
- FixedText m_aDescription;
- ListBox m_aDatasource;
- OKButton m_aOk;
- CancelButton m_aCancel;
- HelpButton m_aHelp;
+ FixedText m_aDescription;
+ ListBox m_aDatasource;
+ OKButton m_aOk;
+ CancelButton m_aCancel;
+ HelpButton m_aHelp;
#ifdef HAVE_ODBC_ADMINISTRATION
- PushButton m_aManageDatasources;
+ PushButton m_aManageDatasources;
#endif
- PushButton m_aCreateAdabasDB;
- SfxItemSet* m_pOutputSet;
+ PushButton m_aCreateAdabasDB;
+ SfxItemSet* m_pOutputSet;
#ifdef HAVE_ODBC_ADMINISTRATION
::std::auto_ptr< OOdbcManagement >
m_pODBCManagement;
@@ -72,10 +72,10 @@ public:
ODatasourceSelectDialog( Window* _pParent, const StringBag& _rDatasources, bool _bAdabas,SfxItemSet* _pOutputSet = NULL );
~ODatasourceSelectDialog();
- inline String GetSelected() const { return m_aDatasource.GetSelectEntry();}
- void Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); }
+ inline String GetSelected() const { return m_aDatasource.GetSelectEntry();}
+ void Select( const String& _rEntry ) { m_aDatasource.SelectEntry(_rEntry); }
- virtual BOOL Close();
+ virtual BOOL Close();
protected:
DECL_LINK( ListDblClickHdl, ListBox * );
@@ -88,7 +88,7 @@ protected:
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_DSSELECT_HXX_
diff --git a/dbaccess/source/ui/dlg/dsselect.src b/dbaccess/source/ui/dlg/dsselect.src
index 8eff7fffe6c4..4539754e808b 100644
--- a/dbaccess/source/ui/dlg/dsselect.src
+++ b/dbaccess/source/ui/dlg/dsselect.src
@@ -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
@@ -57,7 +57,7 @@ ModalDialog DLG_DATASOURCE_SELECTION
HScroll = TRUE ;
Sort = TRUE ;
};
-
+
OKButton PB_OK
{
Pos = MAP_APPFONT ( 166 , 6 ) ;
diff --git a/dbaccess/source/ui/dlg/finteraction.cxx b/dbaccess/source/ui/dlg/finteraction.cxx
index b7e11951e14e..2af1901bce63 100644
--- a/dbaccess/source/ui/dlg/finteraction.cxx
+++ b/dbaccess/source/ui/dlg/finteraction.cxx
@@ -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
@@ -83,6 +83,6 @@ namespace dbaui
}
//........................................................................
-} // namespace svt
+} // namespace svt
//........................................................................
diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx
index b11e960a144e..94156b51e0f1 100644
--- a/dbaccess/source/ui/dlg/finteraction.hxx
+++ b/dbaccess/source/ui/dlg/finteraction.hxx
@@ -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
@@ -28,7 +28,7 @@
#ifndef DBAUI_FILEPICKER_INTERACTION_HXX
#define DBAUI_FILEPICKER_INTERACTION_HXX
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
+#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include
#endif
#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_
@@ -43,8 +43,8 @@ namespace dbaui
//====================================================================
//= OFilePickerInteractionHandler
//====================================================================
- typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler
- > OFilePickerInteractionHandler_Base;
+ typedef ::cppu::WeakImplHelper1 < ::com::sun::star::task::XInteractionHandler
+ > OFilePickerInteractionHandler_Base;
/** a InteractionHandler implementation which extends another handler with some customizability
*/
@@ -52,13 +52,13 @@ namespace dbaui
{
protected:
::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >
- m_xMaster; // our master handler
- sal_Bool m_bDoesNotExist;
+ m_xMaster; // our master handler
+ sal_Bool m_bDoesNotExist;
public:
OFilePickerInteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxMaster );
- inline sal_Bool isDoesNotExist( ) const { return m_bDoesNotExist; }
+ inline sal_Bool isDoesNotExist( ) const { return m_bDoesNotExist; }
protected:
// XInteractionHandler
@@ -68,7 +68,7 @@ namespace dbaui
};
//........................................................................
-} // namespace dbaui
+} // namespace dbaui
//........................................................................
#endif // DBAUI_FILEPICKER_INTERACTION_HXX
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 50658fb7811d..80134a070bea 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -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
@@ -76,14 +76,14 @@ namespace dbaui
,m_aFT_DocListLabel (this, ModuleRes(FT_DOCLISTLABEL))
,m_pLB_DocumentList ( new OpenDocumentListBox( this, "com.sun.star.sdb.OfficeDatabaseDocument", ModuleRes( LB_DOCUMENTLIST ) ) )
,m_aPB_OpenDocument (this, "com.sun.star.sdb.OfficeDatabaseDocument", ModuleRes(PB_OPENDOCUMENT))
- ,m_aTypePreLabel (this, ModuleRes(FT_DATASOURCETYPE_PRE))
- ,m_aDatasourceTypeLabel (this, ModuleRes(FT_DATATYPE))
- ,m_pDatasourceType ( new ListBox(this, ModuleRes(LB_DATATYPE)))
+ ,m_aTypePreLabel (this, ModuleRes(FT_DATASOURCETYPE_PRE))
+ ,m_aDatasourceTypeLabel (this, ModuleRes(FT_DATATYPE))
+ ,m_pDatasourceType ( new ListBox(this, ModuleRes(LB_DATATYPE)))
,m_aFTDataSourceAppendix (this, ModuleRes(FT_DATATYPEAPPENDIX))
- ,m_aTypePostLabel (this, ModuleRes(FT_DATASOURCETYPE_POST))
- ,m_aSpecialMessage (this, ModuleRes(FT_SPECIAL_MESSAGE))
+ ,m_aTypePostLabel (this, ModuleRes(FT_DATASOURCETYPE_POST))
+ ,m_aSpecialMessage (this, ModuleRes(FT_SPECIAL_MESSAGE))
,m_DBWizardMode (_bDBWizardMode)
- ,m_sMySQLEntry (ModuleRes(STR_MYSQLENTRY))
+ ,m_sMySQLEntry (ModuleRes(STR_MYSQLENTRY))
,m_eOriginalCreationMode (eCreateNew)
,m_pCollection (NULL)
,m_eNotSupportedKnownType ( ::dbaccess::DST_UNKNOWN)
@@ -189,16 +189,16 @@ namespace dbaui
DisplayedTypes aDisplayedTypes;
::dbaccess::ODsnTypeCollection::TypeIterator aEnd = m_pCollection->end();
- for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop = m_pCollection->begin();
+ for ( ::dbaccess::ODsnTypeCollection::TypeIterator aTypeLoop = m_pCollection->begin();
aTypeLoop != aEnd;
++aTypeLoop
)
{
const ::rtl::OUString sURLPrefix = aTypeLoop.getURLPrefix();
if ( sURLPrefix.getLength() )
- {
+ {
String sDisplayName = aTypeLoop.getDisplayName();
- if ( m_pDatasourceType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND
+ if ( m_pDatasourceType->GetEntryPos( sDisplayName ) == LISTBOX_ENTRY_NOTFOUND
&& approveDataSourceType( sURLPrefix, sDisplayName ) )
{
aDisplayedTypes.push_back( DisplayedTypes::value_type( sURLPrefix, sDisplayName ) );
@@ -382,9 +382,9 @@ namespace dbaui
if ( approveDataSourceType( m_eCurrentSelection, sDisplayName )
&& ( LISTBOX_ENTRY_NOTFOUND == m_pDatasourceType->GetEntryPos( sDisplayName ) )
)
- { // this indicates it's really a type which is known in general, but not supported on the current platform
+ { // this indicates it's really a type which is known in general, but not supported on the current platform
// show a message saying so
- // eSpecialMessage = smUnsupportedType;
+ // eSpecialMessage = smUnsupportedType;
insertDatasourceTypeEntryData(m_eCurrentSelection, sDisplayName);
// remember this type so we can show the special message again if the user selects this
// type again (without changing the data source)
@@ -478,7 +478,7 @@ namespace dbaui
}
//-------------------------------------------------------------------------
- SfxTabPage* OGeneralPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet, sal_Bool _bWizardMode)
+ SfxTabPage* OGeneralPage::Create(Window* _pParent, const SfxItemSet& _rAttrSet, sal_Bool _bWizardMode)
{
return ( new OGeneralPage( _pParent, _rAttrSet, _bWizardMode ) );
}
@@ -606,7 +606,7 @@ namespace dbaui
const SfxFilter* pFilter = getStandardDatabaseFilter();
if ( pFilter )
{
-// aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension());
+// aFileDlg.AddFilter(pFilter->GetUIName(),pFilter->GetDefaultExtension());
aFileDlg.SetCurrentFilter(pFilter->GetUIName());
}
if ( aFileDlg.Execute() == ERRCODE_NONE )
@@ -631,6 +631,6 @@ namespace dbaui
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index efd1e326d5cf..0a2ae9c49f2a 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -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
@@ -85,15 +85,15 @@ namespace dbaui
::std::auto_ptr< OpenDocumentListBox >
m_pLB_DocumentList;
OpenDocumentButton m_aPB_OpenDocument;
- FixedText m_aTypePreLabel;
- FixedText m_aDatasourceTypeLabel;
+ FixedText m_aTypePreLabel;
+ FixedText m_aDatasourceTypeLabel;
::std::auto_ptr< ListBox >
m_pDatasourceType;
FixedText m_aFTDataSourceAppendix;
- FixedText m_aTypePostLabel;
- FixedText m_aSpecialMessage;
+ FixedText m_aTypePostLabel;
+ FixedText m_aSpecialMessage;
sal_Bool m_DBWizardMode;
- String m_sMySQLEntry;
+ String m_sMySQLEntry;
CreationMode m_eOriginalCreationMode;
DocumentDescriptor m_aBrowsedDocument;
@@ -102,47 +102,47 @@ namespace dbaui
::std::vector< ::rtl::OUString> m_aURLPrefixes;
- ::dbaccess::ODsnTypeCollection*
- m_pCollection; /// the DSN type collection instance
- ::rtl::OUString m_eCurrentSelection; /// currently selected type
- ::dbaccess::DATASOURCE_TYPE m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered ....
+ ::dbaccess::ODsnTypeCollection*
+ m_pCollection; /// the DSN type collection instance
+ ::rtl::OUString m_eCurrentSelection; /// currently selected type
+ ::dbaccess::DATASOURCE_TYPE m_eNotSupportedKnownType; /// if a data source of an unsupported, but known type is encountered ....
enum SPECIAL_MESSAGE
{
smNone,
smUnsupportedType
};
- SPECIAL_MESSAGE m_eLastMessage;
+ SPECIAL_MESSAGE m_eLastMessage;
- Link m_aTypeSelectHandler; /// to be called if a new type is selected
- Link m_aCreationModeHandler; /// to be called if a new type is selected
- Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected
+ Link m_aTypeSelectHandler; /// to be called if a new type is selected
+ Link m_aCreationModeHandler; /// to be called if a new type is selected
+ Link m_aDocumentSelectionHandler; /// to be called when a document in the RecentDoc list is selected
Link m_aChooseDocumentHandler; /// to be called when a recent document has been definately chosen
- sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted
- sal_Bool m_bUserGrabFocus : 1;
- bool m_bInitTypeList : 1;
+ sal_Bool m_bDisplayingInvalid : 1; // the currently displayed data source is deleted
+ sal_Bool m_bUserGrabFocus : 1;
+ bool m_bInitTypeList : 1;
bool approveDataSourceType( const ::rtl::OUString& _sURLPrefix, String& _inout_rDisplayName );
- void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName);
+ void insertDatasourceTypeEntryData(const ::rtl::OUString& _sType, String sDisplayName);
public:
- static SfxTabPage* Create(Window* pParent, const SfxItemSet& _rAttrSet, sal_Bool _bDBWizardMode = sal_False);
+ static SfxTabPage* Create(Window* pParent, const SfxItemSet& _rAttrSet, sal_Bool _bDBWizardMode = sal_False);
/// set a handler which gets called every time the user selects a new type
- void SetTypeSelectHandler(const Link& _rHandler) { m_aTypeSelectHandler = _rHandler; }
- void SetCreationModeHandler(const Link& _rHandler) { m_aCreationModeHandler = _rHandler; }
- void SetDocumentSelectionHandler( const Link& _rHandler) { m_aDocumentSelectionHandler = _rHandler; }
- void SetChooseDocumentHandler( const Link& _rHandler) { m_aChooseDocumentHandler = _rHandler; }
+ void SetTypeSelectHandler(const Link& _rHandler) { m_aTypeSelectHandler = _rHandler; }
+ void SetCreationModeHandler(const Link& _rHandler) { m_aCreationModeHandler = _rHandler; }
+ void SetDocumentSelectionHandler( const Link& _rHandler) { m_aDocumentSelectionHandler = _rHandler; }
+ void SetChooseDocumentHandler( const Link& _rHandler) { m_aChooseDocumentHandler = _rHandler; }
CreationMode GetDatabaseCreationMode() const;
DocumentDescriptor GetSelectedDocument() const;
/// get the currently selected datasource type
- ::rtl::OUString GetSelectedType() const { return m_eCurrentSelection; }
+ ::rtl::OUString GetSelectedType() const { return m_eCurrentSelection; }
protected:
// SfxTabPage overridables
- virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs);
- virtual void Reset(const SfxItemSet& _rCoreAttrs);
+ virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs);
+ virtual void Reset(const SfxItemSet& _rCoreAttrs);
virtual void implInitControls(const SfxItemSet& _rSet, sal_Bool _bSaveValue);
@@ -172,6 +172,6 @@ namespace dbaui
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_GENERALPAGE_HXX_
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index b9a0b0e75bfc..1938fdab9de2 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -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
@@ -46,7 +46,7 @@
#ifndef _DBAUI_INDEXCOLLECTION_HXX_
#include "indexcollection.hxx"
#endif
-#ifndef _SV_MSGBOX_HXX
+#ifndef _SV_MSGBOX_HXX
#include
#endif
#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
@@ -82,8 +82,8 @@ namespace dbaui
//------------------------------------------------------------------
sal_Bool operator ==(const OIndexField& _rLHS, const OIndexField& _rRHS)
{
- return (_rLHS.sFieldName == _rRHS.sFieldName)
- && (_rLHS.bSortAscending == _rRHS.bSortAscending);
+ return (_rLHS.sFieldName == _rRHS.sFieldName)
+ && (_rLHS.bSortAscending == _rRHS.bSortAscending);
}
//------------------------------------------------------------------
@@ -101,7 +101,7 @@ namespace dbaui
ConstIndexFieldsIterator aLeft = _rLHS.begin();
ConstIndexFieldsIterator aLeftEnd = _rLHS.end();
ConstIndexFieldsIterator aRight = _rRHS.begin();
- for (; aLeft != aLeftEnd; ++aLeft, ++aRight)
+ for (; aLeft != aLeftEnd; ++aLeft, ++aRight)
{
if (*aLeft != *aRight)
return sal_False;
@@ -139,9 +139,9 @@ namespace dbaui
::rtl::OUString sNewName(_rNewText);
::rtl::OUString sAlias = ::dbtools::convertName2SQLName(sNewName,xMeta->getExtraNameCharacters());
if ( ( xMeta->supportsMixedCaseQuotedIdentifiers() )
- ?
- sAlias != sNewName
- :
+ ?
+ sAlias != sNewName
+ :
!sNewName.equalsIgnoreAsciiCase(sAlias))
return sal_False;
}
@@ -203,23 +203,23 @@ namespace dbaui
//==================================================================
DBG_NAME(DbaIndexDialog)
//------------------------------------------------------------------
- DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames,
- const Reference< XNameAccess >& _rxIndexes,
+ DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence< ::rtl::OUString >& _rFieldNames,
+ const Reference< XNameAccess >& _rxIndexes,
const Reference< XConnection >& _rxConnection,
const Reference< XMultiServiceFactory >& _rxORB,sal_Int32 _nMaxColumnsInIndex)
:ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN))
,m_xConnection(_rxConnection)
,m_aGeometrySettings(E_DIALOG, ::rtl::OUString::createFromAscii("dbaccess.tabledesign.indexdialog"))
- ,m_aActions (this, ModuleRes(TLB_ACTIONS))
- ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST))
- ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS))
- ,m_aDescriptionLabel (this, ModuleRes(FT_DESC_LABEL))
- ,m_aDescription (this, ModuleRes(FT_DESCRIPTION))
- ,m_aUnique (this, ModuleRes(CB_UNIQUE))
- ,m_aFieldsLabel (this, ModuleRes(FT_FIELDS))
- ,m_pFields(new IndexFieldsControl (this, ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" )))
- ,m_aClose (this, ModuleRes(PB_CLOSE))
- ,m_aHelp (this, ModuleRes(HB_HELP))
+ ,m_aActions (this, ModuleRes(TLB_ACTIONS))
+ ,m_aIndexes (this, ModuleRes(CTR_INDEXLIST))
+ ,m_aIndexDetails (this, ModuleRes(FL_INDEXDETAILS))
+ ,m_aDescriptionLabel (this, ModuleRes(FT_DESC_LABEL))
+ ,m_aDescription (this, ModuleRes(FT_DESCRIPTION))
+ ,m_aUnique (this, ModuleRes(CB_UNIQUE))
+ ,m_aFieldsLabel (this, ModuleRes(FT_FIELDS))
+ ,m_pFields(new IndexFieldsControl (this, ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting( m_xConnection, "AddIndexAppendix" )))
+ ,m_aClose (this, ModuleRes(PB_CLOSE))
+ ,m_aHelp (this, ModuleRes(HB_HELP))
,m_pIndexes(NULL)
,m_pPreviousSelection(NULL)
,m_bEditAgain(sal_False)
@@ -263,17 +263,17 @@ DBG_NAME(DbaIndexDialog)
m_aClose.SetClickHdl(LINK(this, DbaIndexDialog, OnCloseDialog));
// get our most recent geometry settings
-// if (m_aGeometrySettings.Exists())
-// {
-// Point aPos;
-// m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y());
-// SetPosPixel(aPos);
-// }
+// if (m_aGeometrySettings.Exists())
+// {
+// Point aPos;
+// m_aGeometrySettings.GetPosition(aPos.X(), aPos.Y());
+// SetPosPixel(aPos);
+// }
// if all of the indexes have an empty description, we're not interested in displaying it
Indexes::const_iterator aCheck;
- for ( aCheck = m_pIndexes->begin();
+ for ( aCheck = m_pIndexes->begin();
aCheck != m_pIndexes->end();
++aCheck
)
@@ -317,7 +317,7 @@ DBG_NAME(DbaIndexDialog)
SvLBoxEntry* pSelected = m_aIndexes.FirstSelected();
sal_Bool bSelectedAnything = NULL != pSelected;
-
+
if (pSelected)
{
@@ -367,9 +367,9 @@ DBG_NAME(DbaIndexDialog)
delete m_pFields;
// save our geometry settings
-// Point aPos = GetPosPixel();
-// m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y());
-
+// Point aPos = GetPosPixel();
+// m_aGeometrySettings.SetPosition(aPos.X(), aPos.Y());
+
DBG_DTOR(DbaIndexDialog,NULL);
}
@@ -575,7 +575,7 @@ DBG_NAME(DbaIndexDialog)
OnDropIndex(sal_False);
return;
}
-
+
SQLExceptionInfo aExceptionInfo;
try
{
@@ -642,7 +642,7 @@ DBG_NAME(DbaIndexDialog)
{
// the descriptor
Indexes::const_iterator aSelected = m_pIndexes->begin() + reinterpret_cast(pSelected->GetUserData());
-
+
if (aSelected->isModified() || aSelected->isNew())
{
QueryBox aQuestion(this, ModuleRes(QUERY_SAVE_CURRENT_INDEX));
@@ -679,7 +679,7 @@ DBG_NAME(DbaIndexDialog)
IMPL_LINK( DbaIndexDialog, OnEntryEdited, SvLBoxEntry*, _pEntry )
{
Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast(_pEntry->GetUserData());
-
+
DBG_ASSERT(aPosition >= m_pIndexes->begin() && aPosition < m_pIndexes->end(),
"DbaIndexDialog::OnEntryEdited: invalid entry!");
@@ -762,7 +762,7 @@ DBG_NAME(DbaIndexDialog)
// no double fields
DECLARE_STL_STDKEY_SET( String, StringBag );
StringBag aExistentFields;
- for ( ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin();
+ for ( ConstIndexFieldsIterator aFieldCheck = _rPos->aFields.begin();
aFieldCheck != _rPos->aFields.end();
++aFieldCheck
)
@@ -853,7 +853,7 @@ DBG_NAME(DbaIndexDialog)
// commit the old data
if (m_aIndexes.FirstSelected() != m_pPreviousSelection)
- { // (this call may happen in case somebody ended an in-place edit with 'return', so we need to check this before committing)
+ { // (this call may happen in case somebody ended an in-place edit with 'return', so we need to check this before committing)
if (!implCommitPreviouslySelected())
{
m_aIndexes.SelectNoHandlerCall(m_pPreviousSelection);
@@ -894,7 +894,7 @@ DBG_NAME(DbaIndexDialog)
{
// The physical toolbar changed its outlook and shows another logical toolbar!
// We have to set the correct high contrast mode on the new tbx manager.
- // pMgr->SetHiContrast( IsHiContrastMode() );
+ // pMgr->SetHiContrast( IsHiContrastMode() );
checkImageList();
}
}
@@ -903,9 +903,9 @@ DBG_NAME(DbaIndexDialog)
{
ModalDialog::DataChanged( rDCEvt );
- if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
- ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) &&
- ( rDCEvt.GetFlags() & SETTINGS_STYLE ))
+ if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
+ ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) &&
+ ( rDCEvt.GetFlags() & SETTINGS_STYLE ))
{
// Check if we need to get new images for normal/high contrast mode
checkImageList();
@@ -916,7 +916,7 @@ DBG_NAME(DbaIndexDialog)
{
sal_Int16 nN = IMG_INDEX_DLG_SC;
sal_Int16 nH = IMG_INDEX_DLG_SCH;
- if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
+ if ( _eBitmapSet == SFX_SYMBOLS_SIZE_LARGE )
{
nN = IMG_INDEX_DLG_LC;
nH = IMG_INDEX_DLG_LCH;
@@ -933,7 +933,7 @@ DBG_NAME(DbaIndexDialog)
Size aDlgSize = GetSizePixel();
// adjust size of dlg
SetSizePixel(Size(aDlgSize.Width() + _rDiff.Width(),
- aDlgSize.Height() + _rDiff.Height())
+ aDlgSize.Height() + _rDiff.Height())
);
Size aIndexSize = m_aIndexes.GetSizePixel();
m_aIndexes.SetPosSizePixel(m_aIndexes.GetPosPixel() + Point(0,_rDiff.Height()),
@@ -957,6 +957,6 @@ DBG_NAME(DbaIndexDialog)
}
//......................................................................
-} // namespace dbaui
+} // namespace dbaui
//......................................................................
diff --git a/dbaccess/source/ui/dlg/indexdialog.hrc b/dbaccess/source/ui/dlg/indexdialog.hrc
index 825e96de2edc..003bcf6a0903 100644
--- a/dbaccess/source/ui/dlg/indexdialog.hrc
+++ b/dbaccess/source/ui/dlg/indexdialog.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,21 +29,21 @@
#define _DBAUI_INDEXDIALOG_HRC_
-#define CTR_INDEXLIST 1
-#define CTR_FIELDS 2
+#define CTR_INDEXLIST 1
+#define CTR_FIELDS 2
-#define FL_INDEXDETAILS 1
+#define FL_INDEXDETAILS 1
-#define CB_UNIQUE 1
+#define CB_UNIQUE 1
-#define FT_FIELDS 1
-#define FT_DESC_LABEL 2
-#define FT_DESCRIPTION 3
+#define FT_FIELDS 1
+#define FT_DESC_LABEL 2
+#define FT_DESCRIPTION 3
-#define TLB_ACTIONS 1
+#define TLB_ACTIONS 1
-#define PB_CLOSE 1
+#define PB_CLOSE 1
-#define HB_HELP 1
+#define HB_HELP 1
#endif // _DBAUI_INDEXDIALOG_HRC_
diff --git a/dbaccess/source/ui/dlg/indexdialog.src b/dbaccess/source/ui/dlg/indexdialog.src
index ae8f80d6c616..ead770c40482 100644
--- a/dbaccess/source/ui/dlg/indexdialog.src
+++ b/dbaccess/source/ui/dlg/indexdialog.src
@@ -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
@@ -38,12 +38,12 @@
#include "dbaccess_helpid.hrc"
#endif
-#define DIALOG_SIZE_X 220
-#define DIALOG_SIZE_Y 140
-#define BUTTON_SIZE_X 50
-#define BUTTON_SIZE_Y 14
+#define DIALOG_SIZE_X 220
+#define DIALOG_SIZE_Y 140
+#define BUTTON_SIZE_X 50
+#define BUTTON_SIZE_Y 14
-#define LIST_WIDTH 70
+#define LIST_WIDTH 70
ModalDialog DLG_INDEXDESIGN
{
@@ -57,7 +57,7 @@ ModalDialog DLG_INDEXDESIGN
ToolBox TLB_ACTIONS
{
Pos = MAP_APPFONT ( 6 , 6 ) ;
- // Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ;
+ // Size = MAP_APPFONT ( DIALOG_SIZE_X - 14 , 14 ) ;
ButtonType = BUTTON_SYMBOL;
Align = BOXALIGN_TOP;
HelpId = HID_INDEX_DIALOG_ACTION_TB;
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 55457a36ae64..e26a99a3f4f2 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -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
@@ -46,11 +46,11 @@ namespace dbaui
{
//......................................................................
-#define BROWSER_STANDARD_FLAGS BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | \
+#define BROWSER_STANDARD_FLAGS BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL | \
BROWSER_HIDECURSOR | BROWSER_HIDESELECT | BROWSER_AUTO_HSCROLL | BROWSER_AUTO_VSCROLL
-#define COLUMN_ID_FIELDNAME 1
-#define COLUMN_ID_ORDER 2
+#define COLUMN_ID_FIELDNAME 1
+#define COLUMN_ID_ORDER 2
using namespace ::com::sun::star::uno;
using namespace ::svt;
@@ -61,8 +61,8 @@ namespace dbaui
class DbaMouseDownListBoxController : public ListBoxCellController
{
protected:
- Link m_aOriginalModifyHdl;
- Link m_aAdditionalModifyHdl;
+ Link m_aOriginalModifyHdl;
+ Link m_aAdditionalModifyHdl;
public:
DbaMouseDownListBoxController(ListBoxControl* _pParent)
@@ -138,7 +138,7 @@ DBG_NAME(IndexFieldsControl)
{
delete m_pSortingCell;
delete m_pFieldNameCell;
-
+
DBG_DTOR(IndexFieldsControl,NULL);
}
@@ -205,7 +205,7 @@ DBG_NAME(IndexFieldsControl)
// insert rows for the the fields
RowInserted(GetRowCount(), m_aFields.size(), sal_False);
// insert an additional row for a new field for that index
-// if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex )
+// if(!m_nMaxColumnsInIndex || GetRowCount() < m_nMaxColumnsInIndex )
RowInserted(GetRowCount(), 1, sal_False);
SetUpdateMode(sal_True);
@@ -289,7 +289,7 @@ DBG_NAME(IndexFieldsControl)
// for the field name cell
m_pFieldNameCell = new ListBoxControl(&GetDataWindow());
m_pFieldNameCell->InsertEntry(String());
- m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD );
+ m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD );
const ::rtl::OUString* pFields = _rAvailableFields.getConstArray();
const ::rtl::OUString* pFieldsEnd = pFields + _rAvailableFields.getLength();
for (;pFields < pFieldsEnd; ++pFields)
@@ -370,7 +370,7 @@ DBG_NAME(IndexFieldsControl)
{
sal_Int32 nRow = GetCurRow();
OSL_ENSURE(nRow < (sal_Int32)m_aFields.size(), "IndexFieldsControl::SaveModified: invalid current row!");
- if (nRow >= 0) // may be -1 in case the control was empty
+ if (nRow >= 0) // may be -1 in case the control was empty
{
// remove the field from the selection
IndexFieldsIterator aPos = m_aFields.begin() + nRow;
@@ -443,9 +443,9 @@ DBG_NAME(IndexFieldsControl)
m_aModifyHdl.Call(this);
if (_pBox == m_pFieldNameCell)
- { // a field has been selected
+ { // a field has been selected
if (GetCurRow() >= GetRowCount() - 2)
- { // and we're in one of the last two rows
+ { // and we're in one of the last two rows
String sSelectedEntry = m_pFieldNameCell->GetSelectEntry();
sal_Int32 nCurrentRow = GetCurRow();
sal_Int32 rowCount = GetRowCount();
@@ -453,14 +453,14 @@ DBG_NAME(IndexFieldsControl)
OSL_ENSURE(((sal_Int32)(m_aFields.size() + 1)) == rowCount, "IndexFieldsControl::OnListEntrySelected: inconsistence!");
if (sSelectedEntry.Len() && (nCurrentRow == rowCount - 1) /*&& (!m_nMaxColumnsInIndex || rowCount < m_nMaxColumnsInIndex )*/ )
- { // in the last row, an non-empty string has been selected
+ { // in the last row, an non-empty string has been selected
// -> insert a new row
m_aFields.push_back(OIndexField());
RowInserted(GetRowCount(), 1);
Invalidate(GetRowRectPixel(nCurrentRow));
}
else if (!sSelectedEntry.Len() && (nCurrentRow == rowCount - 2))
- { // in the (last-1)th row, an empty entry has been selected
+ { // in the (last-1)th row, an empty entry has been selected
// -> remove the last row
m_aFields.erase(m_aFields.end() - 1);
RowRemoved(GetRowCount() - 1, 1);
@@ -511,6 +511,6 @@ DBG_NAME(IndexFieldsControl)
//------------------------------------------------------------------
//......................................................................
-} // namespace dbaui
+} // namespace dbaui
//......................................................................
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index c4b73ee08af0..27d5176d618e 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -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
@@ -57,22 +57,22 @@
#ifdef HAVE_ODBC_SUPPORT
#if defined(WIN) || defined(OS2)
-#define ODBC_LIBRARY "ODBC.DLL"
-#define ODBC_UI_LIBRARY "ODBCINST.DLL"
+#define ODBC_LIBRARY "ODBC.DLL"
+#define ODBC_UI_LIBRARY "ODBCINST.DLL"
#endif
#if defined WNT
-#define ODBC_LIBRARY "ODBC32.DLL"
-#define ODBC_UI_LIBRARY "ODBCCP32.DLL"
+#define ODBC_LIBRARY "ODBC32.DLL"
+#define ODBC_UI_LIBRARY "ODBCCP32.DLL"
#endif
#ifdef UNX
#ifdef MACOSX
-#define ODBC_LIBRARY "libiodbc.dylib"
-#define ODBC_UI_LIBRARY "libiodbcinst.dylib"
+#define ODBC_LIBRARY "libiodbc.dylib"
+#define ODBC_UI_LIBRARY "libiodbcinst.dylib"
#else
-#define ODBC_LIBRARY_1 "libodbc.so.1"
-#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1"
-#define ODBC_LIBRARY "libodbc.so"
-#define ODBC_UI_LIBRARY "libodbcinst.so"
+#define ODBC_LIBRARY_1 "libodbc.so.1"
+#define ODBC_UI_LIBRARY_1 "libodbcinst.so.1"
+#define ODBC_LIBRARY "libodbc.so"
+#define ODBC_UI_LIBRARY "libodbcinst.so"
#endif
#endif
@@ -118,10 +118,10 @@
#else
-#define ODBC_LIBRARY ""
-#define ODBC_UI_LIBRARY ""
+#define ODBC_LIBRARY ""
+#define ODBC_UI_LIBRARY ""
-#endif // HAVE_ODBC_SUPPORT
+#endif // HAVE_ODBC_SUPPORT
//.........................................................................
namespace dbaui
@@ -131,10 +131,10 @@ namespace dbaui
#ifdef HAVE_ODBC_SUPPORT
typedef SQLRETURN (SQL_API* TSQLManageDataSource) (SQLHWND hwndParent);
-typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr);
+typedef SQLRETURN (SQL_API* TSQLAllocHandle) (SQLSMALLINT HandleType, SQLHANDLE InputHandle, SQLHANDLE* OutputHandlePtr);
typedef SQLRETURN (SQL_API* TSQLFreeHandle) (SQLSMALLINT HandleType, SQLHANDLE Handle);
typedef SQLRETURN (SQL_API* TSQLSetEnvAttr) (SQLHENV EnvironmentHandle, SQLINTEGER Attribute, SQLPOINTER ValuePtr, SQLINTEGER StringLength);
-typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName,
+typedef SQLRETURN (SQL_API* TSQLDataSources) (SQLHENV EnvironmentHandle, SQLUSMALLINT Direction, SQLCHAR* ServerName,
SQLSMALLINT BufferLength1, SQLSMALLINT* NameLength1Ptr, SQLCHAR* Description, SQLSMALLINT BufferLength2, SQLSMALLINT* NameLength2Ptr);
#define NSQLManageDataSource(a) (*(TSQLManageDataSource)(m_pSQLManageDataSource))(a)
@@ -201,10 +201,10 @@ OOdbcLibWrapper::~OOdbcLibWrapper()
struct OdbcTypesImpl
{
#ifdef HAVE_ODBC_SUPPORT
- SQLHANDLE hEnvironment;
+ SQLHANDLE hEnvironment;
OdbcTypesImpl() : hEnvironment(0) { }
#else
- void* pDummy;
+ void* pDummy;
#endif
};
DBG_NAME(OOdbcEnumeration)
@@ -308,7 +308,7 @@ void OOdbcEnumeration::getDatasourceNames(StringBag& _rNames)
SQLRETURN nResult = SQL_SUCCESS;
rtl_TextEncoding nTextEncoding = osl_getThreadTextEncoding();
- for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription);
+ for ( nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_FIRST, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription);
;
nResult = NSQLDataSources(m_pImpl->hEnvironment, SQL_FETCH_NEXT, szDSN, sizeof(szDSN), &pcbDSN, szDescription, sizeof(szDescription)-1, &pcbDescription)
)
@@ -399,5 +399,5 @@ bool OOdbcManagement::isRunning() const
#endif // HAVE_ODBC_ADMINISTRATION
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index b4a10625e49b..1b15435db59d 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -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
@@ -55,14 +55,14 @@ namespace dbaui
*/
class OOdbcLibWrapper
{
- oslModule m_pOdbcLib; // the library handle
- ::rtl::OUString m_sLibPath; // the path to the library
+ oslModule m_pOdbcLib; // the library handle
+ ::rtl::OUString m_sLibPath; // the path to the library
public:
#ifdef HAVE_ODBC_SUPPORT
- sal_Bool isLoaded() const { return NULL != m_pOdbcLib; }
+ sal_Bool isLoaded() const { return NULL != m_pOdbcLib; }
#else
- sal_Bool isLoaded() const { return sal_False; }
+ sal_Bool isLoaded() const { return sal_False; }
#endif
::rtl::OUString getLibraryName() const { return m_sLibPath; }
@@ -77,9 +77,9 @@ protected:
oslGenericFunction loadSymbol(const sal_Char* _pFunctionName);
/// load the lib
- sal_Bool load(const sal_Char* _pLibPath);
+ sal_Bool load(const sal_Char* _pLibPath);
/// unload the lib
- void unload();
+ void unload();
};
//=========================================================================
@@ -96,7 +96,7 @@ class OOdbcEnumeration : public OOdbcLibWrapper
oslGenericFunction m_pDataSources;
#endif
- OdbcTypesImpl* m_pImpl;
+ OdbcTypesImpl* m_pImpl;
// needed because we can't have a member of type SQLHANDLE: this would require us to include the respective
// ODBC file, which would lead to a lot of conflicts with other includes
@@ -104,13 +104,13 @@ public:
OOdbcEnumeration();
~OOdbcEnumeration();
- void getDatasourceNames(StringBag& _rNames);
+ void getDatasourceNames(StringBag& _rNames);
protected:
/// ensure that an ODBC environment is allocated
- sal_Bool allocEnv();
+ sal_Bool allocEnv();
/// free any allocated ODBC environment
- void freeEnv();
+ void freeEnv();
};
//=========================================================================
@@ -133,7 +133,7 @@ public:
#endif
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_ODBC_CONFIG_HXX_
diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx
index cdc3ff03ee5b..e39bd1cf6866 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.cxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx
index 89d7d0d5de3b..80740cecd816 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.hxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx
@@ -1,6 +1,6 @@
/*************************************************************************
* 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
@@ -48,8 +48,8 @@ namespace dbaui
OptionalBoolItem( sal_Int16 nWhich );
OptionalBoolItem( const OptionalBoolItem& _rSource );
- virtual int operator==( const SfxPoolItem& _rItem ) const;
- virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const;
+ virtual int operator==( const SfxPoolItem& _rItem ) const;
+ virtual SfxPoolItem* Clone( SfxItemPool* _pPool = NULL ) const;
bool HasValue() const { return !!m_aValue; }
void ClearValue() { m_aValue.reset(); }
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index 61d6551ef08e..eec5eb8d4cc7 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -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
@@ -72,14 +72,14 @@
#include
#endif
-#define EF_VISITED 0x0001
-#define EF_DIRTY 0x0002
+#define EF_VISITED 0x0001
+#define EF_DIRTY 0x0002
//.........................................................................
namespace dbaui
{
//.........................................................................
-
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
@@ -93,19 +93,19 @@ namespace dbaui
//==================================================================
//------------------------------------------------------------------------------
- #define INIT_MEMBERS() \
- :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \
- ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \
- ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \
- ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \
- ,m_aParam (this, ModuleRes(ET_PARAM)) \
- ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \
- ,m_aOKBtn (this, ModuleRes(BT_OK)) \
- ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \
- ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \
- ,m_xConnection(_rxConnection) \
- ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \
- ,m_bNeedErrorOnCurrent(sal_True) \
+ #define INIT_MEMBERS() \
+ :ModalDialog( pParent, ModuleRes(DLG_PARAMETERS)) \
+ ,m_aNamesFrame (this, ModuleRes(FL_PARAMS)) \
+ ,m_aAllParams (this, ModuleRes(LB_ALLPARAMS)) \
+ ,m_aValueFrame (this, ModuleRes(FT_VALUE)) \
+ ,m_aParam (this, ModuleRes(ET_PARAM)) \
+ ,m_aTravelNext (this, ModuleRes(BT_TRAVELNEXT)) \
+ ,m_aOKBtn (this, ModuleRes(BT_OK)) \
+ ,m_aCancelBtn (this, ModuleRes(BT_CANCEL)) \
+ ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND) \
+ ,m_xConnection(_rxConnection) \
+ ,m_aPredicateInput( _rxORB, _rxConnection, getParseContext() ) \
+ ,m_bNeedErrorOnCurrent(sal_True) \
//------------------------------------------------------------------------------
@@ -163,7 +163,7 @@ DBG_NAME(OParameterDialog)
{
DBG_UNHANDLED_EXCEPTION();
}
-
+
Construct();
@@ -196,12 +196,12 @@ DBG_NAME(OParameterDialog)
m_aAllParams.SelectEntryPos(0);
LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams);
- if (m_aAllParams.GetEntryCount() == 1)
+ if (m_aAllParams.GetEntryCount() == 1)
{
m_aTravelNext.Enable(sal_False);
}
- if (m_aAllParams.GetEntryCount() > 1)
+ if (m_aAllParams.GetEntryCount() > 1)
{
m_aOKBtn.SetStyle(m_aOKBtn.GetStyle() & ~WB_DEFBUTTON);
m_aTravelNext.SetStyle(m_aTravelNext.GetStyle() | WB_DEFBUTTON);
@@ -243,14 +243,14 @@ DBG_NAME(OParameterDialog)
if (!m_bNeedErrorOnCurrent)
return 1L;
- m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified
+ m_bNeedErrorOnCurrent = sal_False; // will be reset in OnValueModified
::rtl::OUString sName;
- try
- {
- sName = ::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME));
- }
- catch(Exception&)
+ try
+ {
+ sName = ::comphelper::getString(xParamAsSet->getPropertyValue(PROPERTY_NAME));
+ }
+ catch(Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -277,8 +277,8 @@ DBG_NAME(OParameterDialog)
if (&m_aCancelBtn == pButton)
{
// no interpreting of the given values anymore ....
- m_aParam.SetLoseFocusHdl(Link()); // no direct call from the control anymore ...
- m_bNeedErrorOnCurrent = sal_False; // in case of any indirect calls -> no error message
+ m_aParam.SetLoseFocusHdl(Link()); // no direct call from the control anymore ...
+ m_bNeedErrorOnCurrent = sal_False; // in case of any indirect calls -> no error message
m_aCancelBtn.SetClickHdl(Link());
m_aCancelBtn.Click();
}
@@ -286,7 +286,7 @@ DBG_NAME(OParameterDialog)
{
// transfer the current values into the Any
if (LINK(this, OParameterDialog, OnEntrySelected).Call(&m_aAllParams) != 0L)
- { // there was an error interpreting the current text
+ { // there was an error interpreting the current text
m_bNeedErrorOnCurrent = sal_True;
// we're are out of the complex web :) of direct and indirect calls to OnValueLoseFocus now,
// so the next time it is called we need an error message, again ....
@@ -315,7 +315,7 @@ DBG_NAME(OParameterDialog)
{
DBG_UNHANDLED_EXCEPTION();
}
-
+
}
// to close the dialog (which is more code than a simple EndDialog)
m_aOKBtn.SetClickHdl(Link());
@@ -360,7 +360,7 @@ DBG_NAME(OParameterDialog)
{
// do the transformation of the current text
if (LINK(this, OParameterDialog, OnValueLoseFocus).Call(&m_aParam) != 0L)
- { // there was an error interpreting the text
+ { // there was an error interpreting the text
m_aAllParams.SelectEntryPos(m_nCurrentlySelected);
return 1L;
}
@@ -396,7 +396,7 @@ DBG_NAME(OParameterDialog)
// was it the last "not visited yet" entry ?
ConstByteVectorIterator aIter;
- for ( aIter = m_aVisitedParams.begin();
+ for ( aIter = m_aVisitedParams.begin();
aIter < m_aVisitedParams.end();
++aIter
)
@@ -405,10 +405,10 @@ DBG_NAME(OParameterDialog)
break;
}
if (aIter == m_aVisitedParams.end())
- { // yes, there isn't another one -> change the "default button"
+ { // yes, there isn't another one -> change the "default button"
m_aTravelNext.SetStyle(m_aTravelNext.GetStyle() & ~WB_DEFBUTTON);
m_aOKBtn.SetStyle(m_aOKBtn.GetStyle() | WB_DEFBUTTON);
-
+
// set to focus to one of the buttons temporary (with this their "default"-state is really updated)
Window* pOldFocus = Application::GetFocusWindow();
@@ -448,5 +448,5 @@ DBG_NAME(OParameterDialog)
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/paramdialog.hrc b/dbaccess/source/ui/dlg/paramdialog.hrc
index 0b834dd3e7eb..c344ef454c65 100644
--- a/dbaccess/source/ui/dlg/paramdialog.hrc
+++ b/dbaccess/source/ui/dlg/paramdialog.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
@@ -28,19 +28,19 @@
#ifndef _DBAUI_PARAMDIALOG_HRC_
#define _DBAUI_PARAMDIALOG_HRC_
-#define LB_ALLPARAMS 1
-#define FL_PARAMS 2
-#define FT_VALUE 3
-#define ET_PARAM 4
-#define CB_NULLVAL 5
-#define BT_TRAVELNEXT 6
-#define BT_OK 7
-#define BT_CANCEL 8
-#define AB_PREV 9
-#define AB_NEXT 10
+#define LB_ALLPARAMS 1
+#define FL_PARAMS 2
+#define FT_VALUE 3
+#define ET_PARAM 4
+#define CB_NULLVAL 5
+#define BT_TRAVELNEXT 6
+#define BT_OK 7
+#define BT_CANCEL 8
+#define AB_PREV 9
+#define AB_NEXT 10
-#define STR_COULD_NOT_CONVERT_PARAM 1
+#define STR_COULD_NOT_CONVERT_PARAM 1
#endif // _DBAUI_PARAMDIALOG_HRC_
diff --git a/dbaccess/source/ui/dlg/paramdialog.src b/dbaccess/source/ui/dlg/paramdialog.src
index 3993096f8847..c35e395c697c 100644
--- a/dbaccess/source/ui/dlg/paramdialog.src
+++ b/dbaccess/source/ui/dlg/paramdialog.src
@@ -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,8 +32,8 @@
#include "dbu_dlg.hrc"
#endif
-#define LIST_WIDTH 100
-#define LIST_HEIGHT 50
+#define LIST_WIDTH 100
+#define LIST_HEIGHT 50
ModalDialog DLG_PARAMETERS
{
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 96eb49b1c38e..699ab5b7a25a 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -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
@@ -133,26 +133,26 @@ DlgFilterCrit::DlgFilterCrit(Window * pParent,
const Reference< XNameAccess>& _rxCols
)
:ModalDialog( pParent, ModuleRes( DLG_FILTERCRIT ) )
- ,aLB_WHEREFIELD1 ( this, ModuleRes( LB_WHEREFIELD1 ) )
- ,aLB_WHERECOMP1 ( this, ModuleRes( LB_WHERECOMP1 ) )
- ,aET_WHEREVALUE1 ( this, ModuleRes( ET_WHEREVALUE1 ) )
- ,aLB_WHERECOND2 ( this, ModuleRes( LB_WHERECOND2 ) )
- ,aLB_WHEREFIELD2 ( this, ModuleRes( LB_WHEREFIELD2 ) )
- ,aLB_WHERECOMP2 ( this, ModuleRes( LB_WHERECOMP2 ) )
- ,aET_WHEREVALUE2 ( this, ModuleRes( ET_WHEREVALUE2 ) )
- ,aLB_WHERECOND3 ( this, ModuleRes( LB_WHERECOND3 ) )
- ,aLB_WHEREFIELD3 ( this, ModuleRes( LB_WHEREFIELD3 ) )
- ,aLB_WHERECOMP3 ( this, ModuleRes( LB_WHERECOMP3 ) )
- ,aET_WHEREVALUE3 ( this, ModuleRes( ET_WHEREVALUE3 ) )
- ,aFT_WHEREFIELD ( this, ModuleRes( FT_WHEREFIELD ) )
- ,aFT_WHERECOMP ( this, ModuleRes( FT_WHERECOMP ) )
- ,aFT_WHEREVALUE ( this, ModuleRes( FT_WHEREVALUE ) )
- ,aFT_WHEREOPER ( this, ModuleRes( FT_WHEREOPER ) )
+ ,aLB_WHEREFIELD1 ( this, ModuleRes( LB_WHEREFIELD1 ) )
+ ,aLB_WHERECOMP1 ( this, ModuleRes( LB_WHERECOMP1 ) )
+ ,aET_WHEREVALUE1 ( this, ModuleRes( ET_WHEREVALUE1 ) )
+ ,aLB_WHERECOND2 ( this, ModuleRes( LB_WHERECOND2 ) )
+ ,aLB_WHEREFIELD2 ( this, ModuleRes( LB_WHEREFIELD2 ) )
+ ,aLB_WHERECOMP2 ( this, ModuleRes( LB_WHERECOMP2 ) )
+ ,aET_WHEREVALUE2 ( this, ModuleRes( ET_WHEREVALUE2 ) )
+ ,aLB_WHERECOND3 ( this, ModuleRes( LB_WHERECOND3 ) )
+ ,aLB_WHEREFIELD3 ( this, ModuleRes( LB_WHEREFIELD3 ) )
+ ,aLB_WHERECOMP3 ( this, ModuleRes( LB_WHERECOMP3 ) )
+ ,aET_WHEREVALUE3 ( this, ModuleRes( ET_WHEREVALUE3 ) )
+ ,aFT_WHEREFIELD ( this, ModuleRes( FT_WHEREFIELD ) )
+ ,aFT_WHERECOMP ( this, ModuleRes( FT_WHERECOMP ) )
+ ,aFT_WHEREVALUE ( this, ModuleRes( FT_WHEREVALUE ) )
+ ,aFT_WHEREOPER ( this, ModuleRes( FT_WHEREOPER ) )
,aFL_FIELDS ( this, ModuleRes( FL_FIELDS ) )
- ,aBT_OK ( this, ModuleRes( BT_OK ) )
- ,aBT_CANCEL ( this, ModuleRes( BT_CANCEL ) )
- ,aBT_HELP ( this, ModuleRes( BT_HELP ) )
- ,aSTR_NOENTRY ( ModuleRes( STR_NOENTRY ) )
+ ,aBT_OK ( this, ModuleRes( BT_OK ) )
+ ,aBT_CANCEL ( this, ModuleRes( BT_CANCEL ) )
+ ,aBT_HELP ( this, ModuleRes( BT_HELP ) )
+ ,aSTR_NOENTRY ( ModuleRes( STR_NOENTRY ) )
,aSTR_COMPARE_OPERATORS( ModuleRes( STR_COMPARE_OPERATORS ) )
,m_xQueryComposer(_rxComposer)
,m_xColumns( _rxCols )
@@ -266,8 +266,8 @@ DlgFilterCrit::~DlgFilterCrit()
DBG_DTOR(DlgFilterCrit,NULL);
}
-#define LbText(x) ((x).GetSelectEntry())
-#define LbPos(x) ((x).GetSelectEntryPos())
+#define LbText(x) ((x).GetSelectEntry())
+#define LbPos(x) ((x).GetSelectEntryPos())
//------------------------------------------------------------------------------
sal_Int32 DlgFilterCrit::GetOSQLPredicateType( const String& _rSelectedPredicate ) const
@@ -380,7 +380,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
{
if ( xInfo->hasPropertyByName(PROPERTY_TABLENAME) )
{
- xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
+ xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName;
if ( sTableName.getLength() )
{
// properly quote all parts of the table name, so e.g. . becomes "".""
@@ -389,7 +389,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
sTableName = ::dbtools::composeTableName( m_xMetaData, aCatlog, aSchema, aTable, sal_True, ::dbtools::eInDataManipulation );
}
}
- xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name;
+ xColumn->getPropertyValue(PROPERTY_REALNAME) >>= _rFilter.Name;
static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction"));
if ( xInfo->hasPropertyByName(sAgg) )
xColumn->getPropertyValue(sAgg) >>= bHaving;
@@ -399,7 +399,7 @@ sal_Bool DlgFilterCrit::getCondition(const ListBox& _rField,const ListBox& _rCom
}
if ( !bFunction )
{
- const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString();
+ const ::rtl::OUString aQuote = m_xMetaData.is() ? m_xMetaData->getIdentifierQuoteString() : ::rtl::OUString();
_rFilter.Name = ::dbtools::quoteName(aQuote,_rFilter.Name);
if ( sTableName.getLength() )
{
@@ -439,14 +439,14 @@ Reference< XPropertySet > DlgFilterCrit::getColumn( const ::rtl::OUString& _rFie
{
Sequence< ::rtl::OUString> aSeq = xColumns->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)
{
Reference xProp(xColumns->getByName(*pIter),UNO_QUERY);
if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) )
{
::rtl::OUString sRealName;
- xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
+ xProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
if ( sRealName == _rFieldName )
{
if ( m_xColumns.is() && m_xColumns->hasByName( *pIter ) )
@@ -532,7 +532,7 @@ IMPL_LINK( DlgFilterCrit, PredicateLoseFocus, Edit*, _pField )
void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Bool _bOr )
{
DBG_CHKTHIS(DlgFilterCrit,NULL);
- ::rtl::OUString aCondition;
+ ::rtl::OUString aCondition;
_rItem.Value >>= aCondition;
String aStr = aCondition.getStr();
::Replace_SQL_PlaceHolder(aStr);
@@ -544,7 +544,7 @@ void DlgFilterCrit::SetLine( sal_uInt16 nIdx,const PropertyValue& _rItem,sal_Boo
switch(_rItem.Handle)
{
case SQLFilterOperator::EQUAL:
- // aStr.Erase(0,1);
+ // aStr.Erase(0,1);
break;
case SQLFilterOperator::NOT_EQUAL:
aStr.Erase(0,2);
@@ -631,11 +631,11 @@ void DlgFilterCrit::SelectField( ListBox& rBox, const String& rField )
{
DBG_CHKTHIS(DlgFilterCrit,NULL);
sal_uInt16 nCnt = rBox.GetEntryCount();
- // sal_Bool bCase = m_rIterator.TablesAreSensitive();
+ // sal_Bool bCase = m_rIterator.TablesAreSensitive();
for( sal_uInt16 i=0 ; i > aFilter,aHaving;
aFilter.realloc(1);
aHaving.realloc(1);
- // ::rtl::OUString aFilter;
+ // ::rtl::OUString aFilter;
if( LbPos(aLB_WHEREFIELD1) != 0 )
{
@@ -904,13 +904,13 @@ void DlgFilterCrit::BuildWherePart()
void DlgFilterCrit::fillLines(const Sequence >& _aValues)
{
const Sequence* pOrIter = _aValues.getConstArray();
- const Sequence* pOrEnd = pOrIter + _aValues.getLength();
+ const Sequence* pOrEnd = pOrIter + _aValues.getLength();
sal_Bool bOr = sal_True;
for(sal_uInt16 i=0;pOrIter != pOrEnd; ++pOrIter)
{
bOr = sal_True;
- const PropertyValue* pAndIter = pOrIter->getConstArray();
- const PropertyValue* pAndEnd = pAndIter + pOrIter->getLength();
+ const PropertyValue* pAndIter = pOrIter->getConstArray();
+ const PropertyValue* pAndEnd = pAndIter + pOrIter->getLength();
for(;pAndIter != pAndEnd; ++pAndIter)
{
SetLine( i++,*pAndIter,bOr);
diff --git a/dbaccess/source/ui/dlg/queryfilter.hrc b/dbaccess/source/ui/dlg/queryfilter.hrc
index ff2aaaca30d0..9895f222e274 100644
--- a/dbaccess/source/ui/dlg/queryfilter.hrc
+++ b/dbaccess/source/ui/dlg/queryfilter.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
@@ -31,34 +31,34 @@
#include "dbu_dlg.hrc"
#endif
-#define FT_WHEREFIELD 1
-#define FT_WHERECOMP 2
-#define FT_WHEREVALUE 3
-#define FT_WHEREOPER 4
+#define FT_WHEREFIELD 1
+#define FT_WHERECOMP 2
+#define FT_WHEREVALUE 3
+#define FT_WHEREOPER 4
-#define LB_WHEREFIELD1 1
-#define LB_WHERECOMP1 2
-#define LB_WHEREFIELD2 3
-#define LB_WHERECOMP2 4
-#define LB_WHEREFIELD3 5
-#define LB_WHERECOMP3 6
-#define LB_WHERECOND2 7
-#define LB_WHERECOND3 8
+#define LB_WHEREFIELD1 1
+#define LB_WHERECOMP1 2
+#define LB_WHEREFIELD2 3
+#define LB_WHERECOMP2 4
+#define LB_WHEREFIELD3 5
+#define LB_WHERECOMP3 6
+#define LB_WHERECOND2 7
+#define LB_WHERECOND3 8
#define FL_FIELDS 1
-#define ET_WHEREVALUE1 1
-#define ET_WHEREVALUE2 2
-#define ET_WHEREVALUE3 3
+#define ET_WHEREVALUE1 1
+#define ET_WHEREVALUE2 2
+#define ET_WHEREVALUE3 3
-#define STR_NOENTRY 1
-#define STR_NOENTRY2 2
-#define STR_DEFAULT 3
+#define STR_NOENTRY 1
+#define STR_NOENTRY2 2
+#define STR_DEFAULT 3
#define STR_COMPARE_OPERATORS 4
-#define BT_OK 1
-#define BT_CANCEL 2
-#define BT_HELP 3
+#define BT_OK 1
+#define BT_CANCEL 2
+#define BT_HELP 3
#endif // DBAUI_QUERYFILTER_HRC
diff --git a/dbaccess/source/ui/dlg/queryfilter.src b/dbaccess/source/ui/dlg/queryfilter.src
index 2b1ef6e6baf5..fcabfdcb496e 100644
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@ -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
@@ -84,11 +84,11 @@ ModalDialog DLG_FILTERCRIT
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
-// STRLST_AND_OR
+// STRLST_AND_OR
StringList [ en-US ] =
{
- < "AND" ; Default ; > ;
- < "OR" ; Default ; > ;
+ < "AND" ; Default ; > ;
+ < "OR" ; Default ; > ;
};
};
ListBox LB_WHEREFIELD2
@@ -124,11 +124,11 @@ ModalDialog DLG_FILTERCRIT
TabStop = TRUE ;
DropDown = TRUE ;
CurPos = 0 ;
-// STRLST_AND_OR
+// STRLST_AND_OR
StringList [ en-US ] =
{
- < "AND" ; Default ; > ;
- < "OR" ; Default ; > ;
+ < "AND" ; Default ; > ;
+ < "OR" ; Default ; > ;
};
};
ListBox LB_WHEREFIELD3
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 45dea3837d00..ba025ae765e2 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -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
@@ -85,27 +85,27 @@ using namespace ::com::sun::star::beans;
DBG_NAME(DlgOrderCrit)
//------------------------------------------------------------------------------
-DlgOrderCrit::DlgOrderCrit( Window * pParent,
+DlgOrderCrit::DlgOrderCrit( Window * pParent,
const Reference< XConnection>& _rxConnection,
const Reference< XSingleSelectQueryComposer >& _rxComposer,
const Reference< XNameAccess>& _rxCols)
:ModalDialog( pParent, ModuleRes(DLG_ORDERCRIT) )
- ,aLB_ORDERFIELD1( this, ModuleRes( LB_ORDERFIELD1 ) )
- ,aLB_ORDERVALUE1( this, ModuleRes( LB_ORDERVALUE1 ) )
- ,aLB_ORDERFIELD2( this, ModuleRes( LB_ORDERFIELD2 ) )
- ,aLB_ORDERVALUE2( this, ModuleRes( LB_ORDERVALUE2 ) )
- ,aLB_ORDERFIELD3( this, ModuleRes( LB_ORDERFIELD3 ) )
- ,aLB_ORDERVALUE3( this, ModuleRes( LB_ORDERVALUE3 ) )
- ,aFT_ORDERFIELD( this, ModuleRes( FT_ORDERFIELD ) )
- ,aFT_ORDERAFTER1( this, ModuleRes( FT_ORDERAFTER1 ) )
- ,aFT_ORDERAFTER2( this, ModuleRes( FT_ORDERAFTER2 ) )
- ,aFT_ORDEROPER( this, ModuleRes( FT_ORDEROPER ) )
- ,aFT_ORDERDIR( this, ModuleRes( FT_ORDERDIR ) )
- ,aBT_OK( this, ModuleRes( BT_OK ) )
- ,aBT_CANCEL( this, ModuleRes( BT_CANCEL ) )
- ,aBT_HELP( this, ModuleRes( BT_HELP ) )
+ ,aLB_ORDERFIELD1( this, ModuleRes( LB_ORDERFIELD1 ) )
+ ,aLB_ORDERVALUE1( this, ModuleRes( LB_ORDERVALUE1 ) )
+ ,aLB_ORDERFIELD2( this, ModuleRes( LB_ORDERFIELD2 ) )
+ ,aLB_ORDERVALUE2( this, ModuleRes( LB_ORDERVALUE2 ) )
+ ,aLB_ORDERFIELD3( this, ModuleRes( LB_ORDERFIELD3 ) )
+ ,aLB_ORDERVALUE3( this, ModuleRes( LB_ORDERVALUE3 ) )
+ ,aFT_ORDERFIELD( this, ModuleRes( FT_ORDERFIELD ) )
+ ,aFT_ORDERAFTER1( this, ModuleRes( FT_ORDERAFTER1 ) )
+ ,aFT_ORDERAFTER2( this, ModuleRes( FT_ORDERAFTER2 ) )
+ ,aFT_ORDEROPER( this, ModuleRes( FT_ORDEROPER ) )
+ ,aFT_ORDERDIR( this, ModuleRes( FT_ORDERDIR ) )
+ ,aBT_OK( this, ModuleRes( BT_OK ) )
+ ,aBT_CANCEL( this, ModuleRes( BT_CANCEL ) )
+ ,aBT_HELP( this, ModuleRes( BT_HELP ) )
,aFL_ORDER( this, ModuleRes( FL_ORDER ) )
- ,aSTR_NOENTRY( ModuleRes( STR_NOENTRY ) )
+ ,aSTR_NOENTRY( ModuleRes( STR_NOENTRY ) )
,m_xQueryComposer( _rxComposer )
,m_xColumns(_rxCols)
,m_xConnection(_rxConnection)
@@ -181,8 +181,8 @@ DlgOrderCrit::DlgOrderCrit( Window * pParent,
//------------------------------------------------------------------------------
-#define LbText(x) ((x).GetSelectEntry())
-#define LbPos(x) ((x).GetSelectEntryPos())
+#define LbText(x) ((x).GetSelectEntry())
+#define LbPos(x) ((x).GetSelectEntryPos())
//------------------------------------------------------------------------------
DlgOrderCrit::~DlgOrderCrit()
@@ -271,7 +271,7 @@ void DlgOrderCrit::EnableLines()
{
DBG_CHKTHIS(DlgOrderCrit,NULL);
Reference xMetaData = m_xConnection->getMetaData();
- ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString();
+ ::rtl::OUString sQuote = xMetaData.is() ? xMetaData->getIdentifierQuoteString() : ::rtl::OUString();
static const ::rtl::OUString sDESC = ::rtl::OUString::createFromAscii(" DESC ");
static const ::rtl::OUString sASC = ::rtl::OUString::createFromAscii(" ASC ");
@@ -295,7 +295,7 @@ void DlgOrderCrit::EnableLines()
if ( xColumn->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME) )
{
::rtl::OUString sRealName;
- xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
+ xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName;
sName = sRealName;
static ::rtl::OUString sAgg(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction"));
static ::rtl::OUString sFunction(RTL_CONSTASCII_USTRINGPARAM("Function"));
diff --git a/dbaccess/source/ui/dlg/queryorder.hrc b/dbaccess/source/ui/dlg/queryorder.hrc
index 059151ba9a8d..fde41dfc39d9 100644
--- a/dbaccess/source/ui/dlg/queryorder.hrc
+++ b/dbaccess/source/ui/dlg/queryorder.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,26 +32,26 @@
#endif
-#define FT_ORDERFIELD 1
-#define FT_ORDERDIR 3
-#define FT_ORDERAFTER1 4
-#define FT_ORDERAFTER2 5
-#define FT_ORDEROPER 6
+#define FT_ORDERFIELD 1
+#define FT_ORDERDIR 3
+#define FT_ORDERAFTER1 4
+#define FT_ORDERAFTER2 5
+#define FT_ORDEROPER 6
-#define LB_ORDERFIELD1 1
-#define LB_ORDERFIELD2 2
-#define LB_ORDERFIELD3 3
-#define LB_ORDERVALUE1 4
-#define LB_ORDERVALUE2 5
-#define LB_ORDERVALUE3 6
+#define LB_ORDERFIELD1 1
+#define LB_ORDERFIELD2 2
+#define LB_ORDERFIELD3 3
+#define LB_ORDERVALUE1 4
+#define LB_ORDERVALUE2 5
+#define LB_ORDERVALUE3 6
#define FL_ORDER 1
-#define BT_OK 1
-#define BT_CANCEL 2
-#define BT_HELP 3
+#define BT_OK 1
+#define BT_CANCEL 2
+#define BT_HELP 3
-#define STR_NOENTRY 1
+#define STR_NOENTRY 1
#endif // DBAUI_QUERYORDER_HRC
diff --git a/dbaccess/source/ui/dlg/queryorder.src b/dbaccess/source/ui/dlg/queryorder.src
index 2f2f85a797a0..2927be9d838a 100644
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ b/dbaccess/source/ui/dlg/queryorder.src
@@ -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/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index f7600fd137ed..38cc726ffb98 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -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 @@
#include "moduledbu.hxx"
#endif
-#define BUTTONID_MORE BUTTONID_RETRY + 1
+#define BUTTONID_MORE BUTTONID_RETRY + 1
#define DIALOG_WIDTH 220
#define OUTER_MARGIN 6
@@ -157,7 +157,7 @@ namespace
:m_label( ModuleRes( _labelResourceID ) )
{
}
-
+
virtual String getLabel() const
{
return m_label;
@@ -358,11 +358,11 @@ namespace
class OExceptionChainDialog : public ModalDialog
{
FixedLine m_aFrame;
- FixedText m_aListLabel;
- SvTreeListBox m_aExceptionList;
- FixedText m_aDescLabel;
- MultiLineEdit m_aExceptionText;
- OKButton m_aOK;
+ FixedText m_aListLabel;
+ SvTreeListBox m_aExceptionList;
+ FixedText m_aDescLabel;
+ MultiLineEdit m_aExceptionText;
+ OKButton m_aOK;
String m_sStatusLabel;
String m_sErrorCodeLabel;
@@ -381,12 +381,12 @@ DBG_NAME(OExceptionChainDialog)
//------------------------------------------------------------------------------
OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDisplayChain& _rExceptions )
:ModalDialog(pParent, ModuleRes(DLG_SQLEXCEPTIONCHAIN))
- ,m_aFrame (this, ModuleRes(FL_DETAILS))
- ,m_aListLabel (this, ModuleRes(FT_ERRORLIST))
- ,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST))
- ,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION))
- ,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION))
- ,m_aOK (this, ModuleRes(PB_OK))
+ ,m_aFrame (this, ModuleRes(FL_DETAILS))
+ ,m_aListLabel (this, ModuleRes(FT_ERRORLIST))
+ ,m_aExceptionList (this, ModuleRes(CTL_ERRORLIST))
+ ,m_aDescLabel (this, ModuleRes(FT_DESCRIPTION))
+ ,m_aExceptionText (this, ModuleRes(ME_DESCRIPTION))
+ ,m_aOK (this, ModuleRes(PB_OK))
,m_aExceptions( _rExceptions )
{
DBG_CTOR(OExceptionChainDialog,NULL);
@@ -536,11 +536,11 @@ void OSQLMessageBox::impl_positionControls()
{
OSL_PRECOND( !m_pImpl->aDisplayInfo.empty(), "OSQLMessageBox::impl_positionControls: nothing to display at all?" );
-
+
if ( m_pImpl->aDisplayInfo.empty() )
return;
const ExceptionDisplayInfo* pSecondInfo = NULL;
-
+
const ExceptionDisplayInfo& rFirstInfo = *m_pImpl->aDisplayInfo.begin();
if ( m_pImpl->aDisplayInfo.size() > 1 )
pSecondInfo = &m_pImpl->aDisplayInfo[1];
@@ -812,6 +812,6 @@ OSQLWarningBox::OSQLWarningBox( Window* _pParent, const UniString& _rMessage, Wi
}
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/sqlmessage.hrc b/dbaccess/source/ui/dlg/sqlmessage.hrc
index 76f722a1b08f..b8267bafcb7a 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.hrc
+++ b/dbaccess/source/ui/dlg/sqlmessage.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
@@ -28,23 +28,23 @@
#ifndef _DBAUI_SQLMESSAGE_HRC_
#define _DBAUI_SQLMESSAGE_HRC_
-#define FT_ERRORLIST 1
-#define FT_DESCRIPTION 2
+#define FT_ERRORLIST 1
+#define FT_DESCRIPTION 2
-#define ED_TEXT 1
+#define ED_TEXT 1
#define FL_DATA 1
-#define FL_DETAILS 1
+#define FL_DETAILS 1
-#define PB_OK 1
-#define PB_CANCEL 2
+#define PB_OK 1
+#define PB_CANCEL 2
-#define CTL_ERRORLIST 1
+#define CTL_ERRORLIST 1
-#define ME_DESCRIPTION 1
+#define ME_DESCRIPTION 1
-#define STR_EXCEPTION_STATUS 1
-#define STR_EXCEPTION_ERRORCODE 2
+#define STR_EXCEPTION_STATUS 1
+#define STR_EXCEPTION_ERRORCODE 2
#endif // _DBAUI_SQLMESSAGE_HRC_
diff --git a/dbaccess/source/ui/dlg/sqlmessage.src b/dbaccess/source/ui/dlg/sqlmessage.src
index af3d53f785dd..fe368f1824d5 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.src
+++ b/dbaccess/source/ui/dlg/sqlmessage.src
@@ -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/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index a48b08de740d..4567b46a92fd 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -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
@@ -46,55 +46,55 @@
#ifndef _DBAUI_DATASOURCECONNECTOR_HXX_
#include "datasourceconnector.hxx"
#endif
-#ifndef _COMPHELPER_TYPES_HXX_
+#ifndef _COMPHELPER_TYPES_HXX_
#include
#endif
#ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include
#endif
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
+#ifndef _DBHELPER_DBEXCEPTION_HXX_
#include
#endif
#ifndef _DBAUI_STRINGLISTITEM_HXX_
#include "stringlistitem.hxx"
#endif
-#ifndef _SFXENUMITEM_HXX
+#ifndef _SFXENUMITEM_HXX
#include
#endif
-#ifndef _SFXSTRITEM_HXX
+#ifndef _SFXSTRITEM_HXX
#include
#endif
#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
#endif
-#ifndef _SV_SVAPP_HXX
+#ifndef _SV_SVAPP_HXX
#include
#endif
-#ifndef _SV_WAITOBJ_HXX
+#ifndef _SV_WAITOBJ_HXX
#include
#endif
#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
#include
#endif
-#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
+#ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_
#include
#endif
-#ifndef _COM_SUN_STAR_SDBCX_XAPPEND_HPP_
+#ifndef _COM_SUN_STAR_SDBCX_XAPPEND_HPP_
#include
#endif
#ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE_HPP_
#include
#endif
-#ifndef _COM_SUN_STAR_SDBCX_XDROP_HPP_
+#ifndef _COM_SUN_STAR_SDBCX_XDROP_HPP_
#include
#endif
-#ifndef _COM_SUN_STAR_SDBCX_XDATADEFINITIONSUPPLIER_HPP_
+#ifndef _COM_SUN_STAR_SDBCX_XDATADEFINITIONSUPPLIER_HPP_
#include
#endif
#ifndef _DBAUI_SQLMESSAGE_HXX_
#include "sqlmessage.hxx"
#endif
-#ifndef _SV_MSGBOX_HXX
+#ifndef _SV_MSGBOX_HXX
#include
#endif
#ifndef _DBA_DBACCESS_HELPID_HRC_
@@ -103,7 +103,7 @@
#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
#endif
-#ifndef _VOS_MUTEX_HXX_
+#ifndef _VOS_MUTEX_HXX_
#include
#endif
#ifndef _SVTOOLS_IMGDEF_HXX
@@ -147,11 +147,11 @@ DBG_NAME(OTableSubscriptionPage)
//------------------------------------------------------------------------
OTableSubscriptionPage::OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs,OTableSubscriptionDialog* _pTablesDlg )
:OGenericAdministrationPage( pParent, ModuleRes(PAGE_TABLESUBSCRIPTION), _rCoreAttrs )
- ,m_aTables (this, ModuleRes(FL_SEPARATOR1))
- ,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True)
- ,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION))
- ,m_bCheckedAll ( sal_False )
- ,m_bCatalogAtStart ( sal_True )
+ ,m_aTables (this, ModuleRes(FL_SEPARATOR1))
+ ,m_aTablesList (this, NULL,ModuleRes(CTL_TABLESUBSCRIPTION),sal_True)
+ ,m_aExplanation (this, ModuleRes(FT_FILTER_EXPLANATION))
+ ,m_bCheckedAll ( sal_False )
+ ,m_bCatalogAtStart ( sal_True )
,m_pTablesDlg(_pTablesDlg)
{
DBG_CTOR(OTableSubscriptionPage,NULL);
@@ -201,9 +201,9 @@ DBG_NAME(OTableSubscriptionPage)
{
OGenericAdministrationPage::DataChanged( rDCEvt );
- if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
- ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) &&
- ( rDCEvt.GetFlags() & SETTINGS_STYLE ))
+ if ((( rDCEvt.GetType() == DATACHANGED_SETTINGS ) ||
+ ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) &&
+ ( rDCEvt.GetFlags() & SETTINGS_STYLE ))
{
// Check if we need to get new images for normal/high contrast mode
m_aTablesList.notifyHiContrastChanged();
@@ -294,13 +294,13 @@ DBG_NAME(OTableSubscriptionPage)
void OTableSubscriptionPage::implCompleteTablesCheck( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter )
{
if (!_rTableFilter.getLength())
- { // no tables visible
+ { // no tables visible
CheckAll(sal_False);
}
else
{
if ((1 == _rTableFilter.getLength()) && _rTableFilter[0].equalsAsciiL("%", 1))
- { // all tables visible
+ { // all tables visible
CheckAll(sal_True);
}
else
@@ -321,7 +321,7 @@ DBG_NAME(OTableSubscriptionPage)
String sDSName = pNameItem->GetValue();
if (bValid && sDSName.Len() && !m_xCurrentConnection.is() )
- { // get the current table list from the connection for the current settings
+ { // get the current table list from the connection for the current settings
// the PropertyValues for the current dialog settings
Sequence< PropertyValue > aConnectionParams;
@@ -374,7 +374,7 @@ DBG_NAME(OTableSubscriptionPage)
Any aTableTypeFilter = xProp->getPropertyValue(PROPERTY_TABLETYPEFILTER);
Reference xModi(getDataSourceOrModel(xProp),UNO_QUERY);
- sal_Bool bModified = ( xModi.is() && xModi->isModified() );
+ sal_Bool bModified = ( xModi.is() && xModi->isModified() );
Sequence< ::rtl::OUString > aNewTableFilter(1);
aNewTableFilter[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("%"));
@@ -391,7 +391,7 @@ DBG_NAME(OTableSubscriptionPage)
xModi->setModified(sal_False);
}
-
+
if ( m_xCurrentConnection.is() )
{
m_aTablesList.UpdateTableList( m_xCurrentConnection );
@@ -423,8 +423,8 @@ DBG_NAME(OTableSubscriptionPage)
else
{
// in addition, we need some infos about the connection used
- m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default)
- m_bCatalogAtStart = sal_True; // (default)
+ m_sCatalogSeparator = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".")); // (default)
+ m_bCatalogAtStart = sal_True; // (default)
try
{
Reference< XDatabaseMetaData > xMeta;
@@ -520,7 +520,7 @@ DBG_NAME(OTableSubscriptionPage)
String sLeftText = pLeftTextItem->GetText();
String sRightText = pRightTextItem->GetText();
- sal_Int32 nCompareResult = 0; // equal by default
+ sal_Int32 nCompareResult = 0; // equal by default
if (m_xCollator.is())
{
@@ -553,13 +553,13 @@ DBG_NAME(OTableSubscriptionPage)
SvLBoxEntry* pEntry = m_aTablesList.GetModel()->Next(const_cast(pAllObjectsEntry));
while(pEntry)
{
- sal_Bool bCatalogWildcard = sal_False;
- sal_Bool bSchemaWildcard = sal_False;
+ sal_Bool bCatalogWildcard = sal_False;
+ sal_Bool bSchemaWildcard = sal_False;
SvLBoxEntry* pSchema = NULL;
SvLBoxEntry* pCatalog = NULL;
if (m_aTablesList.GetCheckButtonState(pEntry) == SV_BUTTON_CHECKED && !m_aTablesList.GetModel()->HasChilds(pEntry))
- { // checked and a leaf, which means it's no catalog, no schema, but a real table
+ { // checked and a leaf, which means it's no catalog, no schema, but a real table
::rtl::OUString sCatalog;
if(m_aTablesList.GetModel()->HasParent(pEntry))
{
@@ -569,7 +569,7 @@ DBG_NAME(OTableSubscriptionPage)
pSchema = NULL;
if (pSchema)
- { // it's a real schema entry, not the "all objects" root
+ { // it's a real schema entry, not the "all objects" root
if(m_aTablesList.GetModel()->HasParent(pSchema))
{
pCatalog = m_aTablesList.GetModel()->GetParent(pSchema);
@@ -578,7 +578,7 @@ DBG_NAME(OTableSubscriptionPage)
pCatalog = NULL;
if (pCatalog)
- { // it's a real catalog entry, not the "all objects" root
+ { // it's a real catalog entry, not the "all objects" root
bCatalogWildcard = m_aTablesList.isWildcardChecked(pCatalog);
if (m_bCatalogAtStart)
{
@@ -659,7 +659,7 @@ DBG_NAME(OTableSubscriptionPage)
/////////////////////////////////////////////////////////////////////////
// create the output string which contains all the table names
if ( m_xCurrentConnection.is() )
- { // collect the table filter data only if we have a connection - else no tables are displayed at all
+ { // collect the table filter data only if we have a connection - else no tables are displayed at all
Sequence< ::rtl::OUString > aTableFilter;
if (m_aTablesList.isWildcardChecked(m_aTablesList.getAllObjectsEntry()))
{
@@ -689,6 +689,6 @@ DBG_NAME(OTableSubscriptionPage)
}
// -----------------------------------------------------------------------
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 0e7f72bd5c93..7b9f33dd83cc 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -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
@@ -64,34 +64,34 @@ namespace dbaui
:public OGenericAdministrationPage
{
private:
- FixedLine m_aTables;
- OTableTreeListBox m_aTablesList;
- FixedText m_aExplanation;
+ FixedLine m_aTables;
+ OTableTreeListBox m_aTablesList;
+ FixedText m_aExplanation;
- ::rtl::OUString m_sCatalogSeparator;
- sal_Bool m_bCheckedAll : 1;
- sal_Bool m_bCatalogAtStart : 1;
+ ::rtl::OUString m_sCatalogSeparator;
+ sal_Bool m_bCheckedAll : 1;
+ sal_Bool m_bCatalogAtStart : 1;
- ::osl::Mutex m_aNotifierMutex;
+ ::osl::Mutex m_aNotifierMutex;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >
- m_xCurrentConnection; /// valid as long as the page is active
+ m_xCurrentConnection; /// valid as long as the page is active
::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCollator >
m_xCollator;
OTableSubscriptionDialog* m_pTablesDlg;
public:
- virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs);
- virtual int DeactivatePage(SfxItemSet* _pSet);
+ virtual BOOL FillItemSet(SfxItemSet& _rCoreAttrs);
+ virtual int DeactivatePage(SfxItemSet* _pSet);
using OGenericAdministrationPage::DeactivatePage;
- virtual void StateChanged( StateChangedType nStateChange );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
+ virtual void StateChanged( StateChangedType nStateChange );
+ virtual void DataChanged( const DataChangedEvent& rDCEvt );
/** will be called when the controls need to be resized.
*/
- virtual void resizeControls(const Size& _rDiff);
+ virtual void resizeControls(const Size& _rDiff);
OTableSubscriptionPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg);
virtual ~OTableSubscriptionPage();
@@ -104,9 +104,9 @@ namespace dbaui
DECL_LINK( OnTreeEntryChecked, Control* );
private:
+
-
- /** check the tables in m_aTablesList according to _rTables
+ /** check the tables in m_aTablesList according to _rTables
*/
void implCheckTables(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTables);
@@ -128,7 +128,7 @@ namespace dbaui
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // _DBAUI_TABLESPAGE_HXX_
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index d0276d7cd20d..a4d63b0a86b5 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -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/ui/dlg/textconnectionsettings.src b/dbaccess/source/ui/dlg/textconnectionsettings.src
index cca76e7f65a3..f285199c54ba 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.src
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.src
@@ -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/ui/imagelists/dbimagelists.src b/dbaccess/source/ui/imagelists/dbimagelists.src
index 2e2a64d87448..c579bc1b7323 100644
--- a/dbaccess/source/ui/imagelists/dbimagelists.src
+++ b/dbaccess/source/ui/imagelists/dbimagelists.src
@@ -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/ui/inc/AccessibleBaseIFace.hxx b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx
index eb2bb5dcd031..0ec25a73f77a 100644
--- a/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx
+++ b/dbaccess/source/ui/inc/AccessibleBaseIFace.hxx
@@ -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
@@ -27,26 +27,26 @@
#ifndef DBAUI_ACCESSIBLE_HELPER_IFACE_HXX
#define DBAUI_ACCESSIBLE_HELPER_IFACE_HXX
-#ifndef _SAL_TYPES_H_
+#ifndef _SAL_TYPES_H_
#include
#endif
namespace dbaui
{
- class SAL_NO_VTABLE IAccessibleHelper
+ class SAL_NO_VTABLE IAccessibleHelper
{
protected:
/** isEditable returns the current editable state
- @return true if it is editable otherwise false
+ @return true if it is editable otherwise false
*/
virtual sal_Bool isEditable() const = 0;
public:
/** notifies all listeners that this object has changed
- @param _nEventId the event id
- @param _aOldValue the old value
- @param _aNewValue the new value
+ @param _nEventId the event id
+ @param _aOldValue the old value
+ @param _aNewValue the new value
*/
- virtual void notifyAccessibleEvent( sal_Int16 _nEventId,
+ virtual void notifyAccessibleEvent( sal_Int16 _nEventId,
const ::com::sun::star::uno::Any& _aOldValue,
const ::com::sun::star::uno::Any& _aNewValue) = 0;
};
diff --git a/dbaccess/source/ui/inc/AppElementType.hxx b/dbaccess/source/ui/inc/AppElementType.hxx
index d615fa034692..5922b68732da 100644
--- a/dbaccess/source/ui/inc/AppElementType.hxx
+++ b/dbaccess/source/ui/inc/AppElementType.hxx
@@ -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
@@ -36,20 +36,20 @@ namespace dbaui
enum ElementType
{
- E_TABLE = ::com::sun::star::sdb::application::DatabaseObject::TABLE,
- E_QUERY = ::com::sun::star::sdb::application::DatabaseObject::QUERY,
- E_FORM = ::com::sun::star::sdb::application::DatabaseObject::FORM,
- E_REPORT = ::com::sun::star::sdb::application::DatabaseObject::REPORT,
+ E_TABLE = ::com::sun::star::sdb::application::DatabaseObject::TABLE,
+ E_QUERY = ::com::sun::star::sdb::application::DatabaseObject::QUERY,
+ E_FORM = ::com::sun::star::sdb::application::DatabaseObject::FORM,
+ E_REPORT = ::com::sun::star::sdb::application::DatabaseObject::REPORT,
- E_NONE = 4,
+ E_NONE = 4,
E_ELEMENT_TYPE_COUNT = E_NONE
};
enum PreviewMode
{
- E_PREVIEWNONE = 0,
- E_DOCUMENT = 1,
- E_DOCUMENTINFO = 2
+ E_PREVIEWNONE = 0,
+ E_DOCUMENT = 1,
+ E_DOCUMENTINFO = 2
};
enum ElementOpenMode
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index 1790f5dc1f4a..cf265e2fe3dc 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -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
@@ -54,24 +54,24 @@ namespace dbaui
/* this class allows to browse through the collection of forms and reports
*/
class OCollectionView : public ModalDialog
- {
- FixedText m_aFTCurrentPath;
- ImageButton m_aNewFolder;
- ImageButton m_aUp;
- SvtFileView m_aView;
- FixedText m_aFTName;
- Edit m_aName;
- FixedLine m_aFL;
- PushButton m_aPB_OK;
- CancelButton m_aPB_CANCEL;
- HelpButton m_aPB_HELP;
- String m_sPath;
- ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
- Size m_aDlgSize;
- Size m_a6Size;
- sal_Int32 m_nFixDeltaHeight;
- sal_Bool m_bCreateForm;
+ {
+ FixedText m_aFTCurrentPath;
+ ImageButton m_aNewFolder;
+ ImageButton m_aUp;
+ SvtFileView m_aView;
+ FixedText m_aFTName;
+ Edit m_aName;
+ FixedLine m_aFL;
+ PushButton m_aPB_OK;
+ CancelButton m_aPB_CANCEL;
+ HelpButton m_aPB_HELP;
+ String m_sPath;
+ ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent> m_xContent;
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB;
+ Size m_aDlgSize;
+ Size m_a6Size;
+ sal_Int32 m_nFixDeltaHeight;
+ sal_Bool m_bCreateForm;
DECL_LINK(Up_Click,PushButton*);
DECL_LINK(NewFolder_Click,PushButton*);
@@ -91,7 +91,7 @@ namespace dbaui
::rtl::OUString getName() const;
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx
index 0035c1480d1c..de21329c19eb 100644
--- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx
+++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx
@@ -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
@@ -49,28 +49,28 @@ namespace dbaui
// =============================================================================================
class OColumnControlWindow : public OFieldDescControl
{
- ::com::sun::star::lang::Locale m_aLocale;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB;
- ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
- mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier
+ ::com::sun::star::lang::Locale m_aLocale;
+ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> m_xORB;
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection;
+ mutable ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > m_xFormatter; // a number formatter working with the connection's NumberFormatsSupplier
- OTypeInfoMap m_aDestTypeInfo;
+ OTypeInfoMap m_aDestTypeInfo;
::std::vector m_aDestTypeInfoIndex;
- mutable TOTypeInfoSP m_pTypeInfo; // default type
- String m_sTypeNames; // these type names are the ones out of the resource file
- ::rtl::OUString m_sAutoIncrementValue;
- sal_Bool m_bAutoIncrementEnabled;
+ mutable TOTypeInfoSP m_pTypeInfo; // default type
+ String m_sTypeNames; // these type names are the ones out of the resource file
+ ::rtl::OUString m_sAutoIncrementValue;
+ sal_Bool m_bAutoIncrementEnabled;
protected:
- virtual void ActivateAggregate( EControlType eType );
- virtual void DeactivateAggregate( EControlType eType );
+ virtual void ActivateAggregate( EControlType eType );
+ virtual void DeactivateAggregate( EControlType eType );
- virtual ::com::sun::star::lang::Locale GetLocale() const;
+ virtual ::com::sun::star::lang::Locale GetLocale() const;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > GetFormatter() const;
- virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos);
- virtual sal_Bool isAutoIncrementValueEnabled() const;
- virtual ::rtl::OUString getAutoIncrementValue() const;
- virtual void CellModified(long nRow, USHORT nColId );
+ virtual TOTypeInfoSP getTypeInfo(sal_Int32 _nPos);
+ virtual sal_Bool isAutoIncrementValueEnabled() const;
+ virtual ::rtl::OUString getAutoIncrementValue() const;
+ virtual void CellModified(long nRow, USHORT nColId );
public:
OColumnControlWindow(Window* pParent
@@ -81,10 +81,10 @@ namespace dbaui
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection();
- virtual const OTypeInfoMap* getTypeInfo() const;
+ virtual const OTypeInfoMap* getTypeInfo() const;
TOTypeInfoSP getDefaultTyp() const;
};
//.........................................................................
-} // namespace dbaui
+} // namespace dbaui
//.........................................................................
#endif // DBAUI_COLUMNCONTROLWINDOW_HXX
diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx
index 9e348297d13c..28a3d4a6ef92 100644
--- a/dbaccess/source/ui/inc/ConnectionLine.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLine.hxx
@@ -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,10 +43,10 @@ namespace dbaui
{
//==================================================================
- // ConnData ---------->* ConnLineData
- // ^1 ^1
- // | |
- // Conn ---------->* ConnLine
+ // ConnData ---------->* ConnLineData
+ // ^1 ^1
+ // | |
+ // Conn ---------->* ConnLine
//==================================================================
/*
@@ -55,14 +55,14 @@ namespace dbaui
class OConnectionLineData;
class OTableConnection;
class OTableWindow;
- class OConnectionLine
+ class OConnectionLine
{
- OTableConnection* m_pTabConn;
- OConnectionLineDataRef m_pData;
+ OTableConnection* m_pTabConn;
+ OConnectionLineDataRef m_pData;
- Point m_aSourceConnPos,
+ Point m_aSourceConnPos,
m_aDestConnPos;
- Point m_aSourceDescrLinePos,
+ Point m_aSourceDescrLinePos,
m_aDestDescrLinePos;
public:
OConnectionLine( OTableConnection* pConn, OConnectionLineDataRef pLineData );
@@ -71,25 +71,25 @@ namespace dbaui
virtual OConnectionLine& operator=( const OConnectionLine& rLine );
- Rectangle GetBoundingRect();
- BOOL RecalcLine();
- void Draw( OutputDevice* pOutDev );
- bool CheckHit( const Point& rMousePos ) const;
- String GetSourceFieldName() const { return m_pData->GetSourceFieldName(); }
- String GetDestFieldName() const { return m_pData->GetDestFieldName(); }
+ Rectangle GetBoundingRect();
+ BOOL RecalcLine();
+ void Draw( OutputDevice* pOutDev );
+ bool CheckHit( const Point& rMousePos ) const;
+ String GetSourceFieldName() const { return m_pData->GetSourceFieldName(); }
+ String GetDestFieldName() const { return m_pData->GetDestFieldName(); }
- BOOL IsValid() const;
+ BOOL IsValid() const;
- Rectangle GetSourceTextPos() const;
- Rectangle GetDestTextPos() const;
+ Rectangle GetSourceTextPos() const;
+ Rectangle GetDestTextPos() const;
- OConnectionLineDataRef GetData() const { return m_pData; }
+ OConnectionLineDataRef GetData() const { return m_pData; }
- Point getMidPoint() const;
+ Point getMidPoint() const;
};
/// unary_function Functor object for class OConnectionLine returntype is void
/// draws a connectionline object on outputdevice
- struct TConnectionLineDrawFunctor : ::std::unary_function
+ struct TConnectionLineDrawFunctor : ::std::unary_function
{
OutputDevice* pDevice;
TConnectionLineDrawFunctor(OutputDevice* _pDevice)
@@ -103,9 +103,9 @@ namespace dbaui
};
/// binary_function Functor object for class OConnectionLine returntype is bool
/// checks if the point is on connectionline
- struct TConnectionLineCheckHitFunctor : ::std::binary_function
+ struct TConnectionLineCheckHitFunctor : ::std::binary_function
{
- inline bool operator()(const OConnectionLine* lhs,const Point& rhs) const
+ inline bool operator()(const OConnectionLine* lhs,const Point& rhs) const
{
return lhs->CheckHit(rhs);
}
diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
index 14fdbfa6d325..3b6ba52e04f3 100644
--- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
@@ -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
@@ -46,17 +46,17 @@ namespace dbaui
/** the class OConnectionLineAccess represents the accessible object for the connection between two table windows
like they are used in the QueryDesign and the RelationDesign
*/
- class OConnectionLineAccess : public VCLXAccessibleComponent
- , public OConnectionLineAccess_BASE
+ class OConnectionLineAccess : public VCLXAccessibleComponent
+ , public OConnectionLineAccess_BASE
{
- const OTableConnection* m_pLine; // the window which I should give accessibility to
+ const OTableConnection* m_pLine; // the window which I should give accessibility to
protected:
/** this function is called upon disposing the component
*/
virtual void SAL_CALL disposing();
/** isEditable returns the current editable state
- @return true if it is editable otherwise false
+ @return true if it is editable otherwise false
*/
virtual sal_Bool isEditable() const;
public:
@@ -80,7 +80,7 @@ namespace dbaui
static ::rtl::OUString getImplementationName_Static(void) throw( com::sun::star::uno::RuntimeException );
// XServiceInfo
virtual ::rtl::OUString SAL_CALL getImplementationName() throw(com::sun::star::uno::RuntimeException);
-
+
// XAccessible
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx
index 0a8d145bd92b..995359c1de33 100644
--- a/dbaccess/source/ui/inc/ConnectionLineData.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx
@@ -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
@@ -30,7 +30,7 @@
#ifndef DBAUI_ENUMTYPES_HXX
#include "QEnumTypes.hxx"
#endif
-#ifndef _VOS_REFERNCE_HXX_
+#ifndef _VOS_REFERNCE_HXX_
#include
#endif
#include
@@ -42,7 +42,7 @@
#ifndef DBAUI_REFFUNCTOR_HXX
#include "RefFunctor.hxx"
#endif
-#ifndef _RTL_USTRING_HXX_
+#ifndef _RTL_USTRING_HXX_
#include
#endif
@@ -50,10 +50,10 @@ namespace dbaui
{
//==================================================================
- // ConnData ---------->* ConnLineData
- // ^1 ^1
- // | |
- // Conn ---------->* ConnLine
+ // ConnData ---------->* ConnLineData
+ // ^1 ^1
+ // | |
+ // Conn ---------->* ConnLine
//==================================================================
@@ -75,23 +75,23 @@ namespace dbaui
OConnectionLineData();
OConnectionLineData( const ::rtl::OUString& rSourceFieldName, const ::rtl::OUString& rDestFieldName );
OConnectionLineData( const OConnectionLineData& rConnLineData );
-
+
// eine Kopie der eigenen Instanz liefern (das ist mir irgendwie angenehmer als ein virtueller Zuweisungsoperator)
void CopyFrom(const OConnectionLineData& rSource);
// Memberzugriff (schreiben)
- void SetFieldName(EConnectionSide nWhich, const ::rtl::OUString& strFieldName)
- {
- if (nWhich==JTCS_FROM)
- m_aSourceFieldName = strFieldName;
- else
- m_aDestFieldName = strFieldName;
+ void SetFieldName(EConnectionSide nWhich, const ::rtl::OUString& strFieldName)
+ {
+ if (nWhich==JTCS_FROM)
+ m_aSourceFieldName = strFieldName;
+ else
+ m_aDestFieldName = strFieldName;
}
void SetSourceFieldName( const ::rtl::OUString& rSourceFieldName){ SetFieldName(JTCS_FROM, rSourceFieldName); }
void SetDestFieldName( const ::rtl::OUString& rDestFieldName ){ SetFieldName(JTCS_TO, rDestFieldName); }
inline bool clearSourceFieldName() { SetSourceFieldName(::rtl::OUString()); return true;}
- inline bool clearDestFieldName() { SetDestFieldName(::rtl::OUString()); return true;}
+ inline bool clearDestFieldName() { SetDestFieldName(::rtl::OUString()); return true;}
// Memberzugriff (lesen)
::rtl::OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; }
@@ -104,8 +104,8 @@ namespace dbaui
//-------------------------------------------------------------------------
//------------------------------------------------------------------
- typedef ::vos::ORef< OConnectionLineData > OConnectionLineDataRef;
- typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec;
+ typedef ::vos::ORef< OConnectionLineData > OConnectionLineDataRef;
+ typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec;
}
#endif // DBAUI_CONNECTIONLINEDATA_HXX
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index de320d363173..a168df79e79c 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -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
@@ -45,7 +45,7 @@
#include "IUpdateHelper.hxx"
#include "WTypeSelect.hxx"
-namespace com { namespace sun { namespace star {
+namespace com { namespace sun { namespace star {
namespace awt{
struct FontDescriptor;
}
@@ -68,26 +68,26 @@ namespace dbaui
{
public:
DECLARE_STL_MAP(::rtl::OUString,OFieldDescription*,::comphelper::UStringMixLess,TColumns);
- typedef ::std::vector TColumnVector;
- typedef ::std::vector< ::std::pair > TPositions;
+ typedef ::std::vector TColumnVector;
+ typedef ::std::vector< ::std::pair > TPositions;
protected:
- TPositions m_vColumns; // Welche Spalten "ubernommen werden sollen
- ::std::vector m_vColumnTypes; // FeldTypen f"ur schnelleren Zugriff
- ::std::vector