[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 167 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
Wed Mar 9 21:26:39 PST 2011
dbaccess/inc/AsyncronousLink.hxx | 2
dbaccess/inc/IEnvironment.hxx | 80
dbaccess/inc/dataview.hxx | 11
dbaccess/inc/dbaccess_helpid.hrc | 870 +++----
dbaccess/inc/dbaccess_slotid.hrc | 3
dbaccess/inc/dbaundomanager.hxx | 103
dbaccess/inc/dbsubcomponentcontroller.hxx | 215 +
dbaccess/inc/genericcontroller.hxx | 2
dbaccess/inc/singledoccontroller.hxx | 236 --
dbaccess/prj/build.lst | 8
dbaccess/prj/d.lst | 6
dbaccess/qa/complex/dbaccess/ApplicationController.java | 46
dbaccess/qa/complex/dbaccess/Beamer.java | 106
dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java | 16
dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java | 8
dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 61
dbaccess/qa/complex/dbaccess/DataSource.java | 57
dbaccess/qa/complex/dbaccess/DatabaseApplication.java | 11
dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 222 -
dbaccess/qa/complex/dbaccess/Parser.java | 45
dbaccess/qa/complex/dbaccess/PropertyBag.java | 123 -
dbaccess/qa/complex/dbaccess/Query.java | 42
dbaccess/qa/complex/dbaccess/QueryInQuery.java | 46
dbaccess/qa/complex/dbaccess/RowSet.java | 190 -
dbaccess/qa/complex/dbaccess/RowSetEventListener.java | 2
dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java | 128 -
dbaccess/qa/complex/dbaccess/TestCase.java | 152 +
dbaccess/qa/complex/dbaccess/UISettings.java | 40
dbaccess/qa/complex/dbaccess/dbaccess.sce | 12
dbaccess/qa/complex/dbaccess/makefile.mk | 88
dbaccess/source/core/api/BookmarkSet.hxx | 2
dbaccess/source/core/api/CacheSet.cxx | 5
dbaccess/source/core/api/CacheSet.hxx | 3
dbaccess/source/core/api/KeySet.cxx | 14
dbaccess/source/core/api/KeySet.hxx | 3
dbaccess/source/core/api/OptimisticSet.cxx | 7
dbaccess/source/core/api/OptimisticSet.hxx | 3
dbaccess/source/core/api/RowSet.cxx | 20
dbaccess/source/core/api/RowSetBase.cxx | 3
dbaccess/source/core/api/RowSetCache.cxx | 17
dbaccess/source/core/api/RowSetCache.hxx | 5
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 2
dbaccess/source/core/api/StaticSet.cxx | 5
dbaccess/source/core/api/StaticSet.hxx | 4
dbaccess/source/core/api/WrappedResultSet.hxx | 2
dbaccess/source/core/api/query.cxx | 2
dbaccess/source/core/misc/dsntypes.cxx | 2
dbaccess/source/core/misc/services.cxx | 22
dbaccess/source/core/resource/strings.src | 2
dbaccess/source/ext/adabas/Acomponentmodule.cxx | 48
dbaccess/source/ext/adabas/Acomponentmodule.hxx | 17
dbaccess/source/ext/adabas/AdabasNewDb.cxx | 16
dbaccess/source/ext/adabas/AdabasNewDb.hxx | 6
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/dbmm_types.cxx | 2
dbaccess/source/ext/macromigration/macromigration.src | 10
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 4
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 2
dbaccess/source/ext/macromigration/makefile.mk | 8
dbaccess/source/ext/macromigration/migrationlog.cxx | 4
dbaccess/source/ext/macromigration/rangeprogressbar.hxx | 2
dbaccess/source/filter/migration/cfgimport.cxx | 1180 ----------
dbaccess/source/filter/migration/cfgimport.hxx | 202 -
dbaccess/source/filter/migration/cfgservices.cxx | 111
dbaccess/source/filter/migration/makefile.mk | 73
dbaccess/source/filter/xml/dbaxml.component | 49
dbaccess/source/filter/xml/dbloader2.cxx | 2
dbaccess/source/filter/xml/makefile.mk | 8
dbaccess/source/filter/xml/xmlExport.cxx | 2
dbaccess/source/filter/xml/xmlExport.hxx | 2
dbaccess/source/filter/xml/xmlfilter.cxx | 2
dbaccess/source/filter/xml/xmlservices.cxx | 22
dbaccess/source/inc/cfg_reghelper.hxx | 50
dbaccess/source/inc/cfgstrings.hrc | 99
dbaccess/source/inc/registrationhelper.hxx | 10
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 21
dbaccess/source/shared/cfg_reghelper.cxx | 46
dbaccess/source/shared/cfgstrings.cxx | 93
dbaccess/source/shared/makefile.mk | 7
dbaccess/source/shared/registrationhelper.cxx | 48
dbaccess/source/ui/app/AppController.cxx | 4
dbaccess/source/ui/app/AppController.hxx | 2
dbaccess/source/ui/app/AppControllerGen.cxx | 4
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 57
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 12
dbaccess/source/ui/app/AppDetailView.cxx | 14
dbaccess/source/ui/app/AppDetailView.hxx | 14
dbaccess/source/ui/app/AppIconControl.cxx | 10
dbaccess/source/ui/app/AppSwapWindow.cxx | 10
dbaccess/source/ui/app/AppSwapWindow.hxx | 6
dbaccess/source/ui/app/AppTitleWindow.cxx | 4
dbaccess/source/ui/app/AppTitleWindow.hxx | 8
dbaccess/source/ui/app/AppView.cxx | 2
dbaccess/source/ui/app/app.src | 19
dbaccess/source/ui/browser/brwctrlr.cxx | 81
dbaccess/source/ui/browser/brwview.cxx | 4
dbaccess/source/ui/browser/dataview.cxx | 37
dbaccess/source/ui/browser/dbexchange.cxx | 2
dbaccess/source/ui/browser/dbtreemodel.hxx | 4
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 4
dbaccess/source/ui/browser/exsrcbrw.cxx | 2
dbaccess/source/ui/browser/genericcontroller.cxx | 18
dbaccess/source/ui/browser/sbabrw.src | 2
dbaccess/source/ui/browser/sbagrid.cxx | 2
dbaccess/source/ui/browser/unodatbr.cxx | 348 ++
dbaccess/source/ui/control/ColumnControlWindow.cxx | 2
dbaccess/source/ui/control/FieldDescControl.cxx | 16
dbaccess/source/ui/control/RelationControl.cxx | 64
dbaccess/source/ui/control/TableGrantCtrl.cxx | 60
dbaccess/source/ui/control/charsetlistbox.cxx | 2
dbaccess/source/ui/control/curledit.cxx | 4
dbaccess/source/ui/control/dbtreelistbox.cxx | 42
dbaccess/source/ui/control/listviewitems.cxx | 2
dbaccess/source/ui/control/opendoccontrols.cxx | 14
dbaccess/source/ui/control/sqledit.cxx | 6
dbaccess/source/ui/control/tabletree.cxx | 14
dbaccess/source/ui/control/toolboxcontroller.cxx | 22
dbaccess/source/ui/dlg/AdabasStat.cxx | 4
dbaccess/source/ui/dlg/AdabasStat.src | 7
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 25
dbaccess/source/ui/dlg/CollectionView.cxx | 4
dbaccess/source/ui/dlg/CollectionView.src | 4
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4
dbaccess/source/ui/dlg/ConnectionPage.cxx | 10
dbaccess/source/ui/dlg/ConnectionPage.hxx | 2
dbaccess/source/ui/dlg/ConnectionPage.src | 7
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 2
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 4
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 12
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 32
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 8
dbaccess/source/ui/dlg/DriverSettings.cxx | 2
dbaccess/source/ui/dlg/ExtensionNotPresent.cxx | 208 -
dbaccess/source/ui/dlg/ExtensionNotPresent.hrc | 47
dbaccess/source/ui/dlg/ExtensionNotPresent.src | 81
dbaccess/source/ui/dlg/RelationDlg.cxx | 26
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.cxx | 2
dbaccess/source/ui/dlg/UserAdminDlg.src | 1
dbaccess/source/ui/dlg/admincontrols.cxx | 6
dbaccess/source/ui/dlg/admincontrols.hxx | 2
dbaccess/source/ui/dlg/adminpages.cxx | 29
dbaccess/source/ui/dlg/adminpages.hxx | 12
dbaccess/source/ui/dlg/adodatalinks.cxx | 4
dbaccess/source/ui/dlg/adtabdlg.cxx | 16
dbaccess/source/ui/dlg/adtabdlg.src | 5
dbaccess/source/ui/dlg/advancedsettings.cxx | 54
dbaccess/source/ui/dlg/advancedsettings.hrc | 2
dbaccess/source/ui/dlg/advancedsettings.hxx | 9
dbaccess/source/ui/dlg/advancedsettings.src | 22
dbaccess/source/ui/dlg/dbadmin.cxx | 6
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.hxx | 2
dbaccess/source/ui/dlg/dbfindex.src | 8
dbaccess/source/ui/dlg/dbwiz.cxx | 2
dbaccess/source/ui/dlg/detailpages.cxx | 14
dbaccess/source/ui/dlg/detailpages.hxx | 28
dbaccess/source/ui/dlg/directsql.cxx | 4
dbaccess/source/ui/dlg/directsql.src | 6
dbaccess/source/ui/dlg/dlgattr.cxx | 4
dbaccess/source/ui/dlg/dlgsave.cxx | 6
dbaccess/source/ui/dlg/dlgsave.src | 3
dbaccess/source/ui/dlg/dlgsize.src | 9
dbaccess/source/ui/dlg/dsselect.cxx | 6
dbaccess/source/ui/dlg/dsselect.hxx | 2
dbaccess/source/ui/dlg/dsselect.src | 4
dbaccess/source/ui/dlg/generalpage.cxx | 4
dbaccess/source/ui/dlg/generalpage.hxx | 2
dbaccess/source/ui/dlg/indexdialog.src | 3
dbaccess/source/ui/dlg/makefile.mk | 1
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 | 11
dbaccess/source/ui/dlg/queryorder.cxx | 2
dbaccess/source/ui/dlg/queryorder.src | 6
dbaccess/source/ui/dlg/sqlmessage.cxx | 27
dbaccess/source/ui/dlg/sqlmessage.src | 1
dbaccess/source/ui/dlg/tablespage.cxx | 4
dbaccess/source/ui/dlg/tablespage.hxx | 4
dbaccess/source/ui/dlg/textconnectionsettings.src | 1
dbaccess/source/ui/inc/ColumnControlWindow.hxx | 2
dbaccess/source/ui/inc/ConnectionLine.hxx | 4
dbaccess/source/ui/inc/ExtensionNotPresent.hxx | 85
dbaccess/source/ui/inc/FieldControls.hxx | 46
dbaccess/source/ui/inc/FieldDescControl.hxx | 24
dbaccess/source/ui/inc/GeneralUndo.hxx | 2
dbaccess/source/ui/inc/JoinController.hxx | 2
dbaccess/source/ui/inc/JoinTableView.hxx | 16
dbaccess/source/ui/inc/QueryTableView.hxx | 14
dbaccess/source/ui/inc/RTableConnectionData.hxx | 20
dbaccess/source/ui/inc/RelationControl.hxx | 4
dbaccess/source/ui/inc/RelationController.hxx | 2
dbaccess/source/ui/inc/RelationDlg.hxx | 4
dbaccess/source/ui/inc/RelationTableView.hxx | 4
dbaccess/source/ui/inc/TableConnection.hxx | 6
dbaccess/source/ui/inc/TableConnectionData.hxx | 10
dbaccess/source/ui/inc/TableController.hxx | 3
dbaccess/source/ui/inc/TableDesignControl.hxx | 24
dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 2
dbaccess/source/ui/inc/TableDesignView.hxx | 2
dbaccess/source/ui/inc/TableGrantCtrl.hxx | 20
dbaccess/source/ui/inc/TableRow.hxx | 4
dbaccess/source/ui/inc/TableWindow.hxx | 28
dbaccess/source/ui/inc/TableWindowData.hxx | 8
dbaccess/source/ui/inc/TableWindowListBox.hxx | 8
dbaccess/source/ui/inc/TokenWriter.hxx | 18
dbaccess/source/ui/inc/UITools.hxx | 8
dbaccess/source/ui/inc/UserAdminDlg.hxx | 2
dbaccess/source/ui/inc/VertSplitView.hxx | 2
dbaccess/source/ui/inc/WCPage.hxx | 18
dbaccess/source/ui/inc/WColumnSelect.hxx | 2
dbaccess/source/ui/inc/adtabdlg.hxx | 2
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 2
dbaccess/source/ui/inc/brwctrlr.hxx | 13
dbaccess/source/ui/inc/charsetlistbox.hxx | 2
dbaccess/source/ui/inc/curledit.hxx | 6
dbaccess/source/ui/inc/dbadmin.hxx | 6
dbaccess/source/ui/inc/dbtreelistbox.hxx | 8
dbaccess/source/ui/inc/dbu_dlg.hrc | 22
dbaccess/source/ui/inc/dbu_resource.hrc | 2
dbaccess/source/ui/inc/dlgattr.hxx | 4
dbaccess/source/ui/inc/dlgsize.hxx | 2
dbaccess/source/ui/inc/dsitems.hxx | 3
dbaccess/source/ui/inc/dsmeta.hxx | 1
dbaccess/source/ui/inc/exsrcbrw.hxx | 2
dbaccess/source/ui/inc/imageprovider.hxx | 2
dbaccess/source/ui/inc/listviewitems.hxx | 2
dbaccess/source/ui/inc/moduledbu.hxx | 2
dbaccess/source/ui/inc/opendoccontrols.hxx | 4
dbaccess/source/ui/inc/propertystorage.hxx | 2
dbaccess/source/ui/inc/querycontroller.hxx | 2
dbaccess/source/ui/inc/queryfilter.hxx | 4
dbaccess/source/ui/inc/sbagrid.hxx | 2
dbaccess/source/ui/inc/singledoccontroller.hxx | 93
dbaccess/source/ui/inc/sqledit.hxx | 6
dbaccess/source/ui/inc/unodatbr.hxx | 12
dbaccess/source/ui/misc/DExport.cxx | 14
dbaccess/source/ui/misc/HtmlReader.cxx | 12
dbaccess/source/ui/misc/RowSetDrop.cxx | 10
dbaccess/source/ui/misc/RtfReader.cxx | 10
dbaccess/source/ui/misc/TokenWriter.cxx | 54
dbaccess/source/ui/misc/UITools.cxx | 6
dbaccess/source/ui/misc/WCPage.cxx | 6
dbaccess/source/ui/misc/WColumnSelect.cxx | 8
dbaccess/source/ui/misc/WNameMatch.cxx | 14
dbaccess/source/ui/misc/WTypeSelect.cxx | 8
dbaccess/source/ui/misc/WizardPages.src | 30
dbaccess/source/ui/misc/dbaundomanager.cxx | 395 +++
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 672 +++++
dbaccess/source/ui/misc/dbumiscres.src | 2
dbaccess/source/ui/misc/dsmeta.cxx | 1
dbaccess/source/ui/misc/imageprovider.cxx | 12
dbaccess/source/ui/misc/linkeddocuments.cxx | 3
dbaccess/source/ui/misc/makefile.mk | 75
dbaccess/source/ui/misc/singledoccontroller.cxx | 692 -----
dbaccess/source/ui/misc/uiservices.cxx | 22
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 10
dbaccess/source/ui/querydesign/JoinController.cxx | 6
dbaccess/source/ui/querydesign/JoinTableView.cxx | 134 -
dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 4
dbaccess/source/ui/querydesign/QTableConnectionData.hxx | 2
dbaccess/source/ui/querydesign/QTableWindow.hxx | 6
dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx | 8
dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx | 2
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 12
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx | 20
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx | 6
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx | 12
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx | 8
dbaccess/source/ui/querydesign/QueryTableView.cxx | 12
dbaccess/source/ui/querydesign/QueryTextView.cxx | 2
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 2
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 122 -
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 30
dbaccess/source/ui/querydesign/TableConnection.cxx | 8
dbaccess/source/ui/querydesign/TableConnectionData.cxx | 20
dbaccess/source/ui/querydesign/TableWindow.cxx | 44
dbaccess/source/ui/querydesign/TableWindowData.cxx | 6
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 24
dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 2
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 2
dbaccess/source/ui/querydesign/querycontroller.cxx | 12
dbaccess/source/ui/querydesign/querydlg.cxx | 20
dbaccess/source/ui/querydesign/querydlg.hxx | 2
dbaccess/source/ui/querydesign/querydlg.src | 1
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 26
dbaccess/source/ui/relationdesign/RelationController.cxx | 6
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 18
dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 6
dbaccess/source/ui/tabledesign/TEditControl.cxx | 38
dbaccess/source/ui/tabledesign/TEditControl.hxx | 60
dbaccess/source/ui/tabledesign/TableController.cxx | 11
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 12
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 2
dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 2
dbaccess/source/ui/tabledesign/TableFieldControl.hxx | 6
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 2
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 6
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 2
dbaccess/source/ui/tabledesign/TableUndo.cxx | 28
dbaccess/source/ui/tabledesign/TableUndo.hxx | 14
dbaccess/source/ui/tabledesign/table.src | 4
dbaccess/source/ui/uno/ColumnControl.cxx | 4
dbaccess/source/ui/uno/ColumnControl.hxx | 1
dbaccess/source/ui/uno/copytablewizard.cxx | 19
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/ModuleHelper.hxx | 2
reportdesign/inc/ReportDefinition.hxx | 77
reportdesign/inc/RptDef.hxx | 18
reportdesign/inc/RptModel.hxx | 10
reportdesign/inc/RptObject.hxx | 20
reportdesign/inc/RptPage.hxx | 6
reportdesign/inc/UndoActions.hxx | 60
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/ReportDefinition.cxx | 176 -
reportdesign/source/core/api/services.cxx | 6
reportdesign/source/core/sdr/ReportDrawPage.cxx | 2
reportdesign/source/core/sdr/ReportUndoFactory.cxx | 10
reportdesign/source/core/sdr/RptModel.cxx | 8
reportdesign/source/core/sdr/RptObject.cxx | 22
reportdesign/source/core/sdr/RptPage.cxx | 16
reportdesign/source/core/sdr/UndoActions.cxx | 10
reportdesign/source/core/sdr/UndoEnv.cxx | 133 -
reportdesign/source/core/sdr/formatnormalizer.cxx | 4
reportdesign/source/filter/xml/xmlExport.cxx | 2
reportdesign/source/filter/xml/xmlExport.hxx | 2
reportdesign/source/filter/xml/xmlfilter.cxx | 2
reportdesign/source/filter/xml/xmlservices.cxx | 8
reportdesign/source/ui/dlg/AddField.cxx | 34
reportdesign/source/ui/dlg/CondFormat.cxx | 10
reportdesign/source/ui/dlg/Condition.cxx | 26
reportdesign/source/ui/dlg/Condition.hxx | 2
reportdesign/source/ui/dlg/DateTime.src | 4
reportdesign/source/ui/dlg/Formula.cxx | 14
reportdesign/source/ui/dlg/GroupExchange.cxx | 2
reportdesign/source/ui/dlg/GroupsSorting.cxx | 91
reportdesign/source/ui/dlg/GroupsSorting.src | 6
reportdesign/source/ui/dlg/Navigator.cxx | 34
reportdesign/source/ui/dlg/Navigator.src | 5
reportdesign/source/ui/dlg/PageNumber.src | 6
reportdesign/source/ui/dlg/dlgpage.cxx | 2
reportdesign/source/ui/inc/CondFormat.hxx | 4
reportdesign/source/ui/inc/DesignView.hxx | 36
reportdesign/source/ui/inc/Formula.hxx | 8
reportdesign/source/ui/inc/FunctionHelper.hxx | 4
reportdesign/source/ui/inc/GeometryHandler.hxx | 2
reportdesign/source/ui/inc/GroupsSorting.hxx | 4
reportdesign/source/ui/inc/ReportController.hxx | 111
reportdesign/source/ui/inc/ReportRuler.hxx | 2
reportdesign/source/ui/inc/ReportSection.hxx | 8
reportdesign/source/ui/inc/ReportWindow.hxx | 16
reportdesign/source/ui/inc/RptUndo.hxx | 156 +
reportdesign/source/ui/inc/ScrollHelper.hxx | 16
reportdesign/source/ui/inc/SectionWindow.hxx | 8
reportdesign/source/ui/inc/UITools.hxx | 2
reportdesign/source/ui/inc/Undo.hxx | 156 -
reportdesign/source/ui/inc/ViewsWindow.hxx | 30
reportdesign/source/ui/inc/dlgedfunc.hxx | 20
reportdesign/source/ui/inc/dlgpage.hxx | 2
reportdesign/source/ui/inc/metadata.hxx | 4
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 6
reportdesign/source/ui/inspection/DefaultInspection.cxx | 13
reportdesign/source/ui/inspection/GeometryHandler.cxx | 12
reportdesign/source/ui/inspection/ReportComponentHandler.cxx | 2
reportdesign/source/ui/inspection/metadata.cxx | 16
reportdesign/source/ui/misc/FunctionHelper.cxx | 8
reportdesign/source/ui/misc/RptUndo.cxx | 413 +++
reportdesign/source/ui/misc/UITools.cxx | 26
reportdesign/source/ui/misc/Undo.cxx | 412 ---
reportdesign/source/ui/misc/makefile.mk | 2
reportdesign/source/ui/misc/rptuiservices.cxx | 8
reportdesign/source/ui/misc/statusbarcontroller.cxx | 6
reportdesign/source/ui/misc/toolboxcontroller.cxx | 10
reportdesign/source/ui/report/DesignView.cxx | 48
reportdesign/source/ui/report/EndMarker.cxx | 10
reportdesign/source/ui/report/FixedTextColor.cxx | 2
reportdesign/source/ui/report/FormattedFieldBeautifier.cxx | 2
reportdesign/source/ui/report/ReportController.cxx | 435 +--
reportdesign/source/ui/report/ReportRuler.cxx | 2
reportdesign/source/ui/report/ReportSection.cxx | 28
reportdesign/source/ui/report/ReportWindow.cxx | 22
reportdesign/source/ui/report/ScrollHelper.cxx | 16
reportdesign/source/ui/report/SectionView.cxx | 18
reportdesign/source/ui/report/SectionWindow.cxx | 16
reportdesign/source/ui/report/StartMarker.cxx | 14
reportdesign/source/ui/report/ViewsWindow.cxx | 60
reportdesign/source/ui/report/dlgedfunc.cxx | 96
reportdesign/source/ui/report/propbrw.cxx | 6
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
423 files changed, 7624 insertions(+), 8238 deletions(-)
New commits:
commit 9da3711604902d631ce93f45f74cfe30d1ec9409
Merge: 14b3638... c290b52...
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Mar 9 23:17:51 2011 -0600
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
* commit 'ooo/DEV300_m101': (76 commits)
masterfix DEV300: #i10000# usage of L10N build_type
removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
hr75: #i116747#: remove obsolete copyright notices
gnumake3: remove comphelper version; fix including extract.hxx
removetooltypes01: #i112600# Replace missing tools types replacement
removetooltypes01: #i112600# remove tooltypes from reportdesign
removetooltypes01: #i112600# remove tooltypes from dbaccess
undoapi: don't use deprecated JUnit API, this seems to fail now (but didn't before the rebase)
undoapi: those two classes do not belong into JAVATESTFILES, but JAVAFILES only
undoapi: (I|Sfx)UndoManager now working with size_t instead of USHORT
gridsort: give the UnoControl(Model/Base) classes a ctor taking a service factory, so we have access to the factory which created us, and don't need to resort to the process'es service factory
dba34b: #109956# notify column value in correct order
dba34b: #i114309# set default values for bit boolean and reset when we are on the insertrow
undoapi: assert unknown slots in ImplInvalidateFeature
dba34b: #i110907# check if design handle event
dba34b: #i109956# notify column values when row is refreshed
dba34b: #i115753# add test again
undoapi: renamed Undo.* to RptUndo.*, to not confuse a certain IDE with different same-named files in the source tree ...
undoapi: migrated report designer to use an own, model-bound UndoManager, instead of the UndoManager formerly bound to the controller
undoapi: split OSingleDocumentController into DBSubComponentController (which the report design's controller will be derived from) and the still-so-named OSingleDocumentController. Module reportdesign does not compile with this change, this is yet to come.
...
Conflicts:
dbaccess/inc/IEnvironment.hxx
dbaccess/inc/dataview.hxx
dbaccess/qa/complex/dbaccess/RowSet.java
dbaccess/source/core/api/CacheSet.cxx
dbaccess/source/core/api/KeySet.hxx
dbaccess/source/core/api/OptimisticSet.hxx
dbaccess/source/core/api/RowSet.cxx
dbaccess/source/core/api/RowSetCache.cxx
dbaccess/source/ext/adabas/Acomponentmodule.cxx
dbaccess/source/ext/adabas/Aservices.cxx
dbaccess/source/filter/migration/cfgimport.cxx
dbaccess/source/filter/migration/cfgimport.hxx
dbaccess/source/filter/migration/cfgservices.cxx
dbaccess/source/filter/migration/makefile.mk
dbaccess/source/inc/cfg_reghelper.hxx
dbaccess/source/sdbtools/misc/sdbt_services.cxx
dbaccess/source/shared/cfg_reghelper.cxx
dbaccess/source/shared/cfgstrings.cxx
dbaccess/source/shared/registrationhelper.cxx
dbaccess/source/ui/app/AppController.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/AppSwapWindow.cxx
dbaccess/source/ui/browser/brwctrlr.cxx
dbaccess/source/ui/browser/dataview.cxx
dbaccess/source/ui/browser/unodatbr.cxx
dbaccess/source/ui/control/dbtreelistbox.cxx
dbaccess/source/ui/control/opendoccontrols.cxx
dbaccess/source/ui/control/tabletree.cxx
dbaccess/source/ui/dlg/ConnectionHelper.cxx
dbaccess/source/ui/dlg/ConnectionPage.src
dbaccess/source/ui/dlg/ExtensionNotPresent.cxx
dbaccess/source/ui/dlg/ExtensionNotPresent.hrc
dbaccess/source/ui/dlg/ExtensionNotPresent.src
dbaccess/source/ui/dlg/TablesSingleDlg.cxx
dbaccess/source/ui/dlg/adodatalinks.hxx
dbaccess/source/ui/dlg/dbadmin2.src
dbaccess/source/ui/dlg/dbadminsetup.src
dbaccess/source/ui/dlg/dlgattr.cxx
dbaccess/source/ui/dlg/dlgsize.src
dbaccess/source/ui/dlg/makefile.mk
dbaccess/source/ui/dlg/sqlmessage.cxx
dbaccess/source/ui/inc/ExtensionNotPresent.hxx
dbaccess/source/ui/inc/TokenWriter.hxx
dbaccess/source/ui/inc/imageprovider.hxx
dbaccess/source/ui/misc/DExport.cxx
dbaccess/source/ui/misc/HtmlReader.cxx
dbaccess/source/ui/misc/RowSetDrop.cxx
dbaccess/source/ui/misc/RtfReader.cxx
dbaccess/source/ui/misc/TokenWriter.cxx
dbaccess/source/ui/misc/imageprovider.cxx
dbaccess/source/ui/misc/linkeddocuments.cxx
dbaccess/source/ui/misc/singledoccontroller.cxx
dbaccess/source/ui/querydesign/ConnectionData.hxx
dbaccess/source/ui/querydesign/JoinTableView.cxx
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
dbaccess/source/ui/querydesign/TableConnectionData.cxx
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
dbaccess/source/ui/relationdesign/RelationController.cxx
dbaccess/source/ui/relationdesign/RelationTableView.cxx
dbaccess/source/ui/tabledesign/table.src
reportdesign/inc/RptPage.hxx
reportdesign/qa/complex/reportdesign/ReportDesignerTest.java
reportdesign/source/core/api/ReportDefinition.cxx
reportdesign/source/core/sdr/ReportUndoFactory.cxx
reportdesign/source/core/sdr/UndoEnv.cxx
reportdesign/source/filter/xml/xmlservices.cxx
reportdesign/source/ui/dlg/GroupsSorting.cxx
reportdesign/source/ui/dlg/Navigator.cxx
reportdesign/source/ui/inspection/metadata.cxx
reportdesign/source/ui/misc/RptUndo.cxx
reportdesign/source/ui/misc/UITools.cxx
reportdesign/source/ui/misc/rptuiservices.cxx
reportdesign/source/ui/report/DesignView.cxx
reportdesign/source/ui/report/FixedTextColor.cxx
reportdesign/source/ui/report/ReportController.cxx
reportdesign/source/ui/report/ReportSection.cxx
reportdesign/source/ui/report/SectionView.cxx
reportdesign/source/ui/report/SectionWindow.cxx
reportdesign/source/ui/report/StartMarker.cxx
reportdesign/source/ui/report/ViewsWindow.cxx
reportdesign/source/ui/report/dlgedfunc.cxx
reportdesign/source/ui/report/report.src
diff --cc dbaccess/inc/dataview.hxx
index ac3e562,53d71d7..e105db3
--- a/dbaccess/inc/dataview.hxx
+++ b/dbaccess/inc/dataview.hxx
@@@ -28,12 -27,13 +28,14 @@@
#ifndef DBAUI_DATAVIEW_HXX
#define DBAUI_DATAVIEW_HXX
- #include <vcl/window.hxx>
+ #include "dbaccessdllapi.h"
+
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <svtools/acceleratorexecute.hxx>
+#include <sal/macros.h>
+ #include <vcl/fixed.hxx>
+
#include <memory>
- #include "dbaccessdllapi.h"
class FixedLine;
class SvtMiscOptions;
diff --cc dbaccess/inc/dbsubcomponentcontroller.hxx
index 0000000,6b9042c..98cb765
mode 000000,100644..100644
--- a/dbaccess/inc/dbsubcomponentcontroller.hxx
+++ b/dbaccess/inc/dbsubcomponentcontroller.hxx
@@@ -1,0 -1,213 +1,215 @@@
++/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ /*************************************************************************
+ *
+ * DO NOT ALTER 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.
+ *
+ ************************************************************************/
+
+ #ifndef DBAUI_SUBCOMPONENTCONTROLLER_HXX
+ #define DBAUI_SUBCOMPONENTCONTROLLER_HXX
+
+ #include "genericcontroller.hxx"
+
+ /** === begin UNO includes === **/
+ #include <com/sun/star/document/XScriptInvocationContext.hpp>
+ #include <com/sun/star/sdbc/XConnection.hpp>
+ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+ #include <com/sun/star/sdbc/XDataSource.hpp>
+ #include <com/sun/star/util/XNumberFormatter.hpp>
+ #include <com/sun/star/util/XModifiable.hpp>
+ /** === end UNO includes === **/
+
+ #include <comphelper/broadcasthelper.hxx>
+ #include <comphelper/proparrhlp.hxx>
+ #include <comphelper/propertycontainer.hxx>
+ #include <connectivity/dbmetadata.hxx>
+ #include <cppuhelper/implbase2.hxx>
+
+ #include <memory>
+
+ //........................................................................
+ namespace dbaui
+ {
+ //........................................................................
+
+ //====================================================================
+ //= DBSubComponentController
+ //====================================================================
+ class DBSubComponentController;
+
+ typedef ::cppu::ImplInheritanceHelper2 < OGenericUnoController
+ , ::com::sun::star::document::XScriptInvocationContext
+ , ::com::sun::star::util::XModifiable
+ > DBSubComponentController_Base;
+
+ struct DBSubComponentController_Impl;
+ class DBACCESS_DLLPUBLIC DBSubComponentController : public DBSubComponentController_Base
+ {
+ private:
+ ::std::auto_ptr<DBSubComponentController_Impl> m_pImpl;
+
+ private:
+ /** forces usage of a connection which we do not own
+ <p>To be used from within XInitialization::initialize, resp. impl_initialize, only.</p>
+ */
+ void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn );
+
+ protected:
+ // OGenericUnoController - initialization
+ virtual void impl_initialize();
+
+ // OGenericUnoController
+ virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs);
+
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const;
+
+ sal_Bool impl_isModified() const;
+ virtual void impl_onModifyChanged();
+
+ public:
+
+ sal_Bool isReadOnly() const;
+ sal_Bool isEditable() const;
+ void setEditable(sal_Bool _bEditable);
+
+ // ----------------------------------------------------------------
+ // asking for connection-related stuff
-
++
+ sal_Bool isConnected() const;
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >
+ getMetaData( ) const;
+
+ // ----------------------------------------------------------------
+ // access to the data source / document
+ ::rtl::OUString getDataSourceName() const;
+ const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >&
+ getDataSource() const;
+ sal_Bool haveDataSource() const;
+
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+ getDatabaseDocument() const;
+
+ /** provides access to the SDB-level database meta data of the current connection
+ */
+ const ::dbtools::DatabaseMetaData& getSdbMetaData() const;
+
+ /** appends an error in the current environment.
+ */
+ void appendError(
+ const ::rtl::OUString& _rErrorMessage,
+ const ::dbtools::StandardSQLState _eSQLState = ::dbtools::SQL_GENERAL_ERROR,
+ const sal_Int32 _nErrorCode = 1000
+ );
+
+ /** clears the error state.
+ */
+ void clearError();
+
+ /** @return
+ <TRUE/> when an error was set otherwise <FALSE/>
+ */
+ sal_Bool hasError() const;
+
+ /** returns the current error
+ */
+ const ::dbtools::SQLExceptionInfo& getError() const;
+
+ /** displays the current error, or does nothing if there is no current error
+ */
+ void displayError();
+
+ /** shows an info box with the string conntection lost.
+ */
+ void connectionLostMessage() const;
+
+ /** gives access to the currently used connection
+ @return
+ the currently used connection.
+ */
+ const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >&
+ getConnection() const;
+
+ /** returns the number formatter
+ */
+ ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const;
+
+ // ::com::sun::star::frame::XController
+ virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL attachModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel) throw( ::com::sun::star::uno::RuntimeException );
+
+ // XScriptInvocationContext
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > SAL_CALL getScriptContainer() throw (::com::sun::star::uno::RuntimeException);
+
+ // XModifiable
+ virtual ::sal_Bool SAL_CALL isModified( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setModified( ::sal_Bool bModified ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
+
+ // XModifyBroadcaster
+ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
+
+ // XTitle
+ virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException);
+
+ protected:
+ DBSubComponentController(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxORB);
+ virtual ~DBSubComponentController();
+
+ virtual void disconnect();
+ virtual void reconnect( sal_Bool _bUI );
+ sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); }
+
+ /** called when our connection is beeing disposed
+ <p>The default implementation does a reconnect</p>
+ */
+ virtual void losingConnection( );
+
+ protected:
+ // XEventListener
+ virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw( ::com::sun::star::uno::RuntimeException );
+
+ // OComponentHelper
+ virtual void SAL_CALL disposing();
+
+ // XInterface
+ virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException);
+
+ // XTypeProvider
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException);
+
+ protected:
+ sal_Int32 getCurrentStartNumber() const;
+
+ private:
+ DBSubComponentController(); // never implemented
+ };
+
+ //........................................................................
+ } // namespace dbaui
+ //........................................................................
+
+ #endif // DBAUI_SUBCOMPONENTCONTROLLER_HXX
+
++/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --cc dbaccess/qa/complex/dbaccess/RowSet.java
index c3e83c9,a85fb01..0f6f794
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@@ -97,9 -101,13 +101,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 -355,10 +351,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/source/core/api/CacheSet.cxx
index 6521f94,634927a..b4c348c
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@@ -68,9 -104,11 +68,10 @@@ using namespace ::com::sun::star::io
using namespace ::osl;
DBG_NAME(OCacheSet)
-// -------------------------------------------------------------------------
+
- OCacheSet::OCacheSet()
- :m_bInserted(sal_False)
+ OCacheSet::OCacheSet(sal_Int32 i_nMaxRows)
+ :m_nMaxRows(i_nMaxRows)
+ ,m_bInserted(sal_False)
,m_bUpdated(sal_False)
,m_bDeleted(sal_False)
{
diff --cc dbaccess/source/core/api/KeySet.hxx
index a439fb2,5a94d1d..826ec1a
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@@ -150,8 -159,9 +150,9 @@@ namespace dbacces
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xTableKeys,
const ::rtl::OUString& _rUpdateTableName,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
- const ORowSetValueVector& _aParameterValueForCache);
+ const ORowSetValueVector& _aParameterValueForCache,
+ sal_Int32 i_nMaxRows);
-
+
// late ctor which can throw exceptions
virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter);
diff --cc dbaccess/source/core/api/OptimisticSet.hxx
index 309a348,cf703da..bcada37
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@@ -76,8 -79,9 +76,9 @@@ namespace dbacces
OptimisticSet(const ::comphelper::ComponentContext& _rContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& i_xConnection,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer,
- const ORowSetValueVector& _aParameterValueForCache);
+ const ORowSetValueVector& _aParameterValueForCache,
+ sal_Int32 i_nMaxRows);
-
+
// late ctor which can throw exceptions
virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter);
diff --cc dbaccess/source/core/api/RowSet.cxx
index e36a995,84a0939..f9a7fbd
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@@ -1067,8 -1078,8 +1067,8 @@@ void ORowSet::implCancelRowUpdates( sal
positionCache( MOVE_NONE_REFRESH_ONLY );
ORowSetRow aOldValues;
- if ( !m_aCurrentRow.isNull() )
+ if ( !m_bModified && _bNotifyModified && !m_aCurrentRow.isNull() )
- aOldValues = new ORowSetValueVector( m_aCurrentRow->getBody() );
+ aOldValues = new ORowSetValueVector( *(*m_aCurrentRow) );
m_pCache->cancelRowUpdates();
@@@ -1077,13 -1088,16 +1077,15 @@@
m_aCurrentRow.setBookmark(m_aBookmark);
// notification order
- // - column values
- ORowSetBase::firePropertyChange(aOldValues);
// IsModified
if( !m_bModified && _bNotifyModified )
+ {
+ // - column values
+ ORowSetBase::firePropertyChange(aOldValues);
fireProperty(PROPERTY_ID_ISMODIFIED,sal_False,sal_True);
+ }
}
-// -------------------------------------------------------------------------
void SAL_CALL ORowSet::cancelRowUpdates( ) throw(SQLException, RuntimeException)
{
implCancelRowUpdates( sal_True );
diff --cc dbaccess/source/core/api/RowSetBase.cxx
index 5cea246,5afc502..d3cc99e
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@@ -1190,11 -1198,14 +1190,14 @@@ void SAL_CALL ORowSetBase::refreshRow
if(!(m_bBeforeFirst || m_bAfterLast))
{
+ sal_Bool bWasNew = m_pCache->m_bNew || impl_rowDeleted();
+ ORowSetRow aOldValues = getOldRow(bWasNew);
positionCache( MOVE_NONE_REFRESH_ONLY );
m_pCache->refreshRow();
+ firePropertyChange(aOldValues);
}
}
-// -------------------------------------------------------------------------
+
sal_Bool SAL_CALL ORowSetBase::rowUpdated( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen at sun.com", "ORowSetBase::rowUpdated" );
diff --cc dbaccess/source/core/api/RowSetCache.cxx
index a7b6460,e27e76d..9bc3268
--- a/dbaccess/source/core/api/RowSetCache.cxx
+++ b/dbaccess/source/core/api/RowSetCache.cxx
@@@ -171,10 -173,10 +172,10 @@@ ORowSetCache::ORowSetCache(const Refere
OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!");
Reference<XNameAccess> xTables = xTabSup->getTables();
Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames();
- if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet )
+ if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet )
{// here we have a join or union and nobody told us which table to update, so we update them all
m_nPrivileges = Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE;
- OptimisticSet* pCursor = new OptimisticSet(m_aContext,xConnection,_xAnalyzer,_aParameterValueForCache);
+ OptimisticSet* pCursor = new OptimisticSet(m_aContext,xConnection,_xAnalyzer,_aParameterValueForCache,i_nMaxRows);
m_pCacheSet = pCursor;
m_xCacheSet = m_pCacheSet;
try
@@@ -264,9 -267,12 +265,9 @@@
// need to check if we could handle this select clause
bAllKeysFound = bAllKeysFound && (nTablesCount == 1 || checkJoin(xConnection,_xAnalyzer,aUpdateTableName));
- // || !(comphelper::hasProperty(PROPERTY_CANUPDATEINSERTEDROWS,xProp) && any2bool(xProp->getPropertyValue(PROPERTY_CANUPDATEINSERTEDROWS)))
-
- // oj removed because keyset uses only the next// || (xProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_RESULTSETTYPE) && comphelper::getINT32(xProp->getPropertyValue(PROPERTY_RESULTSETTYPE)) == ResultSetType::FORWARD_ONLY)
if(!bAllKeysFound )
{
- m_pCacheSet = new OStaticSet();
+ m_pCacheSet = new OStaticSet(i_nMaxRows);
m_xCacheSet = m_pCacheSet;
m_pCacheSet->construct(_xRs,i_sRowSetFilter);
m_nPrivileges = Privilege::SELECT;
@@@ -366,7 -373,8 +367,7 @@@ ORowSetCache::~ORowSetCache(
DBG_DTOR(ORowSetCache,NULL);
}
- void ORowSetCache::setMaxRowSize(sal_Int32 _nSize)
-// -------------------------------------------------------------------------
+ void ORowSetCache::setFetchSize(sal_Int32 _nSize)
{
if(_nSize == m_nFetchSize)
return;
diff --cc dbaccess/source/core/api/query.cxx
index c7a65ca,f0be9ba..2f5e74e
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@@ -178,10 -225,10 +178,10 @@@ void OQuery::rebuildColumns(
}
Reference< XDatabaseMetaData > xDBMeta( m_xConnection->getMetaData(), UNO_QUERY_THROW );
- ::vos::ORef< OSQLColumns > aParseColumns(
+ ::rtl::Reference< OSQLColumns > aParseColumns(
::connectivity::parse::OParseColumn::createColumnsForResultSet( xResultSetMeta, xDBMeta,xColumnDefinitions ) );
xColumns = OPrivateColumns::createWithIntrinsicNames(
- aParseColumns, xDBMeta->storesMixedCaseQuotedIdentifiers(), *this, m_aMutex );
+ aParseColumns, xDBMeta->supportsMixedCaseQuotedIdentifiers(), *this, m_aMutex );
if ( !xColumns.is() )
throw RuntimeException();
}
diff --cc dbaccess/source/core/misc/dsntypes.cxx
index c159edb,c53c6f9..e6f035d
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@@ -443,9 -440,9 +443,9 @@@ DATASOURCE_TYPE ODsnTypeCollection::det
KnownPrefix( "sdbc:address:macab", DST_MACAB, true )
};
- for ( size_t i=0; i < sizeof( aKnowPrefixes ) / sizeof( aKnowPrefixes[0] ); ++i )
+ for ( size_t i=0; i < SAL_N_ELEMENTS( aKnowPrefixes ); ++i )
{
- USHORT nMatchLen = aKnowPrefixes[i].bMatchComplete ? sDsn.Len() : (USHORT)rtl_str_getLength( aKnowPrefixes[i].pAsciiPrefix );
+ sal_uInt16 nMatchLen = aKnowPrefixes[i].bMatchComplete ? sDsn.Len() : (sal_uInt16)rtl_str_getLength( aKnowPrefixes[i].pAsciiPrefix );
if ( sDsn.EqualsIgnoreCaseAscii( aKnowPrefixes[i].pAsciiPrefix, 0, nMatchLen ) )
return aKnowPrefixes[i].eType;
}
diff --cc dbaccess/source/core/resource/strings.src
index c431f2c,a95366b..1a572c8
--- a/dbaccess/source/core/resource/strings.src
+++ b/dbaccess/source/core/resource/strings.src
@@@ -302,14 -271,11 +302,14 @@@ String RID_STR_ROW_ALREADY_DELETE
{
Text [ en-US ] = "Current row is already deleted.";
};
+
String RID_STR_UPDATE_FAILED
{
- Text [ en-US ] = "Current row could be updated.";
+ Text [ en-US ] = "Current row could not be updated.";
};
+
//-------------------------------------------------------------------------
+
String RID_STR_NO_INSERT_PRIVILEGE
{
Text [ en-US ] = "INSERT privilege not available.";
diff --cc dbaccess/source/ext/adabas/AdabasNewDb.cxx
index 03ac722,8251337..8171200
--- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx
+++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx
@@@ -213,8 -269,10 +213,8 @@@ OAdabasNewDbDlg::OAdabasNewDbDlg( Windo
m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl));
- m_ET_DOMAIN_USR.Enable(FALSE);
+ m_ET_DOMAIN_USR.Enable(sal_False);
- // m_ET_SYSUSR.setUpperCase();
- // m_ET_CONUSR.setUpperCase();
}
diff --cc dbaccess/source/ext/macromigration/macromigration.src
index b00ce03,f971bd1..5d1d9db
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@@ -444,12 -451,10 +452,12 @@@ String STR_INVALID_NUMBER_ARG
{
Text [ en-US ] = "Invalid number of initialization arguments. Expected 1.";
};
+
String STR_NO_DATABASE
{
- Text [ en-US ] = "No database document found in the initializatin arguments.";
+ Text [ en-US ] = "No database document found in the initialization arguments.";
};
+
String STR_NOT_READONLY
{
Text [ en-US ] = "Not applicable to read-only documents.";
diff --cc dbaccess/source/shared/makefile.mk
index ff40184,5f75c13..7906623
--- a/dbaccess/source/shared/makefile.mk
+++ b/dbaccess/source/shared/makefile.mk
@@@ -32,9 -32,10 +32,8 @@@ LIBTARGET=N
TARGET=shared
LIB1TARGET=$(SLB)$/dbushared.lib
LIB2TARGET=$(SLB)$/fltshared.lib
- LIB3TARGET=$(SLB)$/cfgshared.lib
LIB4TARGET=$(SLB)$/sdbtshared.lib
-#ENABLE_EXCEPTIONS=TRUE
-
# --- Settings ----------------------------------
.INCLUDE : settings.mk
diff --cc dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 4cfce1d,f6f0833..1644305
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@@ -641,10 -729,10 +641,10 @@@ void OAppDetailPageHelper::createTables
}
// -----------------------------------------------------------------------------
- void OAppDetailPageHelper::getElementIcons( ElementType _eType, USHORT& _rImageId )
-void OAppDetailPageHelper::getElementIcons( ElementType _eType, sal_uInt16& _rImageId, sal_uInt16& _rHighContrastImageId )
++void OAppDetailPageHelper::getElementIcons( ElementType _eType, sal_uInt16& _rImageId)
{
ImageProvider aImageProvider;
- _rImageId = _rHighContrastImageId = 0;
+ _rImageId = 0;
sal_Int32 nDatabaseObjectType( 0 );
switch(_eType )
@@@ -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;
- sal_uInt16 nImageId = 0, nImageIdH = 0;
++ sal_uInt16 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,16 -781,16 +689,16 @@@
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] )
{
if ( !m_pLists[_eType]->GetEntryCount() && _xContainer.is() )
{
- fillNames( _xContainer, _eType, nImageId, nImageIdH, NULL );
+ fillNames( _xContainer, _eType, nImageId, NULL );
- m_pLists[_eType]->SelectAll(FALSE);
+ m_pLists[_eType]->SelectAll(sal_False);
}
setDetailPage(m_pLists[_eType]);
}
@@@ -743,7 -836,7 +744,7 @@@ namespac
// -----------------------------------------------------------------------------
void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContainer, const ElementType _eType,
- const USHORT _nImageId, SvLBoxEntry* _pParent )
- const sal_uInt16 _nImageId, const sal_uInt16 _nHighContrastImageId, SvLBoxEntry* _pParent )
++ const sal_uInt16 _nImageId, SvLBoxEntry* _pParent )
{
OSL_ENSURE(_xContainer.is(),"Data source is NULL! -> GPF");
OSL_ENSURE( ( _eType >= E_TABLE ) && ( _eType < E_ELEMENT_TYPE_COUNT ), "OAppDetailPageHelper::fillNames: invalid type!" );
@@@ -766,9 -859,9 +767,9 @@@
Reference<XNameAccess> xSubElements(_xContainer->getByName(*pIter),UNO_QUERY);
if ( xSubElements.is() )
{
- pEntry = pList->InsertEntry( *pIter, _pParent, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
+ pEntry = pList->InsertEntry( *pIter, _pParent, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
getBorderWin().getView()->getAppController().containerFound( Reference< XContainer >( xSubElements, UNO_QUERY ) );
- fillNames( xSubElements, _eType, _nImageId, _nHighContrastImageId, pEntry );
+ fillNames( xSubElements, _eType, _nImageId, pEntry );
}
else
{
@@@ -782,11 -879,11 +783,11 @@@
}
}
// -----------------------------------------------------------------------------
- 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 );
}
// -----------------------------------------------------------------------------
@@@ -892,14 -991,14 +893,14 @@@ SvLBoxEntry* OAppDetailPageHelper::elem
}
}
- USHORT nImageId = 0;
- sal_uInt16 nImageId = 0, nImageIdH = 0;
- getElementIcons( _eType, nImageId, nImageIdH );
++ sal_uInt16 nImageId = 0;
+ getElementIcons( _eType, nImageId );
Reference<XNameAccess> xContainer(_rObject,UNO_QUERY);
if ( xContainer.is() )
{
const sal_Int32 nFolderIndicator = lcl_getFolderIndicatorForType( _eType );
- pRet = pTreeView->InsertEntry( _rName, pEntry, FALSE, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
+ pRet = pTreeView->InsertEntry( _rName, pEntry, sal_False, LIST_APPEND, reinterpret_cast< void* >( nFolderIndicator ) );
- fillNames( xContainer, _eType, nImageId, nImageIdH, pRet );
+ fillNames( xContainer, _eType, nImageId, pRet );
}
else
{
diff --cc dbaccess/source/ui/app/AppDetailPageHelper.hxx
index f52dc7b,dfc2298..67c426c
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@@ -119,7 -142,7 +119,7 @@@ namespace dbau
/** retrieves the resource ids of the images representing elements of the given type
*/
- void getElementIcons( ElementType _eType, USHORT& _rImageId );
- void getElementIcons( ElementType _eType, sal_uInt16& _rImageId, sal_uInt16& _rHighContrastImageId );
++ void getElementIcons( ElementType _eType, sal_uInt16& _rImageId);
/** fills the names in the listbox
@param _xContainer
@@@ -133,7 -158,8 +133,7 @@@
*/
void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer,
const ElementType _eType,
- const USHORT _nImageId,
+ const sal_uInt16 _nImageId,
- const sal_uInt16 _nHighContrastImageId,
SvLBoxEntry* _pParent );
/** sets the detail page
@@@ -160,7 -190,7 +160,7 @@@
@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/app/AppDetailView.cxx
index c4becf5,14a051a..2b222c0
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@@ -148,11 -193,11 +148,11 @@@ void OCreationList::SelectSearchEntry(
}
// -----------------------------------------------------------------------------
- void OCreationList::ExecuteSearchEntry( const void* _pEntry )
+ void OCreationList::ExecuteSearchEntry( const void* _pEntry ) const
{
SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) );
- DBG_ASSERT( pEntry, "OCreationList::ExecuteSearchEntry: invalid entry!" );
- DBG_ASSERT( pEntry == GetCurEntry(), "OCreationList::ExecuteSearchEntry: SelectSearchEntry should have been called before!" );
+ OSL_ENSURE( pEntry, "OCreationList::ExecuteSearchEntry: invalid entry!" );
+ OSL_ENSURE( pEntry == GetCurEntry(), "OCreationList::ExecuteSearchEntry: SelectSearchEntry should have been called before!" );
if ( pEntry )
onSelected( pEntry );
@@@ -517,8 -568,8 +517,8 @@@ void OTasksWindow::fillTaskEntryList( c
{
}
- m_aCreation.Show();
+ m_aCreation.Show();
- m_aCreation.SelectAll(FALSE);
+ m_aCreation.SelectAll(sal_False);
m_aHelpText.Show();
m_aDescription.Show();
m_aFL.Show();
diff --cc dbaccess/source/ui/app/AppIconControl.cxx
index 293d65f,11e9bc9..3c3689f
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@@ -53,21 -68,23 +53,21 @@@ OApplicationIconControl::OApplicationIc
struct CategoryDescriptor
{
- USHORT nLabelResId;
+ sal_uInt16 nLabelResId;
ElementType eType;
- USHORT nImageResId;
+ sal_uInt16 nImageResId;
- sal_uInt16 nImageResIdHC;
} aCategories[] = {
- { RID_STR_TABLES_CONTAINER, E_TABLE, IMG_TABLEFOLDER_TREE_L, IMG_TABLEFOLDER_TREE_LHC },
- { RID_STR_QUERIES_CONTAINER, E_QUERY, IMG_QUERYFOLDER_TREE_L, IMG_QUERYFOLDER_TREE_LHC },
- { RID_STR_FORMS_CONTAINER, E_FORM, IMG_FORMFOLDER_TREE_L, IMG_FORMFOLDER_TREE_LHC },
- { RID_STR_REPORTS_CONTAINER, E_REPORT, IMG_REPORTFOLDER_TREE_L,IMG_REPORTFOLDER_TREE_LHC }
+ { RID_STR_TABLES_CONTAINER, E_TABLE, IMG_TABLEFOLDER_TREE_L },
+ { RID_STR_QUERIES_CONTAINER, E_QUERY, IMG_QUERYFOLDER_TREE_L },
+ { RID_STR_FORMS_CONTAINER, E_FORM, IMG_FORMFOLDER_TREE_L },
+ { RID_STR_REPORTS_CONTAINER, E_REPORT, IMG_REPORTFOLDER_TREE_L }
};
- for ( size_t i=0; i < sizeof(aCategories)/sizeof(aCategories[0]); ++i)
+ for ( size_t i=0; i < SAL_N_ELEMENTS(aCategories); ++i)
{
SvxIconChoiceCtrlEntry* pEntry = InsertEntry(
- String( ModuleRes( aCategories[i].nLabelResId ) ),
- Image( ModuleRes( aCategories[i].nImageResId ) ),
- Image( ModuleRes( aCategories[i].nImageResIdHC ) ) );
- if ( pEntry )
+ String( ModuleRes( aCategories[i].nLabelResId ) ) ,
+ Image( ModuleRes( aCategories[i].nImageResId ) ) );
+ if ( pEntry )
pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
}
diff --cc dbaccess/source/ui/browser/brwctrlr.cxx
index f7ed72f,0cc058a..b4beba5
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@@ -2683,7 -2730,7 +2723,6 @@@ void SbaXDataBrowserController::initial
{ // (only if the statement isn't native)
// (it is allowed to use the PROPERTY_ISPASSTHROUGH : _after_ loading a form it is valid)
xFormSet->getPropertyValue(PROPERTY_SINGLESELECTQUERYCOMPOSER) >>= m_xParser;
-- }
}
catch(Exception&)
{
diff --cc dbaccess/source/ui/browser/dataview.cxx
index 71d7e95,90ca57a..7be5d58
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@@ -29,17 -28,34 +29,16 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef DBAUI_DATAVIEW_HXX
#include "dataview.hxx"
-#endif
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
#include <toolkit/unohlp.hxx>
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
-#endif
#include <comphelper/namedvaluecollection.hxx>
-#ifndef _SFXAPP_HXX //autogen wg. SFX_APP
#include <sfx2/app.hxx>
-#endif
-#ifndef _SFXIMGMGR_HXX
#include <sfx2/imgmgr.hxx>
- #include <vcl/fixed.hxx>
-#endif
-#ifndef DBAUI_ICONTROLLER_HXX
#include "IController.hxx"
-#endif
-#ifndef DBAUI_TOOLS_HXX
#include "UITools.hxx"
-#endif
-#ifndef _SFX_HRC
#include <sfx2/sfx.hrc>
-#endif
-#ifndef _SVTOOLS_IMGDEF_HXX
#include <svtools/imgdef.hxx>
-#endif
#include <tools/diagnose_ex.h>
//.........................................................................
diff --cc dbaccess/source/ui/browser/genericcontroller.cxx
index 26142fa,100a636..562eae7
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@@ -333,10 -400,10 +333,10 @@@ void SAL_CALL OGenericUnoController::in
ODataView* pView = getView();
if ( !pView )
- throw RuntimeException( ::rtl::OUString::createFromAscii( "unable to create a view" ), *this );
+ throw RuntimeException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("unable to create a view")), *this );
if ( m_bReadOnly || m_bPreview )
- pView->EnableInput( FALSE );
+ pView->EnableInput( sal_False );
impl_initialize();
}
diff --cc dbaccess/source/ui/control/dbtreelistbox.cxx
index b25d34b,a316a39..72c15c3
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@@ -425,8 -460,8 +427,8 @@@ sal_Bool DBTreeListBox::EditedEntry( Sv
m_aSelectedEntries.erase( pEntry );
}
SetEntryText(pEntry,aEntry.aNewText);
-
+
- return FALSE; // we never want that the base change our text
+ return sal_False; // we never want that the base change our text
}
// -----------------------------------------------------------------------------
@@@ -513,9 -548,9 +515,9 @@@ namespac
{
lcl_adjustMenuItemIDs( *pPopup, _rCommandController );
continue;
- } // if ( pPopup )
+ }
- const USHORT nCommandId = _rCommandController.registerCommandURL( aCommand );
+ const sal_uInt16 nCommandId = _rCommandController.registerCommandURL( aCommand );
_rMenu.InsertItem( nCommandId, _rMenu.GetItemText( nId ), _rMenu.GetItemImage( nId ),
_rMenu.GetItemBits( nId ), pos );
@@@ -549,10 -586,10 +551,10 @@@
{
lcl_insertMenuItemImages( *pPopup, _rCommandController );
continue;
- } // if ( pPopup )
+ }
if ( xFrame.is() )
- _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,FALSE));
- _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,sal_False,bHiContrast));
++ _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,sal_False));
}
}
// =========================================================================
diff --cc dbaccess/source/ui/control/opendoccontrols.cxx
index c95a48c,58b98dd..e02b7c0
--- a/dbaccess/source/ui/control/opendoccontrols.cxx
+++ b/dbaccess/source/ui/control/opendoccontrols.cxx
@@@ -196,9 -226,9 +196,9 @@@ namespace dbau
SetText( sLabel );
// Place icon left of text and both centered in the button.
- SetModeImage( GetCommandIcon( ".uno:Open", m_sModule ), BMP_COLOR_NORMAL );
+ SetModeImage( GetCommandIcon( ".uno:Open", m_sModule ) );
- EnableImageDisplay( TRUE );
- EnableTextDisplay( TRUE );
+ EnableImageDisplay( sal_True );
+ EnableTextDisplay( sal_True );
SetImageAlign( IMAGEALIGN_LEFT );
SetStyle( GetStyle() | WB_CENTER );
}
@@@ -289,10 -319,10 +289,10 @@@
}
//--------------------------------------------------------------------
- OpenDocumentListBox::StringPair OpenDocumentListBox::impl_getDocumentAtIndex( USHORT _nListIndex, bool _bSystemNotation ) const
+ OpenDocumentListBox::StringPair OpenDocumentListBox::impl_getDocumentAtIndex( sal_uInt16 _nListIndex, bool _bSystemNotation ) const
{
MapIndexToStringPair::const_iterator pos = m_aURLs.find( _nListIndex );
- DBG_ASSERT( pos != m_aURLs.end(), "OpenDocumentListBox::impl_getDocumentAtIndex: invalid index!" );
+ OSL_ENSURE( pos != m_aURLs.end(), "OpenDocumentListBox::impl_getDocumentAtIndex: invalid index!" );
StringPair aDocumentDescriptor;
if ( pos != m_aURLs.end() )
diff --cc dbaccess/source/ui/control/tabletree.cxx
index 3c78e43,73f1f29..c32b2b1
--- a/dbaccess/source/ui/control/tabletree.cxx
+++ b/dbaccess/source/ui/control/tabletree.cxx
@@@ -298,7 -349,7 +298,7 @@@ void OTableTreeListBox::UpdateTableList
sRootEntryText = String(ModuleRes(STR_ALL_VIEWS));
else
sRootEntryText = String(ModuleRes(STR_ALL_TABLES_AND_VIEWS));
- InsertEntry( sRootEntryText, NULL, FALSE, LIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) );
- pAllObjects = InsertEntry( sRootEntryText, NULL, sal_False, LIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) );
++ InsertEntry( sRootEntryText, NULL, sal_False, LIST_APPEND, reinterpret_cast< void* >( DatabaseObjectContainer::TABLES ) );
}
if ( _rTables.empty() )
@@@ -496,13 -548,15 +496,13 @@@ SvLBoxEntry* OTableTreeListBox::implAdd
SvLBoxEntry* pRet = NULL;
if ( !_bCheckName || !GetEntryPosByName( sName, pParentEntry ) )
{
- pRet = InsertEntry( sName, pParentEntry, FALSE, LIST_APPEND );
+ pRet = InsertEntry( sName, pParentEntry, sal_False, LIST_APPEND );
- Image aImage, aImageHC;
- m_pImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage, aImageHC );
+ Image aImage;
+ m_pImageProvider->getImages( _rTableName, DatabaseObject::TABLE, aImage );
- SetExpandedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
- SetCollapsedEntryBmp( pRet, aImage, BMP_COLOR_NORMAL );
- SetExpandedEntryBmp( pRet, aImageHC, BMP_COLOR_HIGHCONTRAST );
- SetCollapsedEntryBmp( pRet, aImageHC, BMP_COLOR_HIGHCONTRAST );
+ SetExpandedEntryBmp( pRet, aImage );
+ SetCollapsedEntryBmp( pRet, aImage );
}
return pRet;
}
diff --cc dbaccess/source/ui/control/toolboxcontroller.cxx
index 685faf3,ece9473..180e318
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@@ -200,10 -241,12 +200,10 @@@ namespace dbau
short nImageType = hasBigImages() ? ImageType::SIZE_LARGE : ImageType::SIZE_DEFAULT;
- if ( bHighContrast )
- nImageType |= ImageType::COLOR_HIGHCONTRAST;
Sequence< ::rtl::OUString> aSeq(1);
- USHORT nCount = pMenu->GetItemCount();
- for (USHORT nPos = 0; nPos < nCount; ++nPos)
+ sal_uInt16 nCount = pMenu->GetItemCount();
+ for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos)
{
if ( pMenu->GetItemType( nPos ) == MENUITEM_SEPARATOR )
continue;
diff --cc dbaccess/source/ui/dlg/CollectionView.cxx
index 2b8ab81,dfc0c73..e10396c
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@@ -211,9 -268,10 +211,9 @@@ IMPL_LINK( OCollectionView, Save_Click
QueryBox aBox( this, WB_YES_NO, ModuleRes( STR_ALREADYEXISTOVERWRITE ) );
if ( aBox.Execute() != RET_YES )
return 0;
- // xNameContainer->removeByName(sName);
}
m_aName.SetText(sName);
- EndDialog( TRUE );
+ EndDialog( sal_True );
}
}
catch( const Exception& )
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 961a275,1af0017..99f1f3f
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@@ -30,47 -29,125 +30,47 @@@
#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 <osl/diagnose.h>
#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 2ee76e9,1e3fc93..908bd57
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@@ -29,49 -28,132 +29,49 @@@
// 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/DBSetupConnectionPages.cxx
index 7dcaf3f,73d26de..933e4d6
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@@ -674,9 -726,10 +674,9 @@@ DBG_NAME(OMySQLIntroPageSetup
bool OJDBCConnectionPageSetup::checkTestConnection()
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
- BOOL bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
+ sal_Bool bEnableTestConnection = !m_aConnectionURL.IsVisible() || (m_aConnectionURL.GetTextNoPrefix().Len() != 0);
bEnableTestConnection = bEnableTestConnection && (m_aETDriverClass.GetText().Len() != 0);
return bEnableTestConnection;
-// m_aTestConnection.Enable(bEnableTestConnection);
}
diff --cc dbaccess/source/ui/dlg/DbAdminImpl.cxx
index c8e1360,7ffa5f5..0144e5e
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@@ -1114,13 -1111,14 +1114,13 @@@ void ODbDataSourceAdministrationHelper:
SFX_ITEMSET_GET(_rDest, pTypeCollection, DbuTypeCollectionItem, DSID_TYPECOLLECTION, sal_True);
OSL_ENSURE(pUrlItem,"Connection URL is NULL. -> GPF!");
- DBG_ASSERT(pTypeCollection, "ODbAdminDialog::getDatasourceType: invalid items in the source set!");
+ OSL_ENSURE(pTypeCollection, "ODbAdminDialog::getDatasourceType: invalid items in the source set!");
::dbaccess::ODsnTypeCollection* pCollection = pTypeCollection->getCollection();
- DBG_ASSERT(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!");
+ OSL_ENSURE(pCollection, "ODbAdminDialog::getDatasourceType: invalid type collection!");
- USHORT nPortNumberId = 0;
+ sal_uInt16 nPortNumberId = 0;
sal_Int32 nPortNumber = -1;
String sNewHostName;
- //String sUrl = pCollection->cutPrefix(pUrlItem->GetValue());
String sUrlPart;
pCollection->extractHostNamePort(pUrlItem->GetValue(),sUrlPart,sNewHostName,nPortNumber);
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,c94733d..fb8a792
mode 100644,100755..100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
diff --cc dbaccess/source/ui/dlg/admincontrols.hxx
index 4caa61b,61a8a67..b6402f0
mode 100644,100755..100644
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
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/dbadmin.cxx
index 0c1ecab,f80f0db..90d6793
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@@ -409,9 -410,10 +409,10 @@@ SfxItemSet* ODbAdminDialog::createItemS
*pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True);
*pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, String());
*pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT );
+ *pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100);
// create the pool
- static SfxItemInfo __READONLY_DATA aItemInfos[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1] =
+ static SfxItemInfo const aItemInfos[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1] =
{
{0,0},
{0,0},
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/dlgattr.cxx
index 7537283,43fbbbe..a95b4ef
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@@ -88,7 -119,9 +88,7 @@@ void SbaSbAttrDlg::PageCreated( sal_uIn
{
case RID_SVXPAGE_NUMBERFORMAT:
{
- aSet.Put (SvxNumberInfoItem( pNumberInfoItem->GetNumberFormatter(), (const USHORT)SID_ATTR_NUMBERFORMAT_INFO));
- //CHINA001 ((SvxNumberFormatTabPage&)rTabPage).
- //CHINA001 SetNumberFormatList( *pNumberInfoItem );
+ aSet.Put (SvxNumberInfoItem( pNumberInfoItem->GetNumberFormatter(), (const sal_uInt16)SID_ATTR_NUMBERFORMAT_INFO));
rTabPage.PageCreated(aSet);
}
break;
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/sqlmessage.cxx
index 24eb67b,a2a24b2..4658d0e
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@@ -29,24 -28,57 +29,26 @@@
// 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 <osl/diagnose.h>
#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
@@@ -89,13 -121,16 +91,13 @@@ namespac
class ImageProvider : public IImageProvider
{
private:
- USHORT m_defaultImageID;
+ sal_uInt16 m_defaultImageID;
- sal_uInt16 m_highContrastImageID;
mutable Image m_defaultImage;
- mutable Image m_highContrastImage;
public:
- ImageProvider( USHORT _defaultImageID )
- ImageProvider( sal_uInt16 _defaultImageID, sal_uInt16 _highContrastImageID )
++ ImageProvider( sal_uInt16 _defaultImageID )
:m_defaultImageID( _defaultImageID )
- ,m_highContrastImageID( _highContrastImageID )
{
}
@@@ -143,7 -185,8 +145,7 @@@
::boost::shared_ptr< IImageProvider > getImageProvider( SQLExceptionInfo::TYPE _eType ) const
{
::boost::shared_ptr< IImageProvider >* ppProvider( &m_pErrorImage );
- USHORT nNormalImageID( BMP_EXCEPTION_ERROR );
+ sal_uInt16 nNormalImageID( BMP_EXCEPTION_ERROR );
- sal_uInt16 nHCImageID( BMP_EXCEPTION_ERROR_SCH );
switch ( _eType )
{
diff --cc dbaccess/source/ui/inc/TokenWriter.hxx
index 5001f73,5896fa3..523cf82
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.hxx
@@@ -121,11 -120,13 +121,11 @@@ namespace dbau
public:
void setStream(SvStream* _pStream){ m_pStream = _pStream; }
- //dyf add 20070601
//for set the tablename
void setSTableName(const ::rtl::OUString &_sTableName){ m_sDefaultTableName = _sTableName; }
- //dyf add end
- virtual BOOL Write(); // Export
- virtual BOOL Read(); // Import
+ virtual sal_Bool Write(); // Export
+ virtual sal_Bool Read(); // Import
void initialize(const ::svx::ODataAccessDescriptor& _aDataDescriptor);
void dispose();
@@@ -176,11 -177,11 +176,11 @@@
// HtmlFontSz[1-7] in s*3.ini [user]
static sal_Int16 nFontSize[SBA_HTML_FONTSIZES];
static const sal_Int16 nCellSpacing;
- static const char __FAR_DATA sIndentSource[];
+ static const char sIndentSource[];
char sIndent[nIndentMax+1];
sal_Int16 m_nIndent;
- #ifdef DBG_UTIL
+ #if OSL_DEBUG_LEVEL > 0
- BOOL m_bCheckFont;
+ sal_Bool m_bCheckFont;
#endif
void WriteHeader();
diff --cc dbaccess/source/ui/inc/imageprovider.hxx
index 3e45239,42e39b3..d4f6135
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@@ -125,8 -146,9 +125,8 @@@ namespace dbau
the resource ID image to be used for the object type. Must be fed into a
ModuleRes instance to actually load the image.
*/
- USHORT getDefaultImageResourceID(
+ sal_uInt16 getDefaultImageResourceID(
- sal_Int32 _nDatabaseObjectType,
- bool _bHighContrast
+ sal_Int32 _nDatabaseObjectType
);
/** retrieves the image to be used for folders of database objects
diff --cc dbaccess/source/ui/misc/DExport.cxx
index f8b3cb5,ab9d6d8..d4b6555
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@@ -785,10 -786,10 +785,10 @@@ void ODatabaseExport::showErrorDialog(c
OSQLWarningBox aBox( NULL, aMsg, WB_YES_NO | WB_DEF_NO );
if (aBox.Execute() == RET_YES)
- m_bDontAskAgain = TRUE;
+ m_bDontAskAgain = sal_True;
else
- m_bError = TRUE;
+ m_bError = sal_True;
- } // if(!m_bDontAskAgain)
+ }
}
// -----------------------------------------------------------------------------
void ODatabaseExport::adjustFormat()
diff --cc dbaccess/source/ui/misc/HtmlReader.cxx
index 2f49094,1ddbf64..782eb61
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@@ -186,7 -185,7 +186,7 @@@ void OHTMLReader::NextToken( int nToke
case HTML_THEAD_ON:
case HTML_TBODY_ON:
{
-- sal_uInt32 nTell = rInput.Tell(); // verändert vielleicht die Position des Streams
++ sal_uInt32 nTell = rInput.Tell(); // ver�ndert vielleicht die Position des Streams
if ( !m_xTable.is() )
{// erste Zeile als Header verwenden
m_bError = !CreateTable(nToken);
@@@ -486,11 -488,15 +486,11 @@@ sal_Bool OHTMLReader::CreateTable(int n
m_sTextToken.Erase();
break;
case HTML_TABLEDATA_ON:
- // m_bAppendFirstLine = true;
- // run through
case HTML_TABLEHEADER_ON:
- TableDataOn(eVal,nTmpToken2);
+ TableDataOn(eVal);
- bTableHeader = TRUE;
+ bTableHeader = sal_True;
break;
case HTML_TABLEDATA_OFF:
- // m_bAppendFirstLine = true;
- // run through
case HTML_TABLEHEADER_OFF:
{
aColumnName.EraseLeadingChars();
diff --cc dbaccess/source/ui/misc/RowSetDrop.cxx
index f1d7288,3e41b44..cdfd78a
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@@ -119,7 -118,9 +119,7 @@@ sal_Bool ORowSetImportExport::Read(
// check if there is any column to copy
if(::std::find_if(m_aColumnMapping.begin(),m_aColumnMapping.end(),
::std::bind2nd(::std::greater<sal_Int32>(),0)) == m_aColumnMapping.end())
- return FALSE;
+ return sal_False;
- sal_Int32 nCurrentRow = 0;
- sal_Int32 nRowFilterIndex = 0;
sal_Bool bContinue = sal_True;
if(m_aSelection.getLength())
{
diff --cc dbaccess/source/ui/misc/RtfReader.cxx
index f810b18,af4b707..f07a27e
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@@ -162,7 -163,7 +162,7 @@@ void ORTFReader::NextToken( int nToken
bool bInsertRow = true;
if ( !m_xTable.is() ) // erste Zeile als Header verwenden
{
-- sal_uInt32 nTell = rInput.Tell(); // verändert vielleicht die Position des Streams
++ sal_uInt32 nTell = rInput.Tell(); // ver�ndert vielleicht die Position des Streams
m_bError = !CreateTable(nToken);
bInsertRow = m_bAppendFirstLine;
@@@ -215,7 -216,7 +215,7 @@@
}
break;
case RTF_ROW:
-- // es kann vorkommen, daß die letzte Celle nicht mit \cell abgeschlossen ist
++ // es kann vorkommen, da� die letzte Celle nicht mit \cell abgeschlossen ist
try
{
insertValueIntoColumn();
diff --cc dbaccess/source/ui/misc/TokenWriter.cxx
index ed1c3ea,e67220b..4b132e5
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@@ -368,18 -368,18 +368,18 @@@ sal_Bool ODatabaseImportExport::Write(
{
if ( !m_bInInitialize )
initialize();
- } // if ( m_bNeedToReInitialize )
+ }
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
- BOOL ODatabaseImportExport::Read()
+ sal_Bool ODatabaseImportExport::Read()
{
if ( m_bNeedToReInitialize )
{
if ( !m_bInInitialize )
initialize();
- } // if ( m_bNeedToReInitialize )
+ }
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------------
void ODatabaseImportExport::impl_initializeRowMember_throw()
@@@ -403,10 -403,58 +403,10 @@@ sal_Bool ORTFImportExport::Write(
(*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << ODatabaseImportExport::sNewLine;
rtl_TextEncoding eDestEnc = RTL_TEXTENCODING_MS_1252;
- BOOL bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight );
- BOOL bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant );
- BOOL bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline );
- BOOL bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout );
- /*
- // Access RTF Export Beispiel
- {\rtf1\ansi
- {\colortbl\red0\green0\blue0;\red255\green255\blue255;\red192\green192\blue192;}
- {\fonttbl\f0\fcharset0\fnil MS Sans Serif;\f1\fcharset0\fnil Arial;\f2\fcharset0\fnil Arial;}
- \trowd\trgaph40
- \clbrdrl\brdrs\brdrcf0\clbrdrt\brdrs\brdrcf0\clbrdrb\brdrs\brdrcf0\clbrdrr\brdrs\brdrcf0\clshdng10000\clcfpat2\cellx1437
- \clbrdrl\brdrs\brdrcf0\clbrdrt\brdrs\brdrcf0\clbrdrb\brdrs\brdrcf0\clbrdrr\brdrs\brdrcf0\clshdng10000\clcfpat2\cellx2874
- {
- \trrh-270\pard\intbl
- {\qc\fs20\b\f1\cf0\cb2 text\cell}
- \pard\intbl
- {\qc\fs20\b\f1\cf0\cb2 datum\cell}
- \pard\intbl\row
- }
- \trowd\trgaph40\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx1437\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx2874
- {\trrh-270\pard\intbl
- {\ql\fs20\f2\cf0\cb1 heute\cell}
- \pard\intbl
- {\qr\fs20\f2\cf0\cb1 10.11.98\cell}
- \pard\intbl\row
- }
- \trowd\trgaph40\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx1437\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx2874
- {\trrh-270\pard\intbl
- {\ql\fs20\f2\cf0\cb1 morgen\cell}
- \pard\intbl
- {\qr\fs20\f2\cf0\cb1 11.11.98\cell}
- \pard\intbl\row
- }
- \trowd\trgaph40\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx1437\clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx2874
- {\trrh-270\pard\intbl
- {\ql\fs20\f2\cf0\cb1 bruder\cell}
- \pard\intbl
- {\qr\fs20\f2\cf0\cb1 21.04.98\cell}
- \pard\intbl\row
- }
- \trowd\trgaph40
- \clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx
- \clbrdrl\brdrs\brdrcf2\clbrdrt\brdrs\brdrcf2\clbrdrb\brdrs\brdrcf2\clbrdrr\brdrs\brdrcf2\clshdng10000\clcfpat1\cellx2874
- {\trrh-270\pard\intbl
- {\ql\fs20\f2\cf0\cb1 vater\cell}
- \pard\intbl
- {\qr\fs20\f2\cf0\cb1 28.06.98\cell}
- \pard\intbl\row
- }
- }
- */
-
+ sal_Bool bBold = ( ::com::sun::star::awt::FontWeight::BOLD == m_aFont.Weight );
+ sal_Bool bItalic = ( ::com::sun::star::awt::FontSlant_ITALIC == m_aFont.Slant );
+ sal_Bool bUnderline = ( ::com::sun::star::awt::FontUnderline::NONE != m_aFont.Underline );
+ sal_Bool bStrikeout = ( ::com::sun::star::awt::FontStrikeout::NONE != m_aFont.Strikeout );
sal_Int32 nColor = 0;
if(m_xObject.is())
@@@ -694,8 -744,8 +694,8 @@@ OHTMLImportExport::OHTMLImportExport(co
const String& rExchange)
: ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange)
,m_nIndent(0)
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
- ,m_bCheckFont(FALSE)
+ ,m_bCheckFont(sal_False)
#endif
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen at sun.com", "OHTMLImportExport::OHTMLImportExport" );
@@@ -1057,8 -1109,8 +1057,8 @@@ void OHTMLImportExport::WriteCell( sal_
void OHTMLImportExport::FontOn()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen at sun.com", "OHTMLImportExport::FontOn" );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
- m_bCheckFont = TRUE;
+ m_bCheckFont = sal_True;
#endif
// <FONT FACE="xxx">
@@@ -1088,10 -1140,10 +1088,10 @@@
inline void OHTMLImportExport::FontOff()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen at sun.com", "OHTMLImportExport::FontOff" );
- DBG_ASSERT(m_bCheckFont,"Kein FontOn() gerufen");
+ OSL_ENSURE(m_bCheckFont,"Kein FontOn() gerufen");
TAG_OFF( OOO_STRING_SVTOOLS_HTML_font );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 0
- m_bCheckFont = FALSE;
+ m_bCheckFont = sal_False;
#endif
}
//-----------------------------------------------------------------------
diff --cc dbaccess/source/ui/misc/UITools.cxx
index d587513,da6d6b6..5f971a4
--- a/dbaccess/source/ui/misc/UITools.cxx
+++ b/dbaccess/source/ui/misc/UITools.cxx
@@@ -1451,9 -1643,9 +1451,9 @@@ TOTypeInfoSP queryTypeInfoByType(sal_In
return pTypeInfo;
}
// -----------------------------------------------------------------------------
- sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Bool _bAll,const ::rtl::OUString& _sName)
+ sal_Int32 askForUserAction(Window* _pParent,sal_uInt16 _nTitle,sal_uInt16 _nText,sal_Bool _bAll,const ::rtl::OUString& _sName)
{
- vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
String aMsg = String(ModuleRes(_nText));
aMsg.SearchAndReplace(String::CreateFromAscii("%1"),String(_sName));
OSQLMessageBox aAsk(_pParent,String(ModuleRes(_nTitle )),aMsg,WB_YES_NO | WB_DEF_YES,OSQLMessageBox::Query);
diff --cc dbaccess/source/ui/misc/WTypeSelect.cxx
index bf719b5,8926820..c58942d
--- 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 <osl/diagnose.h>
#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/misc/imageprovider.cxx
index b49c254,da4ce39..fb5f42b
--- a/dbaccess/source/ui/misc/imageprovider.cxx
+++ b/dbaccess/source/ui/misc/imageprovider.cxx
@@@ -97,9 -99,9 +97,9 @@@ namespace dbau
//................................................................
static void lcl_getTableImageResourceID_nothrow( const ImageProvider_Data& _rData, const ::rtl::OUString& _rName,
- USHORT& _out_rResourceID )
- sal_uInt16& _out_rResourceID, sal_uInt16& _out_rResourceID_HC )
++ sal_uInt16& _out_rResourceID)
{
- _out_rResourceID = _out_rResourceID_HC = 0;
+ _out_rResourceID = 0;
try
{
bool bIsView = _rData.xViews.is() && _rData.xViews->hasByName( _rName );
@@@ -158,15 -163,19 +158,15 @@@
{
// check whether the connection can give us an icon
Reference< XGraphic > xGraphic;
- Reference< XGraphic > xGraphicHC;
- lcl_getConnectionProvidedTableIcon_nothrow( *m_pData, _rName, xGraphic, xGraphicHC );
+ lcl_getConnectionProvidedTableIcon_nothrow( *m_pData, _rName, xGraphic );
if ( xGraphic.is() )
_out_rImage = Image( xGraphic );
- if ( xGraphicHC.is() )
- _out_rImageHC = Image( xGraphicHC );
- if ( !_out_rImage || !_out_rImageHC )
+ if ( !_out_rImage )
{
// no -> determine by type
- USHORT nImageResourceID = 0;
+ sal_uInt16 nImageResourceID = 0;
- sal_uInt16 nImageResourceID_HC = 0;
- lcl_getTableImageResourceID_nothrow( *m_pData, _rName, nImageResourceID, nImageResourceID_HC );
+ lcl_getTableImageResourceID_nothrow( *m_pData, _rName, nImageResourceID );
if ( nImageResourceID && !_out_rImage )
_out_rImage = Image( ModuleRes( nImageResourceID ) );
@@@ -175,19 -186,19 +175,19 @@@
}
//--------------------------------------------------------------------
- Image ImageProvider::getDefaultImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
+ Image ImageProvider::getDefaultImage( sal_Int32 _nDatabaseObjectType )
{
Image aObjectImage;
- USHORT nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType ) );
- sal_uInt16 nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType, _bHighContrast ) );
++ sal_uInt16 nImageResourceID( getDefaultImageResourceID( _nDatabaseObjectType) );
if ( nImageResourceID )
aObjectImage = Image( ModuleRes( nImageResourceID ) );
return aObjectImage;
}
//--------------------------------------------------------------------
- USHORT ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType )
- sal_uInt16 ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
++ sal_uInt16 ImageProvider::getDefaultImageResourceID( sal_Int32 _nDatabaseObjectType)
{
- USHORT nImageResourceID( 0 );
+ sal_uInt16 nImageResourceID( 0 );
switch ( _nDatabaseObjectType )
{
case DatabaseObject::QUERY:
@@@ -210,9 -221,9 +210,9 @@@
}
//--------------------------------------------------------------------
- Image ImageProvider::getFolderImage( sal_Int32 _nDatabaseObjectType, bool _bHighContrast )
+ Image ImageProvider::getFolderImage( sal_Int32 _nDatabaseObjectType )
{
- USHORT nImageResourceID( 0 );
+ sal_uInt16 nImageResourceID( 0 );
switch ( _nDatabaseObjectType )
{
case DatabaseObject::QUERY:
diff --cc dbaccess/source/ui/misc/linkeddocuments.cxx
index e28c4d8,74b85aa..49b88c4
--- a/dbaccess/source/ui/misc/linkeddocuments.cxx
+++ b/dbaccess/source/ui/misc/linkeddocuments.cxx
@@@ -29,43 -28,107 +29,42 @@@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_dbaccess.hxx"
-#ifndef _DBAUI_LINKEDDOCUMENTS_HXX_
#include "linkeddocuments.hxx"
-#endif
-#ifndef _OSL_DIAGNOSE_H_
#include <osl/diagnose.h>
-#endif
#include <tools/diagnose_ex.h>
#include <unotools/confignode.hxx>
-#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC
#include "dbustrings.hrc"
-#endif
#include <comphelper/classids.hxx>
-#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX
#include <comphelper/namedvaluecollection.hxx>
-#endif
-#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
#include <com/sun/star/frame/XDispatchProvider.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_XCOMPONENTLOADER_HPP_
#include <com/sun/star/frame/XComponentLoader.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UTIL_URL_HPP_
#include <com/sun/star/util/URL.hpp>
-#endif
-#ifndef _COM_SUN_STAR_FRAME_FRAMESEARCHFLAG_HPP_
#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_XCOMMANDPROCESSOR_HPP_
#include <com/sun/star/ucb/XCommandProcessor.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_OPENCOMMANDARGUMENT_HPP_
#include <com/sun/star/ucb/OpenCommandArgument.hpp>
-#endif
-#ifndef _COM_SUN_STAR_UCB_OPENMODE_HPP_
#include <com/sun/star/ucb/OpenMode.hpp>
-#endif
-#ifndef _COM_SUN_STAR_TASK_XJOBEXECUTOR_HPP_
#include <com/sun/star/task/XJobExecutor.hpp>
- #include <cppuhelper/extract.hxx>
-#endif
-#ifndef _COMPHELPER_EXTRACT_HXX_
+ #include <comphelper/extract.hxx>
-#endif
-#ifndef _COMPHELPER_TYPES_HXX_
#include <comphelper/types.hxx>
-#endif
-#ifndef _SV_MSGBOX_HXX
#include <vcl/msgbox.hxx>
-#endif
-#ifndef _UCBHELPER_CONTENT_HXX
#include <ucbhelper/content.hxx>
-#endif
-#ifndef _DBU_MISC_HRC_
#include "dbu_misc.hrc"
-#endif
-#ifndef SVTOOLS_FILENOTATION_HXX_
#include <svl/filenotation.hxx>
-#endif
-#ifndef DBACCESS_UI_BROWSER_ID_HXX
#include "browserids.hxx"
-#endif
-#ifndef _SFXNEW_HXX
#include <sfx2/new.hxx>
-#endif
-#ifndef _SVTOOLS_TEMPLDLG_HXX
-#include <svtools/templdlg.hxx>
-#endif
-#ifndef _DBAUI_MODULE_DBU_HXX_
#include "moduledbu.hxx"
-#endif
// -----------------
// for calling basic
-#ifndef _SFXAPP_HXX
#include <sfx2/app.hxx>
-#endif
-#ifndef _SBXCLASS_HXX
#include <basic/sbx.hxx>
-#endif
-#ifndef _SB_SBUNO_HXX
#include <basic/sbuno.hxx>
- #include <sfx2/macrconf.hxx>
-#endif
-#ifndef _EHDL_HXX
#include <svtools/ehdl.hxx>
-#endif
-#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_
#include <svx/dataaccessdescriptor.hxx>
-#endif
-#ifndef _COM_SUN_STAR_CONTAINER_XHIERARCHICALNAMECONTAINER_HPP_
#include <com/sun/star/container/XHierarchicalNameContainer.hpp>
-#endif
-#ifndef _SV_WAITOBJ_HXX
#include <vcl/waitobj.hxx>
-#endif
-#ifndef _COMPHELPER_MIMECONFIGHELPER_HXX_
#include <comphelper/mimeconfighelper.hxx>
-#endif
#include <cppuhelper/exc_hlp.hxx>
#include <connectivity/dbtools.hxx>
diff --cc dbaccess/source/ui/misc/singledoccontroller.cxx
index 4561219,2e8c002..4f6d7b9
mode 100644,100755..100755
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@@ -1,8 -1,6 +1,7 @@@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
- *
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@@ -33,165 -32,57 +33,58 @@@
#include "dbu_misc.hrc"
#include "dbustrings.hrc"
#include "moduledbu.hxx"
- #include "singledoccontroller.hxx"
- #include <com/sun/star/frame/XUntitledNumbers.hpp>
/** === begin UNO includes === **/
- #include <com/sun/star/beans/PropertyAttribute.hpp>
- #include <com/sun/star/container/XChild.hpp>
- #include <com/sun/star/container/XNameAccess.hpp>
- #include <com/sun/star/sdb/XDocumentDataSource.hpp>
- #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
- #include <com/sun/star/sdbc/XDataSource.hpp>
- #include <com/sun/star/lang/IllegalArgumentException.hpp>
- #include <com/sun/star/frame/XUntitledNumbers.hpp>
/** === end UNO includes === **/
- #include <comphelper/sequence.hxx>
- #include <comphelper/types.hxx>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list