[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 427 commits - dbaccess/inc dbaccess/prj dbaccess/qa dbaccess/source dbaccess/util reportdesign/inc reportdesign/prj reportdesign/qa reportdesign/source reportdesign/util
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Mar 6 20:04:32 PST 2011
dbaccess/inc/dbaccess_helpid.hrc | 2
dbaccess/inc/dbaccess_slotid.hrc | 3
dbaccess/inc/genericcontroller.hxx | 2
dbaccess/prj/build.lst | 7
dbaccess/prj/d.lst | 7
dbaccess/qa/complex/dbaccess/ApplicationController.java | 49
dbaccess/qa/complex/dbaccess/Beamer.java | 126 +-
dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java | 24
dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 58
dbaccess/qa/complex/dbaccess/DataSource.java | 76 -
dbaccess/qa/complex/dbaccess/DatabaseApplication.java | 11
dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 261 ++--
dbaccess/qa/complex/dbaccess/Parser.java | 59 -
dbaccess/qa/complex/dbaccess/PropertyBag.java | 130 +-
dbaccess/qa/complex/dbaccess/Query.java | 52
dbaccess/qa/complex/dbaccess/QueryInQuery.java | 72 -
dbaccess/qa/complex/dbaccess/RowSet.java | 216 +--
dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java | 136 +-
dbaccess/qa/complex/dbaccess/TestCase.java | 65 -
dbaccess/qa/complex/dbaccess/UISettings.java | 58
dbaccess/qa/complex/dbaccess/makefile.mk | 143 +-
dbaccess/source/core/api/CRowSetColumn.cxx | 12
dbaccess/source/core/api/CRowSetColumn.hxx | 3
dbaccess/source/core/api/CRowSetDataColumn.cxx | 10
dbaccess/source/core/api/CacheSet.cxx | 5
dbaccess/source/core/api/KeySet.cxx | 15
dbaccess/source/core/api/KeySet.hxx | 1
dbaccess/source/core/api/OptimisticSet.cxx | 1
dbaccess/source/core/api/RowSet.cxx | 8
dbaccess/source/core/api/RowSetBase.cxx | 4
dbaccess/source/core/api/RowSetCache.cxx | 13
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 1
dbaccess/source/core/api/datasettings.cxx | 1
dbaccess/source/core/api/definitioncolumn.cxx | 10
dbaccess/source/core/api/querycomposer.cxx | 3
dbaccess/source/core/dataaccess/connection.cxx | 1
dbaccess/source/core/dataaccess/databasecontext.cxx | 12
dbaccess/source/core/dataaccess/databasedocument.cxx | 2
dbaccess/source/core/dataaccess/datasource.cxx | 1
dbaccess/source/core/inc/core_resource.hrc | 22
dbaccess/source/core/misc/services.cxx | 22
dbaccess/source/core/resource/strings.src | 1
dbaccess/source/ext/adabas/Acomponentmodule.cxx | 48
dbaccess/source/ext/adabas/Acomponentmodule.hxx | 15
dbaccess/source/ext/adabas/Aservices.cxx | 21
dbaccess/source/ext/adabas/adabasui.component | 34
dbaccess/source/ext/adabas/adabasui.dxp | 1
dbaccess/source/ext/adabas/exports.dxp | 1
dbaccess/source/ext/adabas/makefile.mk | 7
dbaccess/source/ext/macromigration/dbmm.component | 34
dbaccess/source/ext/macromigration/macromigration.src | 12
dbaccess/source/ext/macromigration/makefile.mk | 8
dbaccess/source/ext/macromigration/migrationlog.cxx | 2
dbaccess/source/filter/migration/cfgservices.cxx | 21
dbaccess/source/filter/migration/dbacfg.component | 34
dbaccess/source/filter/migration/makefile.mk | 8
dbaccess/source/filter/xml/dbaxml.component | 49
dbaccess/source/filter/xml/makefile.mk | 8
dbaccess/source/filter/xml/xmlColumn.cxx | 1
dbaccess/source/filter/xml/xmlservices.cxx | 22
dbaccess/source/inc/registrationhelper.hxx | 10
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 21
dbaccess/source/shared/registrationhelper.cxx | 48
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 19
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2
dbaccess/source/ui/app/AppDetailView.cxx | 2
dbaccess/source/ui/app/AppDetailView.hxx | 2
dbaccess/source/ui/app/app.src | 21
dbaccess/source/ui/browser/genericcontroller.cxx | 4
dbaccess/source/ui/browser/sbabrw.src | 6
dbaccess/source/ui/browser/unodatbr.cxx | 7
dbaccess/source/ui/control/FieldDescControl.cxx | 8
dbaccess/source/ui/control/RelationControl.cxx | 8
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/control/opendoccontrols.cxx | 2
dbaccess/source/ui/control/toolboxcontroller.cxx | 2
dbaccess/source/ui/dlg/AdabasStat.src | 7
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 25
dbaccess/source/ui/dlg/CollectionView.cxx | 2
dbaccess/source/ui/dlg/CollectionView.src | 4
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 2
dbaccess/source/ui/dlg/ConnectionPage.cxx | 4
dbaccess/source/ui/dlg/ConnectionPage.src | 7
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 2
dbaccess/source/ui/dlg/ExtensionNotPresent.hrc | 47
dbaccess/source/ui/dlg/RelationDlg.src | 1
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 5
dbaccess/source/ui/dlg/UserAdmin.src | 3
dbaccess/source/ui/dlg/UserAdminDlg.src | 1
dbaccess/source/ui/dlg/adminpages.cxx | 19
dbaccess/source/ui/dlg/adminpages.hxx | 4
dbaccess/source/ui/dlg/adodatalinks.cxx | 2
dbaccess/source/ui/dlg/adtabdlg.cxx | 2
dbaccess/source/ui/dlg/adtabdlg.src | 5
dbaccess/source/ui/dlg/advancedsettings.src | 3
dbaccess/source/ui/dlg/dbadmin.src | 25
dbaccess/source/ui/dlg/dbadmin2.src | 42
dbaccess/source/ui/dlg/dbadminsetup.src | 42
dbaccess/source/ui/dlg/dbfindex.cxx | 2
dbaccess/source/ui/dlg/dbfindex.src | 8
dbaccess/source/ui/dlg/directsql.src | 6
dbaccess/source/ui/dlg/dlgsave.src | 3
dbaccess/source/ui/dlg/dlgsize.src | 4
dbaccess/source/ui/dlg/dsselect.src | 4
dbaccess/source/ui/dlg/indexdialog.src | 3
dbaccess/source/ui/dlg/makefile.mk | 2
dbaccess/source/ui/dlg/odbcconfig.cxx | 10
dbaccess/source/ui/dlg/odbcconfig.hxx | 4
dbaccess/source/ui/dlg/paramdialog.src | 4
dbaccess/source/ui/dlg/queryfilter.src | 13
dbaccess/source/ui/dlg/queryorder.src | 8
dbaccess/source/ui/dlg/sqlmessage.cxx | 15
dbaccess/source/ui/dlg/sqlmessage.src | 1
dbaccess/source/ui/dlg/tablespage.cxx | 2
dbaccess/source/ui/dlg/textconnectionsettings.src | 1
dbaccess/source/ui/inc/FieldDescControl.hxx | 4
dbaccess/source/ui/inc/TableFieldDescription.hxx | 5
dbaccess/source/ui/inc/UITools.hxx | 2
dbaccess/source/ui/inc/dbu_dlg.hrc | 22
dbaccess/source/ui/inc/dbu_resource.hrc | 2
dbaccess/source/ui/misc/UITools.cxx | 4
dbaccess/source/ui/misc/WTypeSelect.cxx | 2
dbaccess/source/ui/misc/WizardPages.src | 30
dbaccess/source/ui/misc/dbumiscres.src | 2
dbaccess/source/ui/misc/uiservices.cxx | 22
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 14
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 14
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 2
dbaccess/source/ui/querydesign/querydlg.src | 1
dbaccess/source/ui/tabledesign/TEditControl.cxx | 7
dbaccess/source/ui/tabledesign/TableController.cxx | 8
dbaccess/source/ui/tabledesign/table.src | 65 -
dbaccess/source/ui/uno/copytablewizard.src | 3
dbaccess/util/dba.component | 63 +
dbaccess/util/dbu.component | 116 +
dbaccess/util/hidother.src | 37
dbaccess/util/makefile.mk | 20
dbaccess/util/sdbt.component | 34
dev/null |binary
reportdesign/inc/helpids.hrc | 174 +-
reportdesign/prj/build.lst | 5
reportdesign/prj/d.lst | 3
reportdesign/qa/complex/ReportDesignerTest.java | 537 ---------
reportdesign/qa/complex/makefile.mk | 58
reportdesign/qa/complex/mysql-connector-exists.pl | 9
reportdesign/qa/complex/reportdesign/FileURL.java | 62 +
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java | 584 ++++++++++
reportdesign/qa/complex/reportdesign/TestDocument.java | 41
reportdesign/qa/complex/reportdesign/makefile.mk | 62 +
reportdesign/qa/complex/reportdesign/mysql-connector-exists.pl | 9
reportdesign/qa/complex/reportdesign/runner.props | 22
reportdesign/qa/complex/reportdesign/test_documents/RPTCalcTests.odb |binary
reportdesign/qa/complex/reportdesign/test_documents/RPTWriterTests.odb |binary
reportdesign/qa/complex/runner.props | 22
reportdesign/source/core/api/services.cxx | 6
reportdesign/source/core/sdr/UndoEnv.cxx | 110 +
reportdesign/source/filter/xml/xmlGroup.cxx | 5
reportdesign/source/filter/xml/xmlservices.cxx | 8
reportdesign/source/ui/dlg/Condition.cxx | 2
reportdesign/source/ui/dlg/DateTime.src | 4
reportdesign/source/ui/dlg/Formula.cxx | 4
reportdesign/source/ui/dlg/GroupsSorting.src | 6
reportdesign/source/ui/dlg/Navigator.cxx | 2
reportdesign/source/ui/dlg/Navigator.src | 5
reportdesign/source/ui/dlg/PageNumber.src | 6
reportdesign/source/ui/inc/ColumnInfo.hxx | 2
reportdesign/source/ui/inc/DesignView.hxx | 2
reportdesign/source/ui/inc/FunctionHelper.hxx | 2
reportdesign/source/ui/inc/GroupsSorting.hxx | 2
reportdesign/source/ui/inc/metadata.hxx | 4
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 6
reportdesign/source/ui/inspection/DefaultInspection.cxx | 11
reportdesign/source/ui/inspection/GeometryHandler.cxx | 12
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 2
reportdesign/source/ui/inspection/metadata.cxx | 14
reportdesign/source/ui/misc/FunctionHelper.cxx | 4
reportdesign/source/ui/misc/rptuiservices.cxx | 8
reportdesign/source/ui/report/DesignView.cxx | 6
reportdesign/source/ui/report/ReportController.cxx | 181 +--
reportdesign/source/ui/report/ViewsWindow.cxx | 2
reportdesign/source/ui/report/report.src | 24
reportdesign/util/hidother.src | 22
reportdesign/util/makefile.mk | 20
reportdesign/util/rpt.component | 58
reportdesign/util/rptui.component | 52
reportdesign/util/rptxml.component | 73 +
186 files changed, 3084 insertions(+), 2187 deletions(-)
New commits:
commit 615f67cedb7873d8cfd1a5a71210c2200ffca8d5
Merge: fb2038e... cc50d78...
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 6 22:03:09 2011 -0600
Merge remote branch 'staging/ooo/dev300_m98_fixed' into integration/dev300_m98
* staging/ooo/dev300_m98_fixed: (242 commits)
vcl117: #i115686# remove old unused style setting
vcl117: removed obsolete header
sb131: #i115124# $(XSLTPROC) implies LIBXSLT:libxslt
dba33k: #i114026# check if key columns from all tables are involved
CWS changehid: generate former auto hids into src files
dba34a: #i112617#
dba34a: if there exists a data source registration from the previous test run, revoke it
dba34a: #i31275# allow 'select as you type' aka 'quick selection' for tree list boxes (SvLBox derivees, to be precise), and enable this for Base main window, and the stylist
dba34a: #i97111# make the 'Test Connection' button big enough to display all its text
dba34a: #i114698# allow for property change notifications for properties which do not exist as real property, but as attribute only
dba34a: #i114671#
dba33j: unxmacxi.pro: WaE
dba33j: GCC WaE
dba33j: i114026: findTableColumnsMatching_throw: take the update-table's name as parameter, to catch the cases where the name is an alias
dba34a: GCC WaE
dba34a: WaE
dba33j: #i114627# do not let the SubComponentManager manage reports executed for data display
dba33j: #i114438#
dba33j: #i114438#
dba34a: #i113475# SRB->ORB
...
Conflicts:
dbaccess/inc/ToolBoxHelper.hxx
dbaccess/inc/dbaccess_helpid.hrc
dbaccess/prj/build.lst
dbaccess/qa/complex/dbaccess/ApplicationController.java
dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java
dbaccess/qa/complex/dbaccess/DataSource.java
dbaccess/qa/complex/dbaccess/DatabaseDocument.java
dbaccess/qa/complex/dbaccess/Query.java
dbaccess/qa/complex/dbaccess/RowSet.java
dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
dbaccess/qa/complex/dbaccess/TestCase.java
dbaccess/qa/complex/dbaccess/UISettings.java
dbaccess/qa/complex/dbaccess/makefile.mk
dbaccess/source/core/api/BookmarkSet.cxx
dbaccess/source/core/api/BookmarkSet.hxx
dbaccess/source/core/api/CIndexColumn.hxx
dbaccess/source/core/api/CIndexes.cxx
dbaccess/source/core/api/CIndexes.hxx
dbaccess/source/core/api/CRowSetColumn.cxx
dbaccess/source/core/api/CRowSetColumn.hxx
dbaccess/source/core/api/CRowSetDataColumn.cxx
dbaccess/source/core/api/CRowSetDataColumn.hxx
dbaccess/source/core/api/CacheSet.cxx
dbaccess/source/core/api/CacheSet.hxx
dbaccess/source/core/api/FilteredContainer.cxx
dbaccess/source/core/api/HelperCollections.cxx
dbaccess/source/core/api/HelperCollections.hxx
dbaccess/source/core/api/KeySet.cxx
dbaccess/source/core/api/KeySet.hxx
dbaccess/source/core/api/OptimisticSet.cxx
dbaccess/source/core/api/OptimisticSet.hxx
dbaccess/source/core/api/PrivateRow.cxx
dbaccess/source/core/api/PrivateRow.hxx
dbaccess/source/core/api/RowSet.cxx
dbaccess/source/core/api/RowSet.hxx
dbaccess/source/core/api/RowSetBase.cxx
dbaccess/source/core/api/RowSetBase.hxx
dbaccess/source/core/api/RowSetCache.cxx
dbaccess/source/core/api/RowSetCache.hxx
dbaccess/source/core/api/RowSetCacheIterator.cxx
dbaccess/source/core/api/RowSetCacheIterator.hxx
dbaccess/source/core/api/RowSetRow.hxx
dbaccess/source/core/api/SingleSelectQueryComposer.cxx
dbaccess/source/core/api/StaticSet.cxx
dbaccess/source/core/api/StaticSet.hxx
dbaccess/source/core/api/TableDeco.cxx
dbaccess/source/core/api/View.cxx
dbaccess/source/core/api/WrappedResultSet.cxx
dbaccess/source/core/api/WrappedResultSet.hxx
dbaccess/source/core/api/callablestatement.cxx
dbaccess/source/core/api/column.cxx
dbaccess/source/core/api/columnsettings.cxx
dbaccess/source/core/api/datacolumn.cxx
dbaccess/source/core/api/datacolumn.hxx
dbaccess/source/core/api/datasettings.cxx
dbaccess/source/core/api/definitioncolumn.cxx
dbaccess/source/core/api/makefile.mk
dbaccess/source/core/api/preparedstatement.cxx
dbaccess/source/core/api/query.cxx
dbaccess/source/core/api/query.hxx
dbaccess/source/core/api/querycomposer.cxx
dbaccess/source/core/api/querycontainer.cxx
dbaccess/source/core/api/querydescriptor.cxx
dbaccess/source/core/api/querydescriptor.hxx
dbaccess/source/core/api/resultcolumn.cxx
dbaccess/source/core/api/resultcolumn.hxx
dbaccess/source/core/api/resultset.cxx
dbaccess/source/core/api/resultset.hxx
dbaccess/source/core/api/statement.cxx
dbaccess/source/core/api/table.cxx
dbaccess/source/core/api/tablecontainer.cxx
dbaccess/source/core/api/viewcontainer.cxx
dbaccess/source/core/dataaccess/ComponentDefinition.cxx
dbaccess/source/core/dataaccess/ComponentDefinition.hxx
dbaccess/source/core/dataaccess/ContentHelper.cxx
dbaccess/source/core/dataaccess/ModelImpl.cxx
dbaccess/source/core/dataaccess/ModelImpl.hxx
dbaccess/source/core/dataaccess/SharedConnection.cxx
dbaccess/source/core/dataaccess/SharedConnection.hxx
dbaccess/source/core/dataaccess/bookmarkcontainer.cxx
dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
dbaccess/source/core/dataaccess/commandcontainer.cxx
dbaccess/source/core/dataaccess/commandcontainer.hxx
dbaccess/source/core/dataaccess/commanddefinition.cxx
dbaccess/source/core/dataaccess/commanddefinition.hxx
dbaccess/source/core/dataaccess/connection.cxx
dbaccess/source/core/dataaccess/connection.hxx
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx
dbaccess/source/core/dataaccess/databasecontext.cxx
dbaccess/source/core/dataaccess/databasecontext.hxx
dbaccess/source/core/dataaccess/databasedocument.cxx
dbaccess/source/core/dataaccess/databasedocument.hxx
dbaccess/source/core/dataaccess/databaseregistrations.cxx
dbaccess/source/core/dataaccess/databaseregistrations.hxx
dbaccess/source/core/dataaccess/datasource.cxx
dbaccess/source/core/dataaccess/datasource.hxx
dbaccess/source/core/dataaccess/definitioncontainer.cxx
dbaccess/source/core/dataaccess/documentcontainer.cxx
dbaccess/source/core/dataaccess/documentcontainer.hxx
dbaccess/source/core/dataaccess/documentdefinition.cxx
dbaccess/source/core/dataaccess/documentdefinition.hxx
dbaccess/source/core/dataaccess/documenteventexecutor.cxx
dbaccess/source/core/dataaccess/documenteventexecutor.hxx
dbaccess/source/core/dataaccess/documenteventnotifier.cxx
dbaccess/source/core/dataaccess/documenteventnotifier.hxx
dbaccess/source/core/dataaccess/documentevents.cxx
dbaccess/source/core/dataaccess/documentevents.hxx
dbaccess/source/core/dataaccess/intercept.cxx
dbaccess/source/core/dataaccess/intercept.hxx
dbaccess/source/core/dataaccess/makefile.mk
dbaccess/source/core/dataaccess/myucp_datasupplier.cxx
dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
dbaccess/source/core/dataaccess/myucp_resultset.cxx
dbaccess/source/core/dataaccess/myucp_resultset.hxx
dbaccess/source/core/inc/ContainerListener.hxx
dbaccess/source/core/inc/ContainerMediator.hxx
dbaccess/source/core/inc/ContentHelper.hxx
dbaccess/source/core/inc/DatabaseDataProvider.hxx
dbaccess/source/core/inc/FilteredContainer.hxx
dbaccess/source/core/inc/PropertyForward.hxx
dbaccess/source/core/inc/RefreshListener.hxx
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
dbaccess/source/core/inc/TableDeco.hxx
dbaccess/source/core/inc/View.hxx
dbaccess/source/core/inc/callablestatement.hxx
dbaccess/source/core/inc/column.hxx
dbaccess/source/core/inc/columnsettings.hxx
dbaccess/source/core/inc/commandbase.hxx
dbaccess/source/core/inc/composertools.hxx
dbaccess/source/core/inc/containerapprove.hxx
dbaccess/source/core/inc/core_resource.hrc
dbaccess/source/core/inc/core_resource.hxx
dbaccess/source/core/inc/datasettings.hxx
dbaccess/source/core/inc/dbamiscres.hrc
dbaccess/source/core/inc/definitioncolumn.hxx
dbaccess/source/core/inc/definitioncontainer.hxx
dbaccess/source/core/inc/module_dba.hxx
dbaccess/source/core/inc/object.hxx
dbaccess/source/core/inc/objectnameapproval.hxx
dbaccess/source/core/inc/preparedstatement.hxx
dbaccess/source/core/inc/querycomposer.hxx
dbaccess/source/core/inc/querycontainer.hxx
dbaccess/source/core/inc/sdbcoretools.hxx
dbaccess/source/core/inc/statement.hxx
dbaccess/source/core/inc/table.hxx
dbaccess/source/core/inc/tablecontainer.hxx
dbaccess/source/core/inc/userinformation.hxx
dbaccess/source/core/inc/veto.hxx
dbaccess/source/core/inc/viewcontainer.hxx
dbaccess/source/core/misc/DatabaseDataProvider.cxx
dbaccess/source/core/recovery/settingsimport.cxx
dbaccess/source/core/recovery/settingsimport.hxx
dbaccess/source/core/recovery/storagestream.cxx
dbaccess/source/core/recovery/storagestream.hxx
dbaccess/source/core/recovery/storagetextstream.cxx
dbaccess/source/core/recovery/storagetextstream.hxx
dbaccess/source/core/recovery/storagexmlstream.cxx
dbaccess/source/core/recovery/storagexmlstream.hxx
dbaccess/source/core/recovery/subcomponentrecovery.cxx
dbaccess/source/core/recovery/subcomponentrecovery.hxx
dbaccess/source/core/recovery/subcomponents.hxx
dbaccess/source/core/resource/strings.src
dbaccess/source/ext/adabas/Acomponentmodule.cxx
dbaccess/source/ext/adabas/AdabasNewDb.src
dbaccess/source/ext/macromigration/macromigration.src
dbaccess/source/filter/migration/makefile.mk
dbaccess/source/filter/xml/makefile.mk
dbaccess/source/filter/xml/xmlColumn.cxx
dbaccess/source/filter/xml/xmlExport.cxx
dbaccess/source/inc/OAuthenticationContinuation.hxx
dbaccess/source/inc/stringconstants.hrc
dbaccess/source/inc/stringconstants.inc
dbaccess/source/sdbtools/resource/sdbt_strings.src
dbaccess/source/shared/registrationhelper.cxx
dbaccess/source/ui/app/AppController.cxx
dbaccess/source/ui/app/AppControllerGen.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/app/AppDetailPageHelper.hxx
dbaccess/source/ui/app/AppDetailView.cxx
dbaccess/source/ui/app/AppIconControl.cxx
dbaccess/source/ui/app/app.src
dbaccess/source/ui/browser/bcommon.src
dbaccess/source/ui/browser/brwctrlr.cxx
dbaccess/source/ui/browser/dsEntriesNoExp.cxx
dbaccess/source/ui/browser/exsrcbrw.cxx
dbaccess/source/ui/browser/sbabrw.src
dbaccess/source/ui/browser/sbagrid.cxx
dbaccess/source/ui/browser/sbagrid.src
dbaccess/source/ui/browser/unodatbr.cxx
dbaccess/source/ui/control/TableGrantCtrl.src
dbaccess/source/ui/control/dbtreelistbox.cxx
dbaccess/source/ui/control/opendoccontrols.cxx
dbaccess/source/ui/control/tabletree.cxx
dbaccess/source/ui/control/tabletree.src
dbaccess/source/ui/control/toolboxcontroller.cxx
dbaccess/source/ui/control/undosqledit.src
dbaccess/source/ui/dlg/AdabasStat.src
dbaccess/source/ui/dlg/AutoControls.src
dbaccess/source/ui/dlg/CollectionView.cxx
dbaccess/source/ui/dlg/CollectionView.src
dbaccess/source/ui/dlg/ConnectionHelper.cxx
dbaccess/source/ui/dlg/ConnectionPage.src
dbaccess/source/ui/dlg/DbAdminImpl.cxx
dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
dbaccess/source/ui/dlg/ExtensionNotPresent.src
dbaccess/source/ui/dlg/RelationDlg.src
dbaccess/source/ui/dlg/TablesSingleDlg.cxx
dbaccess/source/ui/dlg/UserAdmin.src
dbaccess/source/ui/dlg/UserAdminDlg.src
dbaccess/source/ui/dlg/adtabdlg.cxx
dbaccess/source/ui/dlg/adtabdlg.src
dbaccess/source/ui/dlg/advancedsettings.cxx
dbaccess/source/ui/dlg/dbadmin.src
dbaccess/source/ui/dlg/dbadmin2.src
dbaccess/source/ui/dlg/dbadminsetup.src
dbaccess/source/ui/dlg/dbfindex.cxx
dbaccess/source/ui/dlg/dbfindex.src
dbaccess/source/ui/dlg/directsql.src
dbaccess/source/ui/dlg/dlgattr.src
dbaccess/source/ui/dlg/dlgsave.src
dbaccess/source/ui/dlg/dlgsize.src
dbaccess/source/ui/dlg/dsselect.src
dbaccess/source/ui/dlg/indexdialog.src
dbaccess/source/ui/dlg/indexfieldscontrol.cxx
dbaccess/source/ui/dlg/makefile.mk
dbaccess/source/ui/dlg/optionalboolitem.cxx
dbaccess/source/ui/dlg/optionalboolitem.hxx
dbaccess/source/ui/dlg/paramdialog.src
dbaccess/source/ui/dlg/queryfilter.src
dbaccess/source/ui/dlg/queryorder.src
dbaccess/source/ui/dlg/sqlmessage.src
dbaccess/source/ui/dlg/textconnectionsettings.src
dbaccess/source/ui/imagelists/dbimagelists.src
dbaccess/source/ui/inc/ExtensionNotPresent.hxx
dbaccess/source/ui/inc/TableConnectionData.hxx
dbaccess/source/ui/inc/dbu_resource.hrc
dbaccess/source/ui/inc/dsmeta.hxx
dbaccess/source/ui/inc/sbagrid.hxx
dbaccess/source/ui/inc/unodatbr.hxx
dbaccess/source/ui/misc/TableCopyHelper.cxx
dbaccess/source/ui/misc/TokenWriter.cxx
dbaccess/source/ui/misc/ToolBoxHelper.cxx
dbaccess/source/ui/misc/WCopyTable.cxx
dbaccess/source/ui/misc/WNameMatch.cxx
dbaccess/source/ui/misc/WizardPages.src
dbaccess/source/ui/misc/dbumiscres.src
dbaccess/source/ui/querydesign/JoinController.cxx
dbaccess/source/ui/querydesign/QueryDesignView.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/TableFieldDescription.cxx
dbaccess/source/ui/querydesign/TableWindow.cxx
dbaccess/source/ui/querydesign/query.src
dbaccess/source/ui/querydesign/querydlg.src
dbaccess/source/ui/relationdesign/relation.src
dbaccess/source/ui/tabledesign/TEditControl.cxx
dbaccess/source/ui/tabledesign/TableController.cxx
dbaccess/source/ui/tabledesign/table.src
dbaccess/source/ui/uno/copytablewizard.cxx
dbaccess/source/ui/uno/copytablewizard.src
dbaccess/source/ui/uno/dbinteraction.cxx
dbaccess/source/ui/uno/dbinteraction.src
dbaccess/util/hidother.src
reportdesign/inc/RptResId.hrc
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
reportdesign/source/core/resource/strings.src
reportdesign/source/filter/xml/xmlExport.cxx
reportdesign/source/filter/xml/xmlGroup.cxx
reportdesign/source/filter/xml/xmlHelper.cxx
reportdesign/source/filter/xml/xmlservices.cxx
reportdesign/source/ui/dlg/AddField.cxx
reportdesign/source/ui/dlg/CondFormat.hrc
reportdesign/source/ui/dlg/CondFormat.src
reportdesign/source/ui/dlg/Condition.cxx
reportdesign/source/ui/dlg/DateTime.src
reportdesign/source/ui/dlg/GroupsSorting.cxx
reportdesign/source/ui/dlg/GroupsSorting.src
reportdesign/source/ui/dlg/Navigator.cxx
reportdesign/source/ui/dlg/Navigator.src
reportdesign/source/ui/inc/DesignView.hxx
reportdesign/source/ui/inc/GroupsSorting.hxx
reportdesign/source/ui/misc/UITools.cxx
reportdesign/source/ui/misc/rptuiservices.cxx
reportdesign/source/ui/report/DesignView.cxx
reportdesign/source/ui/report/ReportController.cxx
reportdesign/source/ui/report/ReportSection.cxx
reportdesign/source/ui/report/ViewsWindow.cxx
reportdesign/source/ui/report/report.src
diff --cc dbaccess/inc/dbaccess_helpid.hrc
index e911821,55b67ee..a637494
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@@ -29,7 -29,7 +29,6 @@@
#define _DBA_DBACCESS_HELPID_HRC_
#define HID_DSADMIN_CHARSET "DBACCESS_HID_DSADMIN_CHARSET"
--
#define HID_DLG_FILTERCRIT "DBACCESS_HID_DLG_FILTERCRIT"
#define HID_DLG_ORDERCRIT "DBACCESS_HID_DLG_ORDERCRIT"
@@@ -462,4 -462,7 +461,5 @@@
#define HID_DLG_JOIN_TABADD "DBACCESS_HID_DLG_JOIN_TABADD"
+
#endif // _DBA_DBACCESS_HELPID_HRC_
-
-
diff --cc dbaccess/qa/complex/dbaccess/Beamer.java
index ec47e79,92b0fc7..bc723a5
--- a/dbaccess/qa/complex/dbaccess/Beamer.java
+++ b/dbaccess/qa/complex/dbaccess/Beamer.java
@@@ -140,12 -134,13 +134,12 @@@ public class Beamer extends TestCas
{
final XController controller = docModel.getCurrentController();
final XFrame frame = controller.getFrame();
- final XDispatchProvider dispatchP = (XDispatchProvider) UnoRuntime.queryInterface(XDispatchProvider.class, frame);
+ final XDispatchProvider dispatchP = UnoRuntime.queryInterface(XDispatchProvider.class, frame);
URL command = new URL();
- // command.Complete = ".component:DB/DataSourceBrowser";
command.Complete = ".uno:ViewDataSourceBrowser";
- Object instance = getORB().createInstance("com.sun.star.util.URLTransformer");
- XURLTransformer atrans = (XURLTransformer) UnoRuntime.queryInterface(XURLTransformer.class, instance);
+ Object instance = getMSF().createInstance("com.sun.star.util.URLTransformer");
+ XURLTransformer atrans = UnoRuntime.queryInterface(XURLTransformer.class, instance);
com.sun.star.util.URL[] aURLA = new com.sun.star.util.URL[1];
aURLA[0] = command;
atrans.parseStrict(aURLA);
diff --cc dbaccess/qa/complex/dbaccess/RowSet.java
index c3e83c9,80fbde5..acfeb5b
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@@ -97,9 -107,13 +107,9 @@@ public class RowSet extends TestCas
for (int i = 0; m_resultSet.next(); ++i)
{
int pos = m_resultSet.getRow();
- // final int val = m_row.getInt(1);
-// System.out.println("Clone Move(" + m_id +") before i: " + (i+1) + " Pos: " + pos + " Val: " + val);
testPosition(m_resultSet, m_row, i + 1, "clone move(" + m_id + ")");
-// val = m_row.getInt(1);
-// System.out.println("Clone Move(" + m_id +") after i: " + (i+1) + " Pos: " + pos + " Val: " + val);
int pos2 = m_resultSet.getRow();
- assure("ResultSetMovementStress wrong position: " + i + " Pos1: " + pos + " Pos2: " + pos2, pos == pos2);
+ assertTrue("ResultSetMovementStress wrong position: " + i + " Pos1: " + pos + " Pos2: " + pos2, pos == pos2);
}
}
catch (Exception e)
@@@ -373,9 -387,10 +383,9 @@@
// --------------------------------------------------------------------------------------------------------
void testConcurrentAccess(XResultSet _resultSet)
{
- log.println("testing Thread");
+ System.out.println("testing Thread");
try
{
- // final XRow _row = (XRow)UnoRuntime.queryInterface(XRow.class,_resultSet);
_resultSet.beforeFirst();
final int numberOfThreads = 10;
diff --cc dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
index 6eb0525,f9e0286..86e92c7
--- a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
+++ b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java
@@@ -48,24 -58,24 +58,24 @@@ public class SingleSelectQueryComposer
private final static String INNERPRODUCTSQUERY = "products (inner)";
// --------------------------------------------------------------------------------------------------------
- public String[] getTestMethodNames()
- {
- return new String[]
- {
- "testSetCommand",
- "testAttributes",
- "testSubQueries",
- "testParameters",
- "testDisjunctiveNormalForm",
- "testConditionByColumn"
- };
- }
-
- // --------------------------------------------------------------------------------------------------------
- public String getTestObjectName()
- {
- return "SingleSelectQueryComposer";
- }
+ // public String[] getTestMethodNames()
+ // {
+ // return new String[]
+ // {
-// "testSetCommand",
++// "testSetCommand",
+ // "testAttributes",
+ // "testSubQueries",
+ // "testParameters",
+ // "testDisjunctiveNormalForm",
+ // "testConditionByColumn"
+ // };
+ // }
+
+ // // --------------------------------------------------------------------------------------------------------
+ // public String getTestObjectName()
+ // {
+ // return "SingleSelectQueryComposer";
+ // }
// --------------------------------------------------------------------------------------------------------
private void createQueries() throws Exception
diff --cc dbaccess/source/core/api/CRowSetColumn.cxx
index 444169c,60c4fe1..f44de46
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@@ -53,9 -55,13 +53,12 @@@ ORowSetColumn::ORowSetColumn( const Ref
{
}
-//------------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* ORowSetColumn::createArrayHelper( ) const
{
- BEGIN_PROPERTY_SEQUENCE(21)
+ const sal_Int32 nDerivedProperties = 21;
+ Sequence< Property> aDerivedProperties( nDerivedProperties );
+ Property* pDesc = aDerivedProperties.getArray();
+ sal_Int32 nPos = 0;
DECL_PROP1( CATALOGNAME, ::rtl::OUString, READONLY );
DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY );
@@@ -84,9 -89,10 +86,9 @@@
Sequence< Property > aRegisteredProperties;
describeProperties( aRegisteredProperties );
- return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDescriptor, aRegisteredProperties ), sal_False );
+ return new ::cppu::OPropertyArrayHelper( ::comphelper::concatSequences( aDerivedProperties, aRegisteredProperties ), sal_False );
}
-//------------------------------------------------------------------------------
::cppu::IPropertyArrayHelper& ORowSetColumn::getInfoHelper()
{
return *static_cast< ::comphelper::OPropertyArrayUsageHelper< ORowSetColumn >* >(this)->getArrayHelper();
@@@ -98,6 -105,7 +100,6 @@@ void SAL_CALL ORowSetColumn::setFastPro
if ( nHandle != PROPERTY_ID_VALUE )
ORowSetDataColumn::setFastPropertyValue_NoBroadcast( nHandle, rValue );
}
--
-//..............................................................................
} // namespace dbaccess
-//..............................................................................
++
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc dbaccess/source/core/api/CRowSetColumn.hxx
index f2c84a3,3b16166..f16a046
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.hxx
@@@ -57,5 -64,3 +57,4 @@@ namespace dbacces
}
#endif // DBACCESS_CORE_API_CROWSETCOLUMN_HXX
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc dbaccess/source/core/api/CRowSetDataColumn.cxx
index 9e6bfe8,502a0a6..8d7c872
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@@ -73,11 -87,15 +73,14 @@@ ORowSetDataColumn::~ORowSetDataColumn(
{
DBG_DTOR(ORowSetDataColumn,NULL);
}
-// -------------------------------------------------------------------------
+
// comphelper::OPropertyArrayUsageHelper
-//------------------------------------------------------------------------------
::cppu::IPropertyArrayHelper* ORowSetDataColumn::createArrayHelper( ) const
{
- BEGIN_PROPERTY_SEQUENCE(21)
+ const sal_Int32 nDerivedProperties = 21;
+ Sequence< Property> aDerivedProperties( nDerivedProperties );
+ Property* pDesc = aDerivedProperties.getArray();
+ sal_Int32 nPos = 0;
DECL_PROP1( CATALOGNAME, ::rtl::OUString, READONLY );
DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY );
diff --cc dbaccess/source/core/api/CacheSet.cxx
index 6521f94,7f53434..ac3c610
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@@ -88,8 -125,8 +88,8 @@@ OCacheSet::OCacheSet(
sQuote = xMeta->getIdentifierQuoteString();
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 at sun.com", "OCacheSet::construct" );
OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet");
@@@ -206,12 -243,27 +206,12 @@@ void SAL_CALL OCacheSet::insertRow( con
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<XResultSet> xRes(xStmt->executeQuery(aCountSql));
-// if(xRes.is() && xRes->next())
-// {
-// Reference<XRow> 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)
@@@ -697,4 -749,5 +697,5 @@@ bool OCacheSet::updateColumnValues(cons
void OCacheSet::fillMissingValues(ORowSetValueVector::Vector& /*io_aRow*/) const
{
}
-// -----------------------------------------------------------------------------
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --cc dbaccess/source/core/api/KeySet.cxx
index 966ec22,29c906b..4644b9e
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@@ -1645,4 -1700,5 +1646,6 @@@ void OKeySet::impl_convertValue_throw(c
break;
}
}
-// -----------------------------------------------------------------------------
++
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+
diff --cc dbaccess/source/core/api/KeySet.hxx
index a439fb2,072440c..1a7c0e7
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@@ -29,16 -28,24 +29,17 @@@
#ifndef DBACCESS_CORE_API_KEYSET_HXX
#define DBACCESS_CORE_API_KEYSET_HXX
-#ifndef DBACCESS_CORE_API_CACHESET_HXX
#include "CacheSet.hxx"
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX_
#include <cppuhelper/implbase1.hxx>
-#endif
+#include <memory>
+ #include <memory>
#include <map>
-#ifndef _COM_SUN_STAR_LANG_XUNOTUNNEL_HPP_
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#endif
#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
-#ifndef _COMPHELPER_STLTYPES_HXX_
#include <comphelper/stl_types.hxx>
-#endif
namespace dbaccess
{
diff --cc dbaccess/source/core/api/OptimisticSet.cxx
index d007cdd,091ea08..dd8ca58
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@@ -1,5 -1,3 +1,4 @@@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --cc dbaccess/source/core/api/RowSet.cxx
index f12afb9,1f7c029..5807f68
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@@ -134,9 -134,11 +134,8 @@@ extern "C" void SAL_CALL createRegistry
_rGuard.reset();
-//..................................................................
namespace dbaccess
{
-
-//..................................................................
-//--------------------------------------------------------------------------
Reference< XInterface > ORowSet_CreateInstance(const Reference< XMultiServiceFactory >& _rxFactory)
{
return *(new ORowSet(_rxFactory));
@@@ -2633,9 -2701,10 +2634,8 @@@ void SAL_CALL ORowSet::clearWarnings(
{
m_aWarnings.clearWarnings();
}
-
-// -----------------------------------------------------------------------------
void ORowSet::doCancelModification( )
{
- //OSL_ENSURE( isModification(), "ORowSet::doCancelModification: invalid call (no cache!)!" );
if ( isModification() )
{
// read-only flag restored
diff --cc dbaccess/source/core/api/RowSetCache.cxx
index f795ce7,eda4632..5dad203
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@@ -1611,7 -1646,7 +1613,6 @@@ sal_Bool ORowSetCache::fill(ORowSetMatr
}
return _bCheck;
}
-
-// -----------------------------------------------------------------------------
bool ORowSetCache::isResultSetChanged() const
{
return m_pCacheSet->isResultSetChanged();
diff --cc dbaccess/source/core/api/datasettings.cxx
index 085f99e,e2d7666..0eb6573
--- a/dbaccess/source/core/api/datasettings.cxx
+++ b/dbaccess/source/core/api/datasettings.cxx
@@@ -29,21 -28,45 +29,22 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef _DBA_CORE_DATASETTINGS_HXX_
#include "datasettings.hxx"
-#endif
-#ifndef _DBASHARED_APITOOLS_HXX_
#include "apitools.hxx"
-#endif
-#ifndef DBACCESS_SHARED_DBASTRINGS_HRC
#include "dbastrings.hrc"
-#endif
-#ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>
-#endif
-#ifndef _COMPHELPER_PROPERTY_HXX_
#include <comphelper/property.hxx>
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTWEIGHT_HPP_
#include <com/sun/star/awt/FontWeight.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTEMPHASISMARK_HPP_
#include <com/sun/star/awt/FontEmphasisMark.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTRELIEF_HPP_
#include <com/sun/star/awt/FontRelief.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_FONTWIDTH_HPP_
#include <com/sun/star/awt/FontWidth.hpp>
-#endif
+
+
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::awt;
using namespace ::com::sun::star::lang;
diff --cc dbaccess/source/core/api/definitioncolumn.cxx
index c0db663,7f1e7a2..ab27049
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@@ -154,13 -162,16 +156,15 @@@ OTableColumn::~OTableColumn(
DBG_DTOR(OTableColumn,NULL);
}
-//--------------------------------------------------------------------------
IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn )
+ //------------------------------------------------------------------------------
rtl::OUString OTableColumn::getImplementationName( ) throw (RuntimeException)
{
- return rtl::OUString::createFromAscii("com.sun.star.sdb.OTableColumn");
+ return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.OTableColumn"));
}
+ //------------------------------------------------------------------------------
::cppu::IPropertyArrayHelper& SAL_CALL OTableColumn::getInfoHelper()
{
return *OTableColumn_PBase::getArrayHelper();
@@@ -280,8 -295,10 +286,9 @@@ Reference< XPropertySet > OQueryColumn:
return xOriginalTableColumn;
}
-//--------------------------------------------------------------------------
IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn )
+ //--------------------------------------------------------------------------
::rtl::OUString SAL_CALL OQueryColumn::getImplementationName( ) throw(RuntimeException)
{
return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.comp.dbaccess.OQueryColumn" ) );
diff --cc dbaccess/source/core/api/querycomposer.cxx
index 9bf2e34,fab4af4..5cd5502
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@@ -29,30 -28,76 +29,31 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef _COM_SUN_STAR_LANG_DISPOSEDEXCEPTION_HPP_
#include <com/sun/star/lang/DisposedException.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTER_HPP_
#include <com/sun/star/util/XNumberFormatter.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_COLUMNSEARCH_HPP_
#include <com/sun/star/sdbc/ColumnSearch.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_
#include <com/sun/star/sdbc/DataType.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATASUPPLIER_HPP_
#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSETMETADATA_HPP_
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
-#endif
-#ifndef _COM_SUN_STAR_LANG_SERVICENOTREGISTEREDEXCEPTION_HPP_
#include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
-#endif
-#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
-#endif
-#ifndef _COM_SUN_STAR_UNO_XAGGREGATION_HPP_
#include <com/sun/star/uno/XAggregation.hpp>
-#endif
-#ifndef _COMPHELPER_SEQUENCE_HXX_
#include <comphelper/sequence.hxx>
-#endif
-#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
#include <comphelper/processfactory.hxx>
-#endif
-#ifndef DBACCESS_SHARED_DBASTRINGS_HRC
#include "dbastrings.hrc"
-#endif
-#ifndef _CPPUHELPER_TYPEPROVIDER_HXX_
#include <cppuhelper/typeprovider.hxx>
-#endif
-#ifndef _UTL_CONFIGMGR_HXX_
#include <unotools/configmgr.hxx>
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
-#endif
-#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _COM_SUN_STAR_I18N_XLOCALEDATA_HPP_
#include <com/sun/star/i18n/XLocaleData.hpp>
-#endif
-#ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX
#include <unotools/syslocale.hxx>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XCHILD_HPP_
#include <com/sun/star/container/XChild.hpp>
-#endif
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
-#ifndef DBACCESS_CORE_API_QUERYCOMPOSER_HXX
++#include <com/sun/star/sdb/SQLFilterOperator.hpp>
#include "querycomposer.hxx"
-#endif
-#ifndef DBA_HELPERCOLLECTIONS_HXX
#include "HelperCollections.hxx"
-#endif
-#ifndef DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
#include "composertools.hxx"
-#endif
#include <algorithm>
#include <rtl/logfile.hxx>
diff --cc dbaccess/source/core/dataaccess/databasecontext.cxx
index 7b6e9ac,e584553..6b1e3c2
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@@ -107,9 -107,12 +107,8 @@@ extern "C" void SAL_CALL createRegistry
static ::dba::OLegacySingletonRegistration< ::dbaccess::ODatabaseContext > aODatabaseContext_AutoRegistration;
}
-//........................................................................
namespace dbaccess
{
-
-//........................................................................
-
- // .............................................................................
typedef ::cppu::WeakImplHelper1 < XTerminateListener
> DatabaseDocumentLoader_Base;
class DatabaseDocumentLoader : public DatabaseDocumentLoader_Base
diff --cc dbaccess/source/core/dataaccess/datasource.cxx
index c866902,6a11515..be1932e
mode 100644,100755..100755
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@@ -1413,6 -1468,9 +1413,5 @@@ Reference< XInterface > ODatabaseSource
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen at sun.com", "ODatabaseSource::getThis" );
return *const_cast< ODatabaseSource* >( this );
}
-
-// -----------------------------------------------------------------------------
-//........................................................................
} // namespace dbaccess
-//........................................................................
-
-
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc dbaccess/source/core/inc/core_resource.hrc
index 7774530,c438314..c4e3bb1
--- a/dbaccess/source/core/inc/core_resource.hrc
+++ b/dbaccess/source/core/inc/core_resource.hrc
@@@ -90,21 -92,22 +90,43 @@@
#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_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 )
+
-#endif // _DBA_CORE_RESOURCE_HRC_
++#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_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 )
+
+#endif // _DBA_CORE_RESOURCE_HRC_
diff --cc dbaccess/source/filter/xml/xmlColumn.cxx
index e2beb26,7b8ac9b..78da1cf
--- a/dbaccess/source/filter/xml/xmlColumn.cxx
+++ b/dbaccess/source/filter/xml/xmlColumn.cxx
@@@ -101,9 -128,10 +101,10 @@@ OXMLColumn::OXMLColumn( ODBFilter& rImp
case XML_TOK_COLUMN_DEFAULT_VALUE:
if ( sValue.getLength() && sType.getLength() )
m_aDefaultValue <<= sValue;
+ // SvXMLUnitConverter::convertAny(m_aDefaultValue,sType,sValue);
break;
case XML_TOK_COLUMN_VISIBLE:
- m_bHidden = sValue.equalsAscii("false");
+ m_bHidden = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("false"));
break;
case XML_TOK_DEFAULT_CELL_STYLE_NAME:
m_sCellStyleName = sValue;
diff --cc dbaccess/source/ui/app/AppDetailPageHelper.cxx
index df09876,4129a7f..b7a40aa
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@@ -664,22 -753,26 +664,23 @@@ void OAppDetailPageHelper::createPage(E
{
OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
- USHORT nHelpId = 0, nImageId = 0;
- USHORT nImageId = 0, nImageIdH = 0;
++ USHORT nImageId = 0;
+ rtl::OString sHelpId;
ImageProvider aImageProvider;
- Image aFolderImage, aFolderImageHC;
+ Image aFolderImage;
switch( _eType )
{
case E_FORM:
- nHelpId = HID_APP_FORM_TREE;
+ sHelpId = HID_APP_FORM_TREE;
- aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM, false );
- aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::FORM, true );
+ aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM );
break;
case E_REPORT:
- nHelpId = HID_APP_REPORT_TREE;
+ sHelpId = HID_APP_REPORT_TREE;
- aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT, false );
- aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::REPORT, true );
+ aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT );
break;
case E_QUERY:
- nHelpId = HID_APP_QUERY_TREE;
+ sHelpId = HID_APP_QUERY_TREE;
- aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY, false );
- aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::QUERY, true );
+ aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY );
break;
default:
OSL_ENSURE(0,"Illegal call!");
@@@ -688,7 -781,7 +689,7 @@@
if ( !m_pLists[_eType] )
{
- m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage );
- m_pLists[_eType] = createSimpleTree( sHelpId, aFolderImage, aFolderImageHC );
++ m_pLists[_eType] = createSimpleTree( sHelpId, aFolderImage );
}
if ( m_pLists[_eType] )
@@@ -782,11 -879,11 +783,11 @@@ void OAppDetailPageHelper::fillNames( c
}
}
// -----------------------------------------------------------------------------
- DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage )
-DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC )
++DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage)
{
DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP);
- pTreeView->SetHelpId(_nHelpId);
+ pTreeView->SetHelpId( _sHelpId );
- return createTree( pTreeView, _rImage, _rImageHC );
+ return createTree( pTreeView, _rImage );
}
// -----------------------------------------------------------------------------
diff --cc dbaccess/source/ui/app/AppDetailPageHelper.hxx
index f52dc7b,0e688b5..aa3991d
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@@ -160,7 -190,7 +160,7 @@@ namespace dbau
@return
The new tree.
*/
- DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage );
- DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC );
++ DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage);
DECL_LINK( OnEntryDoubleClick, SvTreeListBox* );
DECL_LINK( OnEntrySelChange, void* );
diff --cc dbaccess/source/ui/browser/sbabrw.src
index 2a748cc,168167b..9feb8ba
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@@ -42,14 -43,14 +42,14 @@@ QueryBox QUERY_BRW_SAVEMODIFIE
{
Buttons = WB_YES_NO_CANCEL ;
DefButton = WB_DEF_YES ;
-- /* ### ACHTUNG: Neuer Text in Resource? Soll der geänderte Datensatz gespeichert werden? : Soll der geänderte Datensatz gespeichert werden? */
++ /* ### ACHTUNG: Neuer Text in Resource? Soll der ge�nderte Datensatz gespeichert werden? : Soll der ge�nderte Datensatz gespeichert werden? */
Message [ en-US ] = "The current record has been changed.\nDo you want to save the changes?" ;
};
QueryBox QUERY_BRW_DELETE_ROWS
{
Buttons = WB_YES_NO ;
-- /* ### ACHTUNG: Neuer Text in Resource? Sollen die selektierten Daten gelöscht werden? : Sollen die selektierten Daten gel÷scht werden? */
++ /* ### ACHTUNG: Neuer Text in Resource? Sollen die selektierten Daten gel�scht werden? : Sollen die selektierten Daten gel�scht werden? */
Message [ en-US ] = "Do you want to delete the selected data?" ;
};
diff --cc dbaccess/source/ui/browser/unodatbr.cxx
index ff04d82,451840e..cf80d71
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@@ -2079,10 -2081,12 +2079,12 @@@ SvLBoxEntry* SbaTableQueryBrowser::impl
SvLBoxEntry* pNewEntry = m_pTreeView->getListBox().InsertEntry( _rName, _pParent, _eEntryType == etQueryContainer , LIST_APPEND, _pUserData );
- m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
- m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImage, BMP_COLOR_NORMAL );
- m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
- m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImageHC, BMP_COLOR_HIGHCONTRAST );
+ m_pTreeView->getListBox().SetExpandedEntryBmp( pNewEntry, aImage );
+ m_pTreeView->getListBox().SetCollapsedEntryBmp( pNewEntry, aImage );
+
+ return pNewEntry;
+
+ return pNewEntry;
}
//------------------------------------------------------------------------------
@@@ -3763,7 -3776,7 +3765,6 @@@ void SAL_CALL SbaTableQueryBrowser::cha
implAddDatasource( _Event.Name, SharedConnection() );
}
--
// .........................................................................
} // namespace dbaui
// .........................................................................
diff --cc dbaccess/source/ui/dlg/CollectionView.src
index fb9d9c6,ac5cece..bdb5085
--- a/dbaccess/source/ui/dlg/CollectionView.src
+++ b/dbaccess/source/ui/dlg/CollectionView.src
@@@ -102,9 -107,10 +105,10 @@@ ModalDialog DLG_COLLECTION_VIE
Pos = MAP_APPFONT ( 0 , WIN_Y - 2*UNRELATED_CONTROLS - BUTTON_HEIGHT - FIXEDLINE_HEIGHT) ;
Size = MAP_APPFONT ( WIN_X , FIXEDLINE_HEIGHT ) ;
};
-
+
PushButton BTN_EXPLORERFILE_SAVE
{
+ HelpID = "dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE";
Pos = MAP_APPFONT ( WIN_X - 2*UNRELATED_CONTROLS - RELATED_CONTROLS - 150, WIN_Y - UNRELATED_CONTROLS - BUTTON_HEIGHT ) ;
Size = MAP_APPFONT ( 50 , BUTTON_HEIGHT ) ;
DefButton = TRUE ;
diff --cc dbaccess/source/ui/dlg/ConnectionHelper.cxx
index b1d0971,5e234a3..81dd14c
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@@ -30,46 -29,125 +30,46 @@@
#include "precompiled_dbaccess.hxx"
#include "dsnItem.hxx"
-#ifndef DBAUI_CONNECTIONHELPER_HXX
#include "ConnectionHelper.hxx"
-#endif
-#ifndef _DBAUI_AUTOCONTROLS_HRC_
#include "AutoControls.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef _DBU_MISC_HRC_
#include "dbu_misc.hrc"
-#endif
-#ifndef _SFXITEMSET_HXX
#include <svl/itemset.hxx>
-#endif
-#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
#include <unotools/moduleoptions.hxx>
-#endif
-#ifndef _SFX_FCONTNR_HXX
#include <sfx2/fcontnr.hxx>
-#endif
-#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
#include <unotools/pathoptions.hxx>
-#endif
-#ifndef _SFXSTRITEM_HXX
#include <svl/stritem.hxx>
-#endif
-#ifndef _SFXENUMITEM_HXX
#include <svl/eitem.hxx>
-#endif
-#ifndef _SFXINTITEM_HXX
#include <svl/intitem.hxx>
-#endif
-#ifndef _DBAUI_DATASOURCEITEMS_HXX_
#include "dsitems.hxx"
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBAUI_LOCALRESACCESS_HXX_
#include "localresaccess.hxx"
-#endif
-#ifndef _OSL_PROCESS_H_
#include <osl/process.h>
-#endif
-#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _FILEDLGHELPER_HXX
#include <sfx2/filedlghelper.hxx>
-#endif
-#ifndef _DBAUI_DBADMIN_HXX_
#include "dbadmin.hxx"
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
-#endif
-#ifndef _VCL_STDTEXT_HXX
#include <vcl/stdtext.hxx>
-#endif
-#ifndef _DBAUI_SQLMESSAGE_HXX_
#include "sqlmessage.hxx"
-#endif
-#ifndef _DBAUI_ODBC_CONFIG_HXX_
#include "odbcconfig.hxx"
-#endif
-#ifndef _DBAUI_DSSELECT_HXX_
#include "dsselect.hxx"
-#endif
-#ifndef SVTOOLS_FILENOTATION_HXX_
#include <svl/filenotation.hxx>
-#endif
-#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
-#endif
-#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
#include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_
#include <com/sun/star/awt/XWindow.hpp>
-#endif
-// #106016# ------------------------------------
-#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_
#include <com/sun/star/task/XInteractionHandler.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TASK_XPROGRESSHANDLER_HPP_
#include <com/sun/star/ucb/XProgressHandler.hpp>
-#endif
-#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
-#endif
-#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX
#include <unotools/localfilehelper.hxx>
-#endif
-#ifndef _UNOTOOLS_UCBHELPER_HXX
#include <unotools/ucbhelper.hxx>
-#endif
-#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX
#include <ucbhelper/commandenvironment.hxx>
-#endif
-#ifndef DBAUI_FILEPICKER_INTERACTION_HXX
#include "finteraction.hxx"
-#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
#include <connectivity/CommonTools.hxx>
-#endif
-#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
-#endif
-#ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
-#endif
-#ifndef _SFX_DOCFILT_HACK_HXX
#include <sfx2/docfilt.hxx>
- #if !defined(WINDOWS_VISTA_PSDK) && (defined(WIN) || defined(WNT))
-#endif
+ #if !defined(WINDOWS_VISTA_PSDK) && defined(WNT)
#define _ADO_DATALINK_BROWSE_
#endif
diff --cc dbaccess/source/ui/dlg/ConnectionPage.cxx
index 7293cce,5bd6eca..b60c13f
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@@ -29,50 -28,132 +29,50 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef DBAUI_CONNECTIONPAGE_HXX
#include "ConnectionPage.hxx"
-#endif
-#ifndef DBAUI_CONNECTIONPAGE_HRC
#include "ConnectionPage.hrc"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef DBACCESS_DSMETA_HXX
#include "dsmeta.hxx"
-#endif
-#ifndef _SFXITEMSET_HXX
#include <svl/itemset.hxx>
-#endif
-#ifndef INCLUDED_SVTOOLS_PATHOPTIONS_HXX
#include <unotools/pathoptions.hxx>
-#endif
-#ifndef _SFXSTRITEM_HXX
#include <svl/stritem.hxx>
-#endif
-#ifndef _SFXENUMITEM_HXX
#include <svl/eitem.hxx>
-#endif
-#ifndef _SFXINTITEM_HXX
#include <svl/intitem.hxx>
-#endif
-#ifndef INCLUDED_SVTOOLS_MODULEOPTIONS_HXX
#include <unotools/moduleoptions.hxx>
-#endif
-#ifndef _DBAUI_DATASOURCEITEMS_HXX_
#include "dsitems.hxx"
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBAUI_LOCALRESACCESS_HXX_
#include "localresaccess.hxx"
-#endif
-#ifndef _OSL_PROCESS_H_
#include <osl/process.h>
-#endif
-#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _FILEDLGHELPER_HXX
#include <sfx2/filedlghelper.hxx>
-#endif
-#ifndef _DBAUI_DBADMIN_HXX_
#include "dbadmin.hxx"
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
-#endif
-#ifndef _VCL_STDTEXT_HXX
#include <vcl/stdtext.hxx>
-#endif
-#ifndef _DBAUI_SQLMESSAGE_HXX_
#include "sqlmessage.hxx"
-#endif
-#ifndef _DBAUI_ODBC_CONFIG_HXX_
#include "odbcconfig.hxx"
-#endif
-#ifndef _DBAUI_DSSELECT_HXX_
#include "dsselect.hxx"
-#endif
-#ifndef SVTOOLS_FILENOTATION_HXX_
#include <svl/filenotation.hxx>
-#endif
-#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
-#endif
-#ifndef _COM_SUN_STAR_UI_DIALOGS_XFOLDERPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFolderPicker.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XROW_HPP_
#include <com/sun/star/sdbc/XRow.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_XWINDOW_HPP_
#include <com/sun/star/awt/XWindow.hpp>
-#endif
// #106016# ------------------------------------
-#ifndef _COM_SUN_STAR_TASK_XINTERACTIONHANDLER_HPP_
#include <com/sun/star/task/XInteractionHandler.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TASK_XPROGRESSHANDLER_HPP_
#include <com/sun/star/ucb/XProgressHandler.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XCONNECTION_HPP_
#include <com/sun/star/sdbc/XConnection.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UI_DIALOGS_EXTENDEDFILEPICKERELEMENTIDS_HPP_
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKERCONTROLACCESS_HPP_
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UI_DIALOGS_XFILEPICKER_HPP_
#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#endif
-#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
-#endif
-#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX
#include <unotools/localfilehelper.hxx>
-#endif
-#ifndef _UNOTOOLS_UCBHELPER_HXX
#include <unotools/ucbhelper.hxx>
-#endif
-#ifndef _UCBHELPER_COMMANDENVIRONMENT_HXX
#include <ucbhelper/commandenvironment.hxx>
-#endif
-#ifndef DBAUI_FILEPICKER_INTERACTION_HXX
#include "finteraction.hxx"
-#endif
-#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_
#include <connectivity/CommonTools.hxx>
-#endif
-#ifndef _URLOBJ_HXX
#include <tools/urlobj.hxx>
-#endif
-#ifndef _SFX_DOCFILT_HACK_HXX
#include <sfx2/docfilt.hxx>
-#endif
#include "dsnItem.hxx"
- #if defined(WIN) || defined(WNT)
+ #if defined(WNT)
#define _ADO_DATALINK_BROWSE_
#endif
diff --cc dbaccess/source/ui/dlg/ConnectionPage.src
index 61515a2,9cc2791..63c400b
--- a/dbaccess/source/ui/dlg/ConnectionPage.src
+++ b/dbaccess/source/ui/dlg/ConnectionPage.src
@@@ -54,8 -55,10 +55,8 @@@ TabPage PAGE_CONNECTIO
Text[ en-US ] = "General";
};
- AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL)
-
+ AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL, HID_DSADMIN_BROWSECONN)
-
FixedText FT_NO_ADDITIONAL_SETTINGS
{
Hide = TRUE;
@@@ -85,17 -90,17 +86,19 @@@
Size = MAP_APPFONT ( 90 - 12 , FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "~User name" ;
};
+
Edit ET_USERNAME
{
+ HelpID = "dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME";
Border = TRUE ;
Pos = MAP_APPFONT ( 90 , 3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS -1 ) ;
Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
TabStop = TRUE ;
};
+
CheckBox CB_PASSWORD_REQUIRED
{
+ HelpID = "dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED";
Pos = MAP_APPFONT ( 90 , 4*UNRELATED_CONTROLS + 5*FIXEDTEXT_HEIGHT + 2*RELATED_CONTROLS ) ;
Size = MAP_APPFONT ( 105 , CHECKBOX_HEIGHT ) ;
Text [ en-US ] = "Password required";
diff --cc dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 23d8053,816d3d5..23d8053
mode 100644,100755..100755
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
diff --cc dbaccess/source/ui/dlg/RelationDlg.src
index 908cbab,e29eec5..90602e3
--- a/dbaccess/source/ui/dlg/RelationDlg.src
+++ b/dbaccess/source/ui/dlg/RelationDlg.src
@@@ -33,8 -33,10 +33,9 @@@
#endif
#include "dbaccess_helpid.hrc"
-
ModalDialog DLG_REL_PROPERTIES
{
+ HelpID = "dbaccess:ModalDialog:DLG_REL_PROPERTIES";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 186 , 205 ) ;
diff --cc dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index ebdc251,6679967..4726c9d
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@@ -29,15 -28,28 +29,16 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef _DBAUI_TABLESSINGLEDLG_HXX_
#include "TablesSingleDlg.hxx"
-#endif
-#ifndef _DBAUI_DBADMINIMPL_HXX_
#include "DbAdminImpl.hxx"
- #include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBAUI_TABLESPAGE_HXX_
#include "tablespage.hxx"
-#endif
-#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _DBAUI_DATASOURCEITEMS_HXX_
#include "dsitems.hxx"
-#endif
-#ifndef _DBAUI_PROPERTYSETITEM_HXX_
#include "propertysetitem.hxx"
-#endif
+ #include "dbu_dlg.hrc"
+
//.........................................................................
namespace dbaui
{
diff --cc dbaccess/source/ui/dlg/admincontrols.cxx
index 5213bda,1cb606a..5213bda
mode 100644,100755..100755
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
diff --cc dbaccess/source/ui/dlg/adtabdlg.src
index ecff324,13ce2e2..deb914d
--- a/dbaccess/source/ui/dlg/adtabdlg.src
+++ b/dbaccess/source/ui/dlg/adtabdlg.src
@@@ -67,9 -69,9 +69,10 @@@ ModelessDialog DLG_JOIN_TABAD
Hide = TRUE;
Group = TRUE;
};
+
PushButton PB_ADDTABLE
{
+ HelpID = "dbaccess:PushButton:DLG_JOIN_TABADD:PB_ADDTABLE";
Pos = MAP_APPFONT ( 123 , 6 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ;
Text [ en-US ] = "~Add" ;
diff --cc dbaccess/source/ui/dlg/dbadmin2.src
index 5d6ce54,9cc6ba2..c7afa21
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@@ -67,46 -62,6 +62,11 @@@ String STR_COULD_NOT_CREATE_DIRECTOR
Text [ en-US ] = "The directory $name$ could not be created.";
};
- String STR_ADDRESSBOOK_SYSTEM
- {
- Text[ en-US ] = "Windows address book";
- };
-
- String STR_ADDRESSBOOK_OUTLOOK
- {
- Text[ en-US ] = "MS Outlook";
- };
-
- String STR_ADDRESSBOOK_MOZILLA
- {
- Text[ en-US ] = "Mozilla address book";
- };
-
- String STR_ADDRESSBOOK_THUNDERBIRD
- {
- Text[ en-US ] = "Thunderbird address book";
- };
+
- String STR_ADDRESSBOOK_EVOLUTION
- {
- Text[ en-US ] = "Evolution address book";
- };
+
- String STR_ADDRESSBOOK_LDAP
- {
- Text[ en-US ] = "LDAP address book";
- };
+
- String STR_HINT_READONLY_CONNECTION
- {
- Text [ en-US ] = "(Connection is read-only)";
- };
+
- 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
diff --cc dbaccess/source/ui/dlg/dbadminsetup.src
index f135121,4d0c8df..f8f8dac
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@@ -406,11 -422,14 +412,12 @@@ TabPage PAGE_DBWIZARD_DBAS
Text[ en-US ] = "Select the folder where the dBASE files are stored." ;
};
- AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION)
+ AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION,HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION)
};
-
TabPage PAGE_DBWIZARD_TEXT
{
+ HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_TEXT";
-
String STR_TEXT_HEADERTEXT
{
Text[ en-US ] = "Set up a connection to text files" ;
@@@ -425,12 -446,16 +432,13 @@@
Text[ en-US ] = "Path to text files";
};
- AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE)
-
+ AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE,HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE)
AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X)
};
-
-
TabPage PAGE_DBWIZARD_MSACCESS
{
+ HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MSACCESS";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@@ -446,11 -472,14 +454,12 @@@
Text[ en-US ] = "Please select the Microsoft Access file you want to access.";
};
- AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION)
+ AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION, HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION)
-// FT_MSACCESS_MDB_FILE
};
-
TabPage PAGE_DBWIZARD_LDAP
{
+ HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_LDAP";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@@ -488,8 -518,10 +497,9 @@@
};
};
-
TabPage PAGE_DBWIZARD_ADABAS
{
+ HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADABAS";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@@ -504,11 -537,13 +514,12 @@@
Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ;
};
- AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME)
+ AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME, HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME)
};
-
TabPage PAGE_DBWIZARD_ADO
{
+ HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_ADO";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@@ -523,7 -558,8 +534,7 @@@
Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ;
};
- AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL)
+ AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL, HID_PAGE_DBWIZARD_ADO_PB_ADOURL)
-
};
@@@ -553,11 -591,14 +566,12 @@@ TabPage PAGE_DBWIZARD_USERDEFINE
Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
Hide = TRUE ;
- AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE)
+ AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE, HID_PAGE_DBWIZARD_USERDEFINED_BROWSE)
};
-
-
TabPage PAGE_DBWIZARD_JDBC
{
+ HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_JDBC";
SVLook = TRUE ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
@@@ -623,7 -669,8 +639,7 @@@ TabPage PAGE_DBWIZARD_SPREADSHEE
Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode." ;
};
- AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH )
-
+ AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH,HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH )
String STR_SPREADSHEETPATH{
Text[ en-US ] = "~Location and file name" ;
diff --cc dbaccess/source/ui/dlg/dbfindex.src
index 47c72d1,b0d91a9..c6a03ff
--- a/dbaccess/source/ui/dlg/dbfindex.src
+++ b/dbaccess/source/ui/dlg/dbfindex.src
@@@ -35,8 -35,65 +35,9 @@@
#define WIN_X 264
#define WIN_Y 149
-Image IMG_ONE_LEFT_H
-{
- ImageBitmap = Bitmap
- {
- File = "one_left_h.bmp" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
-};
-
-Image IMG_ALL_LEFT_H
-{
- ImageBitmap = Bitmap
- {
- File = "all_left_h.bmp" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
-};
-
-Image IMG_ONE_RIGHT_H
-{
- ImageBitmap = Bitmap
- {
- File = "one_right_h.bmp" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
-};
-
-Image IMG_ALL_RIGHT_H
-{
- ImageBitmap = Bitmap
- {
- File = "all_right_h.bmp" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
-};
-
ModalDialog DLG_DBASE_INDEXES
{
+ HelpID = "dbaccess:ModalDialog:DLG_DBASE_INDEXES";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( WIN_X , WIN_Y ) ;
diff --cc dbaccess/source/ui/dlg/odbcconfig.cxx
index b4115ca,270571e..e6a8658
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@@ -97,10 -98,12 +97,10 @@@
#ifdef SYSTEM_ODBC_HEADERS
#include <sqlext.h>
#else
-#ifndef __SQLEXT_H
#include <odbc/sqlext.h>
#endif
-#endif
- #if defined(WIN) || defined(WNT)
+ #if defined(WNT)
#if defined _MSC_VER
#pragma warning(pop)
#endif
diff --cc dbaccess/source/ui/dlg/queryfilter.src
index 6001932,4f8241d..d7dc79d
--- a/dbaccess/source/ui/dlg/queryfilter.src
+++ b/dbaccess/source/ui/dlg/queryfilter.src
@@@ -170,7 -192,7 +181,7 @@@ ModalDialog DLG_FILTERCRI
{
Pos = MAP_APPFONT ( 15 , 14 ) ;
Size = MAP_APPFONT ( 40 , 8 ) ;
-- /* ### ACHTUNG: Neuer Text in Resource? Verknüpfung : Verkn³pfung */
++ /* ### ACHTUNG: Neuer Text in Resource? Verkn�pfung : Verkn�pfung */
Center = TRUE ;
Text [ en-US ] = "Operator" ;
};
diff --cc dbaccess/source/ui/dlg/queryorder.src
index fe75042,c585e48..271d054
--- a/dbaccess/source/ui/dlg/queryorder.src
+++ b/dbaccess/source/ui/dlg/queryorder.src
@@@ -133,7 -139,7 +139,7 @@@ ModalDialog DLG_ORDERCRI
{
Pos = MAP_APPFONT ( 12 , 14 ) ;
Size = MAP_APPFONT ( 46 , 8 ) ;
-- /* ### ACHTUNG: Neuer Text in Resource? Verknüpfung : Verkn³pfung */
++ /* ### ACHTUNG: Neuer Text in Resource? Verkn�pfung : Verkn�pfung */
Text [ en-US ] = "Operator" ;
};
FixedText FT_ORDERDIR
diff --cc dbaccess/source/ui/dlg/sqlmessage.cxx
index 22bb460,34b1d6f..57f3fcb
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@@ -29,23 -28,57 +29,25 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef _DBAUI_SQLMESSAGE_HXX_
#include "sqlmessage.hxx"
-#endif
-#ifndef _DBU_DLG_HRC_
#include "dbu_dlg.hrc"
-#endif
-#ifndef _DBAUI_SQLMESSAGE_HRC_
#include "sqlmessage.hrc"
-#endif
-#ifndef _COM_SUN_STAR_SDBC_SQLEXCEPTION_HPP_
#include <com/sun/star/sdbc/SQLException.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDB_SQLCONTEXT_HPP_
#include <com/sun/star/sdb/SQLContext.hpp>
-#endif
-#ifndef _SV_GROUP_HXX //autogen
#include <vcl/fixed.hxx>
-#endif
-#ifndef _SVTREEBOX_HXX
#include <svtools/svtreebx.hxx>
-#endif
-#ifndef _SVEDIT_HXX //autogen
#include <svtools/svmedit.hxx>
-#endif
-#ifndef _DBHELPER_DBEXCEPTION_HXX_
#include <connectivity/dbexception.hxx>
-#endif
-#ifndef CONNECTIVITY_SQLERROR_HXX
#include <connectivity/sqlerror.hxx>
-#endif
-#ifndef _SV_MSGBOX_HXX //autogen
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _UTL_CONFIGMGR_HXX_
#include <unotools/configmgr.hxx>
-#endif
-#ifndef _SFX_SFXUNO_HXX
#include <sfx2/sfxuno.hxx>
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
-#endif
-#ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
-#endif
+ #include <tools/urlobj.hxx>
+
#define BUTTONID_MORE BUTTONID_RETRY + 1
#define DIALOG_WIDTH 220
diff --cc dbaccess/source/ui/inc/TableFieldDescription.hxx
index 1438d5b,d930f48..cacbc81
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@@ -32,18 -31,24 +32,23 @@@
#define INCLUDED_VECTOR
#include <vector>
#endif
-#ifndef DBAUI_ENUMTYPES_HXX
#include "QEnumTypes.hxx"
-#endif
-#ifndef _RTL_USTRING_HXX_
#include <rtl/ustring.hxx>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_
#include <com/sun/star/beans/PropertyValue.hpp>
-#endif
-#ifndef _VOS_REF_HXX_
-#include <vos/ref.hxx>
-#endif
+#include <rtl/ref.hxx>
+
+#include <salhelper/simplereferenceobject.hxx>
+
+namespace comphelper
+{
+ class NamedValueCollection;
+}
+ namespace comphelper
+ {
+ class NamedValueCollection;
+ }
+
class Window;
namespace dbaui
{
diff --cc dbaccess/source/ui/misc/WTypeSelect.cxx
index de188ed,0e9226a..9094982
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@@ -28,21 -27,51 +28,23 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef DBAUI_WIZ_TYPESELECT_HXX
#include "WTypeSelect.hxx"
-#endif
-#ifndef DBAUI_WIZARD_PAGES_HRC
#include "WizardPages.hrc"
-#endif
-#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
-#endif
-#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
-#endif
-#ifndef TOOLS_DIAGNOSE_EX_H
#include <tools/diagnose_ex.h>
-#endif
-#ifndef DBAUI_FIELDDESCRIPTIONS_HXX
#include "FieldDescriptions.hxx"
-#endif
-#ifndef DBAUI_WIZ_COPYTABLEDIALOG_HXX
#include "WCopyTable.hxx"
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _DBU_MISC_HRC_
#include "dbu_misc.hrc"
-#endif
-#ifndef _STREAM_HXX
#include <tools/stream.hxx>
-#endif
-#ifndef _SVPARSER_HXX
#include <svtools/svparser.hxx>
-#endif
-#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
-#endif
-#ifndef _DBAUI_SQLMESSAGE_HXX_
#include "sqlmessage.hxx"
-#endif
-#ifndef DBAUI_FIELDCONTROLS_HXX
#include "FieldControls.hxx"
-#endif
+ #include "dbaccess_slotid.hrc"
+
using namespace ::dbaui;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --cc dbaccess/source/ui/misc/WizardPages.src
index 39e7fbe,21f4793..9910a99
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@@ -122,12 -127,14 +126,13 @@@ TabPage TAB_WIZ_COLUMN_SELEC
FixedLine FL_COLUMN_SELECT
{
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ;
- Text [ en-US ] = "Existing columns" ;
+ Pos = MAP_APPFONT ( 6 , 3 ) ;
+ Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ;
+ Text [ en-US ] = "Existing columns" ;
};
-
MultiListBox LB_ORG_COLUMN_NAMES
{
+ HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES";
Border = TRUE ;
Pos = MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ;
Size = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ;
diff --cc dbaccess/source/ui/querydesign/QueryDesignView.cxx
index ab89750,42ec8d4..4e04790
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@@ -549,7 -621,7 +549,7 @@@ namespac
else if (SQL_ISRULEOR2(pNode,search_condition,boolean_term) && // AND/OR-Verknuepfung:
pNode->count() == 3)
{
-- // nur AND Verknüpfung zulassen
++ // nur AND Verkn�pfung zulassen
if (!SQL_ISTOKEN(pNode->getChild(1),AND))
eErrorCode = eIllegalJoinCondition;
else if ( eOk == (eErrorCode = InsertJoinConnection(_pView,pNode->getChild(0), _eJoinType,pLeftTable,pRightTable)) )
@@@ -840,7 -913,7 +840,7 @@@
}
}
}
-- // nur einmal für jedes Feld
++ // nur einmal f�r jedes Feld
else if ( !i && pEntryField->isCondition() )
{
if (!aWhereStr.getLength()) // noch keine Kriterien
@@@ -1864,7 -1944,7 +1864,7 @@@
if ( !checkJoinConditions(_pView,pNode->getChild(0)) || !checkJoinConditions(_pView,pRightTableRef))
return sal_False;
-- // named column join wird später vieleicht noch implementiert
++ // named column join wird sp�ter vieleicht noch implementiert
// SQL_ISRULE(pNode->getChild(4),named_columns_join)
EJoinType eJoinType = INNER_JOIN;
bool bNatural = false;
@@@ -2136,7 -2216,7 +2136,7 @@@
return eNoSelectStatement;
::connectivity::OSQLParseNode* pParseTree = pNode->getChild(2); // selection
-- sal_Bool bFirstField = sal_True; // bei der Initialisierung muß auf alle Faelle das erste Feld neu aktiviert werden
++ sal_Bool bFirstField = sal_True; // bei der Initialisierung mu� auf alle Faelle das erste Feld neu aktiviert werden
SqlParseError eErrorCode = eOk;
@@@ -3211,6 -3297,4 +3216,7 @@@ void OQueryDesignView::fillFunctionInfo
aInfo->SetField(sFieldName);
aInfo->SetTabWindow(NULL);
}
++
// -----------------------------------------------------------------------------
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index e0993e9,90fa24b..08a5e38
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@@ -217,7 -266,7 +217,7 @@@ void OSelectionBrowseBox::initialize(
m_aFunctionStrings += String(RTL_CONSTASCII_USTRINGPARAM(";"));
m_aFunctionStrings += sGroup;
-- // Diese Funktionen stehen nur unter CORE zur Verfügung
++ // Diese Funktionen stehen nur unter CORE zur Verf�gung
if ( lcl_SupportsCoreSQLGrammar(xConnection) )
{
xub_StrLen nCount = m_aFunctionStrings.GetTokenCount();
@@@ -1068,7 -1117,7 +1068,7 @@@ sal_Bool OSelectionBrowseBox::SaveModif
{
strOldCellContents = pEntry->GetFunction();
sal_uInt16 nPos = m_pFunctionCell->GetSelectEntryPos();
-- // Diese Funktionen stehen nur unter CORE zur Verfügung
++ // Diese Funktionen stehen nur unter CORE zur Verf�gung
String sFunctionName = m_pFunctionCell->GetEntry(nPos);
String sGroupFunctionName = m_aFunctionStrings.GetToken(m_aFunctionStrings.GetTokenCount()-1);
sal_Bool bGroupBy = sal_False;
@@@ -1352,7 -1402,7 +1352,7 @@@ void OSelectionBrowseBox::RemoveField(s
//------------------------------------------------------------------------------
void OSelectionBrowseBox::adjustSelectionMode( sal_Bool _bClickedOntoHeader, sal_Bool _bClickedOntoHandleCol )
{
-- // wenn ein Header selectiert wird, muß die selection angezeigt werden, sonst nicht)
++ // wenn ein Header selectiert wird, mu� die selection angezeigt werden, sonst nicht)
if ( _bClickedOntoHeader )
{
if (0 == GetSelectColumnCount() )
@@@ -2754,7 -2806,7 +2754,7 @@@ void OSelectionBrowseBox::setFunctionCe
Reference< XConnection> xConnection = static_cast<OQueryController&>(getDesignView()->getController()).getConnection();
if ( xConnection.is() )
{
-- // Diese Funktionen stehen nur unter CORE zur Verfügung
++ // Diese Funktionen stehen nur unter CORE zur Verf�gung
if ( lcl_SupportsCoreSQLGrammar(xConnection) )
{
// if we have an asterix, no other function than count is allowed
diff --cc dbaccess/source/ui/tabledesign/TEditControl.cxx
index 4f4dedb,6990143..7c1587a
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@@ -28,33 -27,87 +28,36 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef DBAUI_TABLEEDITORCONTROL_HXX
#include "TEditControl.hxx"
-#endif
-#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
-#endif
-#ifndef _COM_SUN_STAR_SDBC_XDATABASEMETADATA_HPP_
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XALTERTABLE_HPP_
#include <com/sun/star/sdbcx/XAlterTable.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XDROP_HPP_
#include <com/sun/star/sdbcx/XDrop.hpp>
-#endif
-#ifndef _COM_SUN_STAR_SDBCX_XAPPEND_HPP_
#include <com/sun/star/sdbcx/XAppend.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_XNUMBERFORMATTYPES_HPP_
#include <com/sun/star/util/XNumberFormatTypes.hpp>
-#endif
-#ifndef _DBU_TBL_HRC_
#include "dbu_tbl.hrc"
-#endif
-#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
-#endif
-#ifndef _DBA_DBACCESS_HELPID_HRC_
#include "dbaccess_helpid.hrc"
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
-#endif
-#ifndef DBAUI_FIELDDESCRIPTIONCONTROL_HXX
#include "FieldDescControl.hxx"
-#endif
-#ifndef DBAUI_FIELDDESCRIPTIONS_HXX
#include "FieldDescriptions.hxx"
-#endif
-#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
-#endif
-#ifndef DBAUI_TABLEUNDO_HXX
#include "TableUndo.hxx"
-#endif
-#ifndef DBUI_TABLECONTROLLER_HXX
#include "TableController.hxx"
-#endif
-#ifndef _CONNECTIVITY_DBTOOLS_HXX_
#include <connectivity/dbtools.hxx>
-#endif
-#ifndef DBAUI_SQLNAMEEDIT_HXX
#include "SqlNameEdit.hxx"
-#endif
-#ifndef DBAUI_TABLEROW_EXCHANGE_HXX
#include "TableRowExchange.hxx"
-#endif
-#ifndef _SOT_STORAGE_HXX
#include <sot/storage.hxx>
-#endif
-#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
-#endif
-#ifndef DBAUI_FIELDDESCRIPTIONCONTROL_HXX
#include "FieldDescControl.hxx"
-#endif
-#ifndef DBAUI_TABLEFIELDCONTROL_HXX
#include "TableFieldControl.hxx"
-#endif
+#include "dsntypes.hxx"
+ #include "dsntypes.hxx"
+
+ #include "dbaccess_slotid.hrc"
using namespace ::dbaui;
using namespace ::comphelper;
@@@ -1527,9 -1602,9 +1530,9 @@@ sal_Bool OTableEditorCtrl::IsPrimaryKey
Reference<XPropertySet> xTable = rController.getTable();
//////////////////////////////////////////////////////////////
// Key darf nicht veraendert werden
-- // Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine ::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgeführt
++ // Dies gilt jedoch nur, wenn die Tabelle nicht neu ist und keine ::com::sun::star::sdbcx::View. Ansonsten wird kein DROP ausgef�hrt
- if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString::createFromAscii("VIEW"))
+ if(xTable.is() && ::comphelper::getString(xTable->getPropertyValue(PROPERTY_TYPE)) == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW")))
return sal_False;
//////////////////////////////////////////////////////////////
// Wenn leeres Feld, kein PrimKey
@@@ -1549,7 -1624,7 +1552,7 @@@
{
//////////////////////////////////////////////////////////////
// Wenn Feldtyp Memo oder Image, kein PrimKey
-- // oder wenn Spalten nicht gedroped werden können und das Required Flag ist nicht gesetzt
++ // oder wenn Spalten nicht gedroped werden k�nnen und das Required Flag ist nicht gesetzt
// oder wenn eine ::com::sun::star::sdbcx::View vorhanden ist und das Required Flag nicht gesetzt ist
TOTypeInfoSP pTypeInfo = pFieldDescr->getTypeInfo();
if( pTypeInfo->nSearchType == ColumnSearch::NONE
diff --cc dbaccess/source/ui/tabledesign/TableController.cxx
index 9e3805c,180019a..0e0549e
--- a/dbaccess/source/ui/tabledesign/TableController.cxx
+++ b/dbaccess/source/ui/tabledesign/TableController.cxx
@@@ -1594,6 -1603,6 +1594,14 @@@ sal_Int32 OTableController::getFirstEmp
nRet = m_vRowList.size();
m_vRowList.push_back( pTabEdRow);
}
++ if ( nRet == -1 )
++ {
++ bool bReadRow = !isAddAllowed();
++ ::boost::shared_ptr<OTableRow> pTabEdRow(new OTableRow());
++ pTabEdRow->SetReadOnly(bReadRow);
++ nRet = m_vRowList.size();
++ m_vRowList.push_back( pTabEdRow);
++ }
return nRet;
}
// -----------------------------------------------------------------------------
diff --cc dbaccess/source/ui/uno/dbinteraction.cxx
index f0fbb2d,e735c03..f0fbb2d
mode 100644,100755..100755
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
diff --cc reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
index 0000000,446efac..5238edf
mode 000000,100755..100644
--- a/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
+++ b/reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
@@@ -1,0 -1,652 +1,584 @@@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+ package complex.reportdesign;
+
+ import java.io.File;
+ import java.util.ArrayList;
+
+ import com.sun.star.beans.PropertyValue;
+ import com.sun.star.beans.XPropertySet;
+ import com.sun.star.container.XNameAccess;
+ import com.sun.star.frame.XComponentLoader;
+ import com.sun.star.frame.XDesktop;
+ import com.sun.star.frame.XModel;
+ import com.sun.star.frame.XStorable;
+ import com.sun.star.lang.XComponent;
+ import com.sun.star.lang.XMultiServiceFactory;
+ import com.sun.star.sdb.XDocumentDataSource;
+ import com.sun.star.sdb.XOfficeDatabaseDocument;
+ import com.sun.star.sdb.XReportDocumentsSupplier;
+ import com.sun.star.sdb.application.XDatabaseDocumentUI;
+ import com.sun.star.uno.UnoRuntime;
+ import com.sun.star.uno.XInterface;
+ import com.sun.star.util.XCloseable;
+
-// import util.BasicMacroTools;
-// import util.DesktopTools;
-// import util.dbg;
+ // import complexlib.ComplexTestCase;
+ // import util.utils;
+ import helper.OfficeProvider;
+ import helper.URLHelper;
+ // import helper.OfficeWatcher;
+
+ import convwatch.DB;
+
-// import java.util.Date;
-// import java.text.SimpleDateFormat;
-// import java.text.ParsePosition;
-// import java.sql.Time;
-//
-// import java.io.BufferedReader;
-// import java.io.File;
-// import java.io.FileReader;
-// import java.io.IOException;
-// import java.io.FilenameFilter;
-//
-// import java.util.Vector;
-//
-// import helper.AppProvider;
-// import java.text.DecimalFormat;
-// import util.DynamicClassLoader;
-// import java.util.StringTokenizer;
-
+ import org.junit.After;
+ import org.junit.AfterClass;
+ import org.junit.Before;
+ import org.junit.BeforeClass;
+ import org.junit.Test;
+ import org.openoffice.test.OfficeConnection;
+ import static org.junit.Assert.*;
+
-
+ class PropertySetHelper
+ {
+ XPropertySet m_xPropertySet;
+ public PropertySetHelper(Object _aObj)
+ {
+ m_xPropertySet = UnoRuntime.queryInterface(XPropertySet.class, _aObj);
+ }
+
+ /**
+ get a property and don't convert it
+ @param _sName the string name of the property
+ @return the object value of the property without any conversion
+ */
+ public Object getPropertyValueAsObject(String _sName)
+ {
+ Object aObject = null;
+
+ if (m_xPropertySet != null)
+ {
+ try
+ {
+ aObject = m_xPropertySet.getPropertyValue(_sName);
+ }
+ catch (com.sun.star.beans.UnknownPropertyException e)
+ {
+ System.out.println("ERROR: UnknownPropertyException caught. '" + _sName + "'");
+ System.out.println("Message: " + e.getMessage());
+ }
+ catch (com.sun.star.lang.WrappedTargetException e)
+ {
+ System.out.println("ERROR: WrappedTargetException caught.");
+ System.out.println("Message: " + e.getMessage());
+ }
+ }
+ return aObject;
+ }
+ }
+
+ class PropertyHelper
+ {
+ /**
+ Create a PropertyValue[] from a ArrayList
+ @param _aArrayList
+ @return a PropertyValue[]
+ */
+ public static PropertyValue[] createPropertyValueArrayFormArrayList(ArrayList _aPropertyList)
+ {
+ // copy the whole PropertyValue List to an PropertyValue Array
+ PropertyValue[] aSaveProperties = null;
+
+ if (_aPropertyList == null)
+ {
+ aSaveProperties = new PropertyValue[0];
+ }
+ else
+ {
+ if (_aPropertyList.size() > 0)
+ {
+ aSaveProperties = new PropertyValue[_aPropertyList.size()];
+ for (int i = 0;i<_aPropertyList.size(); i++)
+ {
+ aSaveProperties[i] = (PropertyValue) _aPropertyList.get(i);
+ }
+ }
+ else
+ {
+ aSaveProperties = new PropertyValue[0];
+ }
+ }
+ return aSaveProperties;
+ }
+ }
+
+ public class ReportDesignerTest
+ {
+
+ String mTestDocumentPath;
+
+ // public String[] getTestMethodNames()
+ // {
+ // return new String[] {"firsttest"};
+ // }
+
+ @Before public void before()
+ {
+ System.out.println("before");
+ // String tempdir = System.getProperty("java.io.tmpdir");
+ //
+ int dummy = 0;
+ // m_xXMultiServiceFactory = getMSF();
+ }
+
+ @After public void after()
+ {
+ System.out.println("after");
+ }
+
+ // private void checkIfOfficeExists(String _sOfficePathWithTrash)
+ // {
+ // String sOfficePath = "";
+ // int nIndex = _sOfficePathWithTrash.indexOf("soffice.exe");
+ // if (nIndex > 0)
+ // {
+ // sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 11);
+ // }
+ // else
+ // {
+ // nIndex = _sOfficePathWithTrash.indexOf("soffice");
+ // if (nIndex > 0)
+ // {
+ // sOfficePath = _sOfficePathWithTrash.substring(0, nIndex + 7);
+ // }
+ // }
+ //
+ // System.out.println(sOfficePath);
+ // File sOffice = new File(sOfficePath);
+ // if (! sOffice.exists())
+ // {
+ // System.out.println("ERROR: There exists no office installation at given path: '" + sOfficePath + "'");
+ // System.exit(0);
+ // }
+ // }
+
+
+ private XDesktop m_xDesktop = null;
+ public XDesktop getXDesktop()
+ {
+
+ if (m_xDesktop == null)
+ {
+ try
+ {
+ XInterface xInterface = (XInterface) getMSF().createInstance( "com.sun.star.frame.Desktop" );
+ m_xDesktop = UnoRuntime.queryInterface(XDesktop.class, xInterface);
+ assertNotNull("Can't get XDesktop", m_xDesktop);
+ }
+ catch (com.sun.star.uno.Exception e)
+ {
+ System.out.println("ERROR: uno.Exception caught");
+ System.out.println("Message: " + e.getMessage());
+ }
+ }
+ return m_xDesktop;
+ }
+
+ private void showElements(XNameAccess _xNameAccess)
+ {
+ if (_xNameAccess != null)
+ {
+ String[] sElementNames = _xNameAccess.getElementNames();
+ for(int i=0;i<sElementNames.length; i++)
+ {
+ System.out.println("Value: [" + i + "] := " + sElementNames[i]);
+ }
+ }
+ else
+ {
+ System.out.println("Warning: Given object is null.");
+ }
+ }
+
+
+ private OfficeProvider m_aProvider = null;
+ // private void startOffice()
+ // {
+ // // int tempTime = param.getInt("SingleTimeOut");
+ // param.put("TimeOut", new Integer(300000));
+ // System.out.println("TimeOut: " + param.getInt("TimeOut"));
+ // System.out.println("ThreadTimeOut: " + param.getInt("ThreadTimeOut"));
+ //
+ // // OfficeProvider aProvider = null;
+ // m_aProvider = new OfficeProvider();
+ // m_xXMultiServiceFactory = (XMultiServiceFactory) m_aProvider.getManager(param);
+ // param.put("ServiceFactory", m_xXMultiServiceFactory);
+ // }
+ //
+ // private void stopOffice()
+ // {
+ // if (m_aProvider != null)
+ // {
+ // m_aProvider.closeExistingOffice(param, true);
+ // m_aProvider = null;
+ // }
+ // }
+
+ private String m_sMailAddress = null;
+ private String m_sUPDMinor;
+ private String m_sCWS_WORK_STAMP;
+
+ private static final int WRITER = 1;
+ private static final int CALC = 2;
+
+ @Test public void firsttest()
+ {
+ // convwatch.GlobalLogWriter.set(log);
+
+ // -------------------- preconditions, try to find an office --------------------
+
+ // String sAppExecutionCommand = (String) param.get("AppExecutionCommand");
+
+ String sUser = System.getProperty("user.name");
+ System.out.println("user.name='" + sUser + "'");
+
+ String sVCSID = System.getProperty("VCSID");
+ System.out.println("VCSID='" + sVCSID + "'");
+ m_sMailAddress = sVCSID + "@openoffice.org";
+ System.out.println("Assumed mail address: " + m_sMailAddress);
+
+ m_sUPDMinor = System.getProperty("UPDMINOR");
+ m_sCWS_WORK_STAMP = System.getProperty("CWS_WORK_STAMP");
- // createDBEntry();
+ System.out.println("Current CWS: " + m_sCWS_WORK_STAMP);
+ System.out.println("Current MWS: " + m_sUPDMinor);
+
- // System.exit(1);
-
+ // sAppExecutionCommand = sAppExecutionCommand.replaceAll( "\\$\\{USERNAME\\}", sUser);
+ // System.out.println("sAppExecutionCommand='" + sAppExecutionCommand + "'");
+ //
- // an other way to replace strings
- // sAppExecutionCommand = utils.replaceAll13(sAppExecutionCommand, "${USERNAME}", sUser);
-
+ // checkIfOfficeExists(sAppExecutionCommand);
+ // param.put("AppExecutionCommand", new String(sAppExecutionCommand));
+
+ // --------------------------- Start the given Office ---------------------------
+
+ // startOffice();
+
+ // ------------------------------ Start a test run ------------------------------
+
+ // String sCurrentDirectory = System.getProperty("user.dir");
+ // System.out.println("Current Dir: " + sCurrentDirectory);
+ //
+ String sWriterDocument = TestDocument.getUrl("RPTWriterTests.odb");
+ startTestForFile(sWriterDocument, WRITER);
+
+ String sCalcDocument = TestDocument.getUrl("RPTCalcTests.odb");
+ startTestForFile(sCalcDocument, CALC);
+ // catch (AssureException e)
+ // {
+ // stopOffice();
+ // throw new AssureException(e.getMessage());
+ // }
+ //
+ // ------------------------------ Office shutdown ------------------------------
+ // stopOffice();
+ }
+
+ // -----------------------------------------------------------------------------
+ private void startTestForFile(String _sDocument, int _nType)
+ {
+ FileURL aFileURL = new FileURL(_sDocument);
+ assertTrue("Test File doesn't '" + _sDocument + "'exist.", aFileURL.exists());
+
+ String sFileURL = _sDocument; // URLHelper.getFileURLFromSystemPath(_sDocument);
+ System.out.println("File URL: " + sFileURL);
+
+ XComponent xDocComponent = loadComponent(sFileURL, getXDesktop(), null);
+ System.out.println("Load done");
+ assertNotNull("Can't load document ", xDocComponent);
+
- // context = createUnoService("com.sun.star.sdb.DatabaseContext")
-// oDataBase = context.getByName("hh")
-// oDBDoc = oDataBase.DatabaseDocument
-//
-// dim args(1) as new com.sun.star.beans.PropertyValue
-// args(0).Name = "ActiveConnection"
-// args(0).Value = oDBDoc.getCurrentController().getPropertyValue("ActiveConnection")
-// reportContainer = oDBDoc.getReportDocuments()
-// report = reportContainer.loadComponentFromURL("Report40","",0,args)
+
+ try
+ {
+ XInterface x = (XInterface)getMSF().createInstance("com.sun.star.sdb.DatabaseContext");
+ assertNotNull("can't create instance of com.sun.star.sdb.DatabaseContext", x);
+ System.out.println("createInstance com.sun.star.sdb.DatabaseContext done");
+
+ XNameAccess xNameAccess = UnoRuntime.queryInterface(XNameAccess.class, x);
+ showElements(xNameAccess);
+ Object aObj = xNameAccess.getByName(sFileURL);
-// System.out.println("1");
+
- // PropertySetHelper aHelper = new PropertySetHelper(aObj);
+ XDocumentDataSource xDataSource = UnoRuntime.queryInterface(XDocumentDataSource.class, aObj);
-// Object aDatabaseDocmuent = aHelper.getPropertyValueAsObject("DatabaseDocument");
+ XOfficeDatabaseDocument xOfficeDBDoc = xDataSource.getDatabaseDocument();
+
- // XOfficeDatabaseDocument xOfficeDBDoc = (XOfficeDatabaseDocument)UnoRuntime.queryInterface(XOfficeDatabaseDocument.class, aDatabaseDocument);
+ assertNotNull("can't access DatabaseDocument", xOfficeDBDoc);
-// System.out.println("2");
+
+ XModel xDBSource = UnoRuntime.queryInterface(XModel.class, xOfficeDBDoc);
+ Object aController = xDBSource.getCurrentController();
+ assertNotNull("Controller of xOfficeDatabaseDocument is empty!", aController);
-// System.out.println("3");
+
+ XDatabaseDocumentUI aDBDocUI = UnoRuntime.queryInterface(XDatabaseDocumentUI.class, aController);
+ /* boolean isConnect = */
+ // TODO: throws an exception in DEV300m78
+ aDBDocUI.connect();
-// if (isConnect)
-// {
-// System.out.println("true");
-// }
-// else
-// {
-// System.out.println("false");
-// }
-// System.out.println("4");
-
- // aHelper = new PropertySetHelper(aController);
-
- // Object aActiveConnectionObj = aHelper.getPropertyValueAsObject("ActiveConnection");
+ Object aActiveConnectionObj = aDBDocUI.getActiveConnection();
+ assertNotNull("ActiveConnection is empty", aActiveConnectionObj);
-// System.out.println("5");
+
+ XReportDocumentsSupplier xSupplier = UnoRuntime.queryInterface(XReportDocumentsSupplier.class, xOfficeDBDoc);
+ xNameAccess = xSupplier.getReportDocuments();
+ assertNotNull("xOfficeDatabaseDocument returns no Report Document", xNameAccess);
-// System.out.println("5");
+
+ showElements(xNameAccess);
+
+ ArrayList<PropertyValue> aPropertyList = new ArrayList<PropertyValue>();
+
+ PropertyValue aActiveConnection = new PropertyValue();
+ aActiveConnection.Name = "ActiveConnection";
+ aActiveConnection.Value = aActiveConnectionObj;
+ aPropertyList.add(aActiveConnection);
+
+ loadAndStoreReports(xNameAccess, aPropertyList, _nType);
+ createDBEntry(_nType);
+ }
+ catch(com.sun.star.uno.Exception e)
+ {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list