-- cgit v1.2.1 From 2eae09911c113fbdfaa10f3c7c9c5991184b941d Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Wed, 12 Jan 2011 14:22:21 +0000 Subject: BrOffice Windows start menu branding --- solenv/bin/make_installer.pl | 3 ++- solenv/bin/modules/installer/windows/directory.pm | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl index 19da0edf7ad7..17a451594baf 100644 --- a/solenv/bin/make_installer.pl +++ b/solenv/bin/make_installer.pl @@ -2051,7 +2051,8 @@ for ( my $n = 0; $n <= $#installer::globals::languageproducts; $n++ ) if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles17c.log", $filesinproductlanguageresolvedarrayref); } if ( $installer::globals::updatedatabase ) { installer::windows::file::check_file_sequences($allupdatefileorder, $allupdatecomponentorder); } - installer::windows::directory::create_directory_table($directoriesforepmarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir); + # Attention: The table "Director.idt" contains language specific strings -> parameter: $languagesarrayref ! + installer::windows::directory::create_directory_table($directoriesforepmarrayref, $languagesarrayref, $newidtdir, $allvariableshashref, $shortdirname, $loggingdir); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "productfiles18.log", $filesinproductlanguageresolvedarrayref); } if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt1.log", $directoriesforepmarrayref); } diff --git a/solenv/bin/modules/installer/windows/directory.pm b/solenv/bin/modules/installer/windows/directory.pm index 49de6210bbc6..58313f5d3796 100644 --- a/solenv/bin/modules/installer/windows/directory.pm +++ b/solenv/bin/modules/installer/windows/directory.pm @@ -309,7 +309,7 @@ sub create_directorytable_from_collection sub add_root_directories { - my ($directorytableref, $allvariableshashref) = @_; + my ($directorytableref, $allvariableshashref, $onelanguage) = @_; # my $sourcediraddon = ""; # if (($installer::globals::addchildprojects) || @@ -324,7 +324,12 @@ sub add_root_directories if (( ! $installer::globals::patch ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack ) && ( ! $allvariableshashref->{'DONTUSESTARTMENUFOLDER'} )) { - my $productname = $allvariableshashref->{'PRODUCTNAME'}; + my $productname; + + $productname = $allvariableshashref->{'PRODUCTNAME'}; + if ($onelanguage eq 'pt-BR' && defined $allvariableshashref->{'PRODUCTNAME_BR'}) { + $productname = $allvariableshashref->{'PRODUCTNAME_BR'}; + } my $productversion = $allvariableshashref->{'PRODUCTVERSION'}; my $baseproductversion = $productversion; @@ -427,7 +432,7 @@ sub add_root_directories sub create_directory_table { - my ($directoryref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_; + my ($directoryref, $languagesarrayref, $basedir, $allvariableshashref, $shortdirnamehashref, $loggingdir) = @_; # Structure of the directory table: # Directory Directory_Parent DefaultDir @@ -437,6 +442,11 @@ sub create_directory_table # Before ":" : [sourcedir]:[destdir] (not programmed yet) # After ":" : 8+3 and not 8+3 the destination directory name + for ( my $m = 0; $m <= $#{$languagesarrayref}; $m++ ) + { + my $onelanguage = ${$languagesarrayref}[$m]; + $installer::globals::installlocationdirectoryset = 0; + my @directorytable = (); my $infoline; @@ -448,16 +458,16 @@ sub create_directory_table set_installlocation_directory($directoryref, $allvariableshashref); if ( $installer::globals::globallogging ) { installer::files::save_array_of_hashes($loggingdir . "directoriesforidt_local_3.log", $directoryref); } installer::windows::idtglobal::write_idt_header(\@directorytable, "directory"); - add_root_directories(\@directorytable, $allvariableshashref); + add_root_directories(\@directorytable, $allvariableshashref, $onelanguage); create_directorytable_from_collection(\@directorytable, $directoryref); # Saving the file - my $directorytablename = $basedir . $installer::globals::separator . "Director.idt"; + my $directorytablename = $basedir . $installer::globals::separator . "Director.idt" . "." . $onelanguage; installer::files::save_file($directorytablename ,\@directorytable); $infoline = "Created idt file: $directorytablename\n"; push(@installer::globals::logfileinfo, $infoline); - + } } 1; -- cgit v1.2.1 From 4a532a2cec94e674701337579e7d7e6b98264be2 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 11 Jan 2011 10:16:33 +0100 Subject: Added ca_XV and ast name and description signed off by Fridrich on irc signed off by Petr on irc signed off by Thorsten on irc --- scp2/source/ooo/module_helppack.ulf | 12 ++++++++++++ scp2/source/ooo/module_langpack.ulf | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf index 518364385c27..648335df4f81 100644 --- a/scp2/source/ooo/module_helppack.ulf +++ b/scp2/source/ooo/module_helppack.ulf @@ -343,6 +343,12 @@ en-US = "Catalan" [STR_DESC_MODULE_HELPPACK_CA] en-US = "Installs Catalan help in %PRODUCTNAME %PRODUCTVERSION" +[STR_NAME_MODULE_HELPPACK_CA_XV] +en-US = "Catalan (Valencian)" + +[STR_DESC_MODULE_HELPPACK_CA_XV] +en-US = "Installs Catalan (Valencian) help in %PRODUCTNAME %PRODUCTVERSION" + [STR_NAME_MODULE_HELPPACK_DA] en-US = "Danish" @@ -517,6 +523,12 @@ en-US = "Assamese" [STR_DESC_MODULE_HELPPACK_AS_IN] en-US = "Installs Assamese help in %PRODUCTNAME %PRODUCTVERSION" +[STR_NAME_MODULE_HELPPACK_AST] +en-US = "Asturian" + +[STR_DESC_MODULE_HELPPACK_AST] +en-US = "Installs Asturian help in %PRODUCTNAME %PRODUCTVERSION" + [STR_NAME_MODULE_HELPPACK_RW] en-US = "Kinyarwanda" diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index 3b5949dd2a4c..f469a3b6d627 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -343,6 +343,12 @@ en-US = "Catalan" [STR_DESC_MODULE_LANGPACK_CA] en-US = "Installs Catalan support in %PRODUCTNAME %PRODUCTVERSION" +[STR_NAME_MODULE_LANGPACK_CA_XV] +en-US = "Catalan (Valencian)" + +[STR_DESC_MODULE_LANGPACK_CA_XV] +en-US = "Installs Catalan (Valencian) support in %PRODUCTNAME %PRODUCTVERSION" + [STR_NAME_MODULE_LANGPACK_DA] en-US = "Danish" @@ -517,6 +523,12 @@ en-US = "Assamese" [STR_DESC_MODULE_LANGPACK_AS_IN] en-US = "Installs Assamese support in %PRODUCTNAME %PRODUCTVERSION" +[STR_NAME_MODULE_LANGPACK_AST] +en-US = "Asturian" + +[STR_DESC_MODULE_LANGPACK_AST] +en-US = "Installs Asturian support in %PRODUCTNAME %PRODUCTVERSION" + [STR_NAME_MODULE_LANGPACK_RW] en-US = "Kinyarwanda" -- cgit v1.2.1 From 7458d48132862514dbc06e07b59d872b880a5410 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 11 Jan 2011 10:20:12 +0100 Subject: removed language code 'kid' kid is not Koshin but key id pseudo language which is good for debugging UI but should no be included in the product Signed off by Fridrich on irc. Signed off by Petr on irc. Signed off by Thorsten on irc. --- scp2/source/ooo/module_helppack.ulf | 6 ------ scp2/source/ooo/module_langpack.ulf | 6 ------ solenv/inc/postset.mk | 1 - 3 files changed, 13 deletions(-) diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf index 648335df4f81..64604c3cf424 100644 --- a/scp2/source/ooo/module_helppack.ulf +++ b/scp2/source/ooo/module_helppack.ulf @@ -757,12 +757,6 @@ en-US = "Scottish Gaelic" [STR_DESC_MODULE_HELPPACK_GD] en-US = "Installs Scottish Gaelic help in %PRODUCTNAME %PRODUCTVERSION" -[STR_NAME_MODULE_HELPPACK_KID] -en-US = "Koshin" - -[STR_DESC_MODULE_HELPPACK_KID] -en-US = "Installs Koshin help in %PRODUCTNAME %PRODUCTVERSION" - [STR_NAME_MODULE_HELPPACK_KK] en-US = "Kazakh" diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf index f469a3b6d627..f2771c2332be 100644 --- a/scp2/source/ooo/module_langpack.ulf +++ b/scp2/source/ooo/module_langpack.ulf @@ -757,12 +757,6 @@ en-US = "Scottish Gaelic" [STR_DESC_MODULE_LANGPACK_GD] en-US = "Installs Scottish Gaelic support in %PRODUCTNAME %PRODUCTVERSION" -[STR_NAME_MODULE_LANGPACK_KID] -en-US = "Koshin" - -[STR_DESC_MODULE_LANGPACK_KID] -en-US = "Installs Koshin support in %PRODUCTNAME %PRODUCTVERSION" - [STR_NAME_MODULE_LANGPACK_KK] en-US = "Kazakh" diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk index 80c1f7468413..cfb04290f00b 100644 --- a/solenv/inc/postset.mk +++ b/solenv/inc/postset.mk @@ -72,7 +72,6 @@ id \ is \ it \ ja \ -kid \ ky \ ka \ kk \ -- cgit v1.2.1 From cc16ed5647cb7da30ac05171a745b6f5b9f48c7f Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 18 Jan 2011 15:49:33 +0100 Subject: bump SHORT_PRODUCTEXTENSION to rc4 and widnows build version to 6 --- instsetoo_native/util/openoffice.lst | 12 ++++++------ solenv/inc/minor.mk | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index ebe63ce3c57a..2ab17bff20a2 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -57,7 +57,7 @@ LibreOffice PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc3 + SHORT_PRODUCTEXTENSION rc4 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 @@ -126,7 +126,7 @@ LibreOffice_wJRE PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc3 + SHORT_PRODUCTEXTENSION rc4 POSTVERSIONEXTENSION POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 @@ -191,7 +191,7 @@ LibreOffice_Dev PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc3 + SHORT_PRODUCTEXTENSION rc4 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION @@ -269,7 +269,7 @@ URE PRODUCTEXTENSION BRANDPACKAGEVERSION 3 LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc3 + SHORT_PRODUCTEXTENSION rc4 LICENSENAME LGPL SERVICESPROJEKT 1 SETSTATICPATH 1 @@ -310,7 +310,7 @@ LibreOffice_SDK PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc3 + SHORT_PRODUCTEXTENSION rc4 POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 @@ -355,7 +355,7 @@ LibreOffice_Dev_SDK PRODUCTVERSION 3.3 PRODUCTEXTENSION LONG_PRODUCTEXTENSION - SHORT_PRODUCTEXTENSION rc3 + SHORT_PRODUCTEXTENSION rc4 BASISROOTNAME LibO-dev UNIXBASISROOTNAME lo-dev POSTVERSIONEXTENSION SDK diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 330ce125d614..3e2745f9ddf7 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=330 -RSCREVISION=330m19(Build:5) -BUILD=5 +RSCREVISION=330m19(Build:6) +BUILD=6 LAST_MINOR=m19 SOURCEVERSION=OOO330 -- cgit v1.2.1 -- cgit v1.2.1 From 3974f57f56ec7e0209ab914bde51e3528e840e6f Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 23 Aug 2011 15:01:33 +0200 Subject: recreated tag libreoffice-3.3.0.4 which had these commits: commit c48453166abc60b165a252006c220a29afdb4d8d (tag: refs/tags/libreoffice-3.3.0.4) Author: Petr Mladek Date: Tue Jan 18 19:01:14 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit e95e127016d46c6cbb3b736dc4cd9a6d0bc15bd4 Author: Michael Meeks Date: Thu Jan 13 14:49:01 2011 +0000 fix search toolbar up/down search button icons Signed off by Thorsten, Fridrich & Michael .../res/commandimagelist/lc_downsearch.png | Bin 0 -> 411 bytes .../res/commandimagelist/lc_upsearch.png | Bin 0 -> 509 bytes .../res/commandimagelist/sc_downsearch.png | Bin 0 -> 240 bytes .../res/commandimagelist/sc_upsearch.png | Bin 0 -> 236 bytes 4 files changed, 0 insertions(+), 0 deletions(-) commit 03295801ceaf12d5acec348f7bd82420aedb20f7 Author: Petr Mladek Date: Tue Jan 11 22:59:35 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. --- external_images/ooo_crystal_images-1.tar.gz | Bin 0 -> 1079184 bytes external_images/ooo_oxygen_images-2009-06-17.tar.gz | Bin 0 -> 13872995 bytes .../res/commandimagelist/lc_downsearch.png | Bin 0 -> 411 bytes .../industrial/res/commandimagelist/lc_upsearch.png | Bin 0 -> 509 bytes .../res/commandimagelist/sc_downsearch.png | Bin 0 -> 240 bytes .../industrial/res/commandimagelist/sc_upsearch.png | Bin 0 -> 236 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 external_images/ooo_crystal_images-1.tar.gz create mode 100644 external_images/ooo_oxygen_images-2009-06-17.tar.gz create mode 100644 ooo_custom_images/industrial/res/commandimagelist/lc_downsearch.png create mode 100644 ooo_custom_images/industrial/res/commandimagelist/lc_upsearch.png create mode 100644 ooo_custom_images/industrial/res/commandimagelist/sc_downsearch.png create mode 100644 ooo_custom_images/industrial/res/commandimagelist/sc_upsearch.png diff --git a/external_images/ooo_crystal_images-1.tar.gz b/external_images/ooo_crystal_images-1.tar.gz new file mode 100644 index 000000000000..b06df4f545cd Binary files /dev/null and b/external_images/ooo_crystal_images-1.tar.gz differ diff --git a/external_images/ooo_oxygen_images-2009-06-17.tar.gz b/external_images/ooo_oxygen_images-2009-06-17.tar.gz new file mode 100644 index 000000000000..4356d03c026b Binary files /dev/null and b/external_images/ooo_oxygen_images-2009-06-17.tar.gz differ diff --git a/ooo_custom_images/industrial/res/commandimagelist/lc_downsearch.png b/ooo_custom_images/industrial/res/commandimagelist/lc_downsearch.png new file mode 100644 index 000000000000..026215f8e8c9 Binary files /dev/null and b/ooo_custom_images/industrial/res/commandimagelist/lc_downsearch.png differ diff --git a/ooo_custom_images/industrial/res/commandimagelist/lc_upsearch.png b/ooo_custom_images/industrial/res/commandimagelist/lc_upsearch.png new file mode 100644 index 000000000000..974a61894d6a Binary files /dev/null and b/ooo_custom_images/industrial/res/commandimagelist/lc_upsearch.png differ diff --git a/ooo_custom_images/industrial/res/commandimagelist/sc_downsearch.png b/ooo_custom_images/industrial/res/commandimagelist/sc_downsearch.png new file mode 100644 index 000000000000..29ebe9a70bb9 Binary files /dev/null and b/ooo_custom_images/industrial/res/commandimagelist/sc_downsearch.png differ diff --git a/ooo_custom_images/industrial/res/commandimagelist/sc_upsearch.png b/ooo_custom_images/industrial/res/commandimagelist/sc_upsearch.png new file mode 100644 index 000000000000..0cbfe4acb601 Binary files /dev/null and b/ooo_custom_images/industrial/res/commandimagelist/sc_upsearch.png differ -- cgit v1.2.1 From fdc4da32a09265b19470ab09db998ea28936106e Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Tue, 23 Aug 2011 15:02:56 +0200 Subject: recreated tag libreoffice-3.3.0.4 which had these commits: commit e082905e4ce8c9018a2a38035e212eb45e9f70b1 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek Date: Tue Jan 18 19:01:14 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 35131d5a73dd02924bf4b404c55d0dbeb324db1f Author: Lionel Elie Mamane Date: Sat Jan 15 05:39:40 2011 +0100 i#116187: report left/right page margin setting ignored on Unix 64 bit (cherry picked from commit 51a9333217687ff16df40ea3bd8983faaf5e425a) Signed-off-by: Michael Meeks reportdesign/source/ui/report/ReportController.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit ae3903b548d8d05807cc7f3a029495388de5e302 Author: Kohei Yoshida Date: Fri Jan 14 11:24:43 2011 -0500 Remove the Registration... menu item which we don't want. (fdo#33112) dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) commit c71822d4eb36b43cdb08c25d207cae5e3c1660cd Author: Noel Power Date: Wed Jan 12 11:09:51 2011 +0000 fix for fdo#32742# reportdesign/source/ui/inspection/metadata.cxx | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) commit 66d25b635de422a4a811710cb3289266d9a11a84 Author: Petr Mladek Date: Tue Jan 11 22:59:35 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. --- dbaccess/inc/AsyncronousLink.hxx | 6 +- dbaccess/inc/IController.hxx | 32 +- dbaccess/inc/IEnvironment.hxx | 2 +- dbaccess/inc/IReference.hxx | 4 +- dbaccess/inc/ToolBoxHelper.hxx | 22 +- dbaccess/inc/controllerframe.hxx | 2 +- dbaccess/inc/dataview.hxx | 18 +- dbaccess/inc/dbaccess_helpid.hrc | 794 ++++++++++----------- dbaccess/inc/dbaccess_slotid.hrc | 132 ++-- dbaccess/inc/dbaccessdllapi.h | 8 +- dbaccess/inc/genericcontroller.hxx | 78 +- dbaccess/inc/pch/precompiled_dbaccess.cxx | 2 +- dbaccess/inc/pch/precompiled_dbaccess.hxx | 2 +- dbaccess/inc/singledoccontroller.hxx | 30 +- dbaccess/prj/dbu.xml | 2 +- .../qa/complex/dbaccess/ApplicationController.java | 2 +- dbaccess/qa/complex/dbaccess/Beamer.java | 4 +- dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java | 2 +- .../dbaccess/CopyTableInterActionHandler.java | 2 +- dbaccess/qa/complex/dbaccess/CopyTableWizard.java | 6 +- dbaccess/qa/complex/dbaccess/DataSource.java | 2 +- .../qa/complex/dbaccess/DatabaseApplication.java | 2 +- dbaccess/qa/complex/dbaccess/DatabaseDocument.java | 2 +- dbaccess/qa/complex/dbaccess/FileHelper.java | 2 +- dbaccess/qa/complex/dbaccess/Parser.java | 2 +- dbaccess/qa/complex/dbaccess/PropertyBag.java | 2 +- dbaccess/qa/complex/dbaccess/Query.java | 2 +- dbaccess/qa/complex/dbaccess/QueryInQuery.java | 2 +- dbaccess/qa/complex/dbaccess/RowSet.java | 2 +- .../qa/complex/dbaccess/RowSetEventListener.java | 8 +- .../dbaccess/SingleSelectQueryComposer.java | 10 +- dbaccess/qa/complex/dbaccess/TestCase.java | 4 +- dbaccess/qa/complex/dbaccess/UISettings.java | 2 +- dbaccess/source/core/api/BookmarkSet.cxx | 6 +- dbaccess/source/core/api/CIndexColumn.hxx | 14 +- dbaccess/source/core/api/CRowSetColumn.cxx | 2 +- dbaccess/source/core/api/CRowSetColumn.hxx | 2 +- dbaccess/source/core/api/CRowSetDataColumn.cxx | 8 +- dbaccess/source/core/api/CRowSetDataColumn.hxx | 10 +- dbaccess/source/core/api/CacheSet.cxx | 18 +- dbaccess/source/core/api/CacheSet.hxx | 24 +- dbaccess/source/core/api/FilteredContainer.cxx | 24 +- dbaccess/source/core/api/HelperCollections.hxx | 6 +- dbaccess/source/core/api/KeySet.cxx | 46 +- dbaccess/source/core/api/KeySet.hxx | 26 +- dbaccess/source/core/api/OptimisticSet.cxx | 10 +- dbaccess/source/core/api/OptimisticSet.hxx | 10 +- dbaccess/source/core/api/RowSet.cxx | 216 +++--- dbaccess/source/core/api/RowSet.hxx | 150 ++-- dbaccess/source/core/api/RowSetBase.cxx | 54 +- dbaccess/source/core/api/RowSetBase.hxx | 84 +-- dbaccess/source/core/api/RowSetCache.cxx | 136 ++-- dbaccess/source/core/api/RowSetCache.hxx | 64 +- dbaccess/source/core/api/RowSetCacheIterator.cxx | 4 +- dbaccess/source/core/api/RowSetCacheIterator.hxx | 16 +- dbaccess/source/core/api/RowSetRow.hxx | 12 +- .../source/core/api/SingleSelectQueryComposer.cxx | 92 +-- dbaccess/source/core/api/StaticSet.cxx | 10 +- dbaccess/source/core/api/StaticSet.hxx | 4 +- dbaccess/source/core/api/TableDeco.cxx | 26 +- dbaccess/source/core/api/WrappedResultSet.cxx | 4 +- dbaccess/source/core/api/column.cxx | 10 +- dbaccess/source/core/api/datacolumn.hxx | 6 +- dbaccess/source/core/api/datasettings.cxx | 34 +- dbaccess/source/core/api/definitioncolumn.cxx | 14 +- dbaccess/source/core/api/query.cxx | 8 +- dbaccess/source/core/api/query.hxx | 26 +- dbaccess/source/core/api/querycontainer.cxx | 22 +- dbaccess/source/core/api/querydescriptor.cxx | 2 +- dbaccess/source/core/api/querydescriptor.hxx | 24 +- dbaccess/source/core/api/resultcolumn.cxx | 44 +- dbaccess/source/core/api/resultcolumn.hxx | 4 +- dbaccess/source/core/api/resultset.cxx | 14 +- dbaccess/source/core/api/resultset.hxx | 20 +- dbaccess/source/core/api/statement.cxx | 16 +- dbaccess/source/core/api/table.cxx | 38 +- dbaccess/source/core/api/tablecontainer.cxx | 30 +- dbaccess/source/core/api/viewcontainer.cxx | 10 +- .../source/core/dataaccess/ComponentDefinition.cxx | 8 +- .../source/core/dataaccess/ComponentDefinition.hxx | 14 +- dbaccess/source/core/dataaccess/ContentHelper.cxx | 12 +- dbaccess/source/core/dataaccess/ModelImpl.cxx | 2 +- dbaccess/source/core/dataaccess/ModelImpl.hxx | 44 +- .../source/core/dataaccess/SharedConnection.cxx | 4 +- .../source/core/dataaccess/SharedConnection.hxx | 6 +- .../source/core/dataaccess/bookmarkcontainer.cxx | 8 +- .../source/core/dataaccess/bookmarkcontainer.hxx | 50 +- .../source/core/dataaccess/commandcontainer.cxx | 4 +- .../source/core/dataaccess/commandcontainer.hxx | 6 +- .../source/core/dataaccess/commanddefinition.cxx | 4 +- .../source/core/dataaccess/commanddefinition.hxx | 10 +- dbaccess/source/core/dataaccess/connection.cxx | 8 +- dbaccess/source/core/dataaccess/connection.hxx | 26 +- .../source/core/dataaccess/databasecontext.cxx | 18 +- .../source/core/dataaccess/databasecontext.hxx | 28 +- .../source/core/dataaccess/databasedocument.cxx | 6 +- .../source/core/dataaccess/databasedocument.hxx | 32 +- dbaccess/source/core/dataaccess/datasource.cxx | 60 +- dbaccess/source/core/dataaccess/datasource.hxx | 6 +- .../source/core/dataaccess/definitioncontainer.cxx | 14 +- .../source/core/dataaccess/documentcontainer.cxx | 8 +- .../source/core/dataaccess/documentcontainer.hxx | 22 +- .../source/core/dataaccess/documentdefinition.cxx | 18 +- .../source/core/dataaccess/documentdefinition.hxx | 24 +- .../core/dataaccess/documenteventnotifier.cxx | 4 +- dbaccess/source/core/dataaccess/intercept.cxx | 42 +- dbaccess/source/core/dataaccess/intercept.hxx | 4 +- .../source/core/dataaccess/myucp_datasupplier.cxx | 26 +- .../source/core/dataaccess/myucp_resultset.cxx | 4 +- dbaccess/source/core/inc/ContainerListener.hxx | 2 +- dbaccess/source/core/inc/ContainerMediator.hxx | 8 +- dbaccess/source/core/inc/ContentHelper.hxx | 54 +- dbaccess/source/core/inc/DatabaseDataProvider.hxx | 6 +- dbaccess/source/core/inc/FilteredContainer.hxx | 22 +- dbaccess/source/core/inc/PropertyForward.hxx | 10 +- dbaccess/source/core/inc/RefreshListener.hxx | 2 +- .../source/core/inc/SingleSelectQueryComposer.hxx | 64 +- dbaccess/source/core/inc/TableDeco.hxx | 24 +- dbaccess/source/core/inc/column.hxx | 32 +- dbaccess/source/core/inc/columnsettings.hxx | 18 +- dbaccess/source/core/inc/commandbase.hxx | 14 +- dbaccess/source/core/inc/core_resource.hrc | 110 +-- dbaccess/source/core/inc/core_resource.hxx | 14 +- dbaccess/source/core/inc/datasettings.hxx | 36 +- dbaccess/source/core/inc/dbamiscres.hrc | 46 +- dbaccess/source/core/inc/definitioncolumn.hxx | 40 +- dbaccess/source/core/inc/definitioncontainer.hxx | 66 +- dbaccess/source/core/inc/preparedstatement.hxx | 2 +- dbaccess/source/core/inc/querycomposer.hxx | 12 +- dbaccess/source/core/inc/querycontainer.hxx | 12 +- dbaccess/source/core/inc/sdbcoretools.hxx | 2 +- dbaccess/source/core/inc/statement.hxx | 8 +- dbaccess/source/core/inc/table.hxx | 36 +- dbaccess/source/core/inc/tablecontainer.hxx | 22 +- dbaccess/source/core/inc/userinformation.hxx | 4 +- dbaccess/source/core/inc/viewcontainer.hxx | 16 +- dbaccess/source/core/misc/ContainerListener.cxx | 14 +- dbaccess/source/core/misc/ContainerMediator.cxx | 20 +- dbaccess/source/core/misc/DatabaseDataProvider.cxx | 12 +- dbaccess/source/core/misc/PropertyForward.cxx | 10 +- dbaccess/source/core/misc/apitools.cxx | 4 +- dbaccess/source/core/misc/dbastrings.cxx | 2 +- dbaccess/source/core/misc/dsntypes.cxx | 36 +- dbaccess/source/core/misc/module_dba.cxx | 2 +- dbaccess/source/core/misc/objectnameapproval.cxx | 2 +- dbaccess/source/core/misc/sdbcoretools.cxx | 4 +- dbaccess/source/core/misc/services.cxx | 8 +- dbaccess/source/core/misc/userinformation.cxx | 2 +- dbaccess/source/core/misc/veto.cxx | 4 +- dbaccess/source/core/recovery/dbdocrecovery.cxx | 2 +- dbaccess/source/core/recovery/settingsimport.cxx | 2 +- dbaccess/source/core/recovery/settingsimport.hxx | 2 +- dbaccess/source/core/recovery/storagestream.cxx | 2 +- dbaccess/source/core/recovery/storagestream.hxx | 2 +- .../source/core/recovery/storagetextstream.cxx | 2 +- .../source/core/recovery/storagetextstream.hxx | 2 +- dbaccess/source/core/recovery/storagexmlstream.cxx | 2 +- dbaccess/source/core/recovery/storagexmlstream.hxx | 2 +- .../source/core/recovery/subcomponentloader.cxx | 8 +- .../source/core/recovery/subcomponentloader.hxx | 2 +- .../source/core/recovery/subcomponentrecovery.cxx | 16 +- .../source/core/recovery/subcomponentrecovery.hxx | 2 +- dbaccess/source/core/recovery/subcomponents.hxx | 2 +- dbaccess/source/core/resource/core_resource.cxx | 6 +- dbaccess/source/core/resource/strings.src | 4 +- dbaccess/source/ext/adabas/ANewDb.cxx | 30 +- dbaccess/source/ext/adabas/ANewDb.hxx | 18 +- dbaccess/source/ext/adabas/ASQLNameEdit.hxx | 4 +- dbaccess/source/ext/adabas/ASqlNameEdit.cxx | 10 +- dbaccess/source/ext/adabas/Acomponentmodule.cxx | 70 +- dbaccess/source/ext/adabas/Acomponentmodule.hxx | 52 +- dbaccess/source/ext/adabas/AdabasNewDb.cxx | 98 +-- dbaccess/source/ext/adabas/AdabasNewDb.hrc | 72 +- dbaccess/source/ext/adabas/AdabasNewDb.hxx | 136 ++-- dbaccess/source/ext/adabas/AdabasNewDb.src | 186 ++--- dbaccess/source/ext/adabas/Aservices.cxx | 10 +- dbaccess/source/ext/adabas/Astringconstants.cxx | 2 +- dbaccess/source/ext/adabas/Astringconstants.hrc | 16 +- dbaccess/source/ext/adabas/adabasui_resource.hrc | 72 +- dbaccess/source/ext/adabas/adabasuistrings.cxx | 2 +- dbaccess/source/ext/adabas/adabasuistrings.hrc | 2 +- dbaccess/source/ext/macromigration/dbmm_global.hrc | 10 +- dbaccess/source/ext/macromigration/dbmm_module.cxx | 2 +- dbaccess/source/ext/macromigration/dbmm_module.hxx | 2 +- .../source/ext/macromigration/dbmm_services.cxx | 2 +- dbaccess/source/ext/macromigration/dbmm_types.cxx | 2 +- dbaccess/source/ext/macromigration/dbmm_types.hxx | 2 +- .../source/ext/macromigration/docinteraction.cxx | 2 +- .../source/ext/macromigration/docinteraction.hxx | 4 +- .../source/ext/macromigration/macromigration.hrc | 2 +- .../source/ext/macromigration/macromigration.src | 6 +- .../ext/macromigration/macromigrationdialog.cxx | 4 +- .../ext/macromigration/macromigrationdialog.hxx | 4 +- .../ext/macromigration/macromigrationpages.cxx | 4 +- .../ext/macromigration/macromigrationpages.hxx | 4 +- .../ext/macromigration/macromigrationwizard.cxx | 6 +- .../source/ext/macromigration/migrationengine.cxx | 4 +- .../source/ext/macromigration/migrationengine.hxx | 2 +- .../source/ext/macromigration/migrationerror.hxx | 2 +- .../source/ext/macromigration/migrationlog.cxx | 2 +- .../source/ext/macromigration/migrationlog.hxx | 2 +- .../ext/macromigration/migrationprogress.hxx | 2 +- .../source/ext/macromigration/progresscapture.cxx | 10 +- .../source/ext/macromigration/progresscapture.hxx | 2 +- .../source/ext/macromigration/progressmixer.cxx | 2 +- .../source/ext/macromigration/progressmixer.hxx | 2 +- .../source/ext/macromigration/rangeprogressbar.hxx | 2 +- dbaccess/source/filter/migration/cfgimport.cxx | 70 +- dbaccess/source/filter/migration/cfgimport.hxx | 116 +-- dbaccess/source/filter/migration/cfgservices.cxx | 10 +- dbaccess/source/filter/xml/dbloader2.cxx | 34 +- dbaccess/source/filter/xml/xmlAutoStyle.cxx | 6 +- dbaccess/source/filter/xml/xmlAutoStyle.hxx | 4 +- dbaccess/source/filter/xml/xmlColumn.cxx | 6 +- dbaccess/source/filter/xml/xmlColumn.hxx | 4 +- dbaccess/source/filter/xml/xmlComponent.cxx | 2 +- dbaccess/source/filter/xml/xmlComponent.hxx | 4 +- dbaccess/source/filter/xml/xmlConnectionData.cxx | 4 +- dbaccess/source/filter/xml/xmlConnectionData.hxx | 2 +- .../source/filter/xml/xmlConnectionResource.cxx | 2 +- .../source/filter/xml/xmlConnectionResource.hxx | 2 +- dbaccess/source/filter/xml/xmlDataSource.cxx | 4 +- dbaccess/source/filter/xml/xmlDataSource.hxx | 2 +- dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 4 +- dbaccess/source/filter/xml/xmlDataSourceInfo.hxx | 2 +- .../source/filter/xml/xmlDataSourceSetting.cxx | 44 +- .../source/filter/xml/xmlDataSourceSetting.hxx | 6 +- .../source/filter/xml/xmlDataSourceSettings.cxx | 4 +- .../source/filter/xml/xmlDataSourceSettings.hxx | 2 +- dbaccess/source/filter/xml/xmlDatabase.cxx | 4 +- dbaccess/source/filter/xml/xmlDatabase.hxx | 2 +- .../source/filter/xml/xmlDatabaseDescription.cxx | 4 +- .../source/filter/xml/xmlDatabaseDescription.hxx | 2 +- dbaccess/source/filter/xml/xmlDocuments.cxx | 6 +- dbaccess/source/filter/xml/xmlDocuments.hxx | 6 +- dbaccess/source/filter/xml/xmlEnums.hxx | 40 +- dbaccess/source/filter/xml/xmlExport.cxx | 28 +- dbaccess/source/filter/xml/xmlExport.hxx | 102 +-- .../source/filter/xml/xmlFileBasedDatabase.cxx | 2 +- .../source/filter/xml/xmlFileBasedDatabase.hxx | 2 +- dbaccess/source/filter/xml/xmlHelper.cxx | 136 ++-- dbaccess/source/filter/xml/xmlHelper.hxx | 18 +- .../source/filter/xml/xmlHierarchyCollection.cxx | 14 +- .../source/filter/xml/xmlHierarchyCollection.hxx | 8 +- dbaccess/source/filter/xml/xmlLogin.cxx | 4 +- dbaccess/source/filter/xml/xmlLogin.hxx | 2 +- dbaccess/source/filter/xml/xmlQuery.cxx | 6 +- dbaccess/source/filter/xml/xmlQuery.hxx | 4 +- dbaccess/source/filter/xml/xmlServerDatabase.cxx | 4 +- dbaccess/source/filter/xml/xmlServerDatabase.hxx | 2 +- dbaccess/source/filter/xml/xmlStyleImport.cxx | 4 +- dbaccess/source/filter/xml/xmlStyleImport.hxx | 20 +- dbaccess/source/filter/xml/xmlTable.cxx | 12 +- dbaccess/source/filter/xml/xmlTable.hxx | 14 +- dbaccess/source/filter/xml/xmlTableFilterList.cxx | 4 +- dbaccess/source/filter/xml/xmlTableFilterList.hxx | 6 +- .../source/filter/xml/xmlTableFilterPattern.cxx | 2 +- .../source/filter/xml/xmlTableFilterPattern.hxx | 8 +- dbaccess/source/filter/xml/xmlfilter.cxx | 210 +++--- dbaccess/source/filter/xml/xmlfilter.hxx | 52 +- dbaccess/source/filter/xml/xmlservices.cxx | 10 +- .../source/inc/OAuthenticationContinuation.hxx | 4 +- dbaccess/source/inc/apitools.hxx | 488 ++++++------- dbaccess/source/inc/cfg_reghelper.hxx | 2 +- dbaccess/source/inc/cfgstrings.hrc | 2 +- dbaccess/source/inc/constasciistring.hxx | 10 +- dbaccess/source/inc/dbadllapi.hxx | 2 +- dbaccess/source/inc/dbastrings.hrc | 4 +- dbaccess/source/inc/dbu_reghelper.hxx | 2 +- dbaccess/source/inc/dbustrings.hrc | 4 +- dbaccess/source/inc/dsntypes.hxx | 42 +- dbaccess/source/inc/flt_reghelper.hxx | 2 +- dbaccess/source/inc/registrationhelper.hxx | 34 +- dbaccess/source/inc/sdbtstrings.hrc | 2 +- dbaccess/source/inc/stringconstants.hrc | 254 +++---- dbaccess/source/inc/xmlstrings.hrc | 2 +- .../sdbtools/connection/connectiondependent.hxx | 4 +- .../source/sdbtools/connection/connectiontools.cxx | 16 +- .../source/sdbtools/connection/connectiontools.hxx | 2 +- .../sdbtools/connection/datasourcemetadata.cxx | 2 +- .../sdbtools/connection/datasourcemetadata.hxx | 2 +- .../source/sdbtools/connection/objectnames.cxx | 12 +- .../source/sdbtools/connection/objectnames.hxx | 2 +- dbaccess/source/sdbtools/connection/tablename.cxx | 24 +- dbaccess/source/sdbtools/connection/tablename.hxx | 2 +- dbaccess/source/sdbtools/inc/module_sdbt.hxx | 2 +- dbaccess/source/sdbtools/inc/sdbt_resource.hrc | 4 +- dbaccess/source/sdbtools/misc/module_sdbt.cxx | 2 +- dbaccess/source/sdbtools/misc/sdbt_services.cxx | 10 +- dbaccess/source/sdbtools/resource/sdbt_strings.src | 2 +- dbaccess/source/shared/cfg_reghelper.cxx | 2 +- dbaccess/source/shared/cfgstrings.cxx | 4 +- dbaccess/source/shared/dbu_reghelper.cxx | 2 +- dbaccess/source/shared/dbustrings.cxx | 12 +- dbaccess/source/shared/flt_reghelper.cxx | 2 +- dbaccess/source/shared/registrationhelper.cxx | 34 +- dbaccess/source/shared/sdbtstrings.cxx | 2 +- dbaccess/source/shared/xmlstrings.cxx | 2 +- dbaccess/source/ui/app/AppController.cxx | 48 +- dbaccess/source/ui/app/AppController.hxx | 114 +-- dbaccess/source/ui/app/AppControllerDnD.cxx | 20 +- dbaccess/source/ui/app/AppControllerGen.cxx | 8 +- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 +- dbaccess/source/ui/app/AppDetailPageHelper.hxx | 124 ++-- dbaccess/source/ui/app/AppDetailView.cxx | 58 +- dbaccess/source/ui/app/AppDetailView.hxx | 88 +-- dbaccess/source/ui/app/AppIconControl.cxx | 10 +- dbaccess/source/ui/app/AppIconControl.hxx | 16 +- dbaccess/source/ui/app/AppSwapWindow.cxx | 10 +- dbaccess/source/ui/app/AppSwapWindow.hxx | 32 +- dbaccess/source/ui/app/AppTitleWindow.cxx | 24 +- dbaccess/source/ui/app/AppTitleWindow.hxx | 22 +- dbaccess/source/ui/app/AppView.cxx | 12 +- dbaccess/source/ui/app/AppView.hxx | 82 +-- dbaccess/source/ui/app/IApplicationController.hxx | 8 +- dbaccess/source/ui/app/app.src | 4 +- dbaccess/source/ui/app/dbu_app.hrc | 70 +- dbaccess/source/ui/app/subcomponentmanager.cxx | 2 +- dbaccess/source/ui/app/subcomponentmanager.hxx | 2 +- dbaccess/source/ui/browser/AsyncronousLink.cxx | 2 +- dbaccess/source/ui/browser/bcommon.src | 2 +- dbaccess/source/ui/browser/brwctrlr.cxx | 154 ++-- dbaccess/source/ui/browser/brwview.cxx | 38 +- dbaccess/source/ui/browser/dataview.cxx | 12 +- dbaccess/source/ui/browser/dbexchange.cxx | 26 +- dbaccess/source/ui/browser/dbloader.cxx | 36 +- dbaccess/source/ui/browser/dbtreemodel.cxx | 2 +- dbaccess/source/ui/browser/dbtreemodel.hxx | 14 +- dbaccess/source/ui/browser/dbtreeview.cxx | 12 +- dbaccess/source/ui/browser/dbtreeview.hxx | 18 +- dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 14 +- dbaccess/source/ui/browser/dsbrowserDnD.cxx | 26 +- dbaccess/source/ui/browser/exsrcbrw.cxx | 40 +- dbaccess/source/ui/browser/formadapter.cxx | 10 +- dbaccess/source/ui/browser/genericcontroller.cxx | 48 +- dbaccess/source/ui/browser/sbabrw.src | 60 +- dbaccess/source/ui/browser/sbagrid.cxx | 204 +++--- dbaccess/source/ui/browser/sbagrid.src | 2 +- dbaccess/source/ui/browser/sbamultiplex.cxx | 4 +- dbaccess/source/ui/browser/unodatbr.cxx | 236 +++--- dbaccess/source/ui/control/ColumnControlWindow.cxx | 12 +- dbaccess/source/ui/control/FieldDescControl.cxx | 98 +-- dbaccess/source/ui/control/RelationControl.cxx | 88 +-- dbaccess/source/ui/control/ScrollHelper.cxx | 6 +- dbaccess/source/ui/control/SqlNameEdit.cxx | 12 +- dbaccess/source/ui/control/TableGrantCtrl.cxx | 46 +- dbaccess/source/ui/control/TableGrantCtrl.src | 2 +- dbaccess/source/ui/control/VertSplitView.cxx | 38 +- dbaccess/source/ui/control/charsetlistbox.cxx | 2 +- dbaccess/source/ui/control/curledit.cxx | 8 +- dbaccess/source/ui/control/dbtreelistbox.cxx | 24 +- dbaccess/source/ui/control/listviewitems.cxx | 4 +- dbaccess/source/ui/control/marktree.cxx | 14 +- dbaccess/source/ui/control/opendoccontrols.cxx | 2 +- dbaccess/source/ui/control/sqledit.cxx | 4 +- dbaccess/source/ui/control/statusbarontroller.cxx | 2 +- dbaccess/source/ui/control/tabletree.cxx | 10 +- dbaccess/source/ui/control/tabletree.hrc | 6 +- dbaccess/source/ui/control/tabletree.src | 2 +- dbaccess/source/ui/control/toolboxcontroller.cxx | 4 +- dbaccess/source/ui/control/undosqledit.cxx | 2 +- dbaccess/source/ui/control/undosqledit.src | 2 +- dbaccess/source/ui/dlg/AdabasPage.hrc | 24 +- dbaccess/source/ui/dlg/AdabasStat.cxx | 38 +- dbaccess/source/ui/dlg/AdabasStat.hrc | 28 +- dbaccess/source/ui/dlg/AdabasStat.hxx | 34 +- dbaccess/source/ui/dlg/AdabasStat.src | 112 +-- dbaccess/source/ui/dlg/AutoControls.src | 4 +- dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 160 ++--- dbaccess/source/ui/dlg/CollectionView.cxx | 28 +- dbaccess/source/ui/dlg/CollectionView.hrc | 24 +- dbaccess/source/ui/dlg/CollectionView.src | 40 +- dbaccess/source/ui/dlg/ConnectionHelper.cxx | 44 +- dbaccess/source/ui/dlg/ConnectionHelper.hxx | 56 +- dbaccess/source/ui/dlg/ConnectionPage.cxx | 6 +- dbaccess/source/ui/dlg/ConnectionPage.hrc | 2 +- dbaccess/source/ui/dlg/ConnectionPage.hxx | 34 +- dbaccess/source/ui/dlg/ConnectionPage.src | 2 +- dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 28 +- dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 30 +- dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 72 +- dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 86 +-- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 80 +-- dbaccess/source/ui/dlg/DbAdminImpl.hxx | 56 +- dbaccess/source/ui/dlg/DriverSettings.cxx | 2 +- dbaccess/source/ui/dlg/DriverSettings.hxx | 34 +- dbaccess/source/ui/dlg/ExtensionNotPresent.cxx | 24 +- dbaccess/source/ui/dlg/ExtensionNotPresent.hrc | 24 +- dbaccess/source/ui/dlg/ExtensionNotPresent.src | 12 +- dbaccess/source/ui/dlg/RelationDlg.cxx | 20 +- dbaccess/source/ui/dlg/RelationDlg.hrc | 22 +- dbaccess/source/ui/dlg/RelationDlg.src | 6 +- dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 4 +- dbaccess/source/ui/dlg/TextConnectionHelper.cxx | 58 +- dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 40 +- dbaccess/source/ui/dlg/UserAdmin.cxx | 64 +- dbaccess/source/ui/dlg/UserAdmin.hrc | 42 +- dbaccess/source/ui/dlg/UserAdmin.hxx | 40 +- dbaccess/source/ui/dlg/UserAdmin.src | 92 +-- dbaccess/source/ui/dlg/UserAdminDlg.cxx | 6 +- dbaccess/source/ui/dlg/UserAdminDlg.hrc | 4 +- dbaccess/source/ui/dlg/UserAdminDlg.src | 8 +- dbaccess/source/ui/dlg/admincontrols.cxx | 22 +- dbaccess/source/ui/dlg/admincontrols.hrc | 2 +- dbaccess/source/ui/dlg/admincontrols.hxx | 10 +- dbaccess/source/ui/dlg/admincontrols.src | 12 +- dbaccess/source/ui/dlg/adminpages.cxx | 12 +- dbaccess/source/ui/dlg/adminpages.hxx | 78 +- dbaccess/source/ui/dlg/adodatalinks.cxx | 40 +- dbaccess/source/ui/dlg/adodatalinks.hxx | 2 +- dbaccess/source/ui/dlg/adtabdlg.cxx | 22 +- dbaccess/source/ui/dlg/adtabdlg.hrc | 12 +- dbaccess/source/ui/dlg/adtabdlg.src | 2 +- dbaccess/source/ui/dlg/advancedsettings.cxx | 6 +- dbaccess/source/ui/dlg/advancedsettings.hrc | 42 +- dbaccess/source/ui/dlg/advancedsettings.hxx | 6 +- dbaccess/source/ui/dlg/advancedsettings.src | 30 +- dbaccess/source/ui/dlg/dbadmin.cxx | 20 +- dbaccess/source/ui/dlg/dbadmin.hrc | 10 +- dbaccess/source/ui/dlg/dbadmin.src | 116 +-- dbaccess/source/ui/dlg/dbadmin2.src | 24 +- dbaccess/source/ui/dlg/dbadminsetup.hrc | 86 +-- dbaccess/source/ui/dlg/dbadminsetup.src | 26 +- dbaccess/source/ui/dlg/dbfindex.cxx | 52 +- dbaccess/source/ui/dlg/dbfindex.hrc | 18 +- dbaccess/source/ui/dlg/dbfindex.hxx | 52 +- dbaccess/source/ui/dlg/dbfindex.src | 10 +- dbaccess/source/ui/dlg/dbwiz.cxx | 22 +- dbaccess/source/ui/dlg/dbwizsetup.cxx | 18 +- dbaccess/source/ui/dlg/detailpages.cxx | 136 ++-- dbaccess/source/ui/dlg/detailpages.hxx | 200 +++--- dbaccess/source/ui/dlg/directsql.cxx | 28 +- dbaccess/source/ui/dlg/directsql.hrc | 24 +- dbaccess/source/ui/dlg/directsql.src | 22 +- dbaccess/source/ui/dlg/dlgattr.cxx | 4 +- dbaccess/source/ui/dlg/dlgattr.src | 2 +- dbaccess/source/ui/dlg/dlgsave.cxx | 62 +- dbaccess/source/ui/dlg/dlgsave.hrc | 32 +- dbaccess/source/ui/dlg/dlgsave.src | 14 +- dbaccess/source/ui/dlg/dlgsize.cxx | 14 +- dbaccess/source/ui/dlg/dlgsize.hrc | 14 +- dbaccess/source/ui/dlg/dlgsize.src | 6 +- dbaccess/source/ui/dlg/dsnItem.hxx | 12 +- dbaccess/source/ui/dlg/dsselect.cxx | 28 +- dbaccess/source/ui/dlg/dsselect.hrc | 20 +- dbaccess/source/ui/dlg/dsselect.hxx | 26 +- dbaccess/source/ui/dlg/dsselect.src | 4 +- dbaccess/source/ui/dlg/finteraction.cxx | 4 +- dbaccess/source/ui/dlg/finteraction.hxx | 14 +- dbaccess/source/ui/dlg/generalpage.cxx | 30 +- dbaccess/source/ui/dlg/generalpage.hxx | 54 +- dbaccess/source/ui/dlg/indexdialog.cxx | 84 +-- dbaccess/source/ui/dlg/indexdialog.hrc | 22 +- dbaccess/source/ui/dlg/indexdialog.src | 14 +- dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 30 +- dbaccess/source/ui/dlg/odbcconfig.cxx | 40 +- dbaccess/source/ui/dlg/odbcconfig.hxx | 24 +- dbaccess/source/ui/dlg/optionalboolitem.cxx | 2 +- dbaccess/source/ui/dlg/optionalboolitem.hxx | 6 +- dbaccess/source/ui/dlg/paramdialog.cxx | 70 +- dbaccess/source/ui/dlg/paramdialog.hrc | 24 +- dbaccess/source/ui/dlg/paramdialog.src | 6 +- dbaccess/source/ui/dlg/queryfilter.cxx | 70 +- dbaccess/source/ui/dlg/queryfilter.hrc | 44 +- dbaccess/source/ui/dlg/queryfilter.src | 14 +- dbaccess/source/ui/dlg/queryorder.cxx | 42 +- dbaccess/source/ui/dlg/queryorder.hrc | 32 +- dbaccess/source/ui/dlg/queryorder.src | 2 +- dbaccess/source/ui/dlg/sqlmessage.cxx | 34 +- dbaccess/source/ui/dlg/sqlmessage.hrc | 22 +- dbaccess/source/ui/dlg/sqlmessage.src | 2 +- dbaccess/source/ui/dlg/tablespage.cxx | 48 +- dbaccess/source/ui/dlg/tablespage.hxx | 34 +- dbaccess/source/ui/dlg/textconnectionsettings.cxx | 2 +- dbaccess/source/ui/dlg/textconnectionsettings.src | 2 +- dbaccess/source/ui/imagelists/dbimagelists.src | 2 +- dbaccess/source/ui/inc/AccessibleBaseIFace.hxx | 14 +- dbaccess/source/ui/inc/AppElementType.hxx | 18 +- dbaccess/source/ui/inc/CollectionView.hxx | 40 +- dbaccess/source/ui/inc/ColumnControlWindow.hxx | 38 +- dbaccess/source/ui/inc/ConnectionLine.hxx | 48 +- dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 12 +- dbaccess/source/ui/inc/ConnectionLineData.hxx | 30 +- dbaccess/source/ui/inc/DExport.hxx | 98 +-- dbaccess/source/ui/inc/ExtensionNotPresent.hxx | 12 +- dbaccess/source/ui/inc/FieldControls.hxx | 26 +- dbaccess/source/ui/inc/FieldDescControl.hxx | 218 +++--- dbaccess/source/ui/inc/FieldDescriptions.hxx | 106 +-- dbaccess/source/ui/inc/GeneralUndo.hxx | 8 +- dbaccess/source/ui/inc/HtmlReader.hxx | 30 +- dbaccess/source/ui/inc/IClipBoardTest.hxx | 16 +- dbaccess/source/ui/inc/IItemSetHelper.hxx | 6 +- dbaccess/source/ui/inc/IUpdateHelper.hxx | 2 +- dbaccess/source/ui/inc/JAccess.hxx | 16 +- dbaccess/source/ui/inc/JoinController.hxx | 32 +- dbaccess/source/ui/inc/JoinDesignView.hxx | 12 +- dbaccess/source/ui/inc/JoinExchange.hxx | 22 +- dbaccess/source/ui/inc/JoinTableView.hxx | 126 ++-- dbaccess/source/ui/inc/QEnumTypes.hxx | 40 +- dbaccess/source/ui/inc/QueryDesignView.hxx | 28 +- dbaccess/source/ui/inc/QueryTableView.hxx | 26 +- dbaccess/source/ui/inc/QueryTextView.hxx | 6 +- dbaccess/source/ui/inc/QueryViewSwitch.hxx | 18 +- dbaccess/source/ui/inc/RTableConnectionData.hxx | 38 +- dbaccess/source/ui/inc/RefFunctor.hxx | 10 +- dbaccess/source/ui/inc/RelControliFace.hxx | 6 +- dbaccess/source/ui/inc/RelationControl.hrc | 2 +- dbaccess/source/ui/inc/RelationControl.hxx | 32 +- dbaccess/source/ui/inc/RelationController.hxx | 22 +- dbaccess/source/ui/inc/RelationDesignView.hxx | 6 +- dbaccess/source/ui/inc/RelationDlg.hxx | 26 +- dbaccess/source/ui/inc/RelationTableView.hxx | 10 +- dbaccess/source/ui/inc/RtfReader.hxx | 18 +- dbaccess/source/ui/inc/ScrollHelper.hxx | 14 +- dbaccess/source/ui/inc/SqlNameEdit.hxx | 28 +- dbaccess/source/ui/inc/TableConnection.hxx | 36 +- dbaccess/source/ui/inc/TableConnectionData.hxx | 18 +- dbaccess/source/ui/inc/TableController.hxx | 92 +-- dbaccess/source/ui/inc/TableCopyHelper.hxx | 58 +- dbaccess/source/ui/inc/TableDesignControl.hxx | 40 +- dbaccess/source/ui/inc/TableDesignHelpBar.hxx | 8 +- dbaccess/source/ui/inc/TableDesignView.hxx | 36 +- dbaccess/source/ui/inc/TableFieldDescription.hxx | 152 ++-- dbaccess/source/ui/inc/TableGrantCtrl.hxx | 30 +- dbaccess/source/ui/inc/TableRow.hxx | 22 +- dbaccess/source/ui/inc/TableRowExchange.hxx | 10 +- dbaccess/source/ui/inc/TableWindow.hxx | 106 +-- dbaccess/source/ui/inc/TableWindowAccess.hxx | 14 +- dbaccess/source/ui/inc/TableWindowData.hxx | 46 +- dbaccess/source/ui/inc/TableWindowListBox.hxx | 36 +- dbaccess/source/ui/inc/TableWindowTitle.hxx | 4 +- dbaccess/source/ui/inc/TablesSingleDlg.hxx | 20 +- dbaccess/source/ui/inc/TokenWriter.hxx | 92 +-- dbaccess/source/ui/inc/TypeInfo.hxx | 130 ++-- dbaccess/source/ui/inc/UITools.hxx | 160 ++--- dbaccess/source/ui/inc/UserAdminDlg.hxx | 16 +- dbaccess/source/ui/inc/VertSplitView.hxx | 10 +- dbaccess/source/ui/inc/WCPage.hxx | 46 +- dbaccess/source/ui/inc/WColumnSelect.hxx | 36 +- dbaccess/source/ui/inc/WCopyTable.hxx | 136 ++-- dbaccess/source/ui/inc/WExtendPages.hxx | 8 +- dbaccess/source/ui/inc/WNameMatch.hxx | 28 +- dbaccess/source/ui/inc/WTabPage.hxx | 16 +- dbaccess/source/ui/inc/WTypeSelect.hxx | 66 +- dbaccess/source/ui/inc/adtabdlg.hxx | 10 +- dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 10 +- dbaccess/source/ui/inc/asyncmodaldialog.hxx | 2 +- dbaccess/source/ui/inc/browserids.hxx | 140 ++-- dbaccess/source/ui/inc/brwctrlr.hxx | 108 +-- dbaccess/source/ui/inc/brwview.hxx | 34 +- dbaccess/source/ui/inc/callbacks.hxx | 12 +- dbaccess/source/ui/inc/charsetlistbox.hxx | 4 +- dbaccess/source/ui/inc/charsets.hxx | 38 +- dbaccess/source/ui/inc/commontypes.hxx | 6 +- dbaccess/source/ui/inc/curledit.hxx | 26 +- dbaccess/source/ui/inc/databaseobjectview.hxx | 12 +- dbaccess/source/ui/inc/datasourceconnector.hxx | 10 +- dbaccess/source/ui/inc/datasourcemap.hxx | 98 +-- dbaccess/source/ui/inc/dbadmin.hxx | 34 +- dbaccess/source/ui/inc/dbexchange.hxx | 24 +- dbaccess/source/ui/inc/dbtreelistbox.hxx | 100 +-- dbaccess/source/ui/inc/dbu_brw.hrc | 42 +- dbaccess/source/ui/inc/dbu_control.hrc | 30 +- dbaccess/source/ui/inc/dbu_dlg.hrc | 132 ++-- dbaccess/source/ui/inc/dbu_misc.hrc | 26 +- dbaccess/source/ui/inc/dbu_qry.hrc | 90 +-- dbaccess/source/ui/inc/dbu_rel.hrc | 16 +- dbaccess/source/ui/inc/dbu_resource.hrc | 510 ++++++------- dbaccess/source/ui/inc/dbu_tbl.hrc | 102 +-- dbaccess/source/ui/inc/dbu_uno.hrc | 10 +- dbaccess/source/ui/inc/dbwiz.hxx | 38 +- dbaccess/source/ui/inc/dbwizsetup.hxx | 36 +- dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 2 +- dbaccess/source/ui/inc/directsql.hxx | 54 +- dbaccess/source/ui/inc/dlgattr.hrc | 10 +- dbaccess/source/ui/inc/dlgattr.hxx | 4 +- dbaccess/source/ui/inc/dlgsave.hxx | 18 +- dbaccess/source/ui/inc/dlgsize.hxx | 20 +- dbaccess/source/ui/inc/dsitems.hxx | 106 +-- dbaccess/source/ui/inc/dsmeta.hxx | 2 +- dbaccess/source/ui/inc/exsrcbrw.hxx | 14 +- dbaccess/source/ui/inc/formadapter.hxx | 128 ++-- dbaccess/source/ui/inc/imageprovider.hxx | 2 +- dbaccess/source/ui/inc/indexcollection.hxx | 16 +- dbaccess/source/ui/inc/indexdialog.hxx | 48 +- dbaccess/source/ui/inc/indexes.hxx | 38 +- dbaccess/source/ui/inc/indexfieldscontrol.hxx | 32 +- dbaccess/source/ui/inc/linkeddocuments.hxx | 12 +- dbaccess/source/ui/inc/listviewitems.hxx | 12 +- dbaccess/source/ui/inc/localresaccess.hxx | 4 +- dbaccess/source/ui/inc/marktree.hxx | 14 +- dbaccess/source/ui/inc/moduledbu.hxx | 22 +- dbaccess/source/ui/inc/objectnamecheck.hxx | 4 +- dbaccess/source/ui/inc/opendoccontrols.hxx | 2 +- dbaccess/source/ui/inc/paramdialog.hxx | 26 +- dbaccess/source/ui/inc/propertysetitem.hxx | 10 +- dbaccess/source/ui/inc/propertystorage.hxx | 2 +- dbaccess/source/ui/inc/querycontainerwindow.hxx | 52 +- dbaccess/source/ui/inc/querycontroller.hxx | 82 +-- dbaccess/source/ui/inc/queryfilter.hxx | 70 +- dbaccess/source/ui/inc/queryorder.hxx | 54 +- dbaccess/source/ui/inc/queryview.hxx | 14 +- dbaccess/source/ui/inc/sbagrid.hrc | 74 +- dbaccess/source/ui/inc/sbagrid.hxx | 68 +- dbaccess/source/ui/inc/sbamultiplex.hxx | 450 ++++++------ dbaccess/source/ui/inc/sqledit.hxx | 20 +- dbaccess/source/ui/inc/sqlmessage.hxx | 18 +- dbaccess/source/ui/inc/statusbarontroller.hxx | 4 +- dbaccess/source/ui/inc/stringlistitem.hxx | 12 +- dbaccess/source/ui/inc/tabletree.hxx | 40 +- dbaccess/source/ui/inc/textconnectionsettings.hxx | 4 +- dbaccess/source/ui/inc/toolbox_tmpl.hrc | 48 +- dbaccess/source/ui/inc/toolboxcontroller.hxx | 10 +- dbaccess/source/ui/inc/undosqledit.hxx | 10 +- dbaccess/source/ui/inc/unoadmin.hxx | 16 +- dbaccess/source/ui/inc/unodatbr.hxx | 104 +-- dbaccess/source/ui/inc/unosqlmessage.hxx | 8 +- dbaccess/source/ui/misc/DExport.cxx | 84 +-- dbaccess/source/ui/misc/HtmlReader.cxx | 52 +- dbaccess/source/ui/misc/ModuleHelper.cxx | 4 +- dbaccess/source/ui/misc/RowSetDrop.cxx | 22 +- dbaccess/source/ui/misc/RtfReader.cxx | 28 +- dbaccess/source/ui/misc/TableCopyHelper.cxx | 26 +- dbaccess/source/ui/misc/TokenWriter.cxx | 166 ++--- dbaccess/source/ui/misc/ToolBoxHelper.cxx | 22 +- dbaccess/source/ui/misc/UITools.cxx | 188 ++--- dbaccess/source/ui/misc/UpdateHelperImpl.hxx | 6 +- dbaccess/source/ui/misc/WCPage.cxx | 62 +- dbaccess/source/ui/misc/WColumnSelect.cxx | 28 +- dbaccess/source/ui/misc/WCopyTable.cxx | 48 +- dbaccess/source/ui/misc/WExtendPages.cxx | 2 +- dbaccess/source/ui/misc/WNameMatch.cxx | 68 +- dbaccess/source/ui/misc/WTypeSelect.cxx | 22 +- dbaccess/source/ui/misc/WizardPages.hrc | 56 +- dbaccess/source/ui/misc/WizardPages.src | 214 +++--- dbaccess/source/ui/misc/asyncmodaldialog.cxx | 2 +- dbaccess/source/ui/misc/charsets.cxx | 8 +- dbaccess/source/ui/misc/controllerframe.cxx | 16 +- dbaccess/source/ui/misc/databaseobjectview.cxx | 10 +- dbaccess/source/ui/misc/datasourceconnector.cxx | 6 +- dbaccess/source/ui/misc/dbumiscres.hrc | 54 +- dbaccess/source/ui/misc/dbumiscres.src | 6 +- dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 2 +- dbaccess/source/ui/misc/dsmeta.cxx | 4 +- dbaccess/source/ui/misc/imageprovider.cxx | 2 +- dbaccess/source/ui/misc/indexcollection.cxx | 24 +- dbaccess/source/ui/misc/linkeddocuments.cxx | 38 +- dbaccess/source/ui/misc/moduledbu.cxx | 24 +- dbaccess/source/ui/misc/propertysetitem.cxx | 4 +- dbaccess/source/ui/misc/propertystorage.cxx | 2 +- dbaccess/source/ui/misc/singledoccontroller.cxx | 44 +- dbaccess/source/ui/misc/stringlistitem.cxx | 4 +- dbaccess/source/ui/misc/uiservices.cxx | 6 +- dbaccess/source/ui/querydesign/ConnectionData.hxx | 14 +- dbaccess/source/ui/querydesign/ConnectionLine.cxx | 60 +- .../source/ui/querydesign/ConnectionLineAccess.cxx | 10 +- .../source/ui/querydesign/ConnectionLineData.cxx | 4 +- dbaccess/source/ui/querydesign/JAccess.cxx | 2 +- dbaccess/source/ui/querydesign/JoinController.cxx | 10 +- dbaccess/source/ui/querydesign/JoinDesignView.cxx | 8 +- dbaccess/source/ui/querydesign/JoinExchange.cxx | 6 +- dbaccess/source/ui/querydesign/JoinTableView.cxx | 72 +- .../source/ui/querydesign/QTableConnection.cxx | 8 +- .../source/ui/querydesign/QTableConnection.hxx | 10 +- .../source/ui/querydesign/QTableConnectionData.cxx | 6 +- .../source/ui/querydesign/QTableConnectionData.hxx | 30 +- dbaccess/source/ui/querydesign/QTableWindow.cxx | 6 +- dbaccess/source/ui/querydesign/QTableWindow.hxx | 40 +- .../source/ui/querydesign/QTableWindowData.cxx | 2 +- .../source/ui/querydesign/QTableWindowData.hxx | 2 +- dbaccess/source/ui/querydesign/Query.hrc | 6 +- .../ui/querydesign/QueryAddTabConnUndoAction.hxx | 2 +- .../ui/querydesign/QueryDesignFieldUndoAct.hxx | 38 +- .../ui/querydesign/QueryDesignUndoAction.hxx | 4 +- dbaccess/source/ui/querydesign/QueryDesignView.cxx | 318 ++++----- .../ui/querydesign/QueryMoveTabWinUndoAct.cxx | 2 +- .../ui/querydesign/QueryMoveTabWinUndoAct.hxx | 10 +- .../ui/querydesign/QuerySizeTabWinUndoAct.hxx | 12 +- .../ui/querydesign/QueryTabConnUndoAction.cxx | 92 +-- .../ui/querydesign/QueryTabConnUndoAction.hxx | 6 +- .../ui/querydesign/QueryTabWinShowUndoAct.hxx | 10 +- .../source/ui/querydesign/QueryTabWinUndoAct.cxx | 28 +- .../source/ui/querydesign/QueryTabWinUndoAct.hxx | 16 +- dbaccess/source/ui/querydesign/QueryTableView.cxx | 90 +-- dbaccess/source/ui/querydesign/QueryTextView.cxx | 6 +- dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 30 +- .../source/ui/querydesign/SelectionBrowseBox.cxx | 246 +++---- .../source/ui/querydesign/SelectionBrowseBox.hxx | 340 ++++----- dbaccess/source/ui/querydesign/TableConnection.cxx | 4 +- .../source/ui/querydesign/TableConnectionData.cxx | 12 +- .../ui/querydesign/TableFieldDescription.cxx | 28 +- dbaccess/source/ui/querydesign/TableFieldInfo.cxx | 2 +- dbaccess/source/ui/querydesign/TableFieldInfo.hxx | 14 +- dbaccess/source/ui/querydesign/TableWindow.cxx | 46 +- .../source/ui/querydesign/TableWindowAccess.cxx | 16 +- dbaccess/source/ui/querydesign/TableWindowData.cxx | 4 +- .../source/ui/querydesign/TableWindowListBox.cxx | 28 +- .../source/ui/querydesign/TableWindowTitle.cxx | 14 +- dbaccess/source/ui/querydesign/query.src | 2 +- .../source/ui/querydesign/querycontainerwindow.cxx | 24 +- dbaccess/source/ui/querydesign/querycontroller.cxx | 36 +- dbaccess/source/ui/querydesign/querydlg.cxx | 38 +- dbaccess/source/ui/querydesign/querydlg.hrc | 16 +- dbaccess/source/ui/querydesign/querydlg.hxx | 32 +- dbaccess/source/ui/querydesign/querydlg.src | 8 +- dbaccess/source/ui/querydesign/queryview.cxx | 2 +- .../source/ui/relationdesign/RTableConnection.cxx | 8 +- .../source/ui/relationdesign/RTableConnection.hxx | 4 +- .../ui/relationdesign/RTableConnectionData.cxx | 34 +- dbaccess/source/ui/relationdesign/RTableWindow.hxx | 8 +- .../ui/relationdesign/RelationController.cxx | 64 +- .../ui/relationdesign/RelationDesignView.cxx | 8 +- .../source/ui/relationdesign/RelationTableView.cxx | 30 +- dbaccess/source/ui/relationdesign/relation.src | 2 +- dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 4 +- dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 8 +- .../source/ui/tabledesign/FieldDescriptions.cxx | 50 +- dbaccess/source/ui/tabledesign/TEditControl.cxx | 96 +-- dbaccess/source/ui/tabledesign/TEditControl.hxx | 82 +-- dbaccess/source/ui/tabledesign/TableController.cxx | 242 +++---- .../source/ui/tabledesign/TableDesignControl.cxx | 8 +- .../source/ui/tabledesign/TableDesignHelpBar.cxx | 4 +- dbaccess/source/ui/tabledesign/TableDesignView.cxx | 32 +- .../source/ui/tabledesign/TableFieldControl.cxx | 8 +- .../source/ui/tabledesign/TableFieldControl.hxx | 28 +- .../source/ui/tabledesign/TableFieldDescWin.cxx | 72 +- .../source/ui/tabledesign/TableFieldDescWin.hxx | 18 +- dbaccess/source/ui/tabledesign/TableRow.cxx | 16 +- .../source/ui/tabledesign/TableRowExchange.cxx | 2 +- dbaccess/source/ui/tabledesign/TableUndo.cxx | 12 +- dbaccess/source/ui/tabledesign/TableUndo.hxx | 58 +- dbaccess/source/ui/tabledesign/table.src | 14 +- dbaccess/source/ui/uno/AdabasSettingsDlg.cxx | 6 +- dbaccess/source/ui/uno/AdabasSettingsDlg.hxx | 6 +- dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 8 +- dbaccess/source/ui/uno/ColumnControl.cxx | 10 +- dbaccess/source/ui/uno/ColumnControl.hxx | 8 +- dbaccess/source/ui/uno/ColumnModel.cxx | 16 +- dbaccess/source/ui/uno/ColumnModel.hxx | 30 +- dbaccess/source/ui/uno/ColumnPeer.cxx | 20 +- dbaccess/source/ui/uno/ColumnPeer.hxx | 8 +- dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 6 +- dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 6 +- dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 8 +- dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 6 +- dbaccess/source/ui/uno/TableFilterDlg.cxx | 6 +- dbaccess/source/ui/uno/TableFilterDlg.hxx | 6 +- dbaccess/source/ui/uno/UserSettingsDlg.cxx | 6 +- dbaccess/source/ui/uno/UserSettingsDlg.hxx | 6 +- dbaccess/source/ui/uno/admindlg.cxx | 8 +- dbaccess/source/ui/uno/admindlg.hxx | 6 +- dbaccess/source/ui/uno/composerdialogs.cxx | 16 +- dbaccess/source/ui/uno/composerdialogs.hxx | 2 +- dbaccess/source/ui/uno/copytablewizard.cxx | 16 +- dbaccess/source/ui/uno/copytablewizard.src | 2 +- dbaccess/source/ui/uno/dbinteraction.cxx | 8 +- dbaccess/source/ui/uno/dbinteraction.hxx | 18 +- dbaccess/source/ui/uno/dbinteraction.src | 2 +- .../source/ui/uno/textconnectionsettings_uno.cxx | 8 +- dbaccess/source/ui/uno/unoDirectSql.cxx | 10 +- dbaccess/source/ui/uno/unoDirectSql.hxx | 10 +- dbaccess/source/ui/uno/unoadmin.cxx | 6 +- dbaccess/source/ui/uno/unosqlmessage.cxx | 6 +- dbaccess/uiconfig/dbapp/toolbar/toolbar.xml | 2 +- dbaccess/uiconfig/dbbrowser/toolbar/toolbar.xml | 4 +- dbaccess/uiconfig/dbtdata/menubar/menubar.xml | 1 - dbaccess/uiconfig/dbtdata/toolbar/toolbar.xml | 4 +- dbaccess/util/hidother.src | 778 ++++++++++---------- dbaccess/win32/source/odbcconfig/odbcconfig.cxx | 4 +- reportdesign/inc/ModuleHelper.hxx | 22 +- reportdesign/inc/PropertyForward.hxx | 22 +- reportdesign/inc/ReportDefinition.hxx | 26 +- reportdesign/inc/ReportHelperDefines.hxx | 4 +- reportdesign/inc/ReportVisitor.hxx | 4 +- reportdesign/inc/RptDef.hxx | 10 +- reportdesign/inc/RptModel.hxx | 8 +- reportdesign/inc/RptObject.hxx | 46 +- reportdesign/inc/RptPage.hxx | 12 +- reportdesign/inc/RptResId.hrc | 386 +++++----- reportdesign/inc/UndoActions.hxx | 48 +- reportdesign/inc/UndoEnv.hxx | 14 +- reportdesign/inc/conditionalexpression.hxx | 2 +- reportdesign/inc/dllapi.h | 8 +- reportdesign/inc/helpids.hrc | 158 ++-- reportdesign/inc/pch/precompiled_reportdesign.cxx | 2 +- reportdesign/inc/pch/precompiled_reportdesign.hxx | 2 +- reportdesign/inc/reportformula.hxx | 2 +- reportdesign/inc/rptui_slotid.hrc | 300 ++++---- reportdesign/qa/complex/ReportDesignerTest.java | 122 ++-- reportdesign/source/core/api/FixedLine.cxx | 44 +- reportdesign/source/core/api/FixedText.cxx | 10 +- reportdesign/source/core/api/FormatCondition.cxx | 10 +- reportdesign/source/core/api/FormattedField.cxx | 12 +- reportdesign/source/core/api/Function.cxx | 10 +- reportdesign/source/core/api/Functions.cxx | 18 +- reportdesign/source/core/api/Group.cxx | 22 +- reportdesign/source/core/api/Groups.cxx | 22 +- reportdesign/source/core/api/ImageControl.cxx | 100 +-- reportdesign/source/core/api/ReportComponent.cxx | 2 +- .../source/core/api/ReportControlModel.cxx | 2 +- reportdesign/source/core/api/ReportDefinition.cxx | 394 +++++----- reportdesign/source/core/api/ReportEngineJFree.cxx | 2 +- reportdesign/source/core/api/ReportVisitor.cxx | 4 +- reportdesign/source/core/api/Section.cxx | 26 +- reportdesign/source/core/api/Shape.cxx | 22 +- reportdesign/source/core/api/Tools.cxx | 2 +- reportdesign/source/core/api/services.cxx | 6 +- reportdesign/source/core/inc/FixedLine.hxx | 32 +- reportdesign/source/core/inc/FixedText.hxx | 20 +- reportdesign/source/core/inc/FormatCondition.hxx | 22 +- reportdesign/source/core/inc/FormattedField.hxx | 24 +- reportdesign/source/core/inc/Function.hxx | 18 +- reportdesign/source/core/inc/Functions.hxx | 26 +- reportdesign/source/core/inc/Group.hxx | 34 +- reportdesign/source/core/inc/Groups.hxx | 28 +- reportdesign/source/core/inc/ImageControl.hxx | 22 +- reportdesign/source/core/inc/ReportComponent.hxx | 28 +- .../source/core/inc/ReportControlModel.hxx | 58 +- reportdesign/source/core/inc/ReportDrawPage.hxx | 2 +- reportdesign/source/core/inc/ReportEngineJFree.hxx | 26 +- reportdesign/source/core/inc/ReportHelperImpl.hxx | 2 +- reportdesign/source/core/inc/ReportUndoFactory.hxx | 6 +- reportdesign/source/core/inc/RptObjectListener.hxx | 6 +- reportdesign/source/core/inc/Section.hxx | 62 +- reportdesign/source/core/inc/Shape.hxx | 16 +- reportdesign/source/core/inc/Tools.hxx | 4 +- reportdesign/source/core/inc/conditionupdater.hxx | 2 +- reportdesign/source/core/inc/core_resource.hrc | 36 +- reportdesign/source/core/inc/core_resource.hxx | 4 +- .../source/core/misc/conditionalexpression.cxx | 2 +- reportdesign/source/core/misc/conditionupdater.cxx | 2 +- reportdesign/source/core/misc/reportformula.cxx | 10 +- .../source/core/resource/core_resource.cxx | 6 +- reportdesign/source/core/resource/strings.src | 2 +- reportdesign/source/core/sdr/ModuleHelper.cxx | 22 +- reportdesign/source/core/sdr/PropertyForward.cxx | 14 +- reportdesign/source/core/sdr/ReportDrawPage.cxx | 4 +- reportdesign/source/core/sdr/ReportUndoFactory.cxx | 10 +- reportdesign/source/core/sdr/RptModel.cxx | 8 +- reportdesign/source/core/sdr/RptObject.cxx | 74 +- reportdesign/source/core/sdr/RptObjectListener.cxx | 6 +- reportdesign/source/core/sdr/RptPage.cxx | 28 +- reportdesign/source/core/sdr/UndoActions.cxx | 20 +- reportdesign/source/core/sdr/UndoEnv.cxx | 34 +- reportdesign/source/core/sdr/formatnormalizer.cxx | 8 +- reportdesign/source/core/sdr/formatnormalizer.hxx | 2 +- reportdesign/source/filter/xml/dbloader2.cxx | 4 +- reportdesign/source/filter/xml/dbloader2.hxx | 8 +- reportdesign/source/filter/xml/xmlAutoStyle.cxx | 4 +- reportdesign/source/filter/xml/xmlAutoStyle.hxx | 4 +- reportdesign/source/filter/xml/xmlCell.cxx | 18 +- reportdesign/source/filter/xml/xmlCell.hxx | 4 +- reportdesign/source/filter/xml/xmlColumn.cxx | 12 +- reportdesign/source/filter/xml/xmlColumn.hxx | 2 +- reportdesign/source/filter/xml/xmlComponent.cxx | 16 +- reportdesign/source/filter/xml/xmlComponent.hxx | 6 +- reportdesign/source/filter/xml/xmlCondPrtExpr.cxx | 6 +- reportdesign/source/filter/xml/xmlCondPrtExpr.hxx | 4 +- .../source/filter/xml/xmlControlProperty.cxx | 66 +- .../source/filter/xml/xmlControlProperty.hxx | 6 +- reportdesign/source/filter/xml/xmlEnums.hxx | 66 +- reportdesign/source/filter/xml/xmlExport.cxx | 96 +-- reportdesign/source/filter/xml/xmlExport.hxx | 94 +-- .../source/filter/xml/xmlExportDocumentHandler.cxx | 4 +- .../source/filter/xml/xmlExportDocumentHandler.hxx | 2 +- reportdesign/source/filter/xml/xmlFixedContent.cxx | 10 +- reportdesign/source/filter/xml/xmlFixedContent.hxx | 2 +- .../source/filter/xml/xmlFormatCondition.cxx | 6 +- .../source/filter/xml/xmlFormatCondition.hxx | 4 +- .../source/filter/xml/xmlFormattedField.cxx | 6 +- .../source/filter/xml/xmlFormattedField.hxx | 2 +- reportdesign/source/filter/xml/xmlFunction.cxx | 10 +- reportdesign/source/filter/xml/xmlFunction.hxx | 10 +- reportdesign/source/filter/xml/xmlGroup.cxx | 18 +- reportdesign/source/filter/xml/xmlGroup.hxx | 8 +- reportdesign/source/filter/xml/xmlHelper.cxx | 234 +++--- reportdesign/source/filter/xml/xmlHelper.hxx | 28 +- reportdesign/source/filter/xml/xmlImage.cxx | 2 +- reportdesign/source/filter/xml/xmlImage.hxx | 2 +- .../source/filter/xml/xmlImportDocumentHandler.cxx | 24 +- .../source/filter/xml/xmlImportDocumentHandler.hxx | 6 +- reportdesign/source/filter/xml/xmlMasterFields.cxx | 4 +- reportdesign/source/filter/xml/xmlMasterFields.hxx | 2 +- .../source/filter/xml/xmlPropertyHandler.cxx | 2 +- .../source/filter/xml/xmlPropertyHandler.hxx | 2 +- reportdesign/source/filter/xml/xmlReport.cxx | 16 +- reportdesign/source/filter/xml/xmlReport.hxx | 4 +- .../source/filter/xml/xmlReportElement.cxx | 6 +- .../source/filter/xml/xmlReportElement.hxx | 4 +- .../source/filter/xml/xmlReportElementBase.cxx | 4 +- .../source/filter/xml/xmlReportElementBase.hxx | 6 +- reportdesign/source/filter/xml/xmlRow.cxx | 16 +- reportdesign/source/filter/xml/xmlRow.hxx | 2 +- reportdesign/source/filter/xml/xmlSection.cxx | 8 +- reportdesign/source/filter/xml/xmlSection.hxx | 8 +- reportdesign/source/filter/xml/xmlStyleImport.cxx | 10 +- reportdesign/source/filter/xml/xmlStyleImport.hxx | 20 +- reportdesign/source/filter/xml/xmlSubDocument.cxx | 16 +- reportdesign/source/filter/xml/xmlSubDocument.hxx | 6 +- reportdesign/source/filter/xml/xmlTable.cxx | 12 +- reportdesign/source/filter/xml/xmlTable.hxx | 10 +- reportdesign/source/filter/xml/xmlfilter.cxx | 244 +++---- reportdesign/source/filter/xml/xmlfilter.hxx | 70 +- reportdesign/source/filter/xml/xmlservices.cxx | 4 +- reportdesign/source/inc/GroupProperties.hxx | 18 +- reportdesign/source/inc/constasciistring.hxx | 10 +- reportdesign/source/inc/corestrings.hrc | 2 +- reportdesign/source/inc/stringconstants.hrc | 268 +++---- reportdesign/source/inc/uistrings.hrc | 44 +- reportdesign/source/inc/xmlstrings.hrc | 2 +- reportdesign/source/shared/corestrings.cxx | 2 +- reportdesign/source/shared/stringconstants.cxx | 334 ++++----- reportdesign/source/shared/uistrings.cxx | 36 +- reportdesign/source/shared/xmlstrings.cxx | 20 +- reportdesign/source/ui/dlg/AddField.cxx | 24 +- reportdesign/source/ui/dlg/CondFormat.cxx | 22 +- reportdesign/source/ui/dlg/CondFormat.hrc | 4 +- reportdesign/source/ui/dlg/CondFormat.src | 10 +- reportdesign/source/ui/dlg/Condition.cxx | 2 +- reportdesign/source/ui/dlg/Condition.hxx | 6 +- reportdesign/source/ui/dlg/DateTime.cxx | 30 +- reportdesign/source/ui/dlg/DateTime.hrc | 42 +- reportdesign/source/ui/dlg/DateTime.src | 12 +- reportdesign/source/ui/dlg/Formula.cxx | 16 +- reportdesign/source/ui/dlg/GroupExchange.cxx | 2 +- reportdesign/source/ui/dlg/GroupExchange.hxx | 8 +- reportdesign/source/ui/dlg/GroupsSorting.cxx | 72 +- reportdesign/source/ui/dlg/GroupsSorting.hrc | 76 +- reportdesign/source/ui/dlg/GroupsSorting.src | 106 +-- reportdesign/source/ui/dlg/Navigator.cxx | 64 +- reportdesign/source/ui/dlg/Navigator.src | 12 +- reportdesign/source/ui/dlg/PageNumber.cxx | 14 +- reportdesign/source/ui/dlg/PageNumber.hrc | 54 +- reportdesign/source/ui/dlg/PageNumber.src | 18 +- reportdesign/source/ui/dlg/dlgpage.cxx | 28 +- reportdesign/source/ui/dlg/dlgpage.src | 10 +- reportdesign/source/ui/inc/AddField.hxx | 18 +- reportdesign/source/ui/inc/ColorChanger.hxx | 4 +- reportdesign/source/ui/inc/ColorListener.hxx | 30 +- reportdesign/source/ui/inc/ColumnInfo.hxx | 6 +- reportdesign/source/ui/inc/CondFormat.hxx | 2 +- reportdesign/source/ui/inc/DataProviderHandler.hxx | 4 +- reportdesign/source/ui/inc/DateTime.hxx | 36 +- reportdesign/source/ui/inc/DefaultInspection.hxx | 2 +- reportdesign/source/ui/inc/DesignView.hxx | 98 +-- reportdesign/source/ui/inc/EndMarker.hxx | 4 +- reportdesign/source/ui/inc/FixedTextColor.hxx | 2 +- .../source/ui/inc/FormattedFieldBeautifier.hxx | 2 +- reportdesign/source/ui/inc/Formula.hxx | 8 +- reportdesign/source/ui/inc/FunctionHelper.hxx | 2 +- reportdesign/source/ui/inc/GeometryHandler.hxx | 18 +- reportdesign/source/ui/inc/GroupsSorting.hxx | 94 +-- .../source/ui/inc/IReportControllerObserver.hxx | 6 +- reportdesign/source/ui/inc/InsertFunctions.hxx | 4 +- reportdesign/source/ui/inc/MarkedSection.hxx | 6 +- reportdesign/source/ui/inc/Navigator.hxx | 6 +- reportdesign/source/ui/inc/PageNumber.hxx | 38 +- .../source/ui/inc/ReportComponentHandler.hxx | 4 +- reportdesign/source/ui/inc/ReportController.hxx | 106 +-- .../source/ui/inc/ReportControllerObserver.hxx | 14 +- reportdesign/source/ui/inc/ReportDefines.hxx | 8 +- reportdesign/source/ui/inc/ReportRuler.hxx | 12 +- reportdesign/source/ui/inc/ReportSection.hxx | 80 +-- reportdesign/source/ui/inc/ReportWindow.hxx | 82 +-- reportdesign/source/ui/inc/ScrollHelper.hxx | 86 +-- reportdesign/source/ui/inc/SectionView.hxx | 10 +- reportdesign/source/ui/inc/SectionWindow.hxx | 36 +- reportdesign/source/ui/inc/StartMarker.hxx | 34 +- reportdesign/source/ui/inc/UITools.hxx | 36 +- reportdesign/source/ui/inc/Undo.hxx | 48 +- reportdesign/source/ui/inc/ViewsWindow.hxx | 68 +- reportdesign/source/ui/inc/dlgedclip.hxx | 18 +- reportdesign/source/ui/inc/dlgedfac.hxx | 2 +- reportdesign/source/ui/inc/dlgedfunc.hxx | 18 +- reportdesign/source/ui/inc/dlgpage.hxx | 4 +- reportdesign/source/ui/inc/metadata.hxx | 32 +- reportdesign/source/ui/inc/propbrw.hxx | 22 +- reportdesign/source/ui/inc/statusbarcontroller.hxx | 22 +- reportdesign/source/ui/inc/toolboxcontroller.hxx | 10 +- .../source/ui/inspection/DataProviderHandler.cxx | 16 +- .../source/ui/inspection/DefaultInspection.cxx | 18 +- .../source/ui/inspection/GeometryHandler.cxx | 112 +-- .../ui/inspection/ReportComponentHandler.cxx | 4 +- reportdesign/source/ui/inspection/inspection.src | 18 +- reportdesign/source/ui/inspection/metadata.cxx | 24 +- reportdesign/source/ui/misc/ColorListener.cxx | 18 +- reportdesign/source/ui/misc/FunctionHelper.cxx | 14 +- reportdesign/source/ui/misc/UITools.cxx | 14 +- reportdesign/source/ui/misc/Undo.cxx | 20 +- reportdesign/source/ui/misc/rptuiservices.cxx | 4 +- .../source/ui/misc/statusbarcontroller.cxx | 10 +- reportdesign/source/ui/misc/toolboxcontroller.cxx | 6 +- reportdesign/source/ui/report/DesignView.cxx | 16 +- reportdesign/source/ui/report/EndMarker.cxx | 8 +- reportdesign/source/ui/report/FixedTextColor.cxx | 40 +- .../source/ui/report/FormattedFieldBeautifier.cxx | 18 +- reportdesign/source/ui/report/ReportController.cxx | 564 +++++++-------- .../source/ui/report/ReportControllerObserver.cxx | 46 +- reportdesign/source/ui/report/ReportRuler.cxx | 6 +- reportdesign/source/ui/report/ReportSection.cxx | 48 +- reportdesign/source/ui/report/ReportWindow.cxx | 66 +- reportdesign/source/ui/report/ScrollHelper.cxx | 38 +- reportdesign/source/ui/report/SectionView.cxx | 12 +- reportdesign/source/ui/report/SectionWindow.cxx | 36 +- reportdesign/source/ui/report/StartMarker.cxx | 26 +- reportdesign/source/ui/report/ViewsWindow.cxx | 150 ++-- reportdesign/source/ui/report/dlgedclip.cxx | 4 +- reportdesign/source/ui/report/dlgedfac.cxx | 10 +- reportdesign/source/ui/report/dlgedfunc.cxx | 258 +++---- reportdesign/source/ui/report/propbrw.cxx | 24 +- reportdesign/source/ui/report/report.src | 40 +- .../uiconfig/dbreport/toolbar/arrowshapes.xml | 22 +- .../uiconfig/dbreport/toolbar/basicshapes.xml | 14 +- .../uiconfig/dbreport/toolbar/flowchartshapes.xml | 26 +- .../uiconfig/dbreport/toolbar/reportcontrols.xml | 2 +- .../uiconfig/dbreport/toolbar/symbolshapes.xml | 6 +- reportdesign/util/hidother.src | 90 +-- 1017 files changed, 16174 insertions(+), 16175 deletions(-) diff --git a/dbaccess/inc/AsyncronousLink.hxx b/dbaccess/inc/AsyncronousLink.hxx index 93faab850163..36334a8684d3 100644 --- a/dbaccess/inc/AsyncronousLink.hxx +++ b/dbaccess/inc/AsyncronousLink.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,11 +50,11 @@ namespace dbaui protected: ::osl::Mutex m_aEventSafety; ::osl::Mutex m_aDestructionSafety; - ULONG m_nEventId; + ULONG m_nEventId; public: /** constructs the object - @param _rHandler The link to be called asyncronously + @param _rHandler The link to be called asyncronously */ OAsyncronousLink( const Link& _rHandler ); virtual ~OAsyncronousLink(); diff --git a/dbaccess/inc/IController.hxx b/dbaccess/inc/IController.hxx index 962782ea5e18..81a358175c88 100644 --- a/dbaccess/inc/IController.hxx +++ b/dbaccess/inc/IController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,43 +52,43 @@ namespace dbaui { public: /** executes the given command without checking if it is allowed - @param _rCommand the URL of the command + @param _rCommand the URL of the command */ virtual void executeUnChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** executes the given command only when it is allowed - @param _rCommand + @param _rCommand the URL of the command */ virtual void executeChecked(const ::com::sun::star::util::URL& _rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** executes the given command without checking if it is allowed - @param _nCommandId - the id of the command URL + @param _nCommandId + the id of the command URL */ virtual void executeUnChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** executes the given command only when it is allowed - @param _nCommandId - the id of the command URL + @param _nCommandId + the id of the command URL */ virtual void executeChecked(sal_uInt16 _nCommandId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) = 0; /** checks if the given Command is enabled - @param _nCommandId - the id of the command URL - - @return + @param _nCommandId + the id of the command URL + + @return if the command is allowed, otherwise . */ virtual sal_Bool isCommandEnabled(sal_uInt16 _nCommandId) const = 0; /** checks if the given Command is enabled - @param _rCompleteCommandURL + @param _rCompleteCommandURL the URL of the command - - @return + + @return if the command is allowed, otherwise . */ virtual sal_Bool isCommandEnabled( const ::rtl::OUString& _rCompleteCommandURL ) const = 0; @@ -108,13 +108,13 @@ namespace dbaui registerCommandURL( const ::rtl::OUString& _rCompleteCommandURL ) = 0; /** notifyHiContrastChanged will be called when the hicontrast mode changed. - @param _bHiContrast + @param _bHiContrast when in hicontrast mode. */ virtual void notifyHiContrastChanged() = 0; /** checks if the selected data source is read only - @return + @return if read only, otherwise */ virtual sal_Bool isDataSourceReadOnly() const = 0; diff --git a/dbaccess/inc/IEnvironment.hxx b/dbaccess/inc/IEnvironment.hxx index 64ad54844912..3033623e76c2 100644 --- a/dbaccess/inc/IEnvironment.hxx +++ b/dbaccess/inc/IEnvironment.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/inc/IReference.hxx b/dbaccess/inc/IReference.hxx index 01534f6063e0..bd2e45927bd1 100644 --- a/dbaccess/inc/IReference.hxx +++ b/dbaccess/inc/IReference.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,6 +41,6 @@ namespace dbaui }; } #endif // DBAUI_IREFERENCE_HXX - + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/ToolBoxHelper.hxx b/dbaccess/inc/ToolBoxHelper.hxx index e95e40a0f4a1..49d41b74959e 100644 --- a/dbaccess/inc/ToolBoxHelper.hxx +++ b/dbaccess/inc/ToolBoxHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,41 +43,41 @@ namespace dbaui { class DBACCESS_DLLPUBLIC OToolBoxHelper { - sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode - sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps - ToolBox* m_pToolBox; // our toolbox (may be NULL) + sal_Bool m_bIsHiContrast;// true when the toolbox is in hi contrast mode + sal_Int16 m_nSymbolsSize; // shows the toolbox large or small bitmaps + ToolBox* m_pToolBox; // our toolbox (may be NULL) public: OToolBoxHelper(); virtual ~OToolBoxHelper(); /** will be called when the controls need to be resized. - @param _rDiff + @param _rDiff Contains the difference of the old and new toolbox size. */ virtual void resizeControls(const Size& _rDiff) = 0; /** will be called when the image list is needed. - @param _eSymbolsSize + @param _eSymbolsSize - @param _bHiContast + @param _bHiContast when in high contrast mode. */ virtual ImageList getImageList(sal_Int16 _eSymbolsSize,sal_Bool _bHiContast) const = 0; /** only the member will be set, derived classes can overload this function and do what need to be done. - @param _pTB + @param _pTB The new ToolBox. @attention Must be called after a FreeResource() call. */ - virtual void setToolBox(ToolBox* _pTB); + virtual void setToolBox(ToolBox* _pTB); - inline ToolBox* getToolBox() const { return m_pToolBox; } + inline ToolBox* getToolBox() const { return m_pToolBox; } /** checks if the toolbox needs a new imagelist. */ void checkImageList(); - + inline sal_Bool isToolBoxHiContrast() const { return m_bIsHiContrast; } protected: DECL_LINK(ConfigOptionsChanged, SvtMiscOptions*); diff --git a/dbaccess/inc/controllerframe.hxx b/dbaccess/inc/controllerframe.hxx index 19daaebb3d69..7fb7bd7c3895 100644 --- a/dbaccess/inc/controllerframe.hxx +++ b/dbaccess/inc/controllerframe.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/inc/dataview.hxx b/dbaccess/inc/dataview.hxx index e3026f15ce56..ac3e56211426 100644 --- a/dbaccess/inc/dataview.hxx +++ b/dbaccess/inc/dataview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,19 +40,19 @@ class SvtMiscOptions; namespace dbaui { class IController; - class DBACCESS_DLLPUBLIC ODataView : public Window + class DBACCESS_DLLPUBLIC ODataView : public Window { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the service factory to work with + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; // the service factory to work with protected: - IController& m_rController; // the controller in where we resides in - FixedLine* m_pSeparator; // our separator above the toolbox (may be NULL) + IController& m_rController; // the controller in where we resides in + FixedLine* m_pSeparator; // our separator above the toolbox (may be NULL) ::std::auto_ptr< ::svt::AcceleratorExecute> m_pAccel; public: - ODataView( Window* pParent, + ODataView( Window* pParent, IController& _rController, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& , + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& , WinBits nStyle = 0 ); virtual ~ODataView(); @@ -71,8 +71,8 @@ namespace dbaui */ virtual void resizeControls(const Size& /*_rDiff*/) { Resize(); } - void enableSeparator( const sal_Bool _bEnable = sal_True ); - sal_Bool isSeparatorEnabled() const { return NULL != m_pSeparator; } + void enableSeparator( const sal_Bool _bEnable = sal_True ); + sal_Bool isSeparatorEnabled() const { return NULL != m_pSeparator; } ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > getORB() { return m_xServiceFactory;} diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 22d1ceb11368..0dcf6d624a00 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,324 +29,324 @@ #define _DBA_DBACCESS_HELPID_HRC_ #ifndef _SOLAR_HRC -#include // HID_DBACCESS_START +#include // HID_DBACCESS_START #endif -#define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9) - -#define HID_DLG_FILTERCRIT (HID_DBACCESS_START + 15) -#define HID_DLG_ORDERCRIT (HID_DBACCESS_START + 16) - -#define HID_DATABROWSE_HEADER (HID_DBACCESS_START + 17) -#define HID_CTL_TABBROWSER (HID_DBACCESS_START + 18) -#define UID_DATABROWSE_DATAWINDOW (HID_DBACCESS_START + 19) -#define HID_CTL_TREEVIEW (HID_DBACCESS_START + 20) -#define UID_CTL_CONTENT (HID_DBACCESS_START + 21) -#define HID_TLB_TABBROWSER (HID_DBACCESS_START + 22) -#define HID_TLB_TREELISTBOX (HID_DBACCESS_START + 23) -#define HID_DSADMIN_DIALOG (HID_DBACCESS_START + 24) - - -#define HID_DSADMIN_TABCONTROL (HID_DBACCESS_START + 27) -#define HID_DSADMIN_PAGE_GENERAL (HID_DBACCESS_START + 28) -#define HID_DSADMIN_PAGE_DBASE (HID_DBACCESS_START + 29) -#define HID_DSADMIN_PAGE_JDBC (HID_DBACCESS_START + 30) -#define HID_DSADMIN_PAGE_ODBC (HID_DBACCESS_START + 31) -#define HID_DSADMIN_PAGE_ADABAS (HID_DBACCESS_START + 32) -#define HID_DSADMIN_PAGE_TEXT (HID_DBACCESS_START + 33) -#define HID_DSADMIN_TABLE_SUBSCRIPTION (HID_DBACCESS_START + 34) -#define HID_DSADMIN_DSACTIONS_NEWDS (HID_DBACCESS_START + 35) -#define HID_DSADMIN_DSACTIONS_DELETEDS (HID_DBACCESS_START + 36) -#define HID_DSADMIN_DSACTIONS_RESTOREDS (HID_DBACCESS_START + 37) -#define HID_DSADMIN_DSNAME (HID_DBACCESS_START + 38) -#define HID_DSADMIN_DSTYPE (HID_DBACCESS_START + 39) -#define HID_DSADMIN_URL_GENERAL (HID_DBACCESS_START + 40) -#define HID_DSADMIN_BROWSECONN (HID_DBACCESS_START + 41) -#define HID_DSADMIN_LOGINTIMEOUT_NUMBER (HID_DBACCESS_START + 42) -#define HID_DSADMIN_LOGINTIMEOUT_UNIT (HID_DBACCESS_START + 43) -#define HID_DSADMIN_SHOWDELETED (HID_DBACCESS_START + 44) -#define HID_DSADMIN_ALLOWLONG (HID_DBACCESS_START + 45) -#define HID_DSADMIN_DBASE_INDICIES (HID_DBACCESS_START + 46) -#define HID_DSADMIN_DRIVERCLASS (HID_DBACCESS_START + 47) -#define HID_DSADMIN_ODBC_OPTIONS (HID_DBACCESS_START + 48) -#define HID_DSADMIN_TEXT_HEADER (HID_DBACCESS_START + 49) -#define HID_DSADMIN_FIELD_SEPARATOR (HID_DBACCESS_START + 50) -#define HID_DSADMIN_TEXT_SEPARATOR (HID_DBACCESS_START + 51) -#define HID_DSADMIN_DECIMAL_SEPARATOR (HID_DBACCESS_START + 52) -#define HID_DSADMIN_THOUSANDS_SEPARATOR (HID_DBACCESS_START + 53) -#define HID_DSADMIN_EXTENSION (HID_DBACCESS_START + 54) -#define HID_DSADMIN_ALL_TABLES (HID_DBACCESS_START + 55) -#define HID_DSADMIN_NO_TABLES (HID_DBACCESS_START + 56) -#define HID_DSADMIN_SELECT_TABLES (HID_DBACCESS_START + 57) -#define HID_DSADMIN_TABLE_SELECTOR (HID_DBACCESS_START + 58) -#define HID_DSADMIN_SUPPRESS_VERSIONCL (HID_DBACCESS_START + 59) - -#define HID_GENERIC_SQL_ERROR (HID_DBACCESS_START + 60) - -#define HID_BROWSER_COLUMNFORMAT (HID_DBACCESS_START + 61) -#define HID_BROWSER_COLUMNWIDTH (HID_DBACCESS_START + 62) -#define HID_BROWSER_TABLEFORMAT (HID_DBACCESS_START + 63) -#define HID_BROWSER_ROWHEIGHT (HID_DBACCESS_START + 64) +#define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9) + +#define HID_DLG_FILTERCRIT (HID_DBACCESS_START + 15) +#define HID_DLG_ORDERCRIT (HID_DBACCESS_START + 16) + +#define HID_DATABROWSE_HEADER (HID_DBACCESS_START + 17) +#define HID_CTL_TABBROWSER (HID_DBACCESS_START + 18) +#define UID_DATABROWSE_DATAWINDOW (HID_DBACCESS_START + 19) +#define HID_CTL_TREEVIEW (HID_DBACCESS_START + 20) +#define UID_CTL_CONTENT (HID_DBACCESS_START + 21) +#define HID_TLB_TABBROWSER (HID_DBACCESS_START + 22) +#define HID_TLB_TREELISTBOX (HID_DBACCESS_START + 23) +#define HID_DSADMIN_DIALOG (HID_DBACCESS_START + 24) + + +#define HID_DSADMIN_TABCONTROL (HID_DBACCESS_START + 27) +#define HID_DSADMIN_PAGE_GENERAL (HID_DBACCESS_START + 28) +#define HID_DSADMIN_PAGE_DBASE (HID_DBACCESS_START + 29) +#define HID_DSADMIN_PAGE_JDBC (HID_DBACCESS_START + 30) +#define HID_DSADMIN_PAGE_ODBC (HID_DBACCESS_START + 31) +#define HID_DSADMIN_PAGE_ADABAS (HID_DBACCESS_START + 32) +#define HID_DSADMIN_PAGE_TEXT (HID_DBACCESS_START + 33) +#define HID_DSADMIN_TABLE_SUBSCRIPTION (HID_DBACCESS_START + 34) +#define HID_DSADMIN_DSACTIONS_NEWDS (HID_DBACCESS_START + 35) +#define HID_DSADMIN_DSACTIONS_DELETEDS (HID_DBACCESS_START + 36) +#define HID_DSADMIN_DSACTIONS_RESTOREDS (HID_DBACCESS_START + 37) +#define HID_DSADMIN_DSNAME (HID_DBACCESS_START + 38) +#define HID_DSADMIN_DSTYPE (HID_DBACCESS_START + 39) +#define HID_DSADMIN_URL_GENERAL (HID_DBACCESS_START + 40) +#define HID_DSADMIN_BROWSECONN (HID_DBACCESS_START + 41) +#define HID_DSADMIN_LOGINTIMEOUT_NUMBER (HID_DBACCESS_START + 42) +#define HID_DSADMIN_LOGINTIMEOUT_UNIT (HID_DBACCESS_START + 43) +#define HID_DSADMIN_SHOWDELETED (HID_DBACCESS_START + 44) +#define HID_DSADMIN_ALLOWLONG (HID_DBACCESS_START + 45) +#define HID_DSADMIN_DBASE_INDICIES (HID_DBACCESS_START + 46) +#define HID_DSADMIN_DRIVERCLASS (HID_DBACCESS_START + 47) +#define HID_DSADMIN_ODBC_OPTIONS (HID_DBACCESS_START + 48) +#define HID_DSADMIN_TEXT_HEADER (HID_DBACCESS_START + 49) +#define HID_DSADMIN_FIELD_SEPARATOR (HID_DBACCESS_START + 50) +#define HID_DSADMIN_TEXT_SEPARATOR (HID_DBACCESS_START + 51) +#define HID_DSADMIN_DECIMAL_SEPARATOR (HID_DBACCESS_START + 52) +#define HID_DSADMIN_THOUSANDS_SEPARATOR (HID_DBACCESS_START + 53) +#define HID_DSADMIN_EXTENSION (HID_DBACCESS_START + 54) +#define HID_DSADMIN_ALL_TABLES (HID_DBACCESS_START + 55) +#define HID_DSADMIN_NO_TABLES (HID_DBACCESS_START + 56) +#define HID_DSADMIN_SELECT_TABLES (HID_DBACCESS_START + 57) +#define HID_DSADMIN_TABLE_SELECTOR (HID_DBACCESS_START + 58) +#define HID_DSADMIN_SUPPRESS_VERSIONCL (HID_DBACCESS_START + 59) + +#define HID_GENERIC_SQL_ERROR (HID_DBACCESS_START + 60) + +#define HID_BROWSER_COLUMNFORMAT (HID_DBACCESS_START + 61) +#define HID_BROWSER_COLUMNWIDTH (HID_DBACCESS_START + 62) +#define HID_BROWSER_TABLEFORMAT (HID_DBACCESS_START + 63) +#define HID_BROWSER_ROWHEIGHT (HID_DBACCESS_START + 64) #define HID_BROWSER_EDIT_DATABASE (HID_DBACCESS_START + 65) -#define HID_BROWSER_CLOSECONN (HID_DBACCESS_START + 66) -#define HID_BROWSER_REFRESHCONN (HID_DBACCESS_START + 67) - -#define HID_DLG_ROWHEIGHT (HID_DBACCESS_START + 68) -#define HID_DLG_COLWIDTH (HID_DBACCESS_START + 69) - - -#define HID_TLB_QUERYDESIGN (HID_DBACCESS_START + 70) -#define HID_CTL_QRYSQLEDIT (HID_DBACCESS_START + 71) -#define HID_DSADMIN_SPECIAL_MESSAGE (HID_DBACCESS_START + 72) - -#define HID_BROWSER_QUERY_CREATE_TEXT (HID_DBACCESS_START + 73) - -#define HID_DLG_ERROR (HID_DBACCESS_START + 74) -#define HID_DLG_TEXT (HID_DBACCESS_START + 75) -#define UID_SQLERROR_BUTTONMORE (HID_DBACCESS_START + 76) -#define HID_DLG_SAVE_AS (HID_DBACCESS_START + 77) - -#define HID_BROWSER_QUERY_EDIT (HID_DBACCESS_START + 78) -#define HID_BROWSER_QUERY_DELETE (HID_DBACCESS_START + 79) - -#define HID_DSADMIN_USER_ADO (HID_DBACCESS_START + 80) -#define HID_DSADMIN_PWDREC_ADO (HID_DBACCESS_START + 81) -#define HID_DSADMIN_CONNURL_ADOPAGE (HID_DBACCESS_START + 82) -#define HID_DSADMIN_PAGE_ADO (HID_DBACCESS_START + 83) - - -#define HID_JOINSH_ADDTAB_CLOSE (HID_DBACCESS_START + 84) -#define HID_JOINSH_ADDTAB_TABLELIST (HID_DBACCESS_START + 85) -#define HID_CTL_QRYDGNTAB (HID_DBACCESS_START + 86) -#define HID_DLG_QRY_JOIN (HID_DBACCESS_START + 87) -#define HID_DLG_QRY_JOINTYPE (HID_DBACCESS_START + 88) -#define HID_JOINSH_ADDTAB_QUERYLIST (HID_DBACCESS_START + 89) -#define HID_DLG_QRY_HELPTEXT (HID_DBACCESS_START + 92) - -#define HID_CTL_QRYDGNCRIT (HID_DBACCESS_START + 93) -#define HID_QRYDGN_ROW_VISIBLE (HID_DBACCESS_START + 94) -#define HID_QRYDGN_ROW_TABLE (HID_DBACCESS_START + 95) -#define HID_QRYDGN_ROW_FIELD (HID_DBACCESS_START + 96) -#define HID_QRYDGN_ROW_ORDER (HID_DBACCESS_START + 97) -#define HID_QRYDGN_ROW_FUNCTION (HID_DBACCESS_START + 98) -#define HID_QRYDGN_ROW_ALIAS (HID_DBACCESS_START + 99) -#define HID_QRYDGN_ROW_CRIT (HID_DBACCESS_START + 100) - -#define HID_QUERY_FUNCTION (HID_DBACCESS_START + 101) -#define HID_QUERY_TABLENAME (HID_DBACCESS_START + 102) -#define HID_QUERY_ALIASNAME (HID_DBACCESS_START + 103) -#define HID_QUERY_DISTINCT (HID_DBACCESS_START + 104) - -#define HID_BROWSER_QUERY_CREATE_DESIGN (HID_DBACCESS_START + 105) - -#define HID_DSADMIN_QUERIES (HID_DBACCESS_START + 106) -#define HID_DSADMIN_QUERIES_NEW (HID_DBACCESS_START + 107) -#define HID_DSADMIN_QUERIES_EDIT (HID_DBACCESS_START + 108) -#define HID_DSADMIN_QUERIES_DELETE (HID_DBACCESS_START + 109) -#define HID_DSADMIN_QUERYADMINISTRATION (HID_DBACCESS_START + 110) - - -#define HID_TAB_DESIGN_TABLE_DESC (HID_DBACCESS_START + 111) -#define HID_TAB_DESIGN_FIELDCONTROL (HID_DBACCESS_START + 112) -#define HID_TABLE_DESIGN_HELP_WINDOW (HID_DBACCESS_START + 113) -#define HID_TAB_DESIGN_DESCWIN (HID_DBACCESS_START + 114) -#define HID_TAB_DESIGN_TABLE_PROPS (HID_DBACCESS_START + 115) -#define HID_TABDESIGN_BACKGROUND (HID_DBACCESS_START + 116) -#define HID_CTL_TABLEEDIT (HID_DBACCESS_START + 117) -#define HID_TABDESIGN_NAMECELL (HID_DBACCESS_START + 118) -#define HID_TABDESIGN_TYPECELL (HID_DBACCESS_START + 119) -#define HID_TABDESIGN_COMMENTCELL (HID_DBACCESS_START + 120) -#define SID_TABLEDESIGN_INSERTROWS (HID_DBACCESS_START + 121) -#define SID_TABLEDESIGN_TABED_PRIMARYKEY (HID_DBACCESS_START + 122) -#define HID_TLB_TABLEDESIGN (HID_DBACCESS_START + 123) -#define HID_TAB_DESIGN_HELP_TEXT_FRAME (HID_DBACCESS_START + 124) -#define HID_TABLE_DESIGN_TABPAGE_GENERAL (HID_DBACCESS_START + 125) -#define HID_TAB_ENT_DEFAULT (HID_DBACCESS_START + 126) -#define HID_TAB_ENT_FORMAT_SAMPLE (HID_DBACCESS_START + 127) -#define HID_TAB_ENT_FORMAT (HID_DBACCESS_START + 128) -#define HID_TAB_ENT_BOOL_DEFAULT (HID_DBACCESS_START + 129) -#define HID_TAB_ENT_REQUIRED (HID_DBACCESS_START + 130) -#define HID_TAB_ENT_AUTOINCREMENT (HID_DBACCESS_START + 131) -#define HID_TAB_ENT_TEXT_LEN (HID_DBACCESS_START + 132) -#define HID_TAB_ENT_TYPE (HID_DBACCESS_START + 133) -#define HID_TAB_ENT_COLUMNNAME (HID_DBACCESS_START + 134) -#define HID_TAB_ENT_NUMTYP (HID_DBACCESS_START + 135) -#define HID_TAB_ENT_LEN (HID_DBACCESS_START + 136) -#define HID_TAB_ENT_SCALE (HID_DBACCESS_START + 137) -#define HID_BROWSER_TABLE_CREATE_DESIGN (HID_DBACCESS_START + 138) -#define HID_BROWSER_TABLE_EDIT (HID_DBACCESS_START + 139) -#define HID_BROWSER_TABLE_DELETE (HID_DBACCESS_START + 140) -#define HID_SQLERROR_EXCHAIN_ERRORS (HID_DBACCESS_START + 141) -#define HID_SQLERROR_EXCHAIN_TEXT (HID_DBACCESS_START + 142) -#define HID_TAB_WIZ_COLUMN_SELECT (HID_DBACCESS_START + 146) -#define HID_TAB_WIZ_TYPE_SELECT (HID_DBACCESS_START + 147) -#define HID_TAB_NAMEMATCHING_COLS_AVAIL (HID_DBACCESS_START + 148) -#define HID_TAB_NAMEMATCHING_COLS_ASSIGN (HID_DBACCESS_START + 149) -#define HID_TAB_WIZ_COPYTABLE (HID_DBACCESS_START + 150) -#define HID_TAB_WIZ_TABLENAME_EDIT (HID_DBACCESS_START + 151) -#define HID_CTL_RELATIONTAB (HID_DBACCESS_START + 152) -#define HID_TLB_RELATIONDESIGN (HID_DBACCESS_START + 153) -#define HID_RELATIONDIALOG_LEFTFIELDCELL (HID_DBACCESS_START + 154) -#define HID_RELATIONDIALOG_RIGHTFIELDCELL (HID_DBACCESS_START + 155) -#define HID_RELDLG_KEYFIELDS (HID_DBACCESS_START + 156) -#define HID_BROWSER_RELATION_DESIGN (HID_DBACCESS_START + 157) -#define HID_TABLE_DESIGN_NO_CONNECTION (HID_DBACCESS_START + 158) -#define HID_DSADMIN_CREATEDATABASE (HID_DBACCESS_START + 159) -#define HID_BROWSER_COLUMNINFO (HID_DBACCESS_START + 160) -#define HID_DSADMIN_USECATALOG (HID_DBACCESS_START + 161) -#define HID_BROWSER_VIEW_CREATE_DESIGN (HID_DBACCESS_START + 162) -#define HID_DSADMIN_DOCUMENTS (HID_DBACCESS_START + 166) -#define HID_DSADMIN_DOCUMENTLINKS (HID_DBACCESS_START + 167) -#define HID_DSADMIN_FILTER_EXPLANATION (HID_DBACCESS_START + 168) -#define HID_CONFIRM_DROP_BUTTON_ALL (HID_DBACCESS_START + 169) -#define HID_DSBROWSER_BOOKMARK_SELECTED (HID_DBACCESS_START + 170) -#define HID_DSADMIN_TABLE_TOOLBOX (HID_DBACCESS_START + 171) -#define HID_DSADMIN_QUERY_TOOLBOX (HID_DBACCESS_START + 172) -#define HID_DSADMIN_BOOKMARK_TOOLBOX (HID_DBACCESS_START + 173) -#define HID_DSADMIN_PAGE_LDAP (HID_DBACCESS_START + 174) -#define HID_DSADMIN_LDAP_HOSTNAME (HID_DBACCESS_START + 175) -#define HID_DSADMIN_LDAP_BASEDN (HID_DBACCESS_START + 176) -#define HID_DSADMIN_LDAP_PORTNUMBER (HID_DBACCESS_START + 177) -#define HID_DSBROWSER_BOOKMARKSELECTED (HID_DBACCESS_START + 178) -#define HID_DSBROWSER_DISCONNECTING (HID_DBACCESS_START + 179) -#define HID_TAB_PAGE_USERADMIN (HID_DBACCESS_START + 180) -#define HID_TAB_PAGE_PBUSER (HID_DBACCESS_START + 181) -#define HID_TAB_PAGE_PBCHGPWD (HID_DBACCESS_START + 182) -#define HID_TAB_PAGE_PBUSERDELETE (HID_DBACCESS_START + 183) -#define HID_TAB_PAGE_TBLGRANTS (HID_DBACCESS_START + 184) -#define HID_TAB_PAGE_LBUSER (HID_DBACCESS_START + 185) -#define HID_DSBROWSER_DIRECTSQL (HID_DBACCESS_START + 186) -#define HID_DSADMIN_LDAP_ROWCOUNT (HID_DBACCESS_START + 187) -#define HID_BROWSER_QUERY_EDITSQL (HID_DBACCESS_START + 189) -#define HID_DSADMIN_PAGE_MOZILLA (HID_DBACCESS_START + 190) -#define HID_DSADMIN_MOZILLA_PROFILE_NAME (HID_DBACCESS_START + 191) -#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME (HID_DBACCESS_START + 192) -#define HID_BROWSER_OPEN_DOCUMENT (HID_DBACCESS_START + 193) -#define HID_BROWSER_EDIT_DOCUMENT (HID_DBACCESS_START + 194) -#define HID_BROWSER_BEW_DOCUMENT (HID_DBACCESS_START + 195) -#define HID_DLG_PASSWORD (HID_DBACCESS_START + 196) - -#define HID_DLGIDX_NEWINDEX (HID_DBACCESS_START + 197) -#define HID_DLGIDX_DROPINDEX (HID_DBACCESS_START + 198) -#define HID_DLGIDX_RENAMEINDEX (HID_DBACCESS_START + 199) -#define HID_DLGIDX_SAVEINDEX (HID_DBACCESS_START + 200) -#define HID_DLGIDX_RESETINDEX (HID_DBACCESS_START + 201) -#define HID_DLGIDX_INDEXLIST (HID_DBACCESS_START + 202) -#define UID_DLGINDEX_INDEXDETAILS_BACK (HID_DBACCESS_START + 203) -#define UID_DLGINDEX_INDEXDETAILS_MAIN (HID_DBACCESS_START + 204) -#define HID_DLGINDEX_INDEXDETAILS_FIELD (HID_DBACCESS_START + 205) -#define HID_DLGINDEX_INDEXDETAILS_SORTORDER (HID_DBACCESS_START + 206) - -#define HID_DOCLINKEDIT_URL (HID_DBACCESS_START + 207) -#define HID_QUERY_SQLMODE (HID_DBACCESS_START + 208) - -#define HID_BROWSER_REFRESH_REBUILDVIEW (HID_DBACCESS_START + 209) -#define HID_BROWSER_RENAME_ENTRY (HID_DBACCESS_START + 210) - -#define HID_QUERY_EDIT_JOINCONNECTION (HID_DBACCESS_START + 211) - -#define HID_DLG_QRY_WINDOW_CONTROL (HID_DBACCESS_START + 212) -#define HID_DLG_QRY_LEFT_TABLE (HID_DBACCESS_START + 213) -#define HID_DLG_QRY_RIGHT_TABLE (HID_DBACCESS_START + 214) - -#define HID_DLG_REL_CASC_DEL (HID_DBACCESS_START + 215) -#define HID_DLG_REL_NO_CASC_DEL (HID_DBACCESS_START + 216) -#define HID_DLG_REL_CASC_DEL_NULL (HID_DBACCESS_START + 217) -#define HID_DLG_REL_CASC_DEL_DEFAULT (HID_DBACCESS_START + 218) - -#define HID_DLG_REL_CASC_UPD (HID_DBACCESS_START + 219) -#define HID_DLG_REL_NO_CASC_UPD (HID_DBACCESS_START + 220) -#define HID_DLG_REL_CASC_UPD_NULL (HID_DBACCESS_START + 221) -#define HID_DLG_REL_CASC_UPD_DEFAULT (HID_DBACCESS_START + 222) -#define HID_BROWSER_SAVE_RECORD (HID_DBACCESS_START + 223) -#define HID_BROWSER_UNDO_RECORD (HID_DBACCESS_START + 224) - -#define HID_DSADMIN_SQL92CHECK (HID_DBACCESS_START + 225) -#define HID_DSADMIN_AUTOINCREMENTVALUE (HID_DBACCESS_START + 226) -#define HID_DOCUMENT_CREATE_REPWIZ (HID_DBACCESS_START + 227) -#define HID_TAB_AUTOINCREMENTVALUE (HID_DBACCESS_START + 228) -#define HID_DSADMIN_RETRIEVE_AUTO (HID_DBACCESS_START + 229) -#define HID_DSADMIN_AUTORETRIEVEENABLED (HID_DBACCESS_START + 230) - -#define HID_DSADMIN_PAGE_MYSQL_ODBC (HID_DBACCESS_START + 231) -#define HID_TAB_PAGE_TABLEPRIVILEGES (HID_DBACCESS_START + 232) - -#define HID_DSADMIN_PAGE_USERDRIVER (HID_DBACCESS_START + 233) -#define HID_DSADMIN_USER_DEFINED (HID_DBACCESS_START + 234) -#define HID_DSADMIN_USERDEF_OPTIONS (HID_DBACCESS_START + 235) -#define HID_DSADMIN_CHARSET_USERDEF (HID_DBACCESS_START + 236) -#define HID_DSADMIN_USER_LDAP (HID_DBACCESS_START + 237) -#define HID_DSADMIN_PWDREC_LDAP (HID_DBACCESS_START + 238) -#define HID_DSADMIN_USESSL_LDAP (HID_DBACCESS_START + 239) -#define HID_BROWSER_QUERY_WIZARD (HID_DBACCESS_START + 237) - -#define HID_DLG_RENAME (HID_DBACCESS_START + 237) - -#define HID_DSADMIN_PAGE_MYSQL_JDBC (HID_DBACCESS_START + 238) - -#define HID_DSADMIN_DBASE_PATH (HID_DBACCESS_START + 239) -#define HID_DSADMIN_MYSQL_DATABASE (HID_DBACCESS_START + 240) -#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE (HID_DBACCESS_START + 241) -#define HID_DSADMIN_ODBC_DATASOURCE (HID_DBACCESS_START + 242) -#define HID_DSADMIN_ADABAS_DATABASE (HID_DBACCESS_START + 243) -#define HID_DSADMIN_MSACCESS_MDB_FILE (HID_DBACCESS_START + 244) -#define HID_DSADMIN_PAGE_MSACCESS (HID_DBACCESS_START + 245) -#define HID_DSADMIN_FLAT_PATH (HID_DBACCESS_START + 246) -#define HID_DSADMIN_CALC_PATH (HID_DBACCESS_START + 247) -#define HID_DSADMIN_ADVANCED (HID_DBACCESS_START + 248) -#define HID_DSADMIN_BOOLEANCOMPARISON (HID_DBACCESS_START + 249) -#define HID_DSADMIN_ORACLE_DATABASE (HID_DBACCESS_START + 250) - -#define UID_APP_VIEW (HID_DBACCESS_START + 251) -#define HID_APP_TABLE_TREE (HID_DBACCESS_START + 252) -#define HID_APP_FORM_TREE (HID_DBACCESS_START + 253) -#define HID_APP_QUERY_TREE (HID_DBACCESS_START + 254) -#define HID_APP_REPORT_TREE (HID_DBACCESS_START + 255) -#define UID_APP_DETAIL_VIEW (HID_DBACCESS_START + 256) -#define UID_APP_VIEW_VERT_SPLIT (HID_DBACCESS_START + 257) -#define UID_APP_VIEW_BORDER_WIN (HID_DBACCESS_START + 258) -#define HID_APP_CREATION_LIST (HID_DBACCESS_START + 259) -#define UID_APP_SWAP_VIEW (HID_DBACCESS_START + 260) -#define UID_DLG_TABLE_FILTER (HID_DBACCESS_START + 261) -#define HID_APP_SWAP_ICONCONTROL (HID_DBACCESS_START + 262) - -#define HID_DSADMIN_APPENDTABLEALIAS (HID_DBACCESS_START + 263) -#define HID_DSADMIN_PARAMETERNAMESUBST (HID_DBACCESS_START + 264) -#define HID_DSADMIN_IGNOREDRIVER_PRIV (HID_DBACCESS_START + 265) -#define HID_DSADMIN_HOSTNAME (HID_DBACCESS_START + 266) -#define HID_DSADMIN_PORTNUMBER (HID_DBACCESS_START + 267) - -#define HID_APP_HELP_TEXT (HID_DBACCESS_START + 268) -#define HID_EXPLORERDLG_COLLECTION (HID_DBACCESS_START + 269) -#define UID_APP_DATABASE_VIEW (HID_DBACCESS_START + 270) -#define UID_APP_TASKS_VIEW (HID_DBACCESS_START + 271) -#define UID_APP_CONTAINER_VIEW (HID_DBACCESS_START + 272) -#define UID_APP_TASKS_WINDOW (HID_DBACCESS_START + 273) -#define HID_APP_DESCRIPTION_TEXT (HID_DBACCESS_START + 274) -#define UID_APP_DETAILPAGE_HELPER (HID_DBACCESS_START + 275) -#define HID_APP_VIEW_PREVIEW_CB (HID_DBACCESS_START + 276) -#define HID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 277) -#define HID_APP_VIEW_PREVIEW_2 (HID_DBACCESS_START + 278) -#define HID_TABDESIGN_HELPTEXT (HID_DBACCESS_START + 279) -#define UID_APP_VIEW_HORZ_SPLIT (HID_DBACCESS_START + 280) -#define UID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 281) -#define HID_APP_VIEW_PREVIEW_3 (HID_DBACCESS_START + 282) - -#define HID_DSADMIN_TYPE_DIALOG (HID_DBACCESS_START + 283) -#define HID_DSADMIN_ENABLEOUTERJOIN (HID_DBACCESS_START + 284) -#define HID_DSADMIN_ADABASADMIN (HID_DBACCESS_START + 285) -#define HID_DSADMIN_USERADMIN (HID_DBACCESS_START + 286) - -#define HID_DBWIZ_PREVIOUS (HID_DBACCESS_START + 287) -#define HID_DBWIZ_NEXT (HID_DBACCESS_START + 288) -#define HID_DBWIZ_CANCEL (HID_DBACCESS_START + 289) -#define HID_DBWIZ_FINISH (HID_DBACCESS_START + 290) -#define UID_DBWIZ_HELP (HID_DBACCESS_START + 291) - -#define HID_DSADMIN_CATALOG (HID_DBACCESS_START + 292) -#define HID_DSADMIN_SCHEMA (HID_DBACCESS_START + 293) +#define HID_BROWSER_CLOSECONN (HID_DBACCESS_START + 66) +#define HID_BROWSER_REFRESHCONN (HID_DBACCESS_START + 67) + +#define HID_DLG_ROWHEIGHT (HID_DBACCESS_START + 68) +#define HID_DLG_COLWIDTH (HID_DBACCESS_START + 69) + + +#define HID_TLB_QUERYDESIGN (HID_DBACCESS_START + 70) +#define HID_CTL_QRYSQLEDIT (HID_DBACCESS_START + 71) +#define HID_DSADMIN_SPECIAL_MESSAGE (HID_DBACCESS_START + 72) + +#define HID_BROWSER_QUERY_CREATE_TEXT (HID_DBACCESS_START + 73) + +#define HID_DLG_ERROR (HID_DBACCESS_START + 74) +#define HID_DLG_TEXT (HID_DBACCESS_START + 75) +#define UID_SQLERROR_BUTTONMORE (HID_DBACCESS_START + 76) +#define HID_DLG_SAVE_AS (HID_DBACCESS_START + 77) + +#define HID_BROWSER_QUERY_EDIT (HID_DBACCESS_START + 78) +#define HID_BROWSER_QUERY_DELETE (HID_DBACCESS_START + 79) + +#define HID_DSADMIN_USER_ADO (HID_DBACCESS_START + 80) +#define HID_DSADMIN_PWDREC_ADO (HID_DBACCESS_START + 81) +#define HID_DSADMIN_CONNURL_ADOPAGE (HID_DBACCESS_START + 82) +#define HID_DSADMIN_PAGE_ADO (HID_DBACCESS_START + 83) + + +#define HID_JOINSH_ADDTAB_CLOSE (HID_DBACCESS_START + 84) +#define HID_JOINSH_ADDTAB_TABLELIST (HID_DBACCESS_START + 85) +#define HID_CTL_QRYDGNTAB (HID_DBACCESS_START + 86) +#define HID_DLG_QRY_JOIN (HID_DBACCESS_START + 87) +#define HID_DLG_QRY_JOINTYPE (HID_DBACCESS_START + 88) +#define HID_JOINSH_ADDTAB_QUERYLIST (HID_DBACCESS_START + 89) +#define HID_DLG_QRY_HELPTEXT (HID_DBACCESS_START + 92) + +#define HID_CTL_QRYDGNCRIT (HID_DBACCESS_START + 93) +#define HID_QRYDGN_ROW_VISIBLE (HID_DBACCESS_START + 94) +#define HID_QRYDGN_ROW_TABLE (HID_DBACCESS_START + 95) +#define HID_QRYDGN_ROW_FIELD (HID_DBACCESS_START + 96) +#define HID_QRYDGN_ROW_ORDER (HID_DBACCESS_START + 97) +#define HID_QRYDGN_ROW_FUNCTION (HID_DBACCESS_START + 98) +#define HID_QRYDGN_ROW_ALIAS (HID_DBACCESS_START + 99) +#define HID_QRYDGN_ROW_CRIT (HID_DBACCESS_START + 100) + +#define HID_QUERY_FUNCTION (HID_DBACCESS_START + 101) +#define HID_QUERY_TABLENAME (HID_DBACCESS_START + 102) +#define HID_QUERY_ALIASNAME (HID_DBACCESS_START + 103) +#define HID_QUERY_DISTINCT (HID_DBACCESS_START + 104) + +#define HID_BROWSER_QUERY_CREATE_DESIGN (HID_DBACCESS_START + 105) + +#define HID_DSADMIN_QUERIES (HID_DBACCESS_START + 106) +#define HID_DSADMIN_QUERIES_NEW (HID_DBACCESS_START + 107) +#define HID_DSADMIN_QUERIES_EDIT (HID_DBACCESS_START + 108) +#define HID_DSADMIN_QUERIES_DELETE (HID_DBACCESS_START + 109) +#define HID_DSADMIN_QUERYADMINISTRATION (HID_DBACCESS_START + 110) + + +#define HID_TAB_DESIGN_TABLE_DESC (HID_DBACCESS_START + 111) +#define HID_TAB_DESIGN_FIELDCONTROL (HID_DBACCESS_START + 112) +#define HID_TABLE_DESIGN_HELP_WINDOW (HID_DBACCESS_START + 113) +#define HID_TAB_DESIGN_DESCWIN (HID_DBACCESS_START + 114) +#define HID_TAB_DESIGN_TABLE_PROPS (HID_DBACCESS_START + 115) +#define HID_TABDESIGN_BACKGROUND (HID_DBACCESS_START + 116) +#define HID_CTL_TABLEEDIT (HID_DBACCESS_START + 117) +#define HID_TABDESIGN_NAMECELL (HID_DBACCESS_START + 118) +#define HID_TABDESIGN_TYPECELL (HID_DBACCESS_START + 119) +#define HID_TABDESIGN_COMMENTCELL (HID_DBACCESS_START + 120) +#define SID_TABLEDESIGN_INSERTROWS (HID_DBACCESS_START + 121) +#define SID_TABLEDESIGN_TABED_PRIMARYKEY (HID_DBACCESS_START + 122) +#define HID_TLB_TABLEDESIGN (HID_DBACCESS_START + 123) +#define HID_TAB_DESIGN_HELP_TEXT_FRAME (HID_DBACCESS_START + 124) +#define HID_TABLE_DESIGN_TABPAGE_GENERAL (HID_DBACCESS_START + 125) +#define HID_TAB_ENT_DEFAULT (HID_DBACCESS_START + 126) +#define HID_TAB_ENT_FORMAT_SAMPLE (HID_DBACCESS_START + 127) +#define HID_TAB_ENT_FORMAT (HID_DBACCESS_START + 128) +#define HID_TAB_ENT_BOOL_DEFAULT (HID_DBACCESS_START + 129) +#define HID_TAB_ENT_REQUIRED (HID_DBACCESS_START + 130) +#define HID_TAB_ENT_AUTOINCREMENT (HID_DBACCESS_START + 131) +#define HID_TAB_ENT_TEXT_LEN (HID_DBACCESS_START + 132) +#define HID_TAB_ENT_TYPE (HID_DBACCESS_START + 133) +#define HID_TAB_ENT_COLUMNNAME (HID_DBACCESS_START + 134) +#define HID_TAB_ENT_NUMTYP (HID_DBACCESS_START + 135) +#define HID_TAB_ENT_LEN (HID_DBACCESS_START + 136) +#define HID_TAB_ENT_SCALE (HID_DBACCESS_START + 137) +#define HID_BROWSER_TABLE_CREATE_DESIGN (HID_DBACCESS_START + 138) +#define HID_BROWSER_TABLE_EDIT (HID_DBACCESS_START + 139) +#define HID_BROWSER_TABLE_DELETE (HID_DBACCESS_START + 140) +#define HID_SQLERROR_EXCHAIN_ERRORS (HID_DBACCESS_START + 141) +#define HID_SQLERROR_EXCHAIN_TEXT (HID_DBACCESS_START + 142) +#define HID_TAB_WIZ_COLUMN_SELECT (HID_DBACCESS_START + 146) +#define HID_TAB_WIZ_TYPE_SELECT (HID_DBACCESS_START + 147) +#define HID_TAB_NAMEMATCHING_COLS_AVAIL (HID_DBACCESS_START + 148) +#define HID_TAB_NAMEMATCHING_COLS_ASSIGN (HID_DBACCESS_START + 149) +#define HID_TAB_WIZ_COPYTABLE (HID_DBACCESS_START + 150) +#define HID_TAB_WIZ_TABLENAME_EDIT (HID_DBACCESS_START + 151) +#define HID_CTL_RELATIONTAB (HID_DBACCESS_START + 152) +#define HID_TLB_RELATIONDESIGN (HID_DBACCESS_START + 153) +#define HID_RELATIONDIALOG_LEFTFIELDCELL (HID_DBACCESS_START + 154) +#define HID_RELATIONDIALOG_RIGHTFIELDCELL (HID_DBACCESS_START + 155) +#define HID_RELDLG_KEYFIELDS (HID_DBACCESS_START + 156) +#define HID_BROWSER_RELATION_DESIGN (HID_DBACCESS_START + 157) +#define HID_TABLE_DESIGN_NO_CONNECTION (HID_DBACCESS_START + 158) +#define HID_DSADMIN_CREATEDATABASE (HID_DBACCESS_START + 159) +#define HID_BROWSER_COLUMNINFO (HID_DBACCESS_START + 160) +#define HID_DSADMIN_USECATALOG (HID_DBACCESS_START + 161) +#define HID_BROWSER_VIEW_CREATE_DESIGN (HID_DBACCESS_START + 162) +#define HID_DSADMIN_DOCUMENTS (HID_DBACCESS_START + 166) +#define HID_DSADMIN_DOCUMENTLINKS (HID_DBACCESS_START + 167) +#define HID_DSADMIN_FILTER_EXPLANATION (HID_DBACCESS_START + 168) +#define HID_CONFIRM_DROP_BUTTON_ALL (HID_DBACCESS_START + 169) +#define HID_DSBROWSER_BOOKMARK_SELECTED (HID_DBACCESS_START + 170) +#define HID_DSADMIN_TABLE_TOOLBOX (HID_DBACCESS_START + 171) +#define HID_DSADMIN_QUERY_TOOLBOX (HID_DBACCESS_START + 172) +#define HID_DSADMIN_BOOKMARK_TOOLBOX (HID_DBACCESS_START + 173) +#define HID_DSADMIN_PAGE_LDAP (HID_DBACCESS_START + 174) +#define HID_DSADMIN_LDAP_HOSTNAME (HID_DBACCESS_START + 175) +#define HID_DSADMIN_LDAP_BASEDN (HID_DBACCESS_START + 176) +#define HID_DSADMIN_LDAP_PORTNUMBER (HID_DBACCESS_START + 177) +#define HID_DSBROWSER_BOOKMARKSELECTED (HID_DBACCESS_START + 178) +#define HID_DSBROWSER_DISCONNECTING (HID_DBACCESS_START + 179) +#define HID_TAB_PAGE_USERADMIN (HID_DBACCESS_START + 180) +#define HID_TAB_PAGE_PBUSER (HID_DBACCESS_START + 181) +#define HID_TAB_PAGE_PBCHGPWD (HID_DBACCESS_START + 182) +#define HID_TAB_PAGE_PBUSERDELETE (HID_DBACCESS_START + 183) +#define HID_TAB_PAGE_TBLGRANTS (HID_DBACCESS_START + 184) +#define HID_TAB_PAGE_LBUSER (HID_DBACCESS_START + 185) +#define HID_DSBROWSER_DIRECTSQL (HID_DBACCESS_START + 186) +#define HID_DSADMIN_LDAP_ROWCOUNT (HID_DBACCESS_START + 187) +#define HID_BROWSER_QUERY_EDITSQL (HID_DBACCESS_START + 189) +#define HID_DSADMIN_PAGE_MOZILLA (HID_DBACCESS_START + 190) +#define HID_DSADMIN_MOZILLA_PROFILE_NAME (HID_DBACCESS_START + 191) +#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME (HID_DBACCESS_START + 192) +#define HID_BROWSER_OPEN_DOCUMENT (HID_DBACCESS_START + 193) +#define HID_BROWSER_EDIT_DOCUMENT (HID_DBACCESS_START + 194) +#define HID_BROWSER_BEW_DOCUMENT (HID_DBACCESS_START + 195) +#define HID_DLG_PASSWORD (HID_DBACCESS_START + 196) + +#define HID_DLGIDX_NEWINDEX (HID_DBACCESS_START + 197) +#define HID_DLGIDX_DROPINDEX (HID_DBACCESS_START + 198) +#define HID_DLGIDX_RENAMEINDEX (HID_DBACCESS_START + 199) +#define HID_DLGIDX_SAVEINDEX (HID_DBACCESS_START + 200) +#define HID_DLGIDX_RESETINDEX (HID_DBACCESS_START + 201) +#define HID_DLGIDX_INDEXLIST (HID_DBACCESS_START + 202) +#define UID_DLGINDEX_INDEXDETAILS_BACK (HID_DBACCESS_START + 203) +#define UID_DLGINDEX_INDEXDETAILS_MAIN (HID_DBACCESS_START + 204) +#define HID_DLGINDEX_INDEXDETAILS_FIELD (HID_DBACCESS_START + 205) +#define HID_DLGINDEX_INDEXDETAILS_SORTORDER (HID_DBACCESS_START + 206) + +#define HID_DOCLINKEDIT_URL (HID_DBACCESS_START + 207) +#define HID_QUERY_SQLMODE (HID_DBACCESS_START + 208) + +#define HID_BROWSER_REFRESH_REBUILDVIEW (HID_DBACCESS_START + 209) +#define HID_BROWSER_RENAME_ENTRY (HID_DBACCESS_START + 210) + +#define HID_QUERY_EDIT_JOINCONNECTION (HID_DBACCESS_START + 211) + +#define HID_DLG_QRY_WINDOW_CONTROL (HID_DBACCESS_START + 212) +#define HID_DLG_QRY_LEFT_TABLE (HID_DBACCESS_START + 213) +#define HID_DLG_QRY_RIGHT_TABLE (HID_DBACCESS_START + 214) + +#define HID_DLG_REL_CASC_DEL (HID_DBACCESS_START + 215) +#define HID_DLG_REL_NO_CASC_DEL (HID_DBACCESS_START + 216) +#define HID_DLG_REL_CASC_DEL_NULL (HID_DBACCESS_START + 217) +#define HID_DLG_REL_CASC_DEL_DEFAULT (HID_DBACCESS_START + 218) + +#define HID_DLG_REL_CASC_UPD (HID_DBACCESS_START + 219) +#define HID_DLG_REL_NO_CASC_UPD (HID_DBACCESS_START + 220) +#define HID_DLG_REL_CASC_UPD_NULL (HID_DBACCESS_START + 221) +#define HID_DLG_REL_CASC_UPD_DEFAULT (HID_DBACCESS_START + 222) +#define HID_BROWSER_SAVE_RECORD (HID_DBACCESS_START + 223) +#define HID_BROWSER_UNDO_RECORD (HID_DBACCESS_START + 224) + +#define HID_DSADMIN_SQL92CHECK (HID_DBACCESS_START + 225) +#define HID_DSADMIN_AUTOINCREMENTVALUE (HID_DBACCESS_START + 226) +#define HID_DOCUMENT_CREATE_REPWIZ (HID_DBACCESS_START + 227) +#define HID_TAB_AUTOINCREMENTVALUE (HID_DBACCESS_START + 228) +#define HID_DSADMIN_RETRIEVE_AUTO (HID_DBACCESS_START + 229) +#define HID_DSADMIN_AUTORETRIEVEENABLED (HID_DBACCESS_START + 230) + +#define HID_DSADMIN_PAGE_MYSQL_ODBC (HID_DBACCESS_START + 231) +#define HID_TAB_PAGE_TABLEPRIVILEGES (HID_DBACCESS_START + 232) + +#define HID_DSADMIN_PAGE_USERDRIVER (HID_DBACCESS_START + 233) +#define HID_DSADMIN_USER_DEFINED (HID_DBACCESS_START + 234) +#define HID_DSADMIN_USERDEF_OPTIONS (HID_DBACCESS_START + 235) +#define HID_DSADMIN_CHARSET_USERDEF (HID_DBACCESS_START + 236) +#define HID_DSADMIN_USER_LDAP (HID_DBACCESS_START + 237) +#define HID_DSADMIN_PWDREC_LDAP (HID_DBACCESS_START + 238) +#define HID_DSADMIN_USESSL_LDAP (HID_DBACCESS_START + 239) +#define HID_BROWSER_QUERY_WIZARD (HID_DBACCESS_START + 237) + +#define HID_DLG_RENAME (HID_DBACCESS_START + 237) + +#define HID_DSADMIN_PAGE_MYSQL_JDBC (HID_DBACCESS_START + 238) + +#define HID_DSADMIN_DBASE_PATH (HID_DBACCESS_START + 239) +#define HID_DSADMIN_MYSQL_DATABASE (HID_DBACCESS_START + 240) +#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE (HID_DBACCESS_START + 241) +#define HID_DSADMIN_ODBC_DATASOURCE (HID_DBACCESS_START + 242) +#define HID_DSADMIN_ADABAS_DATABASE (HID_DBACCESS_START + 243) +#define HID_DSADMIN_MSACCESS_MDB_FILE (HID_DBACCESS_START + 244) +#define HID_DSADMIN_PAGE_MSACCESS (HID_DBACCESS_START + 245) +#define HID_DSADMIN_FLAT_PATH (HID_DBACCESS_START + 246) +#define HID_DSADMIN_CALC_PATH (HID_DBACCESS_START + 247) +#define HID_DSADMIN_ADVANCED (HID_DBACCESS_START + 248) +#define HID_DSADMIN_BOOLEANCOMPARISON (HID_DBACCESS_START + 249) +#define HID_DSADMIN_ORACLE_DATABASE (HID_DBACCESS_START + 250) + +#define UID_APP_VIEW (HID_DBACCESS_START + 251) +#define HID_APP_TABLE_TREE (HID_DBACCESS_START + 252) +#define HID_APP_FORM_TREE (HID_DBACCESS_START + 253) +#define HID_APP_QUERY_TREE (HID_DBACCESS_START + 254) +#define HID_APP_REPORT_TREE (HID_DBACCESS_START + 255) +#define UID_APP_DETAIL_VIEW (HID_DBACCESS_START + 256) +#define UID_APP_VIEW_VERT_SPLIT (HID_DBACCESS_START + 257) +#define UID_APP_VIEW_BORDER_WIN (HID_DBACCESS_START + 258) +#define HID_APP_CREATION_LIST (HID_DBACCESS_START + 259) +#define UID_APP_SWAP_VIEW (HID_DBACCESS_START + 260) +#define UID_DLG_TABLE_FILTER (HID_DBACCESS_START + 261) +#define HID_APP_SWAP_ICONCONTROL (HID_DBACCESS_START + 262) + +#define HID_DSADMIN_APPENDTABLEALIAS (HID_DBACCESS_START + 263) +#define HID_DSADMIN_PARAMETERNAMESUBST (HID_DBACCESS_START + 264) +#define HID_DSADMIN_IGNOREDRIVER_PRIV (HID_DBACCESS_START + 265) +#define HID_DSADMIN_HOSTNAME (HID_DBACCESS_START + 266) +#define HID_DSADMIN_PORTNUMBER (HID_DBACCESS_START + 267) + +#define HID_APP_HELP_TEXT (HID_DBACCESS_START + 268) +#define HID_EXPLORERDLG_COLLECTION (HID_DBACCESS_START + 269) +#define UID_APP_DATABASE_VIEW (HID_DBACCESS_START + 270) +#define UID_APP_TASKS_VIEW (HID_DBACCESS_START + 271) +#define UID_APP_CONTAINER_VIEW (HID_DBACCESS_START + 272) +#define UID_APP_TASKS_WINDOW (HID_DBACCESS_START + 273) +#define HID_APP_DESCRIPTION_TEXT (HID_DBACCESS_START + 274) +#define UID_APP_DETAILPAGE_HELPER (HID_DBACCESS_START + 275) +#define HID_APP_VIEW_PREVIEW_CB (HID_DBACCESS_START + 276) +#define HID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 277) +#define HID_APP_VIEW_PREVIEW_2 (HID_DBACCESS_START + 278) +#define HID_TABDESIGN_HELPTEXT (HID_DBACCESS_START + 279) +#define UID_APP_VIEW_HORZ_SPLIT (HID_DBACCESS_START + 280) +#define UID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 281) +#define HID_APP_VIEW_PREVIEW_3 (HID_DBACCESS_START + 282) + +#define HID_DSADMIN_TYPE_DIALOG (HID_DBACCESS_START + 283) +#define HID_DSADMIN_ENABLEOUTERJOIN (HID_DBACCESS_START + 284) +#define HID_DSADMIN_ADABASADMIN (HID_DBACCESS_START + 285) +#define HID_DSADMIN_USERADMIN (HID_DBACCESS_START + 286) + +#define HID_DBWIZ_PREVIOUS (HID_DBACCESS_START + 287) +#define HID_DBWIZ_NEXT (HID_DBACCESS_START + 288) +#define HID_DBWIZ_CANCEL (HID_DBACCESS_START + 289) +#define HID_DBWIZ_FINISH (HID_DBACCESS_START + 290) +#define UID_DBWIZ_HELP (HID_DBACCESS_START + 291) + +#define HID_DSADMIN_CATALOG (HID_DBACCESS_START + 292) +#define HID_DSADMIN_SCHEMA (HID_DBACCESS_START + 293) #define HID_DSADMIN_IGNOREINDEXAPPENDIX (HID_DBACCESS_START + 294) -#define HID_DSADMIN_DOSLINEENDS (HID_DBACCESS_START + 295) +#define HID_DSADMIN_DOSLINEENDS (HID_DBACCESS_START + 295) #define HID_BROWSER_ADMINISTRATE (HID_DBACCESS_START + 296) @@ -354,116 +354,116 @@ #define HID_DSADMIN_CHECK_REQUIRED_FIELDS (HID_DBACCESS_START + 298) #define HID_DSADMIN_ESCAPE_DATETIME (HID_DBACCESS_START + 299) -#define HID_PAGE_DBWIZARD_GENERALPAGE (HID_DBACCESS_START + 300) -#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE (HID_DBACCESS_START + 301) -#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE (HID_DBACCESS_START + 302) +#define HID_PAGE_DBWIZARD_GENERALPAGE (HID_DBACCESS_START + 300) +#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE (HID_DBACCESS_START + 301) +#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE (HID_DBACCESS_START + 302) -#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION (HID_DBACCESS_START + 304) -#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION (HID_DBACCESS_START + 305) +#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION (HID_DBACCESS_START + 304) +#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION (HID_DBACCESS_START + 305) -#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES (HID_DBACCESS_START + 307) -#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES (HID_DBACCESS_START + 308) -#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES (HID_DBACCESS_START + 309) -#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION (HID_DBACCESS_START + 310) +#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES (HID_DBACCESS_START + 307) +#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES (HID_DBACCESS_START + 308) +#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES (HID_DBACCESS_START + 309) +#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION (HID_DBACCESS_START + 310) -#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE (HID_DBACCESS_START + 311) -#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE (HID_DBACCESS_START + 312) -#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR (HID_DBACCESS_START + 313) -#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR (HID_DBACCESS_START + 314) -#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR (HID_DBACCESS_START + 315) -#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR (HID_DBACCESS_START + 316) +#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE (HID_DBACCESS_START + 311) +#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE (HID_DBACCESS_START + 312) +#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR (HID_DBACCESS_START + 313) +#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR (HID_DBACCESS_START + 314) +#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR (HID_DBACCESS_START + 315) +#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR (HID_DBACCESS_START + 316) -#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION (HID_DBACCESS_START + 317) -#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION (HID_DBACCESS_START + 318) +#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION (HID_DBACCESS_START + 317) +#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION (HID_DBACCESS_START + 318) -#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER (HID_DBACCESS_START + 319) -#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN (HID_DBACCESS_START + 320) -#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER (HID_DBACCESS_START + 321) -#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL (HID_DBACCESS_START + 322) -#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION (HID_DBACCESS_START + 323) +#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER (HID_DBACCESS_START + 319) +#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN (HID_DBACCESS_START + 320) +#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER (HID_DBACCESS_START + 321) +#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL (HID_DBACCESS_START + 322) +#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION (HID_DBACCESS_START + 323) -#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME (HID_DBACCESS_START + 326) -#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME (HID_DBACCESS_START + 327) +#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME (HID_DBACCESS_START + 326) +#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME (HID_DBACCESS_START + 327) -#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC (HID_DBACCESS_START + 329) -#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC (HID_DBACCESS_START + 330) +#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC (HID_DBACCESS_START + 329) +#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC (HID_DBACCESS_START + 330) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME (HID_DBACCESS_START + 333) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER (HID_DBACCESS_START + 334) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT (HID_DBACCESS_START + 335) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS (HID_DBACCESS_START + 336) -#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS (HID_DBACCESS_START + 337) +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME (HID_DBACCESS_START + 333) +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER (HID_DBACCESS_START + 334) +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT (HID_DBACCESS_START + 335) +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS (HID_DBACCESS_START + 336) +#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS (HID_DBACCESS_START + 337) -#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL (HID_DBACCESS_START + 340) -#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL (HID_DBACCESS_START + 341) +#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL (HID_DBACCESS_START + 340) +#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL (HID_DBACCESS_START + 341) -#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS (HID_DBACCESS_START + 342) -#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS (HID_DBACCESS_START + 343) +#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS (HID_DBACCESS_START + 342) +#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS (HID_DBACCESS_START + 343) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME (HID_DBACCESS_START + 344) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER (HID_DBACCESS_START + 345) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT (HID_DBACCESS_START + 346) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS (HID_DBACCESS_START + 347) -#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS (HID_DBACCESS_START + 348) +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME (HID_DBACCESS_START + 344) +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER (HID_DBACCESS_START + 345) +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT (HID_DBACCESS_START + 346) +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS (HID_DBACCESS_START + 347) +#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS (HID_DBACCESS_START + 348) -#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL (HID_DBACCESS_START + 349) -#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL (HID_DBACCESS_START + 350) -#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION (HID_DBACCESS_START + 351) +#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL (HID_DBACCESS_START + 349) +#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL (HID_DBACCESS_START + 350) +#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION (HID_DBACCESS_START + 351) -#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 355) -#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 356) +#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 355) +#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 356) -#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH (HID_DBACCESS_START + 359) -#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH (HID_DBACCESS_START + 360) -#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED (HID_DBACCESS_START + 361) +#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH (HID_DBACCESS_START + 359) +#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH (HID_DBACCESS_START + 360) +#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED (HID_DBACCESS_START + 361) -#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED (HID_DBACCESS_START + 365) -#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME (HID_DBACCESS_START + 366) -#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION (HID_DBACCESS_START + 367) +#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED (HID_DBACCESS_START + 365) +#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME (HID_DBACCESS_START + 366) +#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION (HID_DBACCESS_START + 367) -#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE (HID_DBACCESS_START + 373) +#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE (HID_DBACCESS_START + 373) #define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE (HID_DBACCESS_START + 374) -#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD (HID_DBACCESS_START + 375) -#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS (HID_DBACCESS_START + 376) +#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD (HID_DBACCESS_START + 375) +#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS (HID_DBACCESS_START + 376) -#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE (HID_DBACCESS_START + 377) -#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE (HID_DBACCESS_START + 378) +#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE (HID_DBACCESS_START + 377) +#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE (HID_DBACCESS_START + 378) #define HID_INDEX_DIALOG_ACTION_TB (HID_DBACCESS_START + 379) -#define HID_DLG_DATABASE_WIZARD (HID_DBACCESS_START + 380) +#define HID_DLG_DATABASE_WIZARD (HID_DBACCESS_START + 380) -#define HID_EXTENSION_NOT_PRESENT_DLG ( HID_DBACCESS_START + 381) -#define HID_DLG_QRY_JOIN_CONTROL ( HID_DBACCESS_START + 382) -#define HID_DSADMIN_IGNORECURRENCY ( HID_DBACCESS_START + 383) +#define HID_EXTENSION_NOT_PRESENT_DLG ( HID_DBACCESS_START + 381) +#define HID_DLG_QRY_JOIN_CONTROL ( HID_DBACCESS_START + 382) +#define HID_DSADMIN_IGNORECURRENCY ( HID_DBACCESS_START + 383) #define HID_MACRO_MIGRATION_BACKUP_LOCATION ( HID_DBACCESS_START + 384) #define HID_DSADMIN_PRIMARY_KEY_SUPPORT ( HID_DBACCESS_START + 385) // this one below have hid in number space HID_SBA_START -#define HID_DLG_ADABAS_NEWDB (HID_SBA_START + 0) -#define HID_DLG_ADABAS_DBNAME (HID_SBA_START + 1) -#define HID_DLG_ADABAS_SYSUSR (HID_SBA_START + 2) -#define HID_DLG_ADABAS_SYSPWD (HID_SBA_START + 3) -#define HID_DLG_ADABAS_CONUSR (HID_SBA_START + 4) -#define HID_DLG_ADABAS_CONPWD (HID_SBA_START + 5) -#define HID_DLG_ADABAS_DATADEVSPACE_SIZE (HID_SBA_START + 6) -#define HID_DLG_ADABAS_CACHE_SIZE (HID_SBA_START + 7) -#define HID_DLG_ADABAS_USR (HID_SBA_START + 8) -#define HID_DLG_ADABAS_DOMAINPWD (HID_SBA_START + 9) -#define HID_DLG_ADABAS_RESTORE (HID_SBA_START + 10) -#define HID_DLG_ADABAS_PBRESTORE (HID_SBA_START + 11) -#define HID_DLG_ADABAS_SYSDEVSPACE (HID_SBA_START + 12) -#define HID_DLG_ADABAS_PBSYSDEVSPACE (HID_SBA_START + 13) -#define HID_DLG_ADABAS_TRANSACTIONLOG (HID_SBA_START + 14) -#define HID_DLG_ADABAS_PBTRANSACTIONLOG (HID_SBA_START + 15) -#define HID_DLG_ADABAS_DATADEVSPACE (HID_SBA_START + 16) -#define HID_DLG_ADABAS_PBDATADEVSPACE (HID_SBA_START + 18) -#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE (HID_SBA_START + 19) -#define HID_DLG_ADABAS_CON_PWD (HID_SBA_START + 20) -#define HID_DLG_ADABAS_SYS_PWD (HID_SBA_START + 21) -#define HID_DLG_ADABAS_DOMAIN_PWD (HID_SBA_START + 22) +#define HID_DLG_ADABAS_NEWDB (HID_SBA_START + 0) +#define HID_DLG_ADABAS_DBNAME (HID_SBA_START + 1) +#define HID_DLG_ADABAS_SYSUSR (HID_SBA_START + 2) +#define HID_DLG_ADABAS_SYSPWD (HID_SBA_START + 3) +#define HID_DLG_ADABAS_CONUSR (HID_SBA_START + 4) +#define HID_DLG_ADABAS_CONPWD (HID_SBA_START + 5) +#define HID_DLG_ADABAS_DATADEVSPACE_SIZE (HID_SBA_START + 6) +#define HID_DLG_ADABAS_CACHE_SIZE (HID_SBA_START + 7) +#define HID_DLG_ADABAS_USR (HID_SBA_START + 8) +#define HID_DLG_ADABAS_DOMAINPWD (HID_SBA_START + 9) +#define HID_DLG_ADABAS_RESTORE (HID_SBA_START + 10) +#define HID_DLG_ADABAS_PBRESTORE (HID_SBA_START + 11) +#define HID_DLG_ADABAS_SYSDEVSPACE (HID_SBA_START + 12) +#define HID_DLG_ADABAS_PBSYSDEVSPACE (HID_SBA_START + 13) +#define HID_DLG_ADABAS_TRANSACTIONLOG (HID_SBA_START + 14) +#define HID_DLG_ADABAS_PBTRANSACTIONLOG (HID_SBA_START + 15) +#define HID_DLG_ADABAS_DATADEVSPACE (HID_SBA_START + 16) +#define HID_DLG_ADABAS_PBDATADEVSPACE (HID_SBA_START + 18) +#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE (HID_SBA_START + 19) +#define HID_DLG_ADABAS_CON_PWD (HID_SBA_START + 20) +#define HID_DLG_ADABAS_SYS_PWD (HID_SBA_START + 21) +#define HID_DLG_ADABAS_DOMAIN_PWD (HID_SBA_START + 22) //end of HID_SBA_START // don't forget to update the file util/hidother.src diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc index c273a67edcbd..6ecd68d05f53 100644 --- a/dbaccess/inc/dbaccess_slotid.hrc +++ b/dbaccess/inc/dbaccess_slotid.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,82 +32,82 @@ #include #endif -#define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 ) -#define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 ) -#define SID_DB_NEW ( SID_DBACCESS_START + 2 ) -#define SID_DB_APP_DISABLE_PREVIEW ( SID_DBACCESS_START + 3 ) -#define SID_DB_APP_DSCONNECTION_TYPE ( SID_DBACCESS_START + 4 ) -#define SID_DB_APP_DSADVANCED_SETTINGS ( SID_DBACCESS_START + 5 ) +#define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 ) +#define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 ) +#define SID_DB_NEW ( SID_DBACCESS_START + 2 ) +#define SID_DB_APP_DISABLE_PREVIEW ( SID_DBACCESS_START + 3 ) +#define SID_DB_APP_DSCONNECTION_TYPE ( SID_DBACCESS_START + 4 ) +#define SID_DB_APP_DSADVANCED_SETTINGS ( SID_DBACCESS_START + 5 ) // free -#define SID_DB_APP_VIEW_DOCINFO_PREVIEW ( SID_DBACCESS_START + 7 ) -#define SID_DB_APP_VIEW_DOC_PREVIEW ( SID_DBACCESS_START + 8 ) -#define SID_DB_APP_VIEW_TABLES ( SID_DBACCESS_START + 9 ) -#define SID_DB_APP_VIEW_QUERIES ( SID_DBACCESS_START + 10 ) -#define SID_DB_APP_DSIMPORT ( SID_DBACCESS_START + 11 ) -#define SID_DB_APP_VIEW_FORMS ( SID_DBACCESS_START + 12 ) -#define SID_DB_APP_DSRELDESIGN ( SID_DBACCESS_START + 13 ) -#define SID_DB_APP_DSUSERADMIN ( SID_DBACCESS_START + 14 ) -#define SID_DB_APP_TABLEFILTER ( SID_DBACCESS_START + 15 ) -#define SID_DB_APP_CLOSECONNECTION ( SID_DBACCESS_START + 16 ) -#define SID_DB_APP_DSPROPS ( SID_DBACCESS_START + 17 ) -#define SID_DB_APP_DBADMIN ( SID_DBACCESS_START + 18 ) -#define SID_APP_NEW_REPORT_PRE_SEL ( SID_DBACCESS_START + 19 ) -#define SID_DB_APP_CONVERTTOVIEW ( SID_DBACCESS_START + 20 ) -#define SID_DB_APP_REFRESH_TABLES ( SID_DBACCESS_START + 21 ) -#define SID_DB_APP_VIEW_REPORTS ( SID_DBACCESS_START + 22 ) -#define SID_DB_APP_DSEXPORT ( SID_DBACCESS_START + 23 ) +#define SID_DB_APP_VIEW_DOCINFO_PREVIEW ( SID_DBACCESS_START + 7 ) +#define SID_DB_APP_VIEW_DOC_PREVIEW ( SID_DBACCESS_START + 8 ) +#define SID_DB_APP_VIEW_TABLES ( SID_DBACCESS_START + 9 ) +#define SID_DB_APP_VIEW_QUERIES ( SID_DBACCESS_START + 10 ) +#define SID_DB_APP_DSIMPORT ( SID_DBACCESS_START + 11 ) +#define SID_DB_APP_VIEW_FORMS ( SID_DBACCESS_START + 12 ) +#define SID_DB_APP_DSRELDESIGN ( SID_DBACCESS_START + 13 ) +#define SID_DB_APP_DSUSERADMIN ( SID_DBACCESS_START + 14 ) +#define SID_DB_APP_TABLEFILTER ( SID_DBACCESS_START + 15 ) +#define SID_DB_APP_CLOSECONNECTION ( SID_DBACCESS_START + 16 ) +#define SID_DB_APP_DSPROPS ( SID_DBACCESS_START + 17 ) +#define SID_DB_APP_DBADMIN ( SID_DBACCESS_START + 18 ) +#define SID_APP_NEW_REPORT_PRE_SEL ( SID_DBACCESS_START + 19 ) +#define SID_DB_APP_CONVERTTOVIEW ( SID_DBACCESS_START + 20 ) +#define SID_DB_APP_REFRESH_TABLES ( SID_DBACCESS_START + 21 ) +#define SID_DB_APP_VIEW_REPORTS ( SID_DBACCESS_START + 22 ) +#define SID_DB_APP_DSEXPORT ( SID_DBACCESS_START + 23 ) -#define SID_DB_APP_TABLE_DELETE ( SID_DBACCESS_START + 24 ) -#define SID_DB_APP_TABLE_RENAME ( SID_DBACCESS_START + 25 ) -#define SID_DB_APP_TABLE_EDIT ( SID_DBACCESS_START + 26 ) -#define SID_DB_APP_TABLE_OPEN ( SID_DBACCESS_START + 27 ) +#define SID_DB_APP_TABLE_DELETE ( SID_DBACCESS_START + 24 ) +#define SID_DB_APP_TABLE_RENAME ( SID_DBACCESS_START + 25 ) +#define SID_DB_APP_TABLE_EDIT ( SID_DBACCESS_START + 26 ) +#define SID_DB_APP_TABLE_OPEN ( SID_DBACCESS_START + 27 ) -#define SID_DB_APP_QUERY_DELETE ( SID_DBACCESS_START + 28 ) -#define SID_DB_APP_QUERY_RENAME ( SID_DBACCESS_START + 29 ) -#define SID_DB_APP_QUERY_EDIT ( SID_DBACCESS_START + 30 ) -#define SID_DB_APP_QUERY_OPEN ( SID_DBACCESS_START + 31 ) +#define SID_DB_APP_QUERY_DELETE ( SID_DBACCESS_START + 28 ) +#define SID_DB_APP_QUERY_RENAME ( SID_DBACCESS_START + 29 ) +#define SID_DB_APP_QUERY_EDIT ( SID_DBACCESS_START + 30 ) +#define SID_DB_APP_QUERY_OPEN ( SID_DBACCESS_START + 31 ) -#define SID_DB_APP_FORM_DELETE ( SID_DBACCESS_START + 32 ) -#define SID_DB_APP_FORM_RENAME ( SID_DBACCESS_START + 33 ) -#define SID_DB_APP_FORM_EDIT ( SID_DBACCESS_START + 34 ) -#define SID_DB_APP_FORM_OPEN ( SID_DBACCESS_START + 35 ) +#define SID_DB_APP_FORM_DELETE ( SID_DBACCESS_START + 32 ) +#define SID_DB_APP_FORM_RENAME ( SID_DBACCESS_START + 33 ) +#define SID_DB_APP_FORM_EDIT ( SID_DBACCESS_START + 34 ) +#define SID_DB_APP_FORM_OPEN ( SID_DBACCESS_START + 35 ) -#define SID_DB_APP_REPORT_DELETE ( SID_DBACCESS_START + 36 ) -#define SID_DB_APP_REPORT_RENAME ( SID_DBACCESS_START + 37 ) -#define SID_DB_APP_REPORT_EDIT ( SID_DBACCESS_START + 38 ) -#define SID_DB_APP_REPORT_OPEN ( SID_DBACCESS_START + 39 ) +#define SID_DB_APP_REPORT_DELETE ( SID_DBACCESS_START + 36 ) +#define SID_DB_APP_REPORT_RENAME ( SID_DBACCESS_START + 37 ) +#define SID_DB_APP_REPORT_EDIT ( SID_DBACCESS_START + 38 ) +#define SID_DB_APP_REPORT_OPEN ( SID_DBACCESS_START + 39 ) -#define SID_DB_APP_DELETE ( SID_DBACCESS_START + 40 ) -#define SID_DB_APP_RENAME ( SID_DBACCESS_START + 41 ) -#define SID_DB_APP_EDIT ( SID_DBACCESS_START + 42 ) -#define SID_DB_APP_OPEN ( SID_DBACCESS_START + 43 ) +#define SID_DB_APP_DELETE ( SID_DBACCESS_START + 40 ) +#define SID_DB_APP_RENAME ( SID_DBACCESS_START + 41 ) +#define SID_DB_APP_EDIT ( SID_DBACCESS_START + 42 ) +#define SID_DB_APP_OPEN ( SID_DBACCESS_START + 43 ) -#define SID_BROWSER_CLEAR_QUERY ( SID_DBACCESS_START + 44 ) -#define SID_RELATION_ADD_RELATION ( SID_DBACCESS_START + 45 ) -#define SID_QUERY_VIEW_FUNCTIONS ( SID_DBACCESS_START + 46 ) -#define SID_QUERY_VIEW_TABLES ( SID_DBACCESS_START + 47 ) -#define SID_QUERY_VIEW_ALIASES ( SID_DBACCESS_START + 48 ) -#define SID_QUERY_DISTINCT_VALUES ( SID_DBACCESS_START + 49 ) -#define SID_FORM_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 50 ) -#define SID_REPORT_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 51 ) -#define SID_DB_QUERY_PREVIEW ( SID_DBACCESS_START + 52 ) -#define SID_APP_NEW_FOLDER ( SID_DBACCESS_START + 53 ) -#define SID_APP_NEW_FORM ( SID_DBACCESS_START + 54 ) -#define SID_DB_APP_PASTE_SPECIAL ( SID_DBACCESS_START + 55 ) +#define SID_BROWSER_CLEAR_QUERY ( SID_DBACCESS_START + 44 ) +#define SID_RELATION_ADD_RELATION ( SID_DBACCESS_START + 45 ) +#define SID_QUERY_VIEW_FUNCTIONS ( SID_DBACCESS_START + 46 ) +#define SID_QUERY_VIEW_TABLES ( SID_DBACCESS_START + 47 ) +#define SID_QUERY_VIEW_ALIASES ( SID_DBACCESS_START + 48 ) +#define SID_QUERY_DISTINCT_VALUES ( SID_DBACCESS_START + 49 ) +#define SID_FORM_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 50 ) +#define SID_REPORT_CREATE_REPWIZ_PRE_SEL ( SID_DBACCESS_START + 51 ) +#define SID_DB_QUERY_PREVIEW ( SID_DBACCESS_START + 52 ) +#define SID_APP_NEW_FOLDER ( SID_DBACCESS_START + 53 ) +#define SID_APP_NEW_FORM ( SID_DBACCESS_START + 54 ) +#define SID_DB_APP_PASTE_SPECIAL ( SID_DBACCESS_START + 55 ) // status information -#define SID_DB_APP_STATUS_TYPE ( SID_DBACCESS_START + 57 ) -#define SID_DB_APP_STATUS_DBNAME ( SID_DBACCESS_START + 58 ) -#define SID_DB_APP_STATUS_USERNAME ( SID_DBACCESS_START + 59 ) -#define SID_DB_APP_STATUS_HOSTNAME ( SID_DBACCESS_START + 60 ) +#define SID_DB_APP_STATUS_TYPE ( SID_DBACCESS_START + 57 ) +#define SID_DB_APP_STATUS_DBNAME ( SID_DBACCESS_START + 58 ) +#define SID_DB_APP_STATUS_USERNAME ( SID_DBACCESS_START + 59 ) +#define SID_DB_APP_STATUS_HOSTNAME ( SID_DBACCESS_START + 60 ) -#define SID_DB_APP_SENDREPORTASMAIL ( SID_DBACCESS_START + 61 ) -#define SID_DB_APP_SENDREPORTTOWRITER ( SID_DBACCESS_START + 62 ) -#define SID_DB_FORM_NEW_PILOT ( SID_DBACCESS_START + 63 ) -#define SID_DB_NEW_VIEW_SQL ( SID_DBACCESS_START + 64 ) -#define SID_APP_NEW_REPORT ( SID_DBACCESS_START + 65 ) +#define SID_DB_APP_SENDREPORTASMAIL ( SID_DBACCESS_START + 61 ) +#define SID_DB_APP_SENDREPORTTOWRITER ( SID_DBACCESS_START + 62 ) +#define SID_DB_FORM_NEW_PILOT ( SID_DBACCESS_START + 63 ) +#define SID_DB_NEW_VIEW_SQL ( SID_DBACCESS_START + 64 ) +#define SID_APP_NEW_REPORT ( SID_DBACCESS_START + 65 ) -#define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 ) +#define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 ) #endif // _DBACCESS_SLOTID_HRC_ diff --git a/dbaccess/inc/dbaccessdllapi.h b/dbaccess/inc/dbaccessdllapi.h index 7365d0c4c84f..5b28a894fe22 100644 --- a/dbaccess/inc/dbaccessdllapi.h +++ b/dbaccess/inc/dbaccessdllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,18 +28,18 @@ #ifndef INCLUDED_DBACCESSDLLAPI_H #define INCLUDED_DBACCESSDLLAPI_H - + #ifndef _SAL_TYPES_H_ #include "sal/types.h" #endif - + #if defined(DBACCESS_DLLIMPLEMENTATION) #define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #else #define DBACCESS_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif #define DBACCESS_DLLPRIVATE SAL_DLLPRIVATE - + #endif /* INCLUDED_DBACCESSDLLAPI_H */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index 510e554e93f6..d31229fbc04f 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -132,7 +132,7 @@ namespace dbaui */ struct FeatureState { - sal_Bool bEnabled; + sal_Bool bEnabled; optional< bool > bChecked; optional< bool > bInvisible; @@ -173,8 +173,8 @@ namespace dbaui { ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; - sal_Int32 nId; - sal_Bool bForceBroadcast; + sal_Int32 nId; + sal_Bool bForceBroadcast; }; // .................................................................... @@ -214,15 +214,15 @@ namespace dbaui ,public IController { private: - SupportedFeatures m_aSupportedFeatures; + SupportedFeatures m_aSupportedFeatures; ::comphelper::NamedValueCollection m_aInitParameters; ::std::auto_ptr< OGenericUnoController_Data > m_pData; - ODataView* m_pView; // our (VCL) "main window" + ODataView* m_pView; // our (VCL) "main window" -#ifdef DBG_UTIL +#ifdef DBG_UTIL bool m_bDescribingSupportedFeatures; #endif @@ -231,8 +231,8 @@ namespace dbaui // attributes struct DispatchTarget { - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; DispatchTarget() { } DispatchTarget(const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xRef) : aURL(rURL), xListener(xRef) { } @@ -243,32 +243,32 @@ namespace dbaui FeatureListeners m_aFeaturesToInvalidate; - ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque - StateCache m_aStateCache; // save the current status of feature state - Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes - OAsyncronousLink m_aAsyncInvalidateAll; - OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed + ::osl::Mutex m_aFeatureMutex; // locked when features are append to or remove from deque + StateCache m_aStateCache; // save the current status of feature state + Dispatch m_arrStatusListener; // all our listeners where we dispatch status changes + OAsyncronousLink m_aAsyncInvalidateAll; + OAsyncronousLink m_aAsyncCloseTask; // called when a task shoud be closed - ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xUrlTransformer; // needed sometimes + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; ControllerFrame m_aCurrentFrame; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; // for intercepting dispatches - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; // dito - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDatabaseContext; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatcher; // for intercepting dispatches + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatcher; // dito + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDatabaseContext; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle > m_xTitleHelper; - sal_Bool m_bPreview; - sal_Bool m_bReadOnly; - - sal_Bool m_bCurrentlyModified : 1; - sal_Bool m_bExternalTitle : 1; + sal_Bool m_bPreview; + sal_Bool m_bReadOnly; + sal_Bool m_bCurrentlyModified : 1; + sal_Bool m_bExternalTitle : 1; + // ---------------------------------------------------------------- // attribute access - ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } - ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } + ::osl::Mutex& getMutex() const { return OGenericUnoController_MBASE::getMutex(); } + ::cppu::OBroadcastHelper& getBroadcastHelper() { return OGenericUnoController_Base::rBHelper; } // ---------------------------------------------------------------- // methods @@ -278,13 +278,13 @@ namespace dbaui /** open the help agent for the given help id. - @param _nHelpId + @param _nHelpId The help id to dispatch. */ void openHelpAgent(sal_Int32 _nHelpId); /** open the help agent for the given help url. - @param _pHelpStringURL + @param _pHelpStringURL The help url to dispatch. */ void openHelpAgent( const rtl::OUString& _suHelpStringURL ); @@ -300,22 +300,22 @@ namespace dbaui void closeTask(); // if getMenu returns a non empty string than this will be dispatched at the frame - virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); + virtual void loadMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame); /** called when our menu has been loaded into our frame, can be used to load sub toolbars @param _xLayoutManager The layout manager. */ - virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); + virtual void onLoadedMenu(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager); // all the features which should be handled by this class - virtual void describeSupportedFeatures(); + virtual void describeSupportedFeatures(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); /** describes a feature supported by the controller @@ -337,7 +337,7 @@ namespace dbaui ); /** returns if the feature is supported, otherwise - @param _nId + @param _nId The ID of the feature. */ sal_Bool isFeatureSupported( sal_Int32 _nId ); @@ -435,7 +435,7 @@ namespace dbaui virtual sal_Bool Construct(Window* pParent); /** get the layout manager - @param _xFrame + @param _xFrame The frame to ask for the layout manager. @return The layout manager of the frame, can be if the frame isn't initialized. @@ -483,9 +483,9 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame(void) throw( ::com::sun::star::uno::RuntimeException ); // ::com::sun::star::frame::XDispatch - virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & aListener, const ::com::sun::star::util::URL& aURL) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider(void) throw(::com::sun::star::uno::RuntimeException); @@ -504,7 +504,7 @@ namespace dbaui virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XFrameActionListener - virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( ::com::sun::star::uno::RuntimeException ); // lang::XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/inc/pch/precompiled_dbaccess.cxx b/dbaccess/inc/pch/precompiled_dbaccess.cxx index 0fe2c43d1189..a5a4e8af7fa8 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.cxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/inc/pch/precompiled_dbaccess.hxx b/dbaccess/inc/pch/precompiled_dbaccess.hxx index daa7a324ab60..dc926527e617 100644 --- a/dbaccess/inc/pch/precompiled_dbaccess.hxx +++ b/dbaccess/inc/pch/precompiled_dbaccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/inc/singledoccontroller.hxx b/dbaccess/inc/singledoccontroller.hxx index 75e146ec2a05..7b61d7fad3db 100644 --- a/dbaccess/inc/singledoccontroller.hxx +++ b/dbaccess/inc/singledoccontroller.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,22 +74,22 @@ namespace dbaui ::std::auto_ptr m_pImpl; protected: - SfxUndoManager m_aUndoManager; + SfxUndoManager m_aUndoManager; private: /** forces usage of a connection which we do not own

To be used from within XInitialization::initialize, resp. impl_initialize, only.

*/ - void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); + void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); protected: // OGenericUnoController - initialization virtual void impl_initialize(); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getPrivateModel() const; @@ -98,8 +98,8 @@ namespace dbaui public: - sal_Bool isReadOnly() const; - sal_Bool isEditable() const; + sal_Bool isReadOnly() const; + sal_Bool isEditable() const; void setEditable(sal_Bool _bEditable); // need for undo's and redo's @@ -107,13 +107,13 @@ namespace dbaui /** addUndoActionAndInvalidate adds an undo action to the undoManager, additionally invalidates the UNDO and REDO slot - @param pAction the undo action to add + @param pAction the undo action to add */ void addUndoActionAndInvalidate(SfxUndoAction *pAction); // ---------------------------------------------------------------- // asking for connection-related stuff - - sal_Bool isConnected() const; + + sal_Bool isConnected() const; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > getMetaData( ) const; @@ -123,7 +123,7 @@ namespace dbaui ::rtl::OUString getDataSourceName() const; const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& getDataSource() const; - sal_Bool haveDataSource() const; + sal_Bool haveDataSource() const; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > getDatabaseDocument() const; @@ -171,7 +171,7 @@ namespace dbaui /** returns the number formatter */ - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getNumberFormatter() const; // ::com::sun::star::frame::XController virtual sal_Bool SAL_CALL suspend(sal_Bool bSuspend) throw( ::com::sun::star::uno::RuntimeException ); @@ -197,7 +197,7 @@ namespace dbaui virtual void disconnect(); virtual void reconnect( sal_Bool _bUI ); - sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } + sal_Bool ensureConnected( sal_Bool _bUI ) { if ( !isConnected() ) reconnect( _bUI ); return isConnected(); } /** called when our connection is beeing disposed

The default implementation does a reconnect

@@ -215,7 +215,7 @@ namespace dbaui virtual void SAL_CALL disposing(); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); // XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); @@ -228,7 +228,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBAUI_SINGLEDOCCONTROLLER_HXX diff --git a/dbaccess/prj/dbu.xml b/dbaccess/prj/dbu.xml index 2acdaf9c75a6..097fa06244aa 100644 --- a/dbaccess/prj/dbu.xml +++ b/dbaccess/prj/dbu.xml @@ -110,7 +110,7 @@ com.sun.star.accessibility.Accessible com.sun.star.accessibility.AccessibleContext - + Ocke Janssen com.sun.star.comp.dbu.OColumnControl diff --git a/dbaccess/qa/complex/dbaccess/ApplicationController.java b/dbaccess/qa/complex/dbaccess/ApplicationController.java index 4c964e82dc06..33a62821a2b8 100644 --- a/dbaccess/qa/complex/dbaccess/ApplicationController.java +++ b/dbaccess/qa/complex/dbaccess/ApplicationController.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/Beamer.java b/dbaccess/qa/complex/dbaccess/Beamer.java index 909bf39d1707..797b5bca6cae 100644 --- a/dbaccess/qa/complex/dbaccess/Beamer.java +++ b/dbaccess/qa/complex/dbaccess/Beamer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -162,7 +162,7 @@ public class Beamer extends complexlib.ComplexTestCase new PropertyValue("CommandType", 0, Integer.valueOf(CommandType.TABLE), PropertyState.DIRECT_VALUE), new PropertyValue("Command", 0, "biblio", PropertyState.DIRECT_VALUE) }; - + final XFrame beamer = frame.findFrame("_beamer", 0); assure(beamer != null); final XEnumerationAccess evtBc = (XEnumerationAccess) UnoRuntime.queryInterface(XEnumerationAccess.class, getORB().createInstance("com.sun.star.frame.GlobalEventBroadcaster")); diff --git a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java index 3bba8fa45001..f9f65268ff9c 100644 --- a/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java +++ b/dbaccess/qa/complex/dbaccess/CRMBasedTestCase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java b/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java index 53527e356f78..5967086df53b 100755 --- a/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableInterActionHandler.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java index 7c3db7f6020d..9bb102e28677 100755 --- a/dbaccess/qa/complex/dbaccess/CopyTableWizard.java +++ b/dbaccess/qa/complex/dbaccess/CopyTableWizard.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,7 @@ public class CopyTableWizard extends CRMBasedTestCase } // -------------------------------------------------------------------------------------------------------- - + class CopyThread implements Runnable { @@ -141,7 +141,7 @@ public class CopyTableWizard extends CRMBasedTestCase } public void copyTableDbase() throws Exception, IOException, java.lang.Exception - { + { copyTable(source,dest); } public void copyTable(final DatabaseApplication sourceDb,final DatabaseApplication destDb) throws Exception, IOException, java.lang.Exception diff --git a/dbaccess/qa/complex/dbaccess/DataSource.java b/dbaccess/qa/complex/dbaccess/DataSource.java index f74d5af8d8f0..69a9fdd82d60 100644 --- a/dbaccess/qa/complex/dbaccess/DataSource.java +++ b/dbaccess/qa/complex/dbaccess/DataSource.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/DatabaseApplication.java b/dbaccess/qa/complex/dbaccess/DatabaseApplication.java index d6bfa804eafa..b9aaac35c222 100755 --- a/dbaccess/qa/complex/dbaccess/DatabaseApplication.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseApplication.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java index 02fb820f3fd4..20ae862075f9 100644 --- a/dbaccess/qa/complex/dbaccess/DatabaseDocument.java +++ b/dbaccess/qa/complex/dbaccess/DatabaseDocument.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/FileHelper.java b/dbaccess/qa/complex/dbaccess/FileHelper.java index f72dc0ff7ca3..f9c2b0a40f58 100644 --- a/dbaccess/qa/complex/dbaccess/FileHelper.java +++ b/dbaccess/qa/complex/dbaccess/FileHelper.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/Parser.java b/dbaccess/qa/complex/dbaccess/Parser.java index 2b1b9342edcb..9616a645af24 100644 --- a/dbaccess/qa/complex/dbaccess/Parser.java +++ b/dbaccess/qa/complex/dbaccess/Parser.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/PropertyBag.java b/dbaccess/qa/complex/dbaccess/PropertyBag.java index c686be886bba..911ac557e455 100644 --- a/dbaccess/qa/complex/dbaccess/PropertyBag.java +++ b/dbaccess/qa/complex/dbaccess/PropertyBag.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/Query.java b/dbaccess/qa/complex/dbaccess/Query.java index 81a651fd5696..d93d5c3377e6 100644 --- a/dbaccess/qa/complex/dbaccess/Query.java +++ b/dbaccess/qa/complex/dbaccess/Query.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/QueryInQuery.java b/dbaccess/qa/complex/dbaccess/QueryInQuery.java index 002d0395b791..cd25209347de 100644 --- a/dbaccess/qa/complex/dbaccess/QueryInQuery.java +++ b/dbaccess/qa/complex/dbaccess/QueryInQuery.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java b/dbaccess/qa/complex/dbaccess/RowSet.java index 5a13f6724d1f..ecf66e8306a2 100644 --- a/dbaccess/qa/complex/dbaccess/RowSet.java +++ b/dbaccess/qa/complex/dbaccess/RowSet.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/qa/complex/dbaccess/RowSetEventListener.java b/dbaccess/qa/complex/dbaccess/RowSetEventListener.java index c4569986a5d7..b0901d9790bb 100644 --- a/dbaccess/qa/complex/dbaccess/RowSetEventListener.java +++ b/dbaccess/qa/complex/dbaccess/RowSetEventListener.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,11 +43,11 @@ public class RowSetEventListener implements XRowSetApproveListener,XRowSetListen public static final int IS_MODIFIED = 5; public static final int IS_NEW = 6; public static final int ROW_COUNT = 7; - public static final int IS_ROW_COUNT_FINAL = 8; - + public static final int IS_ROW_COUNT_FINAL = 8; + int callPos = 1; int calling []; - + RowSetEventListener(){ calling = new int [9]; clearCalling(); diff --git a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java index bb3636100849..6eb0525b9ffa 100755 --- a/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java +++ b/dbaccess/qa/complex/dbaccess/SingleSelectQueryComposer.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -128,7 +128,7 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase realValue.equals(_attributeValue)); log.println(" (results in " + (String) m_composer.getQuery() + ")"); } - + /** tests setCommand of the composer */ public void testSetCommand() @@ -140,11 +140,11 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase final String table = "SELECT * FROM \"customers\""; m_composer.setCommand("customers",CommandType.TABLE); assure("setCommand/getQuery TABLE inconsistent", m_composer.getQuery().equals(table)); - + m_database.getDatabase().getDataSource().createQuery("set command test", "SELECT * FROM \"orders for customer\" \"a\", \"customers\" \"b\" WHERE \"a\".\"Product Name\" = \"b\".\"Name\""); m_composer.setCommand("set command test",CommandType.QUERY); assure("setCommand/getQuery QUERY inconsistent", m_composer.getQuery().equals(m_database.getDatabase().getDataSource().getQueryDefinition("set command test").getCommand())); - + final String sql = "SELECT * FROM \"orders for customer\" WHERE \"Product Name\" = 'test'"; m_composer.setCommand(sql,CommandType.COMMAND); assure("setCommand/getQuery COMMAND inconsistent", m_composer.getQuery().equals(sql)); @@ -166,7 +166,7 @@ public class SingleSelectQueryComposer extends CRMBasedTestCase final String simpleQuery2 = "SELECT * FROM \"customers\" WHERE \"Name\" = 'oranges'"; m_composer.setElementaryQuery(simpleQuery2); assure("setElementaryQuery/getQuery inconsistent", m_composer.getQuery().equals(simpleQuery2)); - + log.println("check setQuery"); final String simpleQuery = "SELECT * FROM \"customers\""; m_composer.setQuery(simpleQuery); diff --git a/dbaccess/qa/complex/dbaccess/TestCase.java b/dbaccess/qa/complex/dbaccess/TestCase.java index b8dae3f6f350..c66efeb0af91 100644 --- a/dbaccess/qa/complex/dbaccess/TestCase.java +++ b/dbaccess/qa/complex/dbaccess/TestCase.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ public abstract class TestCase extends complexlib.ComplexTestCase // -------------------------------------------------------------------------------------------------------- /** returns the URL of a temporary file which can be used during the test. - * + * * The file will be deleted when the process exits * @return the URL of a temporary file */ diff --git a/dbaccess/qa/complex/dbaccess/UISettings.java b/dbaccess/qa/complex/dbaccess/UISettings.java index fc772b158f5f..6ae8fa5f0506 100644 --- a/dbaccess/qa/complex/dbaccess/UISettings.java +++ b/dbaccess/qa/complex/dbaccess/UISettings.java @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index 5a88c248befd..412c2d7bd28a 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -43,11 +43,11 @@ using namespace ::dbtools; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdb; +// using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -// using namespace ::cppu; +// using namespace ::cppu; using namespace ::osl; void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) @@ -133,7 +133,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::updateRow" ); - // OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable); + // OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable); Reference xUpdRow(m_xRowLocate,UNO_QUERY); if(!xUpdRow.is()) ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this ); diff --git a/dbaccess/source/core/api/CIndexColumn.hxx b/dbaccess/source/core/api/CIndexColumn.hxx index 2ac731919703..3bd08da3d7a6 100644 --- a/dbaccess/source/core/api/CIndexColumn.hxx +++ b/dbaccess/source/core/api/CIndexColumn.hxx @@ -38,18 +38,18 @@ namespace connectivity class OIndexColumn : public OAdabasColumn { protected: - sal_Bool m_IsAscending; + sal_Bool m_IsAscending; public: OIndexColumn(); - OIndexColumn( sal_Bool _IsAscending, + OIndexColumn( sal_Bool _IsAscending, const ::rtl::OUString& _Name, const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement); virtual void construct(); }; diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 883ec1b7b1b2..41a5cd81c8ab 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::beans; namespace dbaccess { -ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos, +ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos, const Reference< XDatabaseMetaData >& _rxDBMeta, const ::rtl::OUString& _rDescription, const ::rtl::OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue ) :ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, _rDescription, i_sLabel,_rColumnValue ) { diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx index 2d6fe45a4006..f2c84a3b22ac 100644 --- a/dbaccess/source/core/api/CRowSetColumn.hxx +++ b/dbaccess/source/core/api/CRowSetColumn.hxx @@ -41,7 +41,7 @@ namespace dbaccess { public: - ORowSetColumn( const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData, + ORowSetColumn( const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData, const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow, sal_Int32 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta, diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index c31cc17b6ec2..56e66d864db7 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -42,7 +42,7 @@ using namespace comphelper; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -52,7 +52,7 @@ using namespace osl; DBG_NAME(ORowSetDataColumn) -ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& _xMetaData, +ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, const Reference < XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, @@ -256,10 +256,10 @@ sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName void SAL_CALL ORowSetDataColumns::disposing(void) { - // clear_NoDispose(); + // clear_NoDispose(); ORowSetDataColumns_BASE::disposing(); m_aColumns = NULL; - // m_aColumns.clear(); + // m_aColumns.clear(); } void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector) diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx index 8cf0aa5f2c95..477328ef88bc 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.hxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx @@ -41,17 +41,17 @@ namespace dbaccess class ORowSetDataColumn; typedef ::comphelper::OPropertyArrayUsageHelper ORowSetDataColumn_PROP; - class ORowSetDataColumn : public ODataColumn, + class ORowSetDataColumn : public ODataColumn, public OColumnSettings, public ORowSetDataColumn_PROP { protected: - ORowSetCacheIterator m_aColumnValue; - ::com::sun::star::uno::Any m_aOldValue; + ORowSetCacheIterator m_aColumnValue; + ::com::sun::star::uno::Any m_aOldValue; ::rtl::OUString m_sLabel; - ::rtl::OUString m_aDescription; // description - ORowSetBase* m_pRowSet; + ::rtl::OUString m_aDescription; // description + ORowSetBase* m_pRowSet; virtual ~ORowSetDataColumn(); public: diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 2ebed10c0479..56b045987ab3 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -61,12 +61,12 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdb; +// using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::io; -// using namespace ::cppu; +// using namespace ::cppu; using namespace ::osl; DBG_NAME(OCacheSet) @@ -91,7 +91,7 @@ OCacheSet::OCacheSet() return sQuote; } -void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/) +void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::construct" ); OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet"); @@ -229,7 +229,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow if(xIndexSup.is()) xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY); - // Reference + // Reference Reference xIndexColsSup; Reference xIndexColumns; ::std::vector< Reference > aAllIndexColumns; @@ -238,7 +238,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow for(sal_Int32 j=0;jgetCount();++j) { xIndexColsSup.set(xIndexes->getByIndex(j),UNO_QUERY); - if( xIndexColsSup.is() + if( xIndexColsSup.is() && comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE)) && !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX)) ) @@ -251,7 +251,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM("?,")); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); sal_Int32 nCheckCount = 1; // index for the orginal values sal_Int32 i = 1; @@ -357,7 +357,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); // list all cloumns that should be set - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); // use keys and indexes for excat postioning @@ -369,7 +369,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti if(xIndexSup.is()) xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY); - // Reference + // Reference Reference xIndexColsSup; Reference xIndexColumns; ::std::vector< Reference > aAllIndexColumns; @@ -378,7 +378,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti for(sal_Int32 j=0;jgetCount();++j) { xIndexColsSup.set(xIndexes->getByIndex(j),UNO_QUERY); - if( xIndexColsSup.is() + if( xIndexColsSup.is() && comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE)) && !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX)) ) diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 42f5d290edd5..078bdb83741d 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -52,19 +52,19 @@ namespace dbaccess class OCacheSet : public ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XRow> { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xDriverSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xDriverRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xSetMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xDriverSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xDriverRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xSetMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Sequence m_aNullable; - ::com::sun::star::uno::Sequence m_aSignedFlags; - ::com::sun::star::uno::Sequence m_aColumnTypes; - ORowSetRow m_aInsertRow; - ::rtl::OUString m_aComposedTableName; - sal_Bool m_bInserted; - sal_Bool m_bUpdated; - sal_Bool m_bDeleted; + ::com::sun::star::uno::Sequence m_aNullable; + ::com::sun::star::uno::Sequence m_aSignedFlags; + ::com::sun::star::uno::Sequence m_aColumnTypes; + ORowSetRow m_aInsertRow; + ::rtl::OUString m_aComposedTableName; + sal_Bool m_bInserted; + sal_Bool m_bUpdated; + sal_Bool m_bDeleted; OCacheSet(); virtual ~OCacheSet(); diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 4befdc824b03..757e44a8d80b 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -65,7 +65,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard // for them ::rtl::OUString* pTableFilters = _rTableFilter.getArray(); - ::rtl::OUString* pEnd = pTableFilters + _rTableFilter.getLength(); + ::rtl::OUString* pEnd = pTableFilters + _rTableFilter.getLength(); sal_Int32 nShiftPos = 0; for (sal_Int32 i=0; pEnd != pTableFilters; ++pTableFilters,++i) { @@ -98,8 +98,8 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std bool bFilterMatch = ::std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd; // the table is allowed to "pass" if we had no filters at all or any of the non-wildcard filters matches if (!bFilterMatch && !_rWCSearch.empty()) - { // or if one of the wildcrad expression matches - for ( ::std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin(); + { // or if one of the wildcrad expression matches + for ( ::std::vector< WildCard >::const_iterator aLoop = _rWCSearch.begin(); aLoop != _rWCSearch.end() && !bFilterMatch; ++aLoop ) @@ -255,7 +255,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std ::osl::Mutex& _rMutex, const Reference< XConnection >& _xCon, sal_Bool _bCase, - IRefreshListener* _pRefreshListener, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) :OCollection(_rParent,_bCase,_rMutex,::std::vector< ::rtl::OUString>()) @@ -311,7 +311,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std { // build sorted versions of the filter sequences, so the visibility decision is faster Sequence< ::rtl::OUString > aTableFilter(_rTableFilter); - sal_Int32 nTableFilterLen = aTableFilter.getLength(); + sal_Int32 nTableFilterLen = aTableFilter.getLength(); // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard // for them @@ -371,9 +371,9 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std ::rtl::OUString sCatalog, sSchema, sName, sType; while ( xTables->next() ) { - sCatalog = xCurrentRow->getString(1); - sSchema = xCurrentRow->getString(2); - sName = xCurrentRow->getString(3); + sCatalog = xCurrentRow->getString(1); + sSchema = xCurrentRow->getString(2); + sName = xCurrentRow->getString(3); sType = xCurrentRow->getString(4); aUnfilteredTables.push_back( TableInfo( sCatalog, sSchema, sName, sType ) ); @@ -401,11 +401,11 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std if ( m_xMasterContainer.is() ) removeMasterContainerListener(); - m_xMasterContainer = NULL; - m_xMetaData = NULL; + m_xMasterContainer = NULL; + m_xMetaData = NULL; m_pWarningsContainer = NULL; - m_pRefreshListener = NULL; - m_bConstructed = sal_False; + m_pRefreshListener = NULL; + m_bConstructed = sal_False; } void OFilteredContainer::impl_refresh() throw(RuntimeException) diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index f88024bc9b7a..ec24c9cbac15 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -53,7 +53,7 @@ namespace dbaccess typedef connectivity::sdbcx::OCollection OPrivateColumns_Base; class OPrivateColumns : public OPrivateColumns_Base { - ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; + ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} @@ -88,7 +88,7 @@ namespace dbaccess //========================================================================== class OPrivateTables : public OPrivateTables_BASE { - OSQLTables m_aTables; + OSQLTables m_aTables; protected: virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} @@ -97,7 +97,7 @@ namespace dbaccess return NULL; } public: - OPrivateTables( const OSQLTables& _rTables, + OPrivateTables( const OSQLTables& _rTables, sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index 0d4c3147efb6..17ec5dfacdba 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -89,7 +89,7 @@ namespace for(sal_Int32 j = 0 ; j < nCount ; ++j) { xIndexColsSup.set(_xIndexes->getByIndex(j),UNO_QUERY); - if( xIndexColsSup.is() + if( xIndexColsSup.is() && comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISUNIQUE)) && !comphelper::getBOOL(xIndexColsSup->getPropertyValue(PROPERTY_ISPRIMARYKEYINDEX)) ) @@ -102,7 +102,7 @@ DBG_NAME(OKeySet) OKeySet::OKeySet(const connectivity::OSQLTable& _xTable, const Reference< XIndexAccess>& _xTableKeys, - const ::rtl::OUString& _rUpdateTableName, // this can be the alias or the full qualified name + const ::rtl::OUString& _rUpdateTableName, // this can be the alias or the full qualified name const Reference< XSingleSelectQueryAnalyzer >& _xComposer, const ORowSetValueVector& _aParameterValueForCache) :m_aParameterValueForCache(_aParameterValueForCache) @@ -156,7 +156,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, { // first ask the database itself for the best columns which can be used Sequence< ::rtl::OUString> aBestColumnNames; - Reference xKeyColumns = getPrimaryKeyColumns_throw(i_aTable); + Reference xKeyColumns = getPrimaryKeyColumns_throw(i_aTable); if ( xKeyColumns.is() ) aBestColumnNames = xKeyColumns->getElementNames(); @@ -220,7 +220,7 @@ void OKeySet::findTableColumnsMatching_throw( const Any& i_aTable, ::rtl::OUStringBuffer OKeySet::createKeyFilter() { static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - const ::rtl::OUString aQuote = getIdentifierQuoteString(); + const ::rtl::OUString aQuote = getIdentifierQuoteString(); ::rtl::OUStringBuffer aFilter; static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -246,13 +246,13 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O OCacheSet::construct(_xDriverSet,i_sRowSetFilter); initColumns(); - Reference xKeyColumns = getKeyColumns(); + Reference xKeyColumns = getKeyColumns(); Reference xMeta = m_xConnection->getMetaData(); Reference xQueryColSup(m_xComposer,UNO_QUERY); const Reference xQueryColumns = xQueryColSup->getColumns(); findTableColumnsMatching_throw(makeAny(m_xTable),m_sUpdateTableName,xMeta,xQueryColumns,m_pKeyColumnNames); - // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first + // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first // without extra varaible to be set m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair >(0,NULL)))); m_aKeyIter = m_aKeyMap.begin(); @@ -269,11 +269,11 @@ void OKeySet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::O if ( aSeq.getLength() > 1 ) // special handling for join { static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - const ::rtl::OUString aQuote = getIdentifierQuoteString(); + const ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString s_sDot(RTL_CONSTASCII_USTRINGPARAM(".")); static ::rtl::OUString s_sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( *pIter != m_sUpdateTableName ) @@ -401,7 +401,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); // list all cloumns that should be set - const ::rtl::OUString aQuote = getIdentifierQuoteString(); + const ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); static ::rtl::OUString aOr(RTL_CONSTASCII_USTRINGPARAM(" OR ")); static ::rtl::OUString aEqual(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -424,8 +424,8 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows aCondition.setLength(aCondition.getLength()-5); const ::rtl::OUString sCon( aCondition.makeStringAndClear() ); - const Any* pBegin = rows.getConstArray(); - const Any* pEnd = pBegin + rows.getLength(); + const Any* pBegin = rows.getConstArray(); + const Any* pEnd = pBegin + rows.getLength(); Sequence< Any > aKeys; for(;pBegin != pEnd;++pBegin) @@ -440,7 +440,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(aSql.makeStringAndClear())); Reference< XParameters > xParameter(xPrep,UNO_QUERY); - pBegin = rows.getConstArray(); + pBegin = rows.getConstArray(); sal_Int32 i=1; for(;pBegin != pEnd;++pBegin) { @@ -489,7 +489,7 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" SET "))); // list all cloumns that should be set static ::rtl::OUString aPara(RTL_CONSTASCII_USTRINGPARAM(" = ?,")); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -950,7 +950,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit aSql.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE "))); // list all cloumns that should be set - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); // use keys and indexes for excat postioning @@ -961,7 +961,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit if ( xIndexSup.is() ) xIndexes.set(xIndexSup->getIndexes(),UNO_QUERY); - // Reference + // Reference ::std::vector< Reference > aAllIndexColumns; lcl_fillIndexColumns(xIndexes,aAllIndexColumns); @@ -1573,11 +1573,11 @@ void getColumnPositions(const Reference& _rxQueryColumns, { // get the real name of the columns Sequence< ::rtl::OUString> aSelNames(_rxQueryColumns->getElementNames()); - const ::rtl::OUString* pSelIter = aSelNames.getConstArray(); - const ::rtl::OUString* pSelEnd = pSelIter + aSelNames.getLength(); + const ::rtl::OUString* pSelIter = aSelNames.getConstArray(); + const ::rtl::OUString* pSelEnd = pSelIter + aSelNames.getLength(); - const ::rtl::OUString* pTblColumnIter = _aColumnNames.getConstArray(); - const ::rtl::OUString* pTblColumnEnd = pTblColumnIter + _aColumnNames.getLength(); + const ::rtl::OUString* pTblColumnIter = _aColumnNames.getConstArray(); + const ::rtl::OUString* pTblColumnEnd = pTblColumnIter + _aColumnNames.getLength(); ::comphelper::UStringMixLess aTmp(o_rColumnNames.key_comp()); @@ -1589,17 +1589,17 @@ void getColumnPositions(const Reference& _rxQueryColumns, ::rtl::OUString sRealName,sTableName; OSL_ENSURE(xQueryColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_REALNAME),"Property REALNAME not available!"); OSL_ENSURE(xQueryColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_TABLENAME),"Property TABLENAME not available!"); - xQueryColumnProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; - xQueryColumnProp->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; + xQueryColumnProp->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xQueryColumnProp->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; for(;pTblColumnIter != pTblColumnEnd;++pTblColumnIter) { if(bCase(sRealName,*pTblColumnIter) && bCase(_rsUpdateTableName,sTableName) && o_rColumnNames.find(*pTblColumnIter) == o_rColumnNames.end()) { sal_Int32 nType = 0; - xQueryColumnProp->getPropertyValue(PROPERTY_TYPE) >>= nType; + xQueryColumnProp->getPropertyValue(PROPERTY_TYPE) >>= nType; sal_Int32 nScale = 0; - xQueryColumnProp->getPropertyValue(PROPERTY_SCALE) >>= nScale; + xQueryColumnProp->getPropertyValue(PROPERTY_SCALE) >>= nScale; ::rtl::OUString sColumnDefault; if ( xQueryColumnProp->getPropertySetInfo()->hasPropertyByName(PROPERTY_DEFAULTVALUE) ) xQueryColumnProp->getPropertyValue(PROPERTY_DEFAULTVALUE) >>= sColumnDefault; diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 3ee20477f63a..a439fb22e1d1 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -85,10 +85,10 @@ namespace dbaccess class OKeySet : public OCacheSet { protected: - OKeySetMatrix m_aKeyMap; - OKeySetMatrix::iterator m_aKeyIter; + OKeySetMatrix m_aKeyMap; + OKeySetMatrix::iterator m_aKeyIter; - ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones + ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching ORowSetValueVector m_aParameterValueForCache; @@ -96,22 +96,22 @@ namespace dbaccess ::std::auto_ptr m_pColumnNames; // contains all column names ::std::auto_ptr m_pParameterNames; // contains all parameter names ::std::auto_ptr m_pForeignColumnNames; // contains all column names of the rest - connectivity::OSQLTable m_xTable; // reference to our table + connectivity::OSQLTable m_xTable; // reference to our table ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess> m_xTableKeys; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer; - ::rtl::OUString m_sUpdateTableName; - ::std::vector< ::rtl::OUString > m_aFilterColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement> m_xStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer; + ::rtl::OUString m_sUpdateTableName; + ::std::vector< ::rtl::OUString > m_aFilterColumns; sal_Bool m_bRowCountFinal; /** getComposedTableName return the composed table name for the query - @param _sCatalog the catalogname may be empty - @param _sSchema the schemaname may be empty - @param _sTable the tablename + @param _sCatalog the catalogname may be empty + @param _sSchema the schemaname may be empty + @param _sTable the tablename @return the composed name */ diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 9433df191294..3609068d794b 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -140,7 +140,7 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: m_pKeyColumnNames->insert(pKeyColumNames->begin(),pKeyColumNames->end()); } - // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first + // the first row is empty because it's now easier for us to distinguish when we are beforefirst or first // without extra variable to be set m_aKeyMap.insert(OKeySetMatrix::value_type(0,OKeySetValue(NULL,::std::pair >(0,NULL)))); m_aKeyIter = m_aKeyMap.begin(); @@ -188,7 +188,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow throw SQLException(); // list all cloumns that should be set static ::rtl::OUString s_sPara(RTL_CONSTASCII_USTRINGPARAM(" = ?")); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -276,7 +276,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn TSQLStatements aParameter; TSQLStatements aKeyConditions; ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); @@ -385,7 +385,7 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); static const ::rtl::OUString s_sAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); ::rtl::OUString aColumnName; ::rtl::OUStringBuffer sKeyCondition,sIndexCondition; ::std::vector aIndexColumnPositions; @@ -662,7 +662,7 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const TSQLStatements aSql; TSQLStatements aKeyConditions; ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::rtl::OUString aQuote = getIdentifierQuoteString(); static ::rtl::OUString aAnd(RTL_CONSTASCII_USTRINGPARAM(" AND ")); ::rtl::OUString sIsNull(RTL_CONSTASCII_USTRINGPARAM(" IS NULL")); ::rtl::OUString sParam(RTL_CONSTASCII_USTRINGPARAM(" = ?")); diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index 3dc4ad4f0e73..6fcefad8d1e6 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -48,8 +48,8 @@ namespace dbaccess // is used when the source supports keys class OptimisticSet : public OKeySet { - ::connectivity::OSQLParser m_aSqlParser; - ::connectivity::OSQLParseTreeIterator m_aSqlIterator; + ::connectivity::OSQLParser m_aSqlParser; + ::connectivity::OSQLParseTreeIterator m_aSqlIterator; ::std::map m_aJoinedColumns; ::std::map m_aJoinedKeyColumns; @@ -58,9 +58,9 @@ namespace dbaccess /** getComposedTableName return the composed table name for the query - @param _sCatalog the catalogname may be empty - @param _sSchema the schemaname may be empty - @param _sTable the tablename + @param _sCatalog the catalogname may be empty + @param _sSchema the schemaname may be empty + @param _sTable the tablename @return the composed name */ diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index d035d1480648..6339b8df52f3 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -109,28 +109,28 @@ extern "C" void SAL_CALL createRegistryInfo_ORowSet() static ::dba::OAutoRegistration< ORowSet > aAutoRegistration; } -#define NOTIFY_LISTERNERS_CHECK(_rListeners,T,method) \ +#define NOTIFY_LISTERNERS_CHECK(_rListeners,T,method) \ Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \ \ - const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ + const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \ \ - _rGuard.clear(); \ - sal_Bool bCheck = sal_True; \ - while( pxInt > pxIntBegin && bCheck ) \ - { \ - try \ - { \ - while( pxInt > pxIntBegin && bCheck ) \ - { \ - --pxInt; \ - bCheck = static_cast< T* >( pxInt->get() )->method(aEvt); \ - } \ - } \ - catch( RuntimeException& ) \ - { \ - } \ - } \ + _rGuard.clear(); \ + sal_Bool bCheck = sal_True; \ + while( pxInt > pxIntBegin && bCheck ) \ + { \ + try \ + { \ + while( pxInt > pxIntBegin && bCheck ) \ + { \ + --pxInt; \ + bCheck = static_cast< T* >( pxInt->get() )->method(aEvt); \ + } \ + } \ + catch( RuntimeException& ) \ + { \ + } \ + } \ _rGuard.reset(); @@ -175,52 +175,52 @@ ORowSet::ORowSet( const Reference< ::com::sun::star::lang::XMultiServiceFactory m_pMySelf = this; m_aActiveConnection <<= m_xActiveConnection; - sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; - sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; - sal_Int32 nBT = PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; + sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; + sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; + sal_Int32 nBT = PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; m_aPrematureParamValues.get().resize( 0 ); // sdb.RowSet Properties - registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); - registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType()); - registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType()); - registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType()); - registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType()); - registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(reinterpret_cast< Reference< XSingleSelectQueryComposer >* >(NULL))); + registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT|PropertyAttribute::BOUND, &m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); + registerProperty(PROPERTY_DATASOURCENAME, PROPERTY_ID_DATASOURCENAME, PropertyAttribute::BOUND, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_COMMAND, PROPERTY_ID_COMMAND, PropertyAttribute::BOUND, &m_aCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_COMMAND_TYPE, PROPERTY_ID_COMMAND_TYPE, PropertyAttribute::BOUND, &m_nCommandType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_ACTIVECOMMAND, PROPERTY_ID_ACTIVECOMMAND, nRBT, &m_aActiveCommand, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_IGNORERESULT, PROPERTY_ID_IGNORERESULT, PropertyAttribute::BOUND, &m_bIgnoreResult, ::getBooleanCppuType()); + registerProperty(PROPERTY_FILTER, PROPERTY_ID_FILTER, PropertyAttribute::BOUND, &m_aFilter, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_HAVING_CLAUSE, PROPERTY_ID_HAVING_CLAUSE, PropertyAttribute::BOUND, &m_aHavingClause, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_GROUP_BY, PROPERTY_ID_GROUP_BY, PropertyAttribute::BOUND, &m_aGroupBy, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_APPLYFILTER, PROPERTY_ID_APPLYFILTER, PropertyAttribute::BOUND, &m_bApplyFilter, ::getBooleanCppuType()); + registerProperty(PROPERTY_ORDER, PROPERTY_ID_ORDER, PropertyAttribute::BOUND, &m_aOrder, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_PRIVILEGES, PROPERTY_ID_PRIVILEGES, nRT, &m_nPrivileges, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_ISMODIFIED, PROPERTY_ID_ISMODIFIED, nBT, &m_bModified, ::getBooleanCppuType()); + registerProperty(PROPERTY_ISNEW, PROPERTY_ID_ISNEW, nRBT, &m_bNew, ::getBooleanCppuType()); + registerProperty(PROPERTY_SINGLESELECTQUERYCOMPOSER,PROPERTY_ID_SINGLESELECTQUERYCOMPOSER, nRT, &m_xComposer, ::getCppuType(reinterpret_cast< Reference< XSingleSelectQueryComposer >* >(NULL))); // sdbcx.ResultSet Properties - registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType()); - registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType()); + registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType()); + registerProperty(PROPERTY_CANUPDATEINSERTEDROWS,PROPERTY_ID_CANUPDATEINSERTEDROWS, nRT, &m_bCanUpdateInsertedRows, ::getBooleanCppuType()); // sdbc.ResultSet Properties - registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::TRANSIENT, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::TRANSIENT, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); // sdbc.RowSet Properties - registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL))); - registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() ); - registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) ); - registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - - registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_URL, PROPERTY_ID_URL, 0, &m_aURL, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_TRANSACTIONISOLATION, PROPERTY_ID_TRANSACTIONISOLATION, PropertyAttribute::TRANSIENT, &m_nTransactionIsolation,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerMayBeVoidProperty(PROPERTY_TYPEMAP, PROPERTY_ID_TYPEMAP, PropertyAttribute::MAYBEVOID|PropertyAttribute::TRANSIENT, &m_aTypeMap, ::getCppuType(reinterpret_cast< Reference< XNameAccess >* >(NULL))); + registerProperty(PROPERTY_ESCAPE_PROCESSING,PROPERTY_ID_ESCAPE_PROCESSING, PropertyAttribute::BOUND, &m_bUseEscapeProcessing,::getBooleanCppuType() ); + registerProperty(PROPERTY_QUERYTIMEOUT, PROPERTY_ID_QUERYTIMEOUT, PropertyAttribute::TRANSIENT, &m_nQueryTimeOut, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_MAXFIELDSIZE, PROPERTY_ID_MAXFIELDSIZE, PropertyAttribute::TRANSIENT, &m_nMaxFieldSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_MAXROWS, PROPERTY_ID_MAXROWS, 0, &m_nMaxRows, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL)) ); + registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT, &m_aUser, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT, &m_aPassword, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + + registerProperty(PROPERTY_UPDATE_CATALOGNAME, PROPERTY_ID_UPDATE_CATALOGNAME, PropertyAttribute::BOUND, &m_aUpdateCatalogName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_UPDATE_SCHEMANAME, PROPERTY_ID_UPDATE_SCHEMANAME, PropertyAttribute::BOUND, &m_aUpdateSchemaName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(PROPERTY_UPDATE_TABLENAME, PROPERTY_ID_UPDATE_TABLENAME, PropertyAttribute::BOUND, &m_aUpdateTableName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); // ??? registerProperty(PROPERTY_CHANGE_NOTIFICATION_ENABLED, PROPERTY_ID_PROPCHANGE_NOTIFY, PropertyAttribute::BOUND, &m_bPropChangeNotifyEnabled, ::getBooleanCppuType()); @@ -288,7 +288,7 @@ void ORowSet::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) c } } -// typedef ::comphelper::OPropertyArrayUsageHelper ORowSet_Prop; +// typedef ::comphelper::OPropertyArrayUsageHelper ORowSet_Prop; void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) { switch(nHandle) @@ -330,7 +330,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const setActiveConnection(xNewConnection, sal_False); } - m_bOwnConnection = sal_False; + m_bOwnConnection = sal_False; m_bRebuildConnOnExecute = sal_False; break; @@ -361,7 +361,7 @@ void SAL_CALL ORowSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const // yes -> the next execute needs to rebuild our connection because of this new property m_bRebuildConnOnExecute = sal_True; else - { // no -> drop our active connection (if we have one) as it doesn't correspond to this new property value anymore + { // no -> drop our active connection (if we have one) as it doesn't correspond to this new property value anymore Reference< XConnection > xNewConn; Any aNewConn; aNewConn <<= xNewConn; @@ -573,7 +573,7 @@ void ORowSet::freeResources( bool _bComplete ) // the columns must be disposed before the querycomposer is disposed because // their owner can be the composer TDataColumns().swap(m_aDataColumns);// clear and resize capacity - m_xColumns = NULL; + m_xColumns = NULL; if ( m_pColumns ) m_pColumns->disposing(); // dispose the composer to avoid that everbody knows that the querycomposer is eol @@ -591,14 +591,14 @@ void ORowSet::freeResources( bool _bComplete ) impl_resetTables_nothrow(); - m_xStatement = NULL; - m_xTypeMap = NULL; + m_xStatement = NULL; + m_xTypeMap = NULL; - m_aBookmark = Any(); - m_bBeforeFirst = sal_True; - m_bAfterLast = sal_False; - m_bNew = sal_False; - m_bModified = sal_False; + m_aBookmark = Any(); + m_bBeforeFirst = sal_True; + m_bAfterLast = sal_False; + m_bNew = sal_False; + m_bModified = sal_False; m_bLastKnownRowCountFinal = sal_False; m_nLastKnownRowCount = 0; if ( m_aOldRow.is() ) @@ -849,7 +849,7 @@ void SAL_CALL ORowSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw } if (!::dbtools::implUpdateObject(this, columnIndex, aNewValue)) - { // there is no other updateXXX call which can handle the value in x + { // there is no other updateXXX call which can handle the value in x ORowSetValueVector::Vector& rRow = ((*m_aCurrentRow)->get()); ORowSetNotifier aNotify(this,rRow); m_pCache->updateObject(columnIndex,aNewValue,rRow,aNotify.getChangedColumns()); @@ -963,8 +963,8 @@ void SAL_CALL ORowSet::updateRow( ) throw(SQLException, RuntimeException) if ( !aBookmarks.empty() ) aEvt.Bookmarks = Sequence(&(*aBookmarks.begin()),aBookmarks.size()); aEvt.Rows += aBookmarks.size(); - m_aBookmark = m_pCache->getBookmark(); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aBookmark = m_pCache->getBookmark(); + m_aCurrentRow = m_pCache->m_aMatrixIter; if ( m_pCache->m_aMatrixIter != m_pCache->getEnd() && (*m_pCache->m_aMatrixIter).is() ) { if ( m_pCache->isResultSetChanged() ) @@ -1072,8 +1072,8 @@ void ORowSet::implCancelRowUpdates( sal_Bool _bNotifyModified ) SAL_THROW( ( SQL m_pCache->cancelRowUpdates(); - m_aBookmark = m_pCache->getBookmark(); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aBookmark = m_pCache->getBookmark(); + m_aCurrentRow = m_pCache->m_aMatrixIter; m_aCurrentRow.setBookmark(m_aBookmark); // notification order @@ -1304,7 +1304,7 @@ const ORowSetValue& ORowSet::getInsertValue(sal_Int32 columnIndex) checkCache(); if ( m_pCache && isInsertRow() ) - return ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex]; + return ((*m_pCache->m_aInsertRow)->get())[m_nLastColumnIndex = columnIndex]; return getValue(columnIndex); } @@ -1779,8 +1779,8 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi // do we need a new statement if ( m_bCommandFacetsDirty ) { - m_xStatement = NULL; - m_xComposer = NULL; + m_xStatement = NULL; + m_xComposer = NULL; Reference< XResultSet > xResultSet( impl_prepareAndExecute_throw() ); @@ -1804,14 +1804,14 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi m_pCache->m_nPrivileges = Privilege::SELECT; } m_pCache->setMaxRowSize(m_nFetchSize); - m_aCurrentRow = m_pCache->createIterator(this); + m_aCurrentRow = m_pCache->createIterator(this); m_aOldRow = m_pCache->registerOldRow(); } // get the locale - // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager(); + // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager(); Locale aLocale = SvtSysLocale().GetLocaleData().getLocale(); - // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale; + // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale; // get the numberformatTypes OSL_ENSURE(m_xActiveConnection.is(),"No ActiveConnection"); @@ -1856,7 +1856,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi } sName = sAlias; } - ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(), + ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(), this, this, i+1, @@ -1960,7 +1960,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi { xColumn->getPropertyValue(PROPERTY_LABEL) >>= sParseLabel; } - ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(), + ORowSetDataColumn* pColumn = new ORowSetDataColumn( getMetaData(), this, this, i, @@ -2366,9 +2366,9 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw() } ::rtl::OUString aCatalog,aSchema,aTable; - xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME) >>= aCatalog; - xQuery->getPropertyValue(PROPERTY_UPDATE_SCHEMANAME) >>= aSchema; - xQuery->getPropertyValue(PROPERTY_UPDATE_TABLENAME) >>= aTable; + xQuery->getPropertyValue(PROPERTY_UPDATE_CATALOGNAME) >>= aCatalog; + xQuery->getPropertyValue(PROPERTY_UPDATE_SCHEMANAME) >>= aSchema; + xQuery->getPropertyValue(PROPERTY_UPDATE_TABLENAME) >>= aTable; if(aTable.getLength()) m_aUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), aCatalog, aSchema, aTable, sal_False, ::dbtools::eInDataManipulation ); } @@ -2584,7 +2584,7 @@ void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Refer void SAL_CALL ORowSet::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException) { if ( !::dbtools::implSetObject( this, parameterIndex, x ) ) - { // there is no other setXXX call which can handle the value in x + { // there is no other setXXX call which can handle the value in x throw SQLException(); } } @@ -2739,16 +2739,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo { DBG_CTOR(ORowSetClone, NULL); - m_nResultSetType = rParent.m_nResultSetType; + m_nResultSetType = rParent.m_nResultSetType; m_nResultSetConcurrency = ResultSetConcurrency::READ_ONLY; - m_pMySelf = this; - m_bClone = sal_True; - m_bBeforeFirst = rParent.m_bBeforeFirst; - m_bAfterLast = rParent.m_bAfterLast; - m_pCache = rParent.m_pCache; - m_aBookmark = rParent.m_aBookmark; - m_aCurrentRow = m_pCache->createIterator(this); - m_xNumberFormatTypes = rParent.m_xNumberFormatTypes; + m_pMySelf = this; + m_bClone = sal_True; + m_bBeforeFirst = rParent.m_bBeforeFirst; + m_bAfterLast = rParent.m_bAfterLast; + m_pCache = rParent.m_pCache; + m_aBookmark = rParent.m_aBookmark; + m_aCurrentRow = m_pCache->createIterator(this); + m_xNumberFormatTypes = rParent.m_xNumberFormatTypes; m_aOldRow = m_pCache->registerOldRow(); @@ -2756,16 +2756,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo ::std::vector< ::rtl::OUString> aNames; ::rtl::OUString aDescription; - // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager(); - // Locale aLocale; - // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale; + // ConfigManager* pConfigMgr = ConfigManager::GetConfigManager(); + // Locale aLocale; + // pConfigMgr->GetDirectConfigProperty(ConfigManager::LOCALE) >>= aLocale; Locale aLocale = SvtSysLocale().GetLocaleData().getLocale(); if ( rParent.m_pColumns ) { Sequence< ::rtl::OUString> aSeq = rParent.m_pColumns->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pIter = aSeq.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); aColumns->get().reserve(aSeq.getLength()+1); for(sal_Int32 i=1;pIter != pEnd ;++pIter,++i) { @@ -2776,7 +2776,7 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo ::rtl::OUString sParseLabel; xColumn->getPropertyValue(PROPERTY_LABEL) >>= sParseLabel; - ORowSetColumn* pColumn = new ORowSetColumn( rParent.getMetaData(), + ORowSetColumn* pColumn = new ORowSetColumn( rParent.getMetaData(), this, i, rParent.m_xActiveConnection->getMetaData(), @@ -2807,16 +2807,16 @@ ORowSetClone::ORowSetClone( const ::comphelper::ComponentContext& _rContext, ORo m_pColumns = new ORowSetDataColumns(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(), aColumns,*this,m_aMutex,aNames); - sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; + sal_Int32 nRT = PropertyAttribute::READONLY | PropertyAttribute::TRANSIENT; // sdb.RowSet Properties - // registerProperty(PROPERTY_CURSORNAME, PROPERTY_ID_CURSORNAME, PropertyAttribute::READONLY, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); - registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); - registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); - registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType()); + // registerProperty(PROPERTY_CURSORNAME, PROPERTY_ID_CURSORNAME, PropertyAttribute::READONLY, &m_aDataSourceName, ::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerMayBeVoidProperty(PROPERTY_ACTIVE_CONNECTION,PROPERTY_ID_ACTIVE_CONNECTION, PropertyAttribute::MAYBEVOID|PropertyAttribute::READONLY, &rParent.m_aActiveConnection, ::getCppuType(reinterpret_cast< Reference< XConnection >* >(NULL))); + registerProperty(PROPERTY_RESULTSETCONCURRENCY, PROPERTY_ID_RESULTSETCONCURRENCY, PropertyAttribute::READONLY, &m_nResultSetConcurrency,::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_RESULTSETTYPE, PROPERTY_ID_RESULTSETTYPE, PropertyAttribute::READONLY, &m_nResultSetType, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_FETCHDIRECTION, PROPERTY_ID_FETCHDIRECTION, PropertyAttribute::TRANSIENT, &m_nFetchDirection, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_FETCHSIZE, PROPERTY_ID_FETCHSIZE, PropertyAttribute::TRANSIENT, &m_nFetchSize, ::getCppuType(reinterpret_cast< sal_Int32*>(NULL))); + registerProperty(PROPERTY_ISBOOKMARKABLE, PROPERTY_ID_ISBOOKMARKABLE, nRT, &m_bIsBookmarable, ::getBooleanCppuType()); } ORowSetClone::~ORowSetClone() @@ -2874,8 +2874,8 @@ void ORowSetClone::disposing() MutexGuard aGuard( m_aMutex ); ORowSetBase::disposing(); - m_pParent = NULL; - m_pMutex = &m_aMutex; // this must be done here because someone could hold a ref to us and try to do something + m_pParent = NULL; + m_pMutex = &m_aMutex; // this must be done here because someone could hold a ref to us and try to do something OSubComponent::disposing(); } diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index b686bc65a0e5..5047acd9a775 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -60,38 +60,38 @@ namespace dbaccess { - typedef ::cppu::WeakAggComponentImplHelper12 < ::com::sun::star::sdb::XResultSetAccess - , ::com::sun::star::sdb::XRowSetApproveBroadcaster - , ::com::sun::star::sdb::XRowsChangeBroadcaster - , ::com::sun::star::sdbcx::XDeleteRows - , ::com::sun::star::sdbc::XParameters - , ::com::sun::star::lang::XEventListener - , ::com::sun::star::sdbc::XResultSetUpdate - , ::com::sun::star::sdbc::XRowUpdate - , ::com::sun::star::util::XCancellable - , ::com::sun::star::sdb::XCompletedExecution - , ::com::sun::star::sdb::XParametersSupplier - , ::com::sun::star::sdbc::XWarningsSupplier - > ORowSet_BASE1; + typedef ::cppu::WeakAggComponentImplHelper12 < ::com::sun::star::sdb::XResultSetAccess + , ::com::sun::star::sdb::XRowSetApproveBroadcaster + , ::com::sun::star::sdb::XRowsChangeBroadcaster + , ::com::sun::star::sdbcx::XDeleteRows + , ::com::sun::star::sdbc::XParameters + , ::com::sun::star::lang::XEventListener + , ::com::sun::star::sdbc::XResultSetUpdate + , ::com::sun::star::sdbc::XRowUpdate + , ::com::sun::star::util::XCancellable + , ::com::sun::star::sdb::XCompletedExecution + , ::com::sun::star::sdb::XParametersSupplier + , ::com::sun::star::sdbc::XWarningsSupplier + > ORowSet_BASE1; class OTableContainer; - class ORowSet : public comphelper::OBaseMutex + class ORowSet : public comphelper::OBaseMutex , public ORowSet_BASE1 , public ORowSetBase , public ::comphelper::OPropertyArrayUsageHelper { friend class ORowSetClone; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOldConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; - ::com::sun::star::uno::Any m_aActiveConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTypeMap; - ::com::sun::star::uno::Any m_aTypeMap; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; // the columns from a table or query + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOldConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; + ::com::sun::star::uno::Any m_aActiveConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTypeMap; + ::com::sun::star::uno::Any m_aTypeMap; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > m_xStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xComposer; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumns; // the columns from a table or query - connectivity::OWeakRefArray m_aClones; + connectivity::OWeakRefArray m_aClones; /** our parameters as XPropertySet instances and ORowSetValue instances */ ::dbtools::param::ParametersContainerRef m_pParameters; @@ -103,49 +103,49 @@ namespace dbaccess ::std::bit_vector m_aParametersSet; ::std::bit_vector m_aReadOnlyDataColumns; - ::cppu::OInterfaceContainerHelper m_aRowsetListeners; - ::cppu::OInterfaceContainerHelper m_aApproveListeners; - ::cppu::OInterfaceContainerHelper m_aRowsChangeListener; + ::cppu::OInterfaceContainerHelper m_aRowsetListeners; + ::cppu::OInterfaceContainerHelper m_aApproveListeners; + ::cppu::OInterfaceContainerHelper m_aRowsChangeListener; ::dbtools::WarningsContainer m_aWarnings; - OTableContainer* m_pTables; - - rtl::OUString m_aCommand; - rtl::OUString m_aDataSourceName; - rtl::OUString m_aURL; - rtl::OUString m_aUser; - rtl::OUString m_aPassword; - rtl::OUString m_aFilter; - rtl::OUString m_aHavingClause; - rtl::OUString m_aGroupBy; - rtl::OUString m_aOrder; - rtl::OUString m_aActiveCommand; - rtl::OUString m_aCursorName; - rtl::OUString m_aUpdateCatalogName; // is set by a query - rtl::OUString m_aUpdateSchemaName; // is set by a query - rtl::OUString m_aUpdateTableName; // is set by a query - - sal_Int32 m_nFetchDirection; - sal_Int32 m_nFetchSize; - sal_Int32 m_nMaxFieldSize; - sal_Int32 m_nMaxRows; - sal_Int32 m_nQueryTimeOut; - sal_Int32 m_nCommandType; - sal_Int32 m_nTransactionIsolation; - sal_Int32 m_nPrivileges; + OTableContainer* m_pTables; + + rtl::OUString m_aCommand; + rtl::OUString m_aDataSourceName; + rtl::OUString m_aURL; + rtl::OUString m_aUser; + rtl::OUString m_aPassword; + rtl::OUString m_aFilter; + rtl::OUString m_aHavingClause; + rtl::OUString m_aGroupBy; + rtl::OUString m_aOrder; + rtl::OUString m_aActiveCommand; + rtl::OUString m_aCursorName; + rtl::OUString m_aUpdateCatalogName; // is set by a query + rtl::OUString m_aUpdateSchemaName; // is set by a query + rtl::OUString m_aUpdateTableName; // is set by a query + + sal_Int32 m_nFetchDirection; + sal_Int32 m_nFetchSize; + sal_Int32 m_nMaxFieldSize; + sal_Int32 m_nMaxRows; + sal_Int32 m_nQueryTimeOut; + sal_Int32 m_nCommandType; + sal_Int32 m_nTransactionIsolation; + sal_Int32 m_nPrivileges; sal_Int32 m_nLastKnownRowCount; oslInterlockedCount m_nInAppend; sal_Bool m_bLastKnownRowCountFinal; - sal_Bool m_bUseEscapeProcessing ; - sal_Bool m_bApplyFilter ; - sal_Bool m_bCommandFacetsDirty; // any of the facets which define the active command is dirty - sal_Bool m_bModified ; - sal_Bool m_bRebuildConnOnExecute ; - sal_Bool m_bIsBookmarable ; - sal_Bool m_bNew ; - sal_Bool m_bCanUpdateInsertedRows; - sal_Bool m_bOwnConnection; + sal_Bool m_bUseEscapeProcessing ; + sal_Bool m_bApplyFilter ; + sal_Bool m_bCommandFacetsDirty; // any of the facets which define the active command is dirty + sal_Bool m_bModified ; + sal_Bool m_bRebuildConnOnExecute ; + sal_Bool m_bIsBookmarable ; + sal_Bool m_bNew ; + sal_Bool m_bCanUpdateInsertedRows; + sal_Bool m_bOwnConnection; sal_Bool m_bPropChangeNotifyEnabled; private: @@ -246,10 +246,10 @@ namespace dbaccess virtual void notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& _rGuard); virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard); - virtual void doCancelModification( ); - virtual sal_Bool isModification( ); - virtual sal_Bool isModified( ); - virtual sal_Bool isNew( ); + virtual void doCancelModification( ); + virtual sal_Bool isModification( ); + virtual sal_Bool isModified( ); + virtual sal_Bool isNew( ); virtual sal_Bool isPropertyChangeNotificationEnabled() const; virtual ~ORowSet(); @@ -411,14 +411,14 @@ namespace dbaccess protected: /** implement the execute, without calling the approve listeners and without building a new connection - @param _rClearForNotification mutex to clear before doing the final notifications + @param _rClearForNotification mutex to clear before doing the final notifications */ - void execute_NoApprove_NoNewConn(::osl::ResettableMutexGuard& _rClearForNotification); + void execute_NoApprove_NoNewConn(::osl::ResettableMutexGuard& _rClearForNotification); /** call the RowSetApproveListeners

throws an RowSetVetoException if one of the listeners vetoed */ - void approveExecution() throw (::com::sun::star::sdb::RowSetVetoException, ::com::sun::star::uno::RuntimeException); + void approveExecution() throw (::com::sun::star::sdb::RowSetVetoException, ::com::sun::star::uno::RuntimeException); /// set m_xActiveConnection, fire a PropertyChangeEvent if necessary, do the event listener handling etc void setActiveConnection( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxNewConn, sal_Bool _bFireEvent = sal_True ); @@ -473,17 +473,17 @@ namespace dbaccess ,public ::comphelper::OPropertyArrayUsageHelper < ORowSetClone > { protected: - ORowSet* m_pParent; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nFetchSize; - sal_Bool m_bIsBookmarable; + ORowSet* m_pParent; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nFetchSize; + sal_Bool m_bIsBookmarable; protected: // the clone can not insert anything - virtual void doCancelModification( ); - virtual sal_Bool isModification( ); - virtual sal_Bool isModified( ); - virtual sal_Bool isNew( ); + virtual void doCancelModification( ); + virtual sal_Bool isModification( ); + virtual sal_Bool isModified( ); + virtual sal_Bool isNew( ); virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); public: diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index f27dc80b5a64..efb3320a5616 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -115,7 +115,7 @@ ORowSetBase::ORowSetBase( const ::comphelper::ComponentContext& _rContext, ::cpp RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::ORowSetBase" ); DBG_CTOR(ORowSetBase,NULL); - sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; + sal_Int32 nRBT = PropertyAttribute::READONLY | PropertyAttribute::BOUND | PropertyAttribute::TRANSIENT; sal_Int32 nInitialRowCountValue = 0; sal_Bool bInitialRowCountFinalValue( sal_False ); @@ -254,7 +254,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) { // currentrow is null when the clone moves the window positionCache( MOVE_NONE_REFRESH_ONLY ); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getValue: we don't stand on a valid row! Row is null."); bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is() ); @@ -395,7 +395,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS if ( !bValidCurrentRow ) { positionCache( MOVE_NONE_REFRESH_ONLY ); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"ORowSetBase::getBinaryStream: we don't stand on a valid row! Row is null."); bValidCurrentRow = ( !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is() ); @@ -844,7 +844,7 @@ void SAL_CALL ORowSetBase::afterLast( ) throw(SQLException, RuntimeException) DBG_TRACE2("DBACCESS ORowSetBase::afterLast() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); } -sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t& _aCheckFunctor, +sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t& _aCheckFunctor, ::std::mem_fun_t& _aMovementFunctor) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::move" ); @@ -877,7 +877,7 @@ sal_Bool SAL_CALL ORowSetBase::move( ::std::mem_fun_t& setCurrentRow( bMoved, sal_True, aOldValues, aGuard ); } else - { // first goes wrong so there is no row + { // first goes wrong so there is no row movementFailed(); } @@ -1106,15 +1106,15 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::setCurrentRow" ); DBG_TRACE2("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); - m_bBeforeFirst = m_pCache->isBeforeFirst(); - m_bAfterLast = m_pCache->isAfterLast(); + m_bBeforeFirst = m_pCache->isBeforeFirst(); + m_bAfterLast = m_pCache->isAfterLast(); //m_pCache->resetInsertRow(sal_True); if(!(m_bBeforeFirst || m_bAfterLast)) { - m_aBookmark = m_pCache->getBookmark(); + m_aBookmark = m_pCache->getBookmark(); OSL_ENSURE(m_aBookmark.hasValue(),"Bookmark has no value!"); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is null!"); m_aCurrentRow.setBookmark(m_aBookmark); OSL_ENSURE(!m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd(),"Position of matrix iterator isn't valid!"); @@ -1129,7 +1129,7 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR sal_Int32 nNewRow = m_pCache->getRow(); #endif OSL_ENSURE(nOldRow == nNewRow,"Old position is not equal to new postion"); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!"); #if OSL_DEBUG_LEVEL > 0 ORowSetRow rRow = (*m_aCurrentRow); @@ -1140,15 +1140,15 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR if ( _bMoved && m_aCurrentRow.isNull() ) { positionCache( MOVE_NONE_REFRESH_ONLY ); - m_aCurrentRow = m_pCache->m_aMatrixIter; + m_aCurrentRow = m_pCache->m_aMatrixIter; OSL_ENSURE(!m_aCurrentRow.isNull(),"CurrentRow is nul after positionCache!"); } } else { m_aOldRow->clearRow(); - m_aCurrentRow = m_pCache->getEnd(); - m_aBookmark = Any(); + m_aCurrentRow = m_pCache->getEnd(); + m_aBookmark = Any(); m_aCurrentRow.setBookmark(m_aBookmark); } @@ -1401,10 +1401,10 @@ void ORowSetBase::movementFailed() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::movementFailed" ); DBG_TRACE2("DBACCESS ORowSetBase::movementFailed() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); m_aOldRow->clearRow(); - m_aCurrentRow = m_pCache->getEnd(); - m_bBeforeFirst = m_pCache->isBeforeFirst(); - m_bAfterLast = m_pCache->isAfterLast(); - m_aBookmark = Any(); + m_aCurrentRow = m_pCache->getEnd(); + m_bBeforeFirst = m_pCache->isBeforeFirst(); + m_bAfterLast = m_pCache->isAfterLast(); + m_aBookmark = Any(); m_aCurrentRow.setBookmark(m_aBookmark); OSL_ENSURE(m_bBeforeFirst || m_bAfterLast,"BeforeFirst or AfterLast is wrong!"); DBG_TRACE2("DBACCESS ORowSetBase::movementFailed() Clone = %i ID = %i\n",m_bClone,osl_getThreadIdentifier(NULL)); @@ -1416,7 +1416,7 @@ ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew) OSL_ENSURE(m_aOldRow.is(),"RowSetRowHElper isn't valid!"); ORowSetRow aOldValues; if ( !_bWasNew && m_aOldRow->getRow().is() ) - aOldValues = new ORowSetValueVector( *(m_aOldRow->getRow())); // remember the old values + aOldValues = new ORowSetValueVector( *(m_aOldRow->getRow())); // remember the old values return aOldValues; } @@ -1459,8 +1459,8 @@ void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos ) if ( compareBookmarks( _rBookmark, m_aBookmark ) == 0 ) { m_aOldRow->clearRow(); - m_aCurrentRow = m_pCache->getEnd(); - m_aBookmark = Any(); + m_aCurrentRow = m_pCache->getEnd(); + m_aBookmark = Any(); m_aCurrentRow.setBookmark( m_aBookmark ); } } @@ -1496,8 +1496,8 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet ) OSL_ENSURE( m_pRowSet, "ORowSetNotifier::ORowSetNotifier: invalid row set. This wil crash." ); // remember the "inserted" and "modified" state for later firing - m_bWasNew = m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ); - m_bWasModified = m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ); + m_bWasNew = m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ); + m_bWasModified = m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ); // if the row set is on the insert row, then we need to cancel this if ( m_pRowSet->isModification( ORowSetBase::GrantNotifierAccess() ) ) @@ -1530,13 +1530,13 @@ void ORowSetNotifier::fire() // we're not interested in firing changes FALSE->TRUE, only TRUE->FALSE. // (the former would be quite pathological, e.g. after a failed movement) - if ( m_bWasModified - && ( m_bWasModified != m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ) ) + if ( m_bWasModified + && ( m_bWasModified != m_pRowSet->isModified( ORowSetBase::GrantNotifierAccess() ) ) ) m_pRowSet->fireProperty( PROPERTY_ID_ISMODIFIED, sal_False, sal_True, ORowSetBase::GrantNotifierAccess() ); - if ( m_bWasNew - && ( m_bWasNew != m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ) ) + if ( m_bWasNew + && ( m_bWasNew != m_pRowSet->isNew( ORowSetBase::GrantNotifierAccess() ) ) ) m_pRowSet->fireProperty( PROPERTY_ID_ISNEW, sal_False, sal_True, ORowSetBase::GrantNotifierAccess() ); @@ -1570,6 +1570,6 @@ void ORowSetNotifier::firePropertyChange() m_pRowSet->fireProperty(PROPERTY_ID_ISMODIFIED,sal_True,sal_False, ORowSetBase::GrantNotifierAccess()); } } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 58e2765d3aea..516d461123b3 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -64,7 +64,7 @@ namespace dbaccess { class OEmptyCollection; - typedef ::cppu::ImplHelper10< ::com::sun::star::sdbcx::XRowLocate, + typedef ::cppu::ImplHelper10< ::com::sun::star::sdbcx::XRowLocate, ::com::sun::star::sdbc::XRow, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::sdbc::XWarningsSupplier, @@ -85,38 +85,38 @@ namespace dbaccess { OModuleClient m_aModuleClient; protected: - typedef ::std::vector TDataColumns; - ::osl::Mutex* m_pMutex; // this the mutex form the rowset itself - ::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes + typedef ::std::vector TDataColumns; + ::osl::Mutex* m_pMutex; // this the mutex form the rowset itself + ::osl::Mutex m_aRowCountMutex, // mutex for rowcount changes // we need a extra mutex for columns to prevend deadlock when setting new values // for a row m_aColumnsMutex; - ::com::sun::star::uno::Any m_aBookmark; - ORowSetCacheIterator m_aCurrentRow; // contains the actual fetched row - TORowSetOldRowHelperRef m_aOldRow; - TDataColumns m_aDataColumns; // holds the columns as m_pColumns but know the implementation class - connectivity::ORowSetValue m_aEmptyValue; // only for error case + ::com::sun::star::uno::Any m_aBookmark; + ORowSetCacheIterator m_aCurrentRow; // contains the actual fetched row + TORowSetOldRowHelperRef m_aOldRow; + TDataColumns m_aDataColumns; // holds the columns as m_pColumns but know the implementation class + connectivity::ORowSetValue m_aEmptyValue; // only for error case - ::cppu::OWeakObject* m_pMySelf; // set by derived classes - ORowSetCache* m_pCache; // the cache is used by the rowset and his clone (shared) - ORowSetDataColumns* m_pColumns; // represent the select columns - ::cppu::OBroadcastHelper& m_rBHelper; // must be set from the derived classes + ::cppu::OWeakObject* m_pMySelf; // set by derived classes + ORowSetCache* m_pCache; // the cache is used by the rowset and his clone (shared) + ORowSetDataColumns* m_pColumns; // represent the select columns + ::cppu::OBroadcastHelper& m_rBHelper; // must be set from the derived classes // is used when the formatkey for database types is set - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes> m_xNumberFormatTypes; - OEmptyCollection* m_pEmptyCollection; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatTypes> m_xNumberFormatTypes; + OEmptyCollection* m_pEmptyCollection; ::comphelper::ComponentContext m_aContext; ::connectivity::SQLError m_aErrors; - sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull() - sal_Int32 m_nDeletedPosition; // is set only when a row was deleted - sal_Int32 m_nResultSetType; // fetch property + sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull() + sal_Int32 m_nDeletedPosition; // is set only when a row was deleted + sal_Int32 m_nResultSetType; // fetch property sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bClone; // I'm clone or not - sal_Bool m_bIgnoreResult ; - sal_Bool m_bBeforeFirst : 1; - sal_Bool m_bAfterLast : 1; + sal_Bool m_bClone; // I'm clone or not + sal_Bool m_bIgnoreResult ; + sal_Bool m_bBeforeFirst : 1; + sal_Bool m_bAfterLast : 1; protected: ORowSetBase( @@ -141,14 +141,14 @@ namespace dbaccess virtual void notifyAllListeners(::osl::ResettableMutexGuard& _rGuard); // cancel the insertion, if necessary (means if we're on the insert row) - virtual void doCancelModification( ) = 0; + virtual void doCancelModification( ) = 0; // return if and only if we're using the insert row (means: we're updating _or_ inserting) - virtual sal_Bool isModification( ) = 0; + virtual sal_Bool isModification( ) = 0; // return if and only if the current row is modified // TODO: isn't this the same as isModification? - virtual sal_Bool isModified( ) = 0; + virtual sal_Bool isModified( ) = 0; // return if and only if the current row is the insert row - virtual sal_Bool isNew( ) = 0; + virtual sal_Bool isNew( ) = 0; // return if the property change notification should be fired // upon property change. virtual sal_Bool isPropertyChangeNotificationEnabled() const; @@ -202,14 +202,14 @@ namespace dbaccess ORowSetRow getOldRow(sal_Bool _bWasNew); /** move the cache the postion defined by the member functor - @param _aCheckFunctor + @param _aCheckFunctor Return when we already stand on the row we want to. - @param _aMovementFunctor + @param _aMovementFunctor The mehtod used to move. @return if movement was successful. */ - sal_Bool SAL_CALL move( ::std::mem_fun_t& _aCheckFunctor, + sal_Bool SAL_CALL move( ::std::mem_fun_t& _aCheckFunctor, ::std::mem_fun_t& _aMovementFunctor); /** same meaning as isFirst. Only need by mem_fun @@ -341,22 +341,22 @@ namespace dbaccess struct GrantNotifierAccess { friend class ORowSetNotifier; private: GrantNotifierAccess () { } }; // cancel the insertion, if necessary (means if we're on the insert row) - inline void doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); } - inline sal_Bool isModification( const GrantNotifierAccess& ) { return isModification(); } - inline sal_Bool isModified( const GrantNotifierAccess& ) { return isModified(); } - inline sal_Bool isNew( const GrantNotifierAccess& ) { return isNew(); } - inline sal_Bool isInsertRow() { return isNew() || isModified(); } - inline void fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld, const GrantNotifierAccess& ) + inline void doCancelModification( const GrantNotifierAccess& ) { doCancelModification(); } + inline sal_Bool isModification( const GrantNotifierAccess& ) { return isModification(); } + inline sal_Bool isModified( const GrantNotifierAccess& ) { return isModified(); } + inline sal_Bool isNew( const GrantNotifierAccess& ) { return isNew(); } + inline sal_Bool isInsertRow() { return isNew() || isModified(); } + inline void fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld, const GrantNotifierAccess& ) { fireProperty( _nProperty, _bNew, _bOld ); } - inline void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& ) + inline void firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rNewValue, const GrantNotifierAccess& ) { firePropertyChange(_nPos,_rNewValue); } using ::comphelper::OPropertyStateContainer::getFastPropertyValue; - ::osl::Mutex* getMutex() const { return m_pMutex; } + ::osl::Mutex* getMutex() const { return m_pMutex; } }; // ======================================================================== @@ -369,14 +369,14 @@ namespace dbaccess { private: ::std::auto_ptr m_pImpl; - ORowSetBase* m_pRowSet; + ORowSetBase* m_pRowSet; // not aquired! This is not necessary because this class here is to be used on the stack within // a method of ORowSetBase (or derivees) - sal_Bool m_bWasNew; - sal_Bool m_bWasModified; + sal_Bool m_bWasNew; + sal_Bool m_bWasModified; #ifdef DBG_UTIL - sal_Bool m_bNotifyCalled; + sal_Bool m_bNotifyCalled; #endif public: @@ -403,7 +403,7 @@ namespace dbaccess @see ORowSetBase::notifyCancelInsert */ - void fire(); + void fire(); /** notifies value change events and notifies IsModified @param i_aChangedColumns the index of the changed value columns diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index 3710a0e0c108..6ff4fdaa584c 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,8 +86,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, const ::comphelper::ComponentContext& _rContext, const ::rtl::OUString& _rUpdateTableName, - sal_Bool& _bModified, - sal_Bool& _bNew, + sal_Bool& _bModified, + sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, const ::rtl::OUString& i_sRowSetFilter) :m_xSet(_xRs) @@ -170,7 +170,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!"); Reference xTables = xTabSup->getTables(); Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames(); - if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet ) + if ( aTableNames.getLength() > 1 && !_rUpdateTableName.getLength() && bNeedKeySet ) {// here we have a join or union and nobody told us which table to update, so we update them all m_nPrivileges = Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE; OptimisticSet* pCursor = new OptimisticSet(m_aContext,xConnection,_xAnalyzer,_aParameterValueForCache); @@ -279,8 +279,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, Reference xMeta = xConnection->getMetaData(); SelectColumnsMetaData aColumnNames(xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers() ? true : false); Reference xColSup(_xAnalyzer,UNO_QUERY); - Reference xSelColumns = xColSup->getColumns(); - Reference xColumns = m_aUpdateTable->getColumns(); + Reference xSelColumns = xColSup->getColumns(); + Reference xColumns = m_aUpdateTable->getColumns(); ::dbaccess::getColumnPositions(xSelColumns,xColumns->getElementNames(),aUpdateTableName,aColumnNames); // check privileges @@ -288,8 +288,8 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, sal_Bool bNoInsert = sal_False; Sequence< ::rtl::OUString> aNames(xColumns->getElementNames()); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { Reference xColumn(xColumns->getByName(*pIter),UNO_QUERY); @@ -362,9 +362,9 @@ ORowSetCache::~ORowSetCache() m_pInsertMatrix->clear(); delete m_pInsertMatrix; } - m_xSet = WeakReference< XResultSet>(); - m_xMetaData = NULL; - m_aUpdateTable = NULL; + m_xSet = WeakReference< XResultSet>(); + m_xMetaData = NULL; + m_aUpdateTable = NULL; DBG_DTOR(ORowSetCache,NULL); } @@ -383,7 +383,7 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize) m_aMatrixEnd = m_pMatrix->end(); m_pInsertMatrix = new ORowSetMatrix(1); // a little bit overkill but ??? :-) - m_aInsertRow = m_pInsertMatrix->end(); + m_aInsertRow = m_pInsertMatrix->end(); } else { @@ -416,7 +416,7 @@ void ORowSetCache::setMaxRowSize(sal_Int32 _nSize) // now adjust their positions because a resize invalid all iterators ::std::vector::const_iterator aIter = aPositions.begin(); ::std::map::const_iterator aPosChangeIter = aCacheIterToChange.begin(); - for( aCacheIter = m_aCacheIterators.begin(); + for( aCacheIter = m_aCacheIterators.begin(); aPosChangeIter != aCacheIterToChange.end(); ++aPosChangeIter,++aCacheIter) { @@ -480,7 +480,7 @@ sal_Bool ORowSetCache::moveToBookmark( const Any& bookmark ) if ( m_pCacheSet->moveToBookmark(bookmark) ) { m_bBeforeFirst = sal_False; - m_nPosition = m_pCacheSet->getRow(); + m_nPosition = m_pCacheSet->getRow(); checkPositionFlags(); @@ -512,7 +512,7 @@ sal_Bool ORowSetCache::moveRelativeToBookmark( const Any& bookmark, sal_Int32 ro { m_nPosition = m_pCacheSet->getRow() + rows; absolute(m_nPosition); - // for(sal_Int32 i=0;iend();++i,++m_aMatrixIter) ; + // for(sal_Int32 i=0;iend();++i,++m_aMatrixIter) ; bRet = m_aMatrixIter != m_pMatrix->end() && (*m_aMatrixIter).is(); } @@ -592,7 +592,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x ,ORowSetValueVector::Vector& io_aRow - ,::std::vector& o_ChangedColumns + ,::std::vector& o_ChangedColumns ) { checkUpdateConditions(columnIndex); @@ -649,7 +649,7 @@ sal_Bool ORowSetCache::next( ) sal_Bool ORowSetCache::isBeforeFirst( ) { - // return !m_nPosition; + // return !m_nPosition; return m_bBeforeFirst; } @@ -668,7 +668,7 @@ sal_Bool ORowSetCache::isFirst( ) sal_Bool ORowSetCache::isLast( ) { - // return m_bRowCountFinal ? (m_nPosition==m_nRowCount) : m_pCacheSet->isLast(); + // return m_bRowCountFinal ? (m_nPosition==m_nRowCount) : m_pCacheSet->isLast(); return m_nPosition == m_nRowCount; } @@ -679,9 +679,9 @@ sal_Bool ORowSetCache::beforeFirst( ) if(!m_bBeforeFirst) { - m_bAfterLast = sal_False; - m_nPosition = 0; - m_bBeforeFirst = sal_True; + m_bAfterLast = sal_False; + m_nPosition = 0; + m_bBeforeFirst = sal_True; m_pCacheSet->beforeFirst(); moveWindow(); m_aMatrixIter = m_pMatrix->end(); @@ -729,7 +729,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos m_pCacheSet->fillValueRow(*aIter,i); } else - { // there are no more rows found so we can fetch some before start + { // there are no more rows found so we can fetch some before start if(!m_bRowCountFinal) { @@ -764,7 +764,7 @@ sal_Bool ORowSetCache::fillMatrix(sal_Int32& _nNewStartPos,sal_Int32 _nNewEndPos } bCheck = m_pCacheSet->next(); } - // m_nStartPos = _nNewStartPos; + // m_nStartPos = _nNewStartPos; // we have to read one row forward to enshure that we know when we are on last row // but only when we don't know it already if(!m_bRowCountFinal) @@ -788,17 +788,17 @@ sal_Bool ORowSetCache::moveWindow() sal_Bool bRet = sal_True; sal_Int32 nDiff = (sal_Int32)(m_nFetchSize*0.5 -0.5); - sal_Int32 nNewStartPos = (m_nPosition - nDiff); - // sal_Int32 nNewEndPos = (m_nPosition+m_nFetchSize*0.5); - sal_Int32 nNewEndPos = nNewStartPos + m_nFetchSize; + sal_Int32 nNewStartPos = (m_nPosition - nDiff); + // sal_Int32 nNewEndPos = (m_nPosition+m_nFetchSize*0.5); + sal_Int32 nNewEndPos = nNewStartPos + m_nFetchSize; if ( m_nPosition <= m_nStartPos ) - { // the window is behind the new start pos + { // the window is behind the new start pos if(!m_nStartPos) return sal_False; // the new position should be the nPos - nFetchSize/2 if ( nNewEndPos > m_nStartPos ) - { // but the two regions are overlapping + { // but the two regions are overlapping // fill the rows behind the new end ORowSetMatrix::iterator aEnd; // the iterator we need for rotate @@ -808,7 +808,7 @@ sal_Bool ORowSetCache::moveWindow() if ( nNewStartPos < 1 ) { bCheck = m_pCacheSet->first(); - // aEnd = m_pMatrix->begin() + (sal_Int32)(m_nFetchSize*0.5); + // aEnd = m_pMatrix->begin() + (sal_Int32)(m_nFetchSize*0.5); OSL_ENSURE((nNewEndPos - m_nStartPos - nNewStartPos) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!"); aEnd = m_pMatrix->begin() + (nNewEndPos - m_nStartPos - nNewStartPos); aIter = aEnd; @@ -830,7 +830,7 @@ sal_Bool ORowSetCache::moveWindow() ::std::rotate(m_pMatrix->begin(),aEnd,m_pMatrix->end()); // now correct the iterator in our iterator vector - // rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment + // rotateCacheIterator(aEnd-m_pMatrix->begin()); //can't be used because they decrement and here we need to increment ptrdiff_t nNewDist = aEnd - m_pMatrix->begin(); ptrdiff_t nOffSet = m_pMatrix->end() - aEnd; ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin(); @@ -899,10 +899,10 @@ sal_Bool ORowSetCache::moveWindow() } } else if(m_nPosition > m_nStartPos) - { // the new start pos is above the startpos of the window + { // the new start pos is above the startpos of the window if(m_nPosition <= (m_nStartPos+m_nFetchSize)) - { // position in window + { // position in window OSL_ENSURE((m_nPosition - m_nStartPos -1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!"); m_aMatrixIter = calcPosition(); if(!m_aMatrixIter->is()) @@ -933,7 +933,7 @@ sal_Bool ORowSetCache::moveWindow() } } else if(nNewStartPos < (m_nStartPos+m_nFetchSize)) - { // position behind window but the region is overlapping + { // position behind window but the region is overlapping // the rows from begin() to (begin + nNewStartPos - m_nStartPos) can be refilled with the new rows // the rows behind this can be reused ORowSetMatrix::iterator aIter = m_pMatrix->begin(); @@ -944,9 +944,9 @@ sal_Bool ORowSetCache::moveWindow() sal_Bool bCheck = m_pCacheSet->absolute(nPos); bCheck = fill(aIter,aEnd,nPos,bCheck); // refill the region wew don't need anymore -// // we know that this is the current maximal rowcount here -// if ( !m_bRowCountFinal && bCheck ) -// m_nRowCount = std::max(nPos,m_nRowCount); +// // we know that this is the current maximal rowcount here +// if ( !m_bRowCountFinal && bCheck ) +// m_nRowCount = std::max(nPos,m_nRowCount); // we have to read one row forward to enshure that we know when we are on last row // but only when we don't know it already sal_Bool bOk = sal_True; @@ -954,7 +954,7 @@ sal_Bool ORowSetCache::moveWindow() bOk = m_pCacheSet->next(); // bind end to front if(bCheck) - { // rotate the end to the front + { // rotate the end to the front ::std::rotate(m_pMatrix->begin(),aIter,m_pMatrix->end()); // now correct the iterator in our iterator vector rotateCacheIterator( (sal_Int16)( aIter - m_pMatrix->begin() ) ); @@ -963,30 +963,30 @@ sal_Bool ORowSetCache::moveWindow() if(!bOk) { m_pCacheSet->previous(); // because we stand after the last row - m_nRowCount = nPos; // here we have the row count + m_nRowCount = nPos; // here we have the row count m_bRowCountFinal = sal_True; } else if(!m_bRowCountFinal) m_nRowCount = std::max(++nPos,m_nRowCount); } else - { // the end was reached before end() so we can set the start before nNewStartPos + { // the end was reached before end() so we can set the start before nNewStartPos m_nStartPos += (aIter - m_pMatrix->begin()); - // m_nStartPos = (aIter - m_pMatrix->begin()); + // m_nStartPos = (aIter - m_pMatrix->begin()); ::std::rotate(m_pMatrix->begin(),aIter,m_pMatrix->end()); // now correct the iterator in our iterator vector rotateCacheIterator( (sal_Int16)( aIter - m_pMatrix->begin() ) ); if ( !m_bRowCountFinal ) { - m_pCacheSet->previous(); // because we stand after the last row - m_nRowCount = std::max(m_nRowCount,--nPos); // here we have the row count + m_pCacheSet->previous(); // because we stand after the last row + m_nRowCount = std::max(m_nRowCount,--nPos); // here we have the row count OSL_ENSURE(nPos == m_pCacheSet->getRow(),"nPos isn't valid!"); m_bRowCountFinal = sal_True; } // TODO check - // m_nStartPos = (nNewStartPos+m_nRowCount) - m_nFetchSize ; + // m_nStartPos = (nNewStartPos+m_nRowCount) - m_nFetchSize ; if(m_nStartPos < 0) m_nStartPos = 0; } @@ -995,8 +995,8 @@ sal_Bool ORowSetCache::moveWindow() { aIter = m_pMatrix->begin(); - nPos = m_nStartPos; - bCheck = m_pCacheSet->absolute(m_nStartPos); + nPos = m_nStartPos; + bCheck = m_pCacheSet->absolute(m_nStartPos); for(; !aIter->is() && bCheck;++aIter) { OSL_ENSURE(aIter != m_pMatrix->end(),"Invalid iterator"); @@ -1029,10 +1029,10 @@ sal_Bool ORowSetCache::first( ) sal_Bool bRet = m_pCacheSet->first(); if(bRet) { - m_bBeforeFirst = m_bAfterLast = sal_False; - m_nPosition = 1; + m_bBeforeFirst = m_bAfterLast = sal_False; + m_nPosition = 1; moveWindow(); - m_aMatrixIter = m_pMatrix->begin(); + m_aMatrixIter = m_pMatrix->begin(); } else { @@ -1105,8 +1105,8 @@ sal_Bool ORowSetCache::absolute( sal_Int32 row ) } else { - m_bBeforeFirst = sal_False; - m_bAfterLast = m_nPosition > m_nRowCount; + m_bBeforeFirst = sal_False; + m_bAfterLast = m_nPosition > m_nRowCount; moveWindow(); OSL_ENSURE(((m_nPosition - m_nStartPos) - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!"); m_aMatrixIter = calcPosition(); @@ -1119,7 +1119,7 @@ sal_Bool ORowSetCache::absolute( sal_Int32 row ) { m_nPosition = row; // the position flags - m_bBeforeFirst = sal_False; + m_bBeforeFirst = sal_False; checkPositionFlags(); if(!m_bAfterLast) @@ -1260,13 +1260,13 @@ void ORowSetCache::resetInsertRow(sal_Bool _bClearInsertRow) { if ( _bClearInsertRow ) clearInsertRow(); - m_bNew = sal_False; + m_bNew = sal_False; m_bModified = sal_False; } void ORowSetCache::cancelRowModification() { - // clear the insertrow references -> implies that the current row of the rowset changes as well + // clear the insertrow references -> implies that the current row of the rowset changes as well ORowSetCacheMap::iterator aCacheIter = m_aCacheIterators.begin(); ORowSetCacheMap::iterator aCacheEnd = m_aCacheIterators.end(); for(;aCacheIter != aCacheEnd;++aCacheIter) @@ -1290,7 +1290,7 @@ void ORowSetCache::updateRow( ORowSetMatrix::iterator& _rUpdateRow,::std::vector m_pCacheSet->updateRow(*_rUpdateRow,*m_aMatrixIter,m_aUpdateTable); // refetch the whole row (*m_aMatrixIter) = NULL; - + if ( moveToBookmark(aBookmark) ) { // update the cached values @@ -1313,7 +1313,7 @@ bool ORowSetCache::deleteRow( ) if(isAfterLast() || isBeforeFirst()) throw SQLException(DBACORE_RESSTRING(RID_STR_NO_DELETEROW),NULL,SQLSTATE_GENERAL,1000,Any() ); - // m_pCacheSet->absolute(m_nPosition); + // m_pCacheSet->absolute(m_nPosition); m_pCacheSet->deleteRow(*m_aMatrixIter,m_aUpdateTable); if ( !m_pCacheSet->rowDeleted() ) return false; @@ -1321,13 +1321,13 @@ bool ORowSetCache::deleteRow( ) --m_nRowCount; OSL_ENSURE(((m_nPosition - m_nStartPos) - 1) < (sal_Int32)m_pMatrix->size(),"Position is behind end()!"); ORowSetMatrix::iterator aPos = calcPosition(); - (*aPos) = NULL; + (*aPos) = NULL; ORowSetMatrix::iterator aEnd = m_pMatrix->end(); for(++aPos;aPos != aEnd && aPos->is();++aPos) { *(aPos-1) = *aPos; - (*aPos) = NULL; + (*aPos) = NULL; } m_aMatrixIter = m_pMatrix->end(); @@ -1355,8 +1355,8 @@ void ORowSetCache::cancelRowUpdates( ) void ORowSetCache::moveToInsertRow( ) { - m_bNew = sal_True; - m_bUpdated = m_bAfterLast = sal_False; + m_bNew = sal_True; + m_bUpdated = m_bAfterLast = sal_False; m_aInsertRow = m_pInsertMatrix->begin(); if(!m_aInsertRow->is()) @@ -1445,7 +1445,7 @@ void ORowSetCache::checkPositionFlags() { if(m_bRowCountFinal) { - m_bAfterLast = m_nPosition > m_nRowCount; + m_bAfterLast = m_nPosition > m_nRowCount; if(m_bAfterLast) m_nPosition = 0;//m_nRowCount; } @@ -1460,13 +1460,13 @@ void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex) sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sUpdateTableName) { sal_Bool bOk = sal_False; - if (pNode->count() == 3 && // Ausdruck is geklammert + if (pNode->count() == 3 && // Ausdruck is geklammert SQL_ISPUNCTUATION(pNode->getChild(0),"(") && SQL_ISPUNCTUATION(pNode->getChild(2),")")) { bOk = checkInnerJoin(pNode->getChild(1),_xConnection,_sUpdateTableName); } - else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) && // AND/OR-Verknuepfung: + else if ((SQL_ISRULE(pNode,search_condition) || SQL_ISRULE(pNode,boolean_term)) && // AND/OR-Verknuepfung: pNode->count() == 3) { // nur AND Verknüpfung zulassen @@ -1515,15 +1515,15 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, OSQLParseNode* pJoin = pTableRefCommalist->getByRule(::connectivity::OSQLParseNode::qualified_join); if(pJoin) { // we are only intereseted in qualified joins like RIGHT or LEFT - OSQLParseNode* pJoinType = pJoin->getChild(1); - OSQLParseNode* pOuterType = NULL; + OSQLParseNode* pJoinType = pJoin->getChild(1); + OSQLParseNode* pOuterType = NULL; if(SQL_ISRULE(pJoinType,join_type) && pJoinType->count() == 2) pOuterType = pJoinType->getChild(0); else if(SQL_ISRULE(pJoinType,outer_join_type)) pOuterType = pJoinType; - sal_Bool bCheck = sal_False; - sal_Bool bLeftSide = sal_False; + sal_Bool bCheck = sal_False; + sal_Bool bLeftSide = sal_False; if(pOuterType) { // found outer join bLeftSide = SQL_ISTOKEN(pOuterType->getChild(0),LEFT); @@ -1572,7 +1572,7 @@ void ORowSetCache::clearInsertRow() } } -ORowSetMatrix::iterator ORowSetCache::calcPosition() const +ORowSetMatrix::iterator ORowSetCache::calcPosition() const { sal_Int32 nValue = (m_nPosition - m_nStartPos) - 1; CHECK_MATRIX_POS(nValue); @@ -1666,7 +1666,7 @@ void ORowSetCache::impl_updateRowFromCache_throw(ORowSetValueVector::Vector& io_ break; } } - + if ( aIter == m_pMatrix->end() ) { m_pCacheSet->fillMissingValues(io_aRow); diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index dedf04ead36b..db9678c29824 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -70,45 +70,45 @@ namespace dbaccess friend class ORowSetClone; friend class ORowSetCacheIterator; - typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows; + typedef ::std::vector< TORowSetOldRowHelperRef > TOldRowSetRows; ::std::map m_aKeyColumns; //the set can be static, bookmarkable or keyset - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; // must be before m_aInsertRow + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; // must be before m_aInsertRow ::comphelper::ComponentContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xCacheSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xCacheSet; - OCacheSet* m_pCacheSet; // is a bookmarkable, keyset or static resultset - ORowSetMatrix* m_pMatrix; // represent the table struct - ORowSetMatrix::iterator m_aMatrixIter; // represent a row of the table - ORowSetMatrix::iterator m_aMatrixEnd; // present the row behind the last row of the table - ORowSetCacheMap m_aCacheIterators; - TOldRowSetRows m_aOldRows; + OCacheSet* m_pCacheSet; // is a bookmarkable, keyset or static resultset + ORowSetMatrix* m_pMatrix; // represent the table struct + ORowSetMatrix::iterator m_aMatrixIter; // represent a row of the table + ORowSetMatrix::iterator m_aMatrixEnd; // present the row behind the last row of the table + ORowSetCacheMap m_aCacheIterators; + TOldRowSetRows m_aOldRows; - ORowSetMatrix* m_pInsertMatrix; // represent the rows which should be inserted normally this is only one - ORowSetMatrix::iterator m_aInsertRow; // represent a insert row + ORowSetMatrix* m_pInsertMatrix; // represent the rows which should be inserted normally this is only one + ORowSetMatrix::iterator m_aInsertRow; // represent a insert row - // ORowSetRow m_aInsertRow; // present the row that should be inserted - sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull() + // ORowSetRow m_aInsertRow; // present the row that should be inserted + sal_Int32 m_nLastColumnIndex; // the last column ask for, used for wasNull() - connectivity::OSQLTable m_aUpdateTable; // used for updates/deletes and inserts + connectivity::OSQLTable m_aUpdateTable; // used for updates/deletes and inserts - sal_Int32 m_nFetchSize; - sal_Int32 m_nRowCount; - sal_Int32 m_nPrivileges; - sal_Int32 m_nPosition; // 0 means beforefirst + sal_Int32 m_nFetchSize; + sal_Int32 m_nRowCount; + sal_Int32 m_nPrivileges; + sal_Int32 m_nPosition; // 0 means beforefirst - sal_Int32 m_nStartPos; // start pos of the window zero based - sal_Int32 m_nEndPos; // end pos of the window zero based + sal_Int32 m_nStartPos; // start pos of the window zero based + sal_Int32 m_nEndPos; // end pos of the window zero based - sal_Bool m_bRowCountFinal ; - sal_Bool m_bBeforeFirst ; - sal_Bool m_bAfterLast ; - sal_Bool m_bUpdated ; - sal_Bool& m_bModified ; // points to the rowset member m_bModified - sal_Bool& m_bNew ; // points to the rowset member m_bNew + sal_Bool m_bRowCountFinal ; + sal_Bool m_bBeforeFirst ; + sal_Bool m_bAfterLast ; + sal_Bool m_bUpdated ; + sal_Bool& m_bModified ; // points to the rowset member m_bModified + sal_Bool& m_bNew ; // points to the rowset member m_bNew sal_Bool fill(ORowSetMatrix::iterator& _aIter,const ORowSetMatrix::iterator& _aEnd,sal_Int32& _nPos,sal_Bool _bCheck); sal_Bool reFillMatrix(sal_Int32 _nNewStartPos,sal_Int32 nNewEndPos); @@ -132,7 +132,7 @@ namespace dbaccess // checks and set the flags isAfterLast isLast and position when afterlast is true void checkPositionFlags(); void checkUpdateConditions(sal_Int32 columnIndex); - sal_Bool checkJoin( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + sal_Bool checkJoin( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer, const ::rtl::OUString& _sUpdateTableName); sal_Bool checkInnerJoin(const ::connectivity::OSQLParseNode *pNode @@ -140,8 +140,8 @@ namespace dbaccess ,const ::rtl::OUString& _sUpdateTableName); // clears the insert row - void clearInsertRow(); - ORowSetMatrix::iterator calcPosition() const; + void clearInsertRow(); + ORowSetMatrix::iterator calcPosition() const; protected: ORowSetMatrix::iterator& getEnd() { return m_aMatrixEnd;} @@ -152,8 +152,8 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xAnalyzer, const ::comphelper::ComponentContext& _rContext, const ::rtl::OUString& _rUpdateTableName, - sal_Bool& _bModified, - sal_Bool& _bNew, + sal_Bool& _bModified, + sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, const ::rtl::OUString& i_sRowSetFilter); ~ORowSetCache(); diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx index 9f634d4bef0e..986a9bb5d7c1 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.cxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx @@ -53,7 +53,7 @@ ORowSetCacheIterator& ORowSetCacheIterator::operator =(const ORowSetCacheIterato return *this; m_pCache = _rRH.m_pCache; - m_aIter = _rRH.m_aIter; + m_aIter = _rRH.m_aIter; m_pRowSet = _rRH.m_pRowSet; return *this; @@ -117,7 +117,7 @@ bool ORowSetCacheIterator::operator ==(const ORowSetMatrix::iterator& _rRH) cons return m_aIter->second.aIterator == _rRH; } -void ORowSetCacheIterator::setBookmark(const ::com::sun::star::uno::Any& _rBookmark) +void ORowSetCacheIterator::setBookmark(const ::com::sun::star::uno::Any& _rBookmark) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::setBookmark" ); m_aIter->second.aBookmark = _rBookmark; diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index e6be14baaeb8..1387635d44a9 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -36,9 +36,9 @@ namespace dbaccess class ORowSetBase; typedef struct { - ORowSetMatrix::iterator aIterator; - ::com::sun::star::uno::Any aBookmark; - ORowSetBase* pRowSet; + ORowSetMatrix::iterator aIterator; + ::com::sun::star::uno::Any aBookmark; + ORowSetBase* pRowSet; } ORowSetCacheIterator_Helper; DECLARE_STL_STDKEY_MAP(sal_Int32,ORowSetCacheIterator_Helper,ORowSetCacheMap); @@ -47,9 +47,9 @@ namespace dbaccess class ORowSetCacheIterator { friend class ORowSetCache; - ORowSetCacheMap::iterator m_aIter; - ORowSetCache* m_pCache; - ORowSetBase* m_pRowSet; + ORowSetCacheMap::iterator m_aIter; + ORowSetCache* m_pCache; + ORowSetBase* m_pRowSet; protected: ORowSetCacheIterator(const ORowSetCacheMap::iterator& _rIter,ORowSetCache* _pCache,ORowSetBase* _pRowSet) : m_aIter(_rIter) @@ -77,9 +77,9 @@ namespace dbaccess bool operator !=(const ORowSetMatrix::iterator& _rRH) const; bool operator ==(const ORowSetMatrix::iterator& _rRH) const; - void setBookmark(const ::com::sun::star::uno::Any& _rBookmark); + void setBookmark(const ::com::sun::star::uno::Any& _rBookmark); ::com::sun::star::uno::Any getBookmark() const { return m_aIter->second.aBookmark; } - ::osl::Mutex* getMutex() const; + ::osl::Mutex* getMutex() const; ORowSetCacheMap::iterator getIter() const { return m_aIter; } }; diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index 9dfb0eb6a80f..88e53ea5f647 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -35,14 +35,14 @@ namespace dbaccess { - typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector; - typedef ::rtl::Reference< ORowSetValueVector > ORowSetRow; - typedef ::std::vector< ORowSetRow > ORowSetMatrix; + typedef connectivity::ORowVector< connectivity::ORowSetValue > ORowSetValueVector; + typedef ::rtl::Reference< ORowSetValueVector > ORowSetRow; + typedef ::std::vector< ORowSetRow > ORowSetMatrix; class ORowSetOldRowHelper { - oslInterlockedCount m_refCount; - ORowSetRow m_aRow; + oslInterlockedCount m_refCount; + ORowSetRow m_aRow; ORowSetOldRowHelper& operator=(const ORowSetOldRowHelper& _rRH); ORowSetOldRowHelper(const ORowSetOldRowHelper& _rRh); @@ -67,7 +67,7 @@ namespace dbaccess inline void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; } }; - typedef ::rtl::Reference< ORowSetOldRowHelper > TORowSetOldRowHelperRef; + typedef ::rtl::Reference< ORowSetOldRowHelper > TORowSetOldRowHelperRef; class ORowSetValueCompare { diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index ec2ce273be59..1ab9fec8469f 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -90,19 +90,19 @@ namespace dbaccess { namespace BooleanComparisonMode = ::com::sun::star::sdb::BooleanComparisonMode; } -#define STR_SELECT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")) -#define STR_FROM ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")) -#define STR_WHERE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")) -#define STR_GROUP_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY ")) -#define STR_HAVING ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING ")) -#define STR_ORDER_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY ")) -#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND ")) -#define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" OR ")) -#define STR_LIKE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" LIKE ")) -#define STR_EQUAL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = ")) -#define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")) -#define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")) -#define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")) +#define STR_SELECT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")) +#define STR_FROM ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")) +#define STR_WHERE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")) +#define STR_GROUP_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY ")) +#define STR_HAVING ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING ")) +#define STR_ORDER_BY ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY ")) +#define STR_AND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" AND ")) +#define STR_OR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" OR ")) +#define STR_LIKE ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" LIKE ")) +#define STR_EQUAL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" = ")) +#define L_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("(")) +#define R_BRACKET ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")")) +#define COMMA ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")) namespace { @@ -316,8 +316,8 @@ void SAL_CALL OSingleSelectQueryComposer::disposing(void) resetIterator( m_aSqlIterator, true ); resetIterator( m_aAdditiveIterator, true ); - m_xConnectionTables = NULL; - m_xConnection = NULL; + m_xConnectionTables = NULL; + m_xConnection = NULL; clearCurrentCollections(); } @@ -496,7 +496,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< } ::rtl::OUString aName,aNewName; - column->getPropertyValue(PROPERTY_NAME) >>= aName; + column->getPropertyValue(PROPERTY_NAME) >>= aName; if ( !m_xMetaData->supportsOrderByUnrelated() && m_aCurrentColumns[SelectColumns] && !m_aCurrentColumns[SelectColumns]->hasByName(aName)) { @@ -507,7 +507,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< // filter anhaengen // select ohne where und order by aufbauen - ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString(); + ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString(); if ( m_aCurrentColumns[SelectColumns]->hasByName(aName) ) { Reference xColumn; @@ -517,10 +517,10 @@ void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< OSL_ENSURE(xColumn->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))),"Property FUNCTION not available!"); ::rtl::OUString sRealName,sTableName; - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; - xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; sal_Bool bFunction = sal_False; - xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))) >>= bFunction; + xColumn->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Function"))) >>= bFunction; if ( sRealName == aName ) { if ( bFunction ) @@ -766,7 +766,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr ::std::vector< ::rtl::OUString> aNames; ::rtl::Reference< OSQLColumns> aSelectColumns; sal_Bool bCase = sal_True; - Reference< XNameAccess> xQueryColumns; + Reference< XNameAccess> xQueryColumns; if ( m_nCommandType == CommandType::QUERY ) { Reference xSup(m_xConnectionQueries->getByName(m_sCommand),UNO_QUERY); @@ -883,7 +883,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns( ) thr if ( aFind != aSelectColumns->get().end() ) { if ( aUsedSelectColumns.find( nFoundSelectColumnPos ) != aUsedSelectColumns.end() ) - { // we found a column name which exists twice + { // we found a column name which exists twice // so we start after the first found do { @@ -1042,9 +1042,9 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition, ::rtl::OUString aColumnName; - // pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast(m_sDecimalSep.toChar())); + // pCondition->parseNodeToStr(aValue,m_xMetaData, xFormatter, m_aLocale,static_cast(m_sDecimalSep.toChar())); pCondition->parseNodeToStr( aValue, m_xConnection, NULL ); - // pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast(m_sDecimalSep.toChar())); + // pCondition->getChild(0)->parseNodeToStr(aColumnName,m_xMetaData, xFormatter, m_aLocale,static_cast(m_sDecimalSep.toChar())); pCondition->getChild(0)->parseNodeToStr( aColumnName, m_xConnection, NULL ); // don't display the column name @@ -1245,7 +1245,7 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon // Kriterium aItem.Handle = pCondition->getChild(1)->getNodeType(); - aValue = pCondition->getChild(1)->getTokenValue(); + aValue = pCondition->getChild(1)->getTokenValue(); for(i=0;i< pRhs->count();i++) pRhs->getChild(i)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast( m_sDecimalSep.toChar() ) ); @@ -1304,14 +1304,14 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon if(m_pTables && m_pTables->getCount() > 1) { ::rtl::OUString aCatalog,aSchema,aTable,aComposedName,aColumnName; - column->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog; - column->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; - column->getPropertyValue(PROPERTY_TABLENAME) >>= aTable; - column->getPropertyValue(PROPERTY_NAME) >>= aColumnName; + column->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog; + column->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; + column->getPropertyValue(PROPERTY_TABLENAME) >>= aTable; + column->getPropertyValue(PROPERTY_NAME) >>= aColumnName; Sequence< ::rtl::OUString> aNames(m_pTables->getElementNames()); - const ::rtl::OUString* pBegin = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); + const ::rtl::OUString* pBegin = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); if(!aTable.getLength()) { // we don't found a table name, now we must search every table for this column @@ -1322,10 +1322,10 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon if(xColumnsSupp.is() && xColumnsSupp->getColumns()->hasByName(aColumnName)) { -// Reference xTableProp(xColumnsSupp,UNO_QUERY); -// xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog; -// xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; -// xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable; +// Reference xTableProp(xColumnsSupp,UNO_QUERY); +// xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog; +// xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema; +// xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable; aTable = *pBegin; break; } @@ -1349,14 +1349,14 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon if(xTableProp.is()) { ::rtl::OUString aCatalog2,aSchema2,aTable2; - xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog2; - xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema2; - xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable2; + xTableProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= aCatalog2; + xTableProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= aSchema2; + xTableProp->getPropertyValue(PROPERTY_NAME) >>= aTable2; if(aComp(aCatalog,aCatalog2) && aComp(aSchema,aSchema2) && aComp(aTable,aTable2)) { - aCatalog = aCatalog2; - aSchema = aSchema2; - aTable = aTable2; + aCatalog = aCatalog2; + aSchema = aSchema2; + aTable = aTable2; break; } } @@ -1559,7 +1559,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert column->getPropertyValue(PROPERTY_VALUE) >>= aValue; ::rtl::OUStringBuffer aSQL; - const ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString(); + const ::rtl::OUString aQuote = m_xMetaData->getIdentifierQuoteString(); getColumns(); if ( m_aCurrentColumns[SelectColumns] && m_aCurrentColumns[SelectColumns]->hasByName(aName) ) @@ -1571,8 +1571,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert OSL_ENSURE(xColumn->getPropertySetInfo()->hasPropertyByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AggregateFunction"))),"Property AggregateFunctionnot available!"); ::rtl::OUString sRealName,sTableName; - xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; - xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; + xColumn->getPropertyValue(PROPERTY_REALNAME) >>= sRealName; + xColumn->getPropertyValue(PROPERTY_TABLENAME) >>= sTableName; if(sTableName.indexOf('.',0) != -1) { ::rtl::OUString aCatlog,aSchema,aTable; @@ -1648,8 +1648,8 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert aSQL.appendAscii( "\'" ); } aSQL.appendAscii( "0x" ); - const sal_Int8* pBegin = aSeq.getConstArray(); - const sal_Int8* pEnd = pBegin + aSeq.getLength(); + const sal_Int8* pBegin = aSeq.getConstArray(); + const sal_Int8* pEnd = pBegin + aSeq.getLength(); for(;pBegin != pEnd;++pBegin) { aSQL.append( (sal_Int32)*pBegin, 16 ).getStr(); diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx index 0093f673d2b9..1249dcfdbfaa 100644 --- a/dbaccess/source/core/api/StaticSet.cxx +++ b/dbaccess/source/core/api/StaticSet.cxx @@ -45,11 +45,11 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdb; +// using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -// using namespace ::cppu; +// using namespace ::cppu; using namespace ::osl; void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/) @@ -255,7 +255,7 @@ sal_Bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, Runt } if(row > (sal_Int32)m_aSet.size()) - m_aSetIter = m_aSet.end(); // check again + m_aSetIter = m_aSet.end(); // check again else m_aSetIter = m_aSet.begin() + row; } @@ -314,8 +314,8 @@ Sequence< sal_Int32 > SAL_CALL OStaticSet::deleteRows( const Sequence< Any >& ro { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::deleteRows" ); Sequence< sal_Int32 > aRet(rows.getLength()); - const Any* pBegin = rows.getConstArray(); - const Any* pEnd = pBegin + rows.getLength(); + const Any* pBegin = rows.getConstArray(); + const Any* pEnd = pBegin + rows.getLength(); for(sal_Int32 i=0;pBegin != pEnd; ++pBegin,++i) { deleteRow(*(m_aSet.begin() + comphelper::getINT32(*pBegin)),_xTable); diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx index d69dfca465ec..8b895015937f 100644 --- a/dbaccess/source/core/api/StaticSet.hxx +++ b/dbaccess/source/core/api/StaticSet.hxx @@ -37,9 +37,9 @@ namespace dbaccess // we use a snapshot class OStaticSet : public OCacheSet { - ORowSetMatrix m_aSet; + ORowSetMatrix m_aSet; ORowSetMatrix::iterator m_aSetIter; - sal_Bool m_bEnd; + sal_Bool m_bEnd; sal_Bool fetchRow(); void fillAllRows(); public: diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 4ed9dcdfcc65..7fed7d09cff3 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -120,9 +120,9 @@ void SAL_CALL ODBTableDecorator::disposing() OTableDescriptor_BASE::disposing(); MutexGuard aGuard(m_aMutex); - m_xTable = NULL; - m_xMetaData = NULL; - m_pTables = NULL; + m_xTable = NULL; + m_xMetaData = NULL; + m_pTables = NULL; m_xColumnDefinitions = NULL; m_xNumberFormats = NULL; if ( m_pColumns ) @@ -401,7 +401,7 @@ Any SAL_CALL ODBTableDecorator::queryInterface( const Type & rType ) throw(Runti { aRet = m_xTable->queryInterface(rType); if(aRet.hasValue()) - { // now we know that our table supports this type so we return ourself + { // now we know that our table supports this type so we return ourself aRet = OTableDescriptor_BASE::queryInterface(rType); if(!aRet.hasValue()) aRet = ODataSettings::queryInterface(rType); @@ -427,9 +427,9 @@ void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) thro Reference xRename(m_xTable,UNO_QUERY); if(xRename.is()) { -// ::rtl::OUString sOldName; -// Reference xProp(m_xTable,UNO_QUERY); -// xProp->getPropertyValue(PROPERTY_NAME) >>= sOldName; +// ::rtl::OUString sOldName; +// Reference xProp(m_xTable,UNO_QUERY); +// xProp->getPropertyValue(PROPERTY_NAME) >>= sOldName; xRename->rename(_rNewName); } else // not supported @@ -553,9 +553,9 @@ void ODBTableDecorator::fillPrivileges() const if ( m_nPrivileges == 0 ) // second chance { ::rtl::OUString sCatalog,sSchema,sName; - xProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; - xProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; - xProp->getPropertyValue(PROPERTY_NAME) >>= sName; + xProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; + xProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; + xProp->getPropertyValue(PROPERTY_NAME) >>= sName; m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),sCatalog,sSchema, sName); } } @@ -608,8 +608,8 @@ void ODBTableDecorator::refreshColumns() if(xNames.is()) { Sequence< ::rtl::OUString> aNames = xNames->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) aVector.push_back(*pIter); } @@ -625,7 +625,7 @@ void ODBTableDecorator::refreshColumns() OContainerMediator* pMediator = new OContainerMediator( pCol, m_xColumnDefinitions, m_xConnection, OContainerMediator::eColumns ); m_xColumnMediator = pMediator; pCol->setMediator( pMediator ); - m_pColumns = pCol; + m_pColumns = pCol; } else m_pColumns->reFill(aVector); diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index b1bd9a71056e..3634b2853af9 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -46,11 +46,11 @@ using namespace ::dbtools; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; -// using namespace ::com::sun::star::sdb; +// using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -// using namespace ::cppu; +// using namespace ::cppu; using namespace ::osl; void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 9afc4b370cac..73a397eba635 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -317,9 +317,9 @@ Any SAL_CALL OColumns::queryInterface( const Type & rType ) throw(RuntimeExcepti } else if(!m_pTable || (m_pTable && !m_pTable->isNew())) { - if(!m_bAddColumn && rType == getCppuType( (Reference*)0)) + if(!m_bAddColumn && rType == getCppuType( (Reference*)0)) return Any(); - if(!m_bDropColumn && rType == getCppuType( (Reference*)0)) + if(!m_bDropColumn && rType == getCppuType( (Reference*)0)) return Any(); } @@ -335,7 +335,7 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException) sal_Int32 nSize = 0; Type aAppendType = getCppuType( (Reference*)0); - Type aDropType = getCppuType( (Reference*)0); + Type aDropType = getCppuType( (Reference*)0); if(m_xDrvColumns.is()) { Reference xTypes(m_xDrvColumns,UNO_QUERY); @@ -360,8 +360,8 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException) nSize = ((m_pTable && m_pTable->isNew()) ? 0 : ((m_bDropColumn ? (m_bAddColumn ? 0 : 1) : (m_bAddColumn ? 1 : 2)))); - bDropFound = (m_pTable && m_pTable->isNew()) || m_bDropColumn; - bAppendFound = (m_pTable && m_pTable->isNew()) || m_bAddColumn; + bDropFound = (m_pTable && m_pTable->isNew()) || m_bDropColumn; + bAppendFound = (m_pTable && m_pTable->isNew()) || m_bAddColumn; } Sequence< Type > aTypes(::comphelper::concatSequences(OColumns_BASE::getTypes(),TXChild::getTypes())); Sequence< Type > aRet(aTypes.getLength() - nSize); diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index fce607807650..40a0a047ab34 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -45,12 +45,12 @@ namespace dbaccess public ::com::sun::star::sdb::XColumnUpdate { protected: - ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow > m_xRow; - ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate; + ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow > m_xRow; + ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate > m_xRowUpdate; virtual ~ODataColumn(); public: - ODataColumn (const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData, + ODataColumn (const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData >& _xMetaData, const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow, const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index 134cd23a6956..085f99ecf7f1 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -93,22 +93,22 @@ void ODataSettings::registerPropertiesFor(ODataSettings_Base* _pItem) registerProperty(PROPERTY_TEXTRELIEF, PROPERTY_ID_TEXTRELIEF, PropertyAttribute::BOUND,&_pItem->m_nFontRelief, ::getCppuType(&_pItem->m_nFontRelief)); - registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&_pItem->m_aFont.Name, ::getCppuType(&_pItem->m_aFont.Name)); - registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Height, ::getCppuType(&_pItem->m_aFont.Height)); - registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.Width, ::getCppuType(&_pItem->m_aFont.Width)); - registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&_pItem->m_aFont.StyleName, ::getCppuType(&_pItem->m_aFont.StyleName)); - registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&_pItem->m_aFont.Family, ::getCppuType(&_pItem->m_aFont.Family)); - registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&_pItem->m_aFont.CharSet, ::getCppuType(&_pItem->m_aFont.CharSet)); - registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&_pItem->m_aFont.Pitch, ::getCppuType(&_pItem->m_aFont.Pitch)); - registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.CharacterWidth, ::getCppuType(&_pItem->m_aFont.CharacterWidth)); - registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Weight, ::getCppuType(&_pItem->m_aFont.Weight)); - registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&_pItem->m_aFont.Slant, ::getCppuType(&_pItem->m_aFont.Slant)); - registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&_pItem->m_aFont.Underline, ::getCppuType(&_pItem->m_aFont.Underline)); - registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&_pItem->m_aFont.Strikeout, ::getCppuType(&_pItem->m_aFont.Strikeout)); - registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&_pItem->m_aFont.Orientation, ::getCppuType(&_pItem->m_aFont.Orientation)); - registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&_pItem->m_aFont.Kerning, ::getCppuType(&_pItem->m_aFont.Kerning)); - registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&_pItem->m_aFont.WordLineMode, ::getCppuType(&_pItem->m_aFont.WordLineMode)); - registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&_pItem->m_aFont.Type, ::getCppuType(&_pItem->m_aFont.Type)); + registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&_pItem->m_aFont.Name, ::getCppuType(&_pItem->m_aFont.Name)); + registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Height, ::getCppuType(&_pItem->m_aFont.Height)); + registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.Width, ::getCppuType(&_pItem->m_aFont.Width)); + registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&_pItem->m_aFont.StyleName, ::getCppuType(&_pItem->m_aFont.StyleName)); + registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&_pItem->m_aFont.Family, ::getCppuType(&_pItem->m_aFont.Family)); + registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&_pItem->m_aFont.CharSet, ::getCppuType(&_pItem->m_aFont.CharSet)); + registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&_pItem->m_aFont.Pitch, ::getCppuType(&_pItem->m_aFont.Pitch)); + registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&_pItem->m_aFont.CharacterWidth, ::getCppuType(&_pItem->m_aFont.CharacterWidth)); + registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&_pItem->m_aFont.Weight, ::getCppuType(&_pItem->m_aFont.Weight)); + registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&_pItem->m_aFont.Slant, ::getCppuType(&_pItem->m_aFont.Slant)); + registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&_pItem->m_aFont.Underline, ::getCppuType(&_pItem->m_aFont.Underline)); + registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&_pItem->m_aFont.Strikeout, ::getCppuType(&_pItem->m_aFont.Strikeout)); + registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&_pItem->m_aFont.Orientation, ::getCppuType(&_pItem->m_aFont.Orientation)); + registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&_pItem->m_aFont.Kerning, ::getCppuType(&_pItem->m_aFont.Kerning)); + registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&_pItem->m_aFont.WordLineMode, ::getCppuType(&_pItem->m_aFont.WordLineMode)); + registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&_pItem->m_aFont.Type, ::getCppuType(&_pItem->m_aFont.Type)); } ODataSettings::ODataSettings(OBroadcastHelper& _rBHelper,sal_Bool _bQuery) @@ -219,5 +219,5 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau } } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index 46d5de5615ef..c38443c0a4bf 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -58,10 +58,10 @@ using namespace ::comphelper; using namespace ::osl; using namespace dbaccess; -#define HAS_DESCRIPTION 0x00000001 -#define HAS_DEFAULTVALUE 0x00000002 -#define HAS_ROWVERSION 0x00000004 -#define HAS_AUTOINCREMENT_CREATION 0x00000008 +#define HAS_DESCRIPTION 0x00000001 +#define HAS_DEFAULTVALUE 0x00000002 +#define HAS_ROWVERSION 0x00000004 +#define HAS_AUTOINCREMENT_CREATION 0x00000008 //============================================================ //= OTableColumnDescriptor @@ -477,9 +477,9 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa DECL_PROP0_BOOL( ISAUTOINCREMENT ); DECL_PROP0_BOOL( ISCURRENCY ); DECL_PROP0( ISNULLABLE, sal_Int32 ); - DECL_PROP0( PRECISION, sal_Int32 ); - DECL_PROP0( SCALE, sal_Int32 ); - DECL_PROP0( TYPE, sal_Int32 ); + DECL_PROP0( PRECISION, sal_Int32 ); + DECL_PROP0( SCALE, sal_Int32 ); + DECL_PROP0( TYPE, sal_Int32 ); DECL_PROP0( TYPENAME, ::rtl::OUString ); if ( nId & HAS_AUTOINCREMENT_CREATION ) diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 30bd7b701d38..e4ec3ac83190 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -114,7 +114,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition } m_xCommandDefinition->addPropertyChangeListener(::rtl::OUString(), this); - // m_xCommandDefinition->addPropertyChangeListener(PROPERTY_NAME, this); + // m_xCommandDefinition->addPropertyChangeListener(PROPERTY_NAME, this); m_xCommandPropInfo = m_xCommandDefinition->getPropertySetInfo(); } DBG_ASSERT(m_xConnection.is(), "OQuery::OQuery : invalid connection !"); @@ -304,7 +304,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r if (getInfoHelper().fillPropertyMembersByHandle(&sAggPropName,&nAttr,_nHandle) && m_xCommandPropInfo.is() && m_xCommandPropInfo->hasPropertyByName(sAggPropName)) - { // the base class holds the property values itself, but we have to forward this to our CommandDefinition + { // the base class holds the property values itself, but we have to forward this to our CommandDefinition m_eDoingCurrently = SETTING_PROPERTIES; OAutoActionReset(this); @@ -316,7 +316,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _r } } -Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(RuntimeException) +Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(RuntimeException) { return createPropertySetInfo( getInfoHelper() ) ; } @@ -379,5 +379,5 @@ void OQuery::registerProperties() return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseQuery" ) ); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index c3fff9cc3cdd..ca5eeb64ea0b 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -52,16 +52,16 @@ namespace dbaccess //========================================================================== //= OQuery - an object implementing the sdb.Query service //========================================================================== -typedef ::cppu::ImplHelper3 < ::com::sun::star::sdbcx::XDataDescriptorFactory, +typedef ::cppu::ImplHelper3 < ::com::sun::star::sdbcx::XDataDescriptorFactory, ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::sdbcx::XRename - > OQuery_Base; + > OQuery_Base; class OQuery; class OColumn; -typedef ::comphelper::OPropertyArrayUsageHelper< OQuery > OQuery_ArrayHelperBase; +typedef ::comphelper::OPropertyArrayUsageHelper< OQuery > OQuery_ArrayHelperBase; -class OQuery :public OContentHelper +class OQuery :public OContentHelper ,public OQueryDescriptor_Base ,public OQuery_Base ,public OQuery_ArrayHelperBase @@ -73,26 +73,26 @@ public: typedef ::std::map< ::rtl::OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; protected: -// TNameColumnMap m_aColumnMap; // contains all columnnames to columns +// TNameColumnMap m_aColumnMap; // contains all columnnames to columns ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xCommandDefinition; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xCommandPropInfo; ::rtl::Reference< OContainerMediator > m_pColumnMediator; ::dbtools::IWarningsContainer* m_pWarnings; - sal_Bool m_bCaseSensitiv : 1; // assume case sensitivity of the column names ? + sal_Bool m_bCaseSensitiv : 1; // assume case sensitivity of the column names ? // possible actions on our "aggregate" enum AGGREGATE_ACTION { NONE, SETTING_PROPERTIES, FLUSHING }; - AGGREGATE_ACTION m_eDoingCurrently; + AGGREGATE_ACTION m_eDoingCurrently; // ------------------------------------------------------------------------ /** a class which automatically resets m_eDoingCurrently in it's destructor */ - class OAutoActionReset; // just for the following friend declaration + class OAutoActionReset; // just for the following friend declaration friend class OAutoActionReset; class OAutoActionReset { - OQuery* m_pActor; + OQuery* m_pActor; public: OAutoActionReset(OQuery* _pActor) : m_pActor(_pActor) { } ~OAutoActionReset() { m_pActor->m_eDoingCurrently = NONE; } @@ -103,7 +103,7 @@ protected: // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; - ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); } + ::cppu::IPropertyArrayHelper* getArrayHelper() { return OQuery_ArrayHelperBase::getArrayHelper(); } public: OQuery( @@ -144,8 +144,8 @@ public: public: // the caller is responsible for the lifetime! - void setWarningsContainer( ::dbtools::IWarningsContainer* _pWarnings ) { m_pWarnings = _pWarnings; } - ::dbtools::IWarningsContainer* getWarningsContainer( ) const { return m_pWarnings; } + void setWarningsContainer( ::dbtools::IWarningsContainer* _pWarnings ) { m_pWarnings = _pWarnings; } + ::dbtools::IWarningsContainer* getWarningsContainer( ) const { return m_pWarnings; } // XRename virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); @@ -165,7 +165,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREAPI_QUERY_HXX_ diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 12f83abf28fd..229ffa1914f5 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -92,7 +92,7 @@ OQueryContainer::OQueryContainer( m_pCommandsListener = new OContainerListener( *this, m_aMutex ); m_pCommandsListener->acquire(); - Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY_THROW ); + Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY_THROW ); xContainer->addContainerListener( m_pCommandsListener ); Reference< XContainerApproveBroadcaster > xContainerApprove( m_xCommandDefinitions, UNO_QUERY_THROW ); @@ -117,8 +117,8 @@ OQueryContainer::OQueryContainer( OQueryContainer::~OQueryContainer() { DBG_DTOR(OQueryContainer, NULL); - // dispose(); - // maybe we're already disposed, but this should be uncritical + // dispose(); + // maybe we're already disposed, but this should be uncritical } IMPLEMENT_FORWARD_XINTERFACE2( OQueryContainer,ODefinitionContainer,OQueryContainer_Base) @@ -135,7 +135,7 @@ void OQueryContainer::disposing() if ( m_pCommandsListener ) { - Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY ); + Reference< XContainer > xContainer( m_xCommandDefinitions, UNO_QUERY ); xContainer->removeContainerListener( m_pCommandsListener ); Reference< XContainerApproveBroadcaster > xContainerApprove( m_xCommandDefinitions, UNO_QUERY ); xContainerApprove->removeContainerApproveListener( m_pCommandsListener ); @@ -145,8 +145,8 @@ void OQueryContainer::disposing() m_pCommandsListener = NULL; } - m_xCommandDefinitions = NULL; - m_xConnection = NULL; + m_xCommandDefinitions = NULL; + m_xConnection = NULL; } // XServiceInfo @@ -189,7 +189,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet // insert the basic object into the definition container { - m_eDoingCurrently = INSERTING; + m_eDoingCurrently = INSERTING; OAutoActionReset aAutoReset(this); m_xCommandDefinitions->insertByName(sNewObjectName, makeAny(xCommandDefinitionPart)); } @@ -316,7 +316,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveRemoveElement( const Contain void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw(::com::sun::star::uno::RuntimeException) { if (_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinitions, UNO_QUERY).get()) - { // our "master container" (with the command definitions) is beeing disposed + { // our "master container" (with the command definitions) is beeing disposed DBG_ERROR("OQueryContainer::disposing : nobody should dispose the CommandDefinition container before disposing my connection !"); dispose(); } @@ -326,7 +326,7 @@ void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObj // it's one of our documents .... Documents::iterator aIter = m_aDocumentMap.begin(); Documents::iterator aEnd = m_aDocumentMap.end(); - for (;aIter != aEnd;++aIter ) + for (;aIter != aEnd;++aIter ) { if ( xSource == aIter->second.get() ) { @@ -363,7 +363,7 @@ Reference< XContent > OQueryContainer::implCreateWrapper(const Reference< XConte xReturn = pNewObject; pNewObject->setWarningsContainer( m_pWarnings ); -// pNewObject->getColumns(); +// pNewObject->getColumns(); // Why? This is expensive. If you comment this in 'cause you really need it, be sure to run the // QueryInQuery test in dbaccess/qa/complex/dbaccess ... } @@ -415,5 +415,5 @@ Sequence< ::rtl::OUString > SAL_CALL OQueryContainer::getElementNames( ) throw( return m_xCommandDefinitions->getElementNames(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index b06a87abebcf..0fa808894d3c 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -128,7 +128,7 @@ Reference< XPropertySetInfo > SAL_CALL OQueryDescriptor::getPropertySetInfo( ) DBG_NAME(OQueryDescriptor_Base); -OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf) +OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf) :m_bColumnsOutOfDate(sal_True) ,m_rMutex(_rMutex) { diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index 391df07351bb..58349c90967a 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -55,7 +55,7 @@ namespace dbaccess typedef ::cppu::ImplHelper3< ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::lang::XUnoTunnel, - ::com::sun::star::lang::XServiceInfo > OQueryDescriptor_BASE; + ::com::sun::star::lang::XServiceInfo > OQueryDescriptor_BASE; class OQueryDescriptor_Base :public OQueryDescriptor_BASE @@ -64,24 +64,24 @@ class OQueryDescriptor_Base ,public ::connectivity::sdbcx::IRefreshableColumns { private: - sal_Bool m_bColumnsOutOfDate : 1; // the columns have to be rebuild on the next getColumns ? - ::osl::Mutex& m_rMutex; + sal_Bool m_bColumnsOutOfDate : 1; // the columns have to be rebuild on the next getColumns ? + ::osl::Mutex& m_rMutex; protected: - OColumns* m_pColumns; // our column descriptions + OColumns* m_pColumns; // our column descriptions ::rtl::OUString m_sElementName; virtual ~OQueryDescriptor_Base(); - void setColumnsOutOfDate( sal_Bool _bOutOfDate = sal_True ); - sal_Bool isColumnsOutOfDate() const { return m_bColumnsOutOfDate; } + void setColumnsOutOfDate( sal_Bool _bOutOfDate = sal_True ); + sal_Bool isColumnsOutOfDate() const { return m_bColumnsOutOfDate; } - sal_Int32 getColumnCount() const { return m_pColumns ? m_pColumns->getCount() : 0; } - void clearColumns( ); + sal_Int32 getColumnCount() const { return m_pColumns ? m_pColumns->getCount() : 0; } + void clearColumns( ); - void implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ); + void implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ); public: - OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf); + OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf); /** constructs the object with a UNO QueryDescriptor. If you use this ctor, the resulting object won't have any column informations (the column container will be empty) */ @@ -102,7 +102,7 @@ public: protected: // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); @@ -152,7 +152,7 @@ public: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREAPI_QUERYDESCRIPTOR_HXX_ diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 89db5a7942a9..9a185bebc473 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -157,27 +157,27 @@ void OResultColumn::disposing() ::cppu::IPropertyArrayHelper* OResultColumn::createArrayHelper( ) const { BEGIN_PROPERTY_HELPER(21) - DECL_PROP1(CATALOGNAME, ::rtl::OUString, READONLY); - DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY); - DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY); - DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY); - DECL_PROP1_BOOL(ISCURRENCY, READONLY); - DECL_PROP1_BOOL(ISDEFINITELYWRITABLE, READONLY); - DECL_PROP1(ISNULLABLE, sal_Int32, READONLY); - DECL_PROP1_BOOL(ISREADONLY, READONLY); + DECL_PROP1(CATALOGNAME, ::rtl::OUString, READONLY); + DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY); + DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY); + DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY); + DECL_PROP1_BOOL(ISCURRENCY, READONLY); + DECL_PROP1_BOOL(ISDEFINITELYWRITABLE, READONLY); + DECL_PROP1(ISNULLABLE, sal_Int32, READONLY); + DECL_PROP1_BOOL(ISREADONLY, READONLY); DECL_PROP1_BOOL(ISROWVERSION, READONLY); - DECL_PROP1_BOOL(ISSEARCHABLE, READONLY); - DECL_PROP1_BOOL(ISSIGNED, READONLY); - DECL_PROP1_BOOL(ISWRITABLE, READONLY); - DECL_PROP1(LABEL, ::rtl::OUString, READONLY); - DECL_PROP1(NAME, ::rtl::OUString, READONLY); - DECL_PROP1(PRECISION, sal_Int32, READONLY); - DECL_PROP1(SCALE, sal_Int32, READONLY); - DECL_PROP1(SCHEMANAME, ::rtl::OUString, READONLY); - DECL_PROP1(SERVICENAME, ::rtl::OUString, READONLY); - DECL_PROP1(TABLENAME, ::rtl::OUString, READONLY); - DECL_PROP1(TYPE, sal_Int32, READONLY); - DECL_PROP1(TYPENAME, ::rtl::OUString, READONLY); + DECL_PROP1_BOOL(ISSEARCHABLE, READONLY); + DECL_PROP1_BOOL(ISSIGNED, READONLY); + DECL_PROP1_BOOL(ISWRITABLE, READONLY); + DECL_PROP1(LABEL, ::rtl::OUString, READONLY); + DECL_PROP1(NAME, ::rtl::OUString, READONLY); + DECL_PROP1(PRECISION, sal_Int32, READONLY); + DECL_PROP1(SCALE, sal_Int32, READONLY); + DECL_PROP1(SCHEMANAME, ::rtl::OUString, READONLY); + DECL_PROP1(SERVICENAME, ::rtl::OUString, READONLY); + DECL_PROP1(TABLENAME, ::rtl::OUString, READONLY); + DECL_PROP1(TYPE, sal_Int32, READONLY); + DECL_PROP1(TYPENAME, ::rtl::OUString, READONLY); END_PROPERTY_HELPER(); } @@ -302,12 +302,12 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const { sal_Bool bVal = sal_False; rValue.setValue(&bVal, getBooleanCppuType()); - } break; + } break; case PROPERTY_ID_ISREADONLY: { sal_Bool bVal = sal_True; rValue.setValue(&bVal, getBooleanCppuType()); - } break; + } break; case PROPERTY_ID_SCALE: case PROPERTY_ID_PRECISION: case PROPERTY_ID_DISPLAYSIZE: diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index a28854fcdf29..789a26f1c7c1 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -41,9 +41,9 @@ namespace dbaccess public ::comphelper::OPropertyArrayUsageHelper < OResultColumn > { protected: - ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xDBMetaData; - sal_Int32 m_nPos; + sal_Int32 m_nPos; ::com::sun::star::uno::Any m_aIsRowVersion; mutable ::boost::optional< sal_Bool > m_isSigned; mutable ::boost::optional< sal_Bool > m_isCurrency; diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 6d0669b874e7..f495088bd69b 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -230,12 +230,12 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::createArrayHelper" ); BEGIN_PROPERTY_HELPER(6) - DECL_PROP1(CURSORNAME, ::rtl::OUString, READONLY); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); - DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY); - DECL_PROP1(RESULTSETCONCURRENCY, sal_Int32, READONLY); - DECL_PROP1(RESULTSETTYPE, sal_Int32, READONLY); + DECL_PROP1(CURSORNAME, ::rtl::OUString, READONLY); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY); + DECL_PROP1(RESULTSETCONCURRENCY, sal_Int32, READONLY); + DECL_PROP1(RESULTSETTYPE, sal_Int32, READONLY); END_PROPERTY_HELPER(); } @@ -282,7 +282,7 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const { sal_Bool bVal = m_bIsBookmarkable; rValue.setValue(&bVal, getBooleanCppuType()); - } break; + } break; default: { // get the property name diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index dfc750bf51be..9bca1b5c58da 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -70,24 +70,24 @@ namespace dbaccess //************************************************************ // OResultSet //************************************************************ - class OResultSet : public comphelper::OBaseMutex, + class OResultSet : public comphelper::OBaseMutex, public OResultSetBase, public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper < OResultSet > { protected: - ONoWeakStatement m_aStatement; + ONoWeakStatement m_aStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xDelegatorResultSet; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xDelegatorResultSetUpdate; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xDelegatorRow; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xDelegatorRowUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > m_xDelegatorResultSet; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetUpdate > m_xDelegatorResultSetUpdate; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > m_xDelegatorRow; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate > m_xDelegatorRowUpdate; ::dbtools::WarningsContainer m_aWarnings; - OColumns* m_pColumns; - sal_Int32 m_nResultSetType; - sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bIsBookmarkable : 1; + OColumns* m_pColumns; + sal_Int32 m_nResultSetType; + sal_Int32 m_nResultSetConcurrency; + sal_Bool m_bIsBookmarkable : 1; public: OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResultSet, diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index ebdc129d8c20..1b33f28b547f 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -200,15 +200,15 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::createArrayHelper" ); BEGIN_PROPERTY_HELPER(10) - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_PROP0_BOOL(ESCAPE_PROCESSING); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); - DECL_PROP0(MAXFIELDSIZE, sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); - DECL_PROP0(QUERYTIMEOUT, sal_Int32); - DECL_PROP0(RESULTSETCONCURRENCY, sal_Int32); - DECL_PROP0(RESULTSETTYPE, sal_Int32); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(MAXFIELDSIZE, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(QUERYTIMEOUT, sal_Int32); + DECL_PROP0(RESULTSETCONCURRENCY, sal_Int32); + DECL_PROP0(RESULTSETTYPE, sal_Int32); DECL_PROP0_BOOL(USEBOOKMARKS); END_PROPERTY_HELPER(); } diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 58194f3babfd..c25bdbec62ad 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -187,7 +187,7 @@ void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getFastPropertyValue" ); if ((PROPERTY_ID_PRIVILEGES == _nHandle) && (-1 == m_nPrivileges)) - { // somebody is asking for the privileges an we do not know them, yet + { // somebody is asking for the privileges an we do not know them, yet const_cast(this)->m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),m_CatalogName,m_SchemaName, m_Name); } @@ -235,22 +235,22 @@ void ODBTable::construct() registerProperty(PROPERTY_TEXTRELIEF, PROPERTY_ID_TEXTRELIEF, PropertyAttribute::BOUND, &m_nFontRelief, ::getCppuType(&m_nFontRelief)); - registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&m_aFont.Name, ::getCppuType(&m_aFont.Name)); - registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&m_aFont.Height, ::getCppuType(&m_aFont.Height)); - registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&m_aFont.Width, ::getCppuType(&m_aFont.Width)); - registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&m_aFont.StyleName, ::getCppuType(&m_aFont.StyleName)); - registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&m_aFont.Family, ::getCppuType(&m_aFont.Family)); - registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&m_aFont.CharSet, ::getCppuType(&m_aFont.CharSet)); - registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&m_aFont.Pitch, ::getCppuType(&m_aFont.Pitch)); - registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&m_aFont.CharacterWidth, ::getCppuType(&m_aFont.CharacterWidth)); - registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&m_aFont.Weight, ::getCppuType(&m_aFont.Weight)); - registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&m_aFont.Slant, ::getCppuType(&m_aFont.Slant)); - registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&m_aFont.Underline, ::getCppuType(&m_aFont.Underline)); - registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&m_aFont.Strikeout, ::getCppuType(&m_aFont.Strikeout)); - registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&m_aFont.Orientation, ::getCppuType(&m_aFont.Orientation)); - registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&m_aFont.Kerning, ::getCppuType(&m_aFont.Kerning)); - registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&m_aFont.WordLineMode, ::getCppuType(&m_aFont.WordLineMode)); - registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&m_aFont.Type, ::getCppuType(&m_aFont.Type)); + registerProperty(PROPERTY_FONTNAME, PROPERTY_ID_FONTNAME, PropertyAttribute::BOUND,&m_aFont.Name, ::getCppuType(&m_aFont.Name)); + registerProperty(PROPERTY_FONTHEIGHT, PROPERTY_ID_FONTHEIGHT, PropertyAttribute::BOUND,&m_aFont.Height, ::getCppuType(&m_aFont.Height)); + registerProperty(PROPERTY_FONTWIDTH, PROPERTY_ID_FONTWIDTH, PropertyAttribute::BOUND,&m_aFont.Width, ::getCppuType(&m_aFont.Width)); + registerProperty(PROPERTY_FONTSTYLENAME, PROPERTY_ID_FONTSTYLENAME, PropertyAttribute::BOUND,&m_aFont.StyleName, ::getCppuType(&m_aFont.StyleName)); + registerProperty(PROPERTY_FONTFAMILY, PROPERTY_ID_FONTFAMILY, PropertyAttribute::BOUND,&m_aFont.Family, ::getCppuType(&m_aFont.Family)); + registerProperty(PROPERTY_FONTCHARSET, PROPERTY_ID_FONTCHARSET, PropertyAttribute::BOUND,&m_aFont.CharSet, ::getCppuType(&m_aFont.CharSet)); + registerProperty(PROPERTY_FONTPITCH, PROPERTY_ID_FONTPITCH, PropertyAttribute::BOUND,&m_aFont.Pitch, ::getCppuType(&m_aFont.Pitch)); + registerProperty(PROPERTY_FONTCHARWIDTH, PROPERTY_ID_FONTCHARWIDTH, PropertyAttribute::BOUND,&m_aFont.CharacterWidth, ::getCppuType(&m_aFont.CharacterWidth)); + registerProperty(PROPERTY_FONTWEIGHT, PROPERTY_ID_FONTWEIGHT, PropertyAttribute::BOUND,&m_aFont.Weight, ::getCppuType(&m_aFont.Weight)); + registerProperty(PROPERTY_FONTSLANT, PROPERTY_ID_FONTSLANT, PropertyAttribute::BOUND,&m_aFont.Slant, ::getCppuType(&m_aFont.Slant)); + registerProperty(PROPERTY_FONTUNDERLINE, PROPERTY_ID_FONTUNDERLINE, PropertyAttribute::BOUND,&m_aFont.Underline, ::getCppuType(&m_aFont.Underline)); + registerProperty(PROPERTY_FONTSTRIKEOUT, PROPERTY_ID_FONTSTRIKEOUT, PropertyAttribute::BOUND,&m_aFont.Strikeout, ::getCppuType(&m_aFont.Strikeout)); + registerProperty(PROPERTY_FONTORIENTATION, PROPERTY_ID_FONTORIENTATION, PropertyAttribute::BOUND,&m_aFont.Orientation, ::getCppuType(&m_aFont.Orientation)); + registerProperty(PROPERTY_FONTKERNING, PROPERTY_ID_FONTKERNING, PropertyAttribute::BOUND,&m_aFont.Kerning, ::getCppuType(&m_aFont.Kerning)); + registerProperty(PROPERTY_FONTWORDLINEMODE, PROPERTY_ID_FONTWORDLINEMODE,PropertyAttribute::BOUND,&m_aFont.WordLineMode, ::getCppuType(&m_aFont.WordLineMode)); + registerProperty(PROPERTY_FONTTYPE, PROPERTY_ID_FONTTYPE, PropertyAttribute::BOUND,&m_aFont.Type, ::getCppuType(&m_aFont.Type)); refreshColumns(); } @@ -262,8 +262,8 @@ void ODBTable::construct() describeProperties(aProps); if(!_nId) { - Property* pIter = aProps.getArray(); - Property* pEnd = pIter + aProps.getLength(); + Property* pIter = aProps.getArray(); + Property* pEnd = pIter + aProps.getLength(); for(;pIter != pEnd;++pIter) { if (0 == pIter->Name.compareToAscii(PROPERTY_CATALOGNAME)) diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 827fbf2cf465..4b86763db667 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -87,7 +87,7 @@ namespace if ( xState.is() ) { const ::rtl::OUString* pIter = _aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + _aNames.getLength(); + const ::rtl::OUString* pEnd = pIter + _aNames.getLength(); for(;pIter != pEnd;++pIter) { try @@ -115,8 +115,8 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const Reference< XConnection >& _xCon, sal_Bool _bCase, - const Reference< XNameContainer >& _xTableDefinitions, - IRefreshListener* _pRefreshListener, + const Reference< XNameContainer >& _xTableDefinitions, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) :OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend) @@ -130,7 +130,7 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent, OTableContainer::~OTableContainer() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::OTableContainer" ); - // dispose(); + // dispose(); DBG_DTOR(OTableContainer, NULL); } @@ -231,8 +231,8 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const ::rtl::OUStr Reference< XRow > xRow(xRes,UNO_QUERY); if(xRow.is()) { - sType = xRow->getString(4); - sDescription = xRow->getString(5); + sType = xRow->getString(4); + sDescription = xRow->getString(5); } } ::comphelper::disposeComponent(xRes); @@ -346,7 +346,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons Reference xProp = xFac->createDataDescriptor(); Sequence< ::rtl::OUString> aSeq = xNames->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { if ( !xColumnDefinitions->hasByName(*pIter) ) @@ -362,7 +362,7 @@ ObjectType OTableContainer::appendObject( const ::rtl::OUString& _rForName, cons } } } - const static ::rtl::OUString s_pTableProps[] = { ::rtl::OUString(PROPERTY_FILTER), ::rtl::OUString(PROPERTY_ORDER) + const static ::rtl::OUString s_pTableProps[] = { ::rtl::OUString(PROPERTY_FILTER), ::rtl::OUString(PROPERTY_ORDER) , ::rtl::OUString(PROPERTY_APPLYFILTER), ::rtl::OUString(PROPERTY_FONT) , ::rtl::OUString(PROPERTY_ROW_HEIGHT), ::rtl::OUString(PROPERTY_TEXTCOLOR) , ::rtl::OUString(PROPERTY_TEXTLINECOLOR), ::rtl::OUString(PROPERTY_TEXTEMPHASIS) @@ -393,15 +393,15 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElement if ( xTable.is() && m_xMetaData.is() ) { if( m_xMetaData.is() && m_xMetaData->supportsCatalogsInTableDefinitions() ) - xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; + xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; if( m_xMetaData.is() && m_xMetaData->supportsSchemasInTableDefinitions() ) - xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; - xTable->getPropertyValue(PROPERTY_NAME) >>= sTable; + xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; + xTable->getPropertyValue(PROPERTY_NAME) >>= sTable; sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); ::rtl::OUString sType; - xTable->getPropertyValue(PROPERTY_TYPE) >>= sType; + xTable->getPropertyValue(PROPERTY_TYPE) >>= sType; bIsView = sType.equalsIgnoreAsciiCase(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VIEW"))); } @@ -469,8 +469,8 @@ void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) th // create a new config entry { ::rtl::OUString sOldComposedName,sNewComposedName; - Event.ReplacedElement >>= sOldComposedName; - Event.Accessor >>= sNewComposedName; + Event.ReplacedElement >>= sOldComposedName; + Event.Accessor >>= sNewComposedName; renameObject(sOldComposedName,sNewComposedName); } @@ -481,7 +481,7 @@ void SAL_CALL OTableContainer::disposing() RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::disposing" ); OFilteredContainer::disposing(); // say our listeners goobye - m_xTableDefinitions = NULL; + m_xTableDefinitions = NULL; m_pTableMediator = NULL; } diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 075bb806f095..465e451ace9b 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -78,7 +78,7 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent ,::osl::Mutex& _rMutex ,const Reference< XConnection >& _xCon ,sal_Bool _bCase - ,IRefreshListener* _pRefreshListener + ,IRefreshListener* _pRefreshListener ,::dbtools::IWarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) :OFilteredContainer(_rParent,_rMutex,_xCon,_bCase,_pRefreshListener,_pWarningsContainer,_nInAppend) @@ -89,7 +89,7 @@ OViewContainer::OViewContainer(::cppu::OWeakObject& _rParent OViewContainer::~OViewContainer() { - // dispose(); + // dispose(); DBG_DTOR(OViewContainer, NULL); } @@ -196,9 +196,9 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN Reference xTable(getObject(_nPos),UNO_QUERY); if ( xTable.is() ) { - xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; - xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; - xTable->getPropertyValue(PROPERTY_NAME) >>= sTable; + xTable->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; + xTable->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; + xTable->getPropertyValue(PROPERTY_NAME) >>= sTable; sComposedName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sTable, sal_True, ::dbtools::eInTableDefinitions ); } diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 24b4716159ed..df7a85434a91 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -62,7 +62,7 @@ namespace dbaccess { /// helper class for column property change events which holds the OComponentDefinition weak -typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE; +typedef ::cppu::WeakImplHelper1 < XPropertyChangeListener > TColumnPropertyListener_BASE; class OColumnPropertyListener : public TColumnPropertyListener_BASE { OComponentDefinition* m_pComponent; @@ -121,7 +121,7 @@ void OComponentDefinition::registerProperties() } OComponentDefinition::OComponentDefinition(const Reference< XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTable) :OContentHelper(_xORB,_xParentContainer,_pImpl) @@ -138,7 +138,7 @@ OComponentDefinition::~OComponentDefinition() } -OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer +OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer ,const ::rtl::OUString& _rElementName ,const Reference< XMultiServiceFactory >& _xORB ,const TContentPtr& _pImpl @@ -297,5 +297,5 @@ void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxS notifyDataSourceModified(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 0eba07a61dd4..6da15cd19fbb 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -66,8 +66,8 @@ namespace dbaccess Columns m_aColumns; public: - ::rtl::OUString m_sSchemaName; - ::rtl::OUString m_sCatalogName; + ::rtl::OUString m_sSchemaName; + ::rtl::OUString m_sCatalogName; public: OComponentDefinition_Impl(); @@ -93,7 +93,7 @@ class OColumnPropertyListener; //========================================================================= //= OComponentDefinition - a database "document" which describes a query //========================================================================= -class OComponentDefinition :public OContentHelper +class OComponentDefinition :public OContentHelper ,public ODataSettings ,public IColumnFactory ,public OComponentDefinition_BASE @@ -105,7 +105,7 @@ protected: ::std::auto_ptr< OColumns > m_pColumns; ::comphelper::ImplementationReference< OColumnPropertyListener,::com::sun::star::beans::XPropertyChangeListener> m_xColumnPropertyListener; - sal_Bool m_bTable; + sal_Bool m_bTable; virtual ~OComponentDefinition(); virtual void SAL_CALL disposing(); @@ -113,7 +113,7 @@ protected: protected: OComponentDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTable = sal_True); @@ -154,7 +154,7 @@ public: virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); @@ -176,7 +176,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // DBA_COREDATAACESS_COMPONENTDEFINITION_HXX diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index fb6bf98877fc..da4e3c271a69 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -72,7 +72,7 @@ OContentHelper_Impl::~OContentHelper_Impl() } OContentHelper::OContentHelper(const Reference< XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl) : OContentHelper_COMPBASE(m_aMutex) ,m_aContentListeners(m_aMutex) @@ -234,7 +234,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma Reference xProp(*this,UNO_QUERY); if ( xProp.is() ) aRet <<= xProp->getPropertySetInfo(); - // aRet <<= getPropertySetInfo(); // TODO + // aRet <<= getPropertySetInfo(); // TODO } else { @@ -349,7 +349,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue PropertyChangeEvent aEvent; aEvent.Source = static_cast< cppu::OWeakObject * >( this ); - aEvent.Further = sal_False; + aEvent.Further = sal_False; aEvent.PropertyHandle = -1; const PropertyValue* pValues = rValues.getConstArray(); @@ -433,7 +433,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue if ( nChanged > 0 ) { // @@@ Save changes. -// storeData(); +// storeData(); notifyDataSourceModified(); aGuard.clear(); @@ -638,7 +638,7 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN Sequence< PropertyChangeEvent > aChanges( 1 ); aChanges[0].Source = static_cast< cppu::OWeakObject * >( this ); - aChanges[0].Further = sal_False; + aChanges[0].Further = sal_False; aChanges[0].PropertyName = PROPERTY_NAME; aChanges[0].PropertyHandle = PROPERTY_ID_NAME; aChanges[0].OldValue <<= m_pImpl->m_aProps.aTitle; @@ -669,5 +669,5 @@ void OContentHelper::notifyDataSourceModified() ::dbaccess::notifyDataSourceModified(m_xParentContainer,sal_True); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 5d31055d2cc2..d3de75af3d53 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -1431,5 +1431,5 @@ ModelDependentComponent::~ModelDependentComponent() { } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index d18f820bff47..223654c38b85 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -192,8 +192,8 @@ public: private: OModuleClient m_aModuleClient; - ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource > m_xDataSource; + ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel; + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDataSource > m_xDataSource; DocumentStorageAccess* m_pStorageAccess; ::comphelper::SharedMutex m_aMutex; @@ -207,14 +207,14 @@ private: SharedStorage m_xDocumentStorage; ::rtl::Reference< ::sfx2::DocumentStorageModifyListener > m_pStorageModifyListener; - ODatabaseContext* m_pDBContext; + ODatabaseContext* m_pDBContext; DocumentEventsData m_aDocumentEvents; ::comphelper::NamedValueCollection m_aMediaDescriptor; /// the URL the document was loaded from - ::rtl::OUString m_sDocFileLocation; + ::rtl::OUString m_sDocFileLocation; - oslInterlockedCount m_refCount; + oslInterlockedCount m_refCount; /// do we have any object (forms/reports) which contains macros? ::boost::optional< EmbeddedMacros > m_aEmbeddedMacros; @@ -240,32 +240,32 @@ public: const ::comphelper::ComponentContext m_aContext; public: - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xCommandDefinitions; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xTableDefinitions; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xCommandDefinitions; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xTableDefinitions; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - ::rtl::OUString m_sConnectURL; - ::rtl::OUString m_sName; // transient, our creator has to tell us the title - ::rtl::OUString m_sUser; - ::rtl::OUString m_aPassword; // transient ! + ::rtl::OUString m_sConnectURL; + ::rtl::OUString m_sName; // transient, our creator has to tell us the title + ::rtl::OUString m_sUser; + ::rtl::OUString m_aPassword; // transient ! ::rtl::OUString m_sFailedPassword; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; sal_Int32 m_nLoginTimeout; - sal_Bool m_bReadOnly : 1; - sal_Bool m_bPasswordRequired : 1; - sal_Bool m_bSuppressVersionColumns : 1; - sal_Bool m_bModified : 1; - sal_Bool m_bDocumentReadOnly : 1; + sal_Bool m_bReadOnly : 1; + sal_Bool m_bPasswordRequired : 1; + sal_Bool m_bSuppressVersionColumns : 1; + sal_Bool m_bModified : 1; + sal_Bool m_bDocumentReadOnly : 1; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyAccess > m_xSettings; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; - OSharedConnectionManager* m_pSharedConnectionManager; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + OSharedConnectionManager* m_pSharedConnectionManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xSharedConnectionManager; - sal_uInt16 m_nControllerLockCount; + sal_uInt16 m_nControllerLockCount; void reset(); @@ -336,7 +336,7 @@ public: stripLoadArguments( const ::comphelper::NamedValueCollection& _rArguments ); // other stuff - void flushTables(); + void flushTables(); // disposes all elements in m_aStorages, and clears it void disposeStorages() SAL_THROW(()); @@ -636,7 +636,7 @@ public: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index 6c18633de23e..eaa2628648f2 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -38,7 +38,7 @@ namespace dbaccess using namespace ::com::sun::star::lang; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; -// using namespace ::com::sun::star::reflection; +// using namespace ::com::sun::star::reflection; using namespace connectivity; DBG_NAME(OSharedConnection) @@ -164,5 +164,5 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OSharedConnection return m_xConnection->getTypeMap(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index 5706d20ef5ae..4d21609d8d2c 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -54,9 +54,9 @@ namespace dbaccess //======================================================================================= typedef ::cppu::WeakComponentImplHelper1< ::com::sun::star::sdbc::XConnection > OSharedConnection_BASE; - typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2; + typedef ::connectivity::OConnectionWrapper OSharedConnection_BASE2; - class OSharedConnection : public ::comphelper::OBaseMutex + class OSharedConnection : public ::comphelper::OBaseMutex , public OSharedConnection_BASE , public OSharedConnection_BASE2 { @@ -137,7 +137,7 @@ namespace dbaccess IMPLEMENT_GET_IMPLEMENTATION_ID( OSharedConnection ); #endif -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CORE_SHARED_CONNECTION_HXX diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index a7d17634a81d..9caf1a583dc7 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -286,7 +286,7 @@ Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) thr Sequence< ::rtl::OUString > aNames(m_aBookmarks.size()); ::rtl::OUString* pNames = aNames.getArray(); ; - for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin(); + for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin(); aNameIter != m_aBookmarksIndexed.end(); ++pNames, ++aNameIter ) @@ -311,7 +311,7 @@ void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) // look for the name in the index access vector MapString2StringIterator aMapPos = m_aBookmarks.end(); - for ( MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin(); + for ( MapIteratorVectorIterator aSearch = m_aBookmarksIndexed.begin(); aSearch != m_aBookmarksIndexed.end(); ++aSearch ) @@ -342,7 +342,7 @@ void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl:: MutexGuard aGuard(m_rMutex); OSL_ENSURE(m_aBookmarks.find(_rName) == m_aBookmarks.end(),"Bookmark already known!"); - m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first); + m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first); } void OBookmarkContainer::implReplace(const ::rtl::OUString& _rName, const ::rtl::OUString& _rNewLink) @@ -367,5 +367,5 @@ void SAL_CALL OBookmarkContainer::setParent( const Reference< XInterface >& /*Pa throw NoSupportException(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index b41c70ae75e3..648d5654d114 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -47,17 +47,17 @@ namespace dbaccess { //========================================================================== -//= OBookmarkContainer - base class of collections of database definition -//= documents +//= OBookmarkContainer - base class of collections of database definition +//= documents //========================================================================== -typedef ::cppu::WeakImplHelper6 < +typedef ::cppu::WeakImplHelper6 < ::com::sun::star::container::XIndexAccess - , ::com::sun::star::container::XNameContainer - , ::com::sun::star::container::XEnumerationAccess - , ::com::sun::star::container::XContainer - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::container::XChild - > OBookmarkContainer_Base; + , ::com::sun::star::container::XNameContainer + , ::com::sun::star::container::XEnumerationAccess + , ::com::sun::star::container::XContainer + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::container::XChild + > OBookmarkContainer_Base; class OBookmarkContainer :public OBookmarkContainer_Base @@ -66,21 +66,21 @@ protected: DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString, MapString2String); DECLARE_STL_VECTOR(MapString2StringIterator, MapIteratorVector); - MapString2String m_aBookmarks; // the bookmarks itself - MapIteratorVector m_aBookmarksIndexed; // for index access to the + MapString2String m_aBookmarks; // the bookmarks itself + MapIteratorVector m_aBookmarksIndexed; // for index access to the protected: - ::cppu::OWeakObject& m_rParent; // for the ref counting + ::cppu::OWeakObject& m_rParent; // for the ref counting ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::osl::Mutex& m_rMutex; + ::osl::Mutex& m_rMutex; public: /** constructs the container.
after the construction of the object the creator has to call initialize. - @param _rParent the parent object which is used for ref counting - @param _rMutex the parent's mutex object for access safety + @param _rParent the parent object which is used for ref counting + @param _rMutex the parent's mutex object for access safety */ OBookmarkContainer( ::cppu::OWeakObject& _rParent, @@ -135,26 +135,26 @@ public: /** tell the container to free all resources. After that it's in a state like after the construction, i.e. you may call initialize again (maybe with another configuration node). */ - virtual void dispose(); + virtual void dispose(); protected: - /** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and + /** checks whether the object is basically alive, i.e. it has been fully initialized (@see initialize) and not disposed (@see dispose) - @param _bIntendWriteAccess determines whether or not the caller intends to modify the configuration. + @param _bIntendWriteAccess determines whether or not the caller intends to modify the configuration. if sal_True and the configuration is readonly, a runtime exception with a description string is thrown. */ - void checkValid(sal_Bool _bIntendWriteAccess) const throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::DisposedException); + void checkValid(sal_Bool _bIntendWriteAccess) const throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::DisposedException); /** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e. if there is such an object which is not already loaded, it won't be loaded now. - @param _rName the object name to check - @return sal_True if there already exists such an object + @param _rName the object name to check + @return sal_True if there already exists such an object */ - inline sal_Bool checkExistence(const ::rtl::OUString& _rName); + inline sal_Bool checkExistence(const ::rtl::OUString& _rName); - void implAppend( + void implAppend( const ::rtl::OUString& _rName, const ::rtl::OUString& _rDocumentLocation ); @@ -167,12 +167,12 @@ protected: }; -inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName) +inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName) { return m_aBookmarks.find(_rName) != m_aBookmarks.end(); } -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_BOOKMARKCONTAINER_HXX_ diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index 695b952ca2f4..3394cd0f0ca4 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -53,7 +53,7 @@ namespace dbaccess DBG_NAME(OCommandContainer) OCommandContainer::OCommandContainer( const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTables ) @@ -97,5 +97,5 @@ Reference< XInterface > SAL_CALL OCommandContainer::createInstance( ) throw (Exc return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.org.openoffice.DatabaseCommandDefinitionContainer" ) ); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index e1ff6b34357c..a425d7795dbe 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -44,7 +44,7 @@ namespace dbaccess typedef ::cppu::ImplHelper1 < ::com::sun::star::lang::XSingleServiceFactory > OCommandContainer_BASE; -class OCommandContainer : public ODefinitionContainer +class OCommandContainer : public ODefinitionContainer ,public OCommandContainer_BASE { sal_Bool m_bTables; @@ -54,7 +54,7 @@ public: */ OCommandContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ,sal_Bool _bTables ); @@ -77,7 +77,7 @@ protected: virtual ::rtl::OUString determineContentType() const; }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_ diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 8ab8abe30755..6cfd9231560f 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -98,7 +98,7 @@ OCommandDefinition::~OCommandDefinition() DBG_DTOR(OCommandDefinition, NULL); } -OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer +OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer ,const ::rtl::OUString& _rElementName ,const Reference< XMultiServiceFactory >& _xORB ,const TContentPtr& _pImpl) @@ -163,5 +163,5 @@ void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw } } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 30f22948cb62..b823c08f86d2 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -56,13 +56,13 @@ namespace dbaccess public: }; -typedef ::cppu::ImplHelper1 < ::com::sun::star::sdbcx::XRename - > OCommandDefinition_Base; +typedef ::cppu::ImplHelper1 < ::com::sun::star::sdbcx::XRename + > OCommandDefinition_Base; class OCommandDefinition; typedef ::comphelper::OPropertyArrayUsageHelper< OCommandDefinition > OCommandDefinition_PROP; -class OCommandDefinition :public OComponentDefinition +class OCommandDefinition :public OComponentDefinition ,public OCommandDefinition_Base ,public OCommandDefinition_PROP { @@ -70,7 +70,7 @@ protected: virtual ~OCommandDefinition(); OCommandDefinition(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ); @@ -114,7 +114,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_ diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 89840f11e2cb..490d0c47ffe0 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -560,7 +560,7 @@ Reference< XSQLQueryComposer > OConnection::createQueryComposer(void) throw( Ru MutexGuard aGuard(m_aMutex); checkDisposed(); - // Reference< XNumberFormatsSupplier > xSupplier = pParent->getNumberFormatsSupplier(); + // Reference< XNumberFormatsSupplier > xSupplier = pParent->getNumberFormatsSupplier(); Reference< XSQLQueryComposer > xComposer( new OQueryComposer( this ) ); m_aComposers.push_back(WeakReferenceHelper(xComposer)); return xComposer; @@ -588,11 +588,11 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed) getMasterTables(); if (m_xMasterTables.is() && m_xMasterTables->getTables().is()) - { // yes -> wrap them + { // yes -> wrap them m_pTables->construct(m_xMasterTables->getTables(),m_aTableFilter, m_aTableTypeFilter); } else - { // no -> use an own container + { // no -> use an own container m_pTables->construct(m_aTableFilter, m_aTableTypeFilter); } } @@ -890,5 +890,5 @@ Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< X return xReturn; } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 20488aa13e1c..2918d4f74192 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -86,7 +86,7 @@ class ODatabaseSource; //========================================================================== //= OConnection //========================================================================== -class OConnection :public ::comphelper::OBaseMutex +class OConnection :public ::comphelper::OBaseMutex ,public OSubComponent ,public ::connectivity::OConnectionWrapper ,public OConnection_Base @@ -95,16 +95,16 @@ class OConnection :public ::comphelper::OBaseMutex protected: ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > m_xMasterTables; // just to avoid the recreation of the catalog - OWeakRefArray m_aStatements; + OWeakRefArray m_aStatements; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xQueries; - OWeakRefArray m_aComposers; + OWeakRefArray m_aComposers; // the filter as set on the parent data link at construction of the connection - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; ::comphelper::ComponentContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XConnectionTools > m_xConnectionTools; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XTableUIProvider > m_xTableUIProvider; @@ -114,13 +114,13 @@ protected: TSupportServices m_aSupportServices; - OTableContainer* m_pTables; - OViewContainer* m_pViews; + OTableContainer* m_pTables; + OViewContainer* m_pViews; ::dbtools::WarningsContainer m_aWarnings; oslInterlockedCount m_nInAppend; - sal_Bool m_bSupportsViews; // true when the getTableTypes return "VIEW" as type - sal_Bool m_bSupportsUsers; - sal_Bool m_bSupportsGroups; + sal_Bool m_bSupportsViews; // true when the getTableTypes return "VIEW" as type + sal_Bool m_bSupportsUsers; + sal_Bool m_bSupportsGroups; protected: virtual ~OConnection(); @@ -216,7 +216,7 @@ public: virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed); protected: - inline void checkDisposed() throw (::com::sun::star::lang::DisposedException) + inline void checkDisposed() throw (::com::sun::star::lang::DisposedException) { if ( rBHelper.bDisposed || !m_xConnection.is() ) throw ::com::sun::star::lang::DisposedException(); @@ -245,7 +245,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_CORE_CONNECTION_HXX_ diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 16d578588f0d..6fcf10a307d1 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -178,7 +178,7 @@ namespace dbaccess void SAL_CALL DatabaseDocumentLoader::notifyTermination( const lang::EventObject& /*Event*/ ) throw (RuntimeException) { } - + void SAL_CALL DatabaseDocumentLoader::disposing( const lang::EventObject& /*Source*/ ) throw (RuntimeException) { } @@ -289,7 +289,7 @@ void ODatabaseContext::disposing() // dispose the data sources ObjectCache::iterator aEnd = m_aDatabaseObjects.end(); - for ( ObjectCache::iterator aIter = m_aDatabaseObjects.begin(); + for ( ObjectCache::iterator aIter = m_aDatabaseObjects.begin(); aIter != aEnd; ++aIter ) @@ -471,8 +471,8 @@ void ODatabaseContext::storeTransientProperties( ODatabaseModelImpl& _rModelImpl const Property* pProperties = aProperties.getConstArray(); for ( sal_Int32 i=0; iAttributes & PropertyAttribute::TRANSIENT) != 0 ) - && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 ) + if ( ( ( pProperties->Attributes & PropertyAttribute::TRANSIENT) != 0 ) + && ( ( pProperties->Attributes & PropertyAttribute::READONLY) == 0 ) ) { // found such a property @@ -643,19 +643,19 @@ Any ODatabaseContext::getByName(const rtl::OUString& _rName) throw( NoSuchElemen return makeAny( xExistent ); } catch (NoSuchElementException&) - { // let these exceptions through + { // let these exceptions through throw; } catch (WrappedTargetException&) - { // let these exceptions through + { // let these exceptions through throw; } catch (RuntimeException&) - { // let these exceptions through + { // let these exceptions through throw; } catch (Exception& e) - { // exceptions other than the speciafied ones -> wrap + { // exceptions other than the speciafied ones -> wrap Any aError = ::cppu::getCaughtException(); throw WrappedTargetException(_rName, *this, aError ); } @@ -766,5 +766,5 @@ void ODatabaseContext::onBasicManagerCreated( const Reference< XModel >& _rxForD _rBasicManager.SetGlobalUNOConstant( "ThisDatabaseDocument", makeAny( xDatabaseDocument ) ); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx index e7dbf9417e7e..71d5fb4ebc23 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.hxx +++ b/dbaccess/source/core/dataaccess/databasecontext.hxx @@ -75,15 +75,15 @@ class DatabaseDocumentLoader; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ODatabaseContext_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); -typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::container::XEnumerationAccess - , ::com::sun::star::container::XNameAccess - , ::com::sun::star::uno::XNamingService - , ::com::sun::star::container::XContainer - , ::com::sun::star::lang::XSingleServiceFactory - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::sdb::XDatabaseRegistrations - > DatabaseAccessContext_Base; +typedef ::cppu::WeakComponentImplHelper8 < ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::container::XEnumerationAccess + , ::com::sun::star::container::XNameAccess + , ::com::sun::star::uno::XNamingService + , ::com::sun::star::container::XContainer + , ::com::sun::star::lang::XSingleServiceFactory + , ::com::sun::star::lang::XUnoTunnel + , ::com::sun::star::sdb::XDatabaseRegistrations + > DatabaseAccessContext_Base; class ODatabaseContext :public DatabaseAccessContext_Base ,public ::basic::BasicManagerCreationListener @@ -108,7 +108,7 @@ private: impl_createNewDataSource(); protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; ::comphelper::ComponentContext m_aContext; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > @@ -117,17 +117,17 @@ protected: m_xDatabaseRegistrations; DECLARE_STL_USTRINGACCESS_MAP( ODatabaseModelImpl*, ObjectCache ); - ObjectCache m_aDatabaseObjects; + ObjectCache m_aDatabaseObjects; DECLARE_STL_USTRINGACCESS_MAP( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >, PropertyCache ); - PropertyCache m_aDatasourceProperties; + PropertyCache m_aDatasourceProperties; // as we hold our data sources weak, we have to cache all properties on the data sources which are // transient but stored as long as the session lasts. The database context is the session (as it lives // as long as the session does), but the data sources may die before the session does, and then be // recreated afterwards. So it's our (the context's) responsibility to store the session-persistent // properties. - ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; DatabaseDocumentLoader* m_pDatabaseDocumentLoader; public: @@ -205,7 +205,7 @@ private: }; //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ #endif // _DBA_COREDATAACCESS_DATABASECONTEXT_HXX_ diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index f6dea5f99b3c..46a82018781f 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -164,7 +164,7 @@ extern "C" void SAL_CALL createRegistryInfo_ODatabaseDocument() static ::dba::OAutoRegistration< ODatabaseDocument > aAutoRegistration; } -ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference& _pImpl ) +ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference& _pImpl ) :ModelDependentComponent( _pImpl ) ,ODatabaseDocument_OfficeDocument( getMutex() ) ,m_aModifyListeners( getMutex() ) @@ -254,7 +254,7 @@ void SAL_CALL ODatabaseDocument::release( ) throw () ODatabaseDocument_OfficeDocument::release(); } -Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeException) +Sequence< Type > SAL_CALL ODatabaseDocument::getTypes( ) throw (RuntimeException) { Sequence< Type > aTypes = ::comphelper::concatSequences( ODatabaseDocument_OfficeDocument::getTypes(), @@ -2088,5 +2088,5 @@ void SAL_CALL ODatabaseDocument::releaseNumberForComponent( const uno::Reference return ::rtl::OUString();/*RTL_CONSTASCII_USTRINGPARAM(" : "));*/ } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index a032251f8efa..9659c033260c 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -166,11 +166,11 @@ typedef ::comphelper::WeakComponentImplHelper17 < ::com::sun::star::frame::XMo > ODatabaseDocument_OfficeDocument; typedef ::cppu::ImplHelper3< ::com::sun::star::frame::XTitle - , ::com::sun::star::frame::XTitleChangeBroadcaster - , ::com::sun::star::frame::XUntitledNumbers + , ::com::sun::star::frame::XTitleChangeBroadcaster + , ::com::sun::star::frame::XUntitledNumbers > ODatabaseDocument_Title; -class ODatabaseDocument :public ModelDependentComponent // ModelDependentComponent must be first! +class ODatabaseDocument :public ModelDependentComponent // ModelDependentComponent must be first! ,public ODatabaseDocument_OfficeDocument ,public ODatabaseDocument_Title { @@ -182,11 +182,11 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe }; DECLARE_STL_USTRINGACCESS_MAP(::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers >,TNumberedController); - ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; + ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager> m_xUIConfigurationManager; - ::cppu::OInterfaceContainerHelper m_aModifyListeners; - ::cppu::OInterfaceContainerHelper m_aCloseListener; - ::cppu::OInterfaceContainerHelper m_aStorageListeners; + ::cppu::OInterfaceContainerHelper m_aModifyListeners; + ::cppu::OInterfaceContainerHelper m_aCloseListener; + ::cppu::OInterfaceContainerHelper m_aStorageListeners; DocumentEvents* m_pEventContainer; ::rtl::Reference< DocumentEventExecutor > m_pEventExecutor; @@ -196,8 +196,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe Controllers m_aControllers; ViewMonitor m_aViewMonitor; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; - ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xForms; + ::com::sun::star::uno::WeakReference< ::com::sun::star::container::XNameAccess > m_xReports; ::com::sun::star::uno::WeakReference< ::com::sun::star::script::provider::XScriptProvider > m_xScriptProvider; /** @short such module manager is used to classify new opened documents. */ @@ -249,8 +249,8 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe /// write a single XML stream into the package void WriteThroughComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > & xComponent, /// the component we export - const sal_Char* pStreamName, /// the stream name - const sal_Char* pServiceName, /// service name of the component + const sal_Char* pStreamName, /// the stream name + const sal_Char* pServiceName, /// service name of the component const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> & rArguments, /// the argument (XInitialization) const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> & rMediaDesc,/// output descriptor const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _xStorageToSaveTo @@ -268,11 +268,11 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe ) const; /** writes the content and settings - @param sURL + @param sURL The URL - @param lArguments + @param lArguments The media descriptor - @param _xStorageToSaveTo + @param _xStorageToSaveTo The storage which should be used for saving */ void impl_writeStorage_throw( @@ -318,7 +318,7 @@ public: SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); // XInterface - virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(const ::com::sun::star::uno::Type& _rType) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL acquire( ) throw (); virtual void SAL_CALL release( ) throw (); @@ -703,7 +703,7 @@ private: const ODatabaseDocument& m_document; }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index 092432d7e487..4577ebb077e9 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -296,8 +296,8 @@ class OSharedConnectionManager : public OConnectionHelper_BASE // contains the currently used master connections typedef struct { - Reference< XConnection > xMasterConnection; - oslInterlockedCount nALiveCount; + Reference< XConnection > xMasterConnection; + oslInterlockedCount nALiveCount; } TConnectionHolder; // the less-compare functor, used for the stl::map @@ -312,13 +312,13 @@ class OSharedConnectionManager : public OConnectionHelper_BASE } }; - typedef ::std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections - typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections + typedef ::std::map< TDigestHolder,TConnectionHolder,TDigestLess> TConnectionMap; // holds the master connections + typedef ::std::map< Reference< XConnection >,TConnectionMap::iterator> TSharedConnectionMap;// holds the shared connections - ::osl::Mutex m_aMutex; - TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest - TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map - Reference< XProxyFactory > m_xProxyFactory; + ::osl::Mutex m_aMutex; + TConnectionMap m_aConnections; // remeber the master connection in conjunction with the digest + TSharedConnectionMap m_aSharedConnection; // the shared connections with conjunction with an iterator into the connections map + Reference< XProxyFactory > m_xProxyFactory; protected: ~OSharedConnectionManager(); @@ -327,7 +327,7 @@ public: OSharedConnectionManager(const Reference< XMultiServiceFactory >& _rxServiceFactory); void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(RuntimeException); - Reference getConnection( const rtl::OUString& url, + Reference getConnection( const rtl::OUString& url, const rtl::OUString& user, const rtl::OUString& password, const Sequence< PropertyValue >& _aInfo, @@ -364,7 +364,7 @@ void SAL_CALL OSharedConnectionManager::disposing( const ::com::sun::star::lang: } } -Reference OSharedConnectionManager::getConnection( const rtl::OUString& url, +Reference OSharedConnectionManager::getConnection( const rtl::OUString& url, const rtl::OUString& user, const rtl::OUString& password, const Sequence< PropertyValue >& _aInfo, @@ -375,15 +375,15 @@ Reference OSharedConnectionManager::getConnection( const rtl::OUStr Sequence< PropertyValue > aInfoCopy(_aInfo); sal_Int32 nPos = aInfoCopy.getLength(); aInfoCopy.realloc( nPos + 2 ); - aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter")); + aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableFilter")); aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableFilter; - aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter")); + aInfoCopy[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TableTypeFilter")); aInfoCopy[nPos++].Value <<= _pDataSource->m_pImpl->m_aTableTypeFilter; // #22377# OJ ::rtl::OUString sUser = user; ::rtl::OUString sPassword = password; if ((0 == sUser.getLength()) && (0 == sPassword.getLength()) && (0 != _pDataSource->m_pImpl->m_sUser.getLength())) - { // ease the usage of this method. data source which are intended to have a user automatically + { // ease the usage of this method. data source which are intended to have a user automatically // fill in the user/password combination if the caller of this method does not specify otherwise // 86951 - 05/08/2001 - frank.schoenheit@germany.sun.com sUser = _pDataSource->m_pImpl->m_sUser; @@ -542,7 +542,7 @@ void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocume Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getTypes" ); - OTypeCollection aPropertyHelperTypes( ::getCppuType( (const Reference< XFastPropertySet > *)0 ), + OTypeCollection aPropertyHelperTypes( ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 ), ::getCppuType( (const Reference< XMultiPropertySet > *)0 )); @@ -662,7 +662,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const ::rtl::O ::rtl::OUString sUser(_rUid); ::rtl::OUString sPwd(_rPwd); if ((0 == sUser.getLength()) && (0 == sPwd.getLength()) && (0 != m_pImpl->m_sUser.getLength())) - { // ease the usage of this method. data source which are intended to have a user automatically + { // ease the usage of this method. data source which are intended to have a user automatically // fill in the user/password combination if the caller of this method does not specify otherwise sUser = m_pImpl->m_sUser; if (0 != m_pImpl->m_aPassword.getLength()) @@ -770,19 +770,19 @@ Reference< XPropertySetInfo > ODatabaseSource::getPropertySetInfo() throw (Runt { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::createArrayHelper" ); BEGIN_PROPERTY_HELPER(13) - DECL_PROP1(INFO, Sequence< PropertyValue >, BOUND); - DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND); - DECL_PROP1_BOOL(ISREADONLY, READONLY); - DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND); - DECL_PROP1(NAME, ::rtl::OUString, READONLY); - DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); - DECL_PROP1(PASSWORD, ::rtl::OUString, TRANSIENT); + DECL_PROP1(INFO, Sequence< PropertyValue >, BOUND); + DECL_PROP1_BOOL(ISPASSWORDREQUIRED, BOUND); + DECL_PROP1_BOOL(ISREADONLY, READONLY); + DECL_PROP1(LAYOUTINFORMATION, Sequence< PropertyValue >, BOUND); + DECL_PROP1(NAME, ::rtl::OUString, READONLY); + DECL_PROP2_IFACE(NUMBERFORMATSSUPPLIER, XNumberFormatsSupplier, READONLY, TRANSIENT); + DECL_PROP1(PASSWORD, ::rtl::OUString, TRANSIENT); DECL_PROP2_IFACE(SETTINGS, XPropertySet, BOUND, READONLY); - DECL_PROP1_BOOL(SUPPRESSVERSIONCL, BOUND); - DECL_PROP1(TABLEFILTER, Sequence< ::rtl::OUString >,BOUND); - DECL_PROP1(TABLETYPEFILTER, Sequence< ::rtl::OUString >,BOUND); - DECL_PROP1(URL, ::rtl::OUString, BOUND); - DECL_PROP1(USER, ::rtl::OUString, BOUND); + DECL_PROP1_BOOL(SUPPRESSVERSIONCL, BOUND); + DECL_PROP1(TABLEFILTER, Sequence< ::rtl::OUString >,BOUND); + DECL_PROP1(TABLETYPEFILTER, Sequence< ::rtl::OUString >,BOUND); + DECL_PROP1(URL, ::rtl::OUString, BOUND); + DECL_PROP1(USER, ::rtl::OUString, BOUND); END_PROPERTY_HELPER(); } @@ -823,7 +823,7 @@ sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any & case PROPERTY_ID_URL: { bModified = ::comphelper::tryPropertyValue(rConvertedValue, rOldValue, rValue, m_pImpl->m_sConnectURL); - } break; + } break; case PROPERTY_ID_INFO: { Sequence aValues; @@ -1124,7 +1124,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const sal_Bool bNewPasswordGiven = sal_False; if (m_pImpl->m_bPasswordRequired && (0 == sPassword.getLength())) - { // we need a password, but don't have one yet. + { // we need a password, but don't have one yet. // -> ask the user // build an interaction request @@ -1414,5 +1414,5 @@ Reference< XInterface > ODatabaseSource::getThis() const return *const_cast< ODatabaseSource* >( this ); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index 88cb631aac36..6bc9175101f6 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -96,8 +96,8 @@ class ODatabaseSource :public ModelDependentComponent // must be first private: using ODatabaseSource_Base::rBHelper; - OBookmarkContainer m_aBookmarks; - ::cppu::OInterfaceContainerHelper m_aFlushListeners; + OBookmarkContainer m_aBookmarks; + ::cppu::OInterfaceContainerHelper m_aFlushListeners; private: virtual ~ODatabaseSource(); @@ -231,7 +231,7 @@ protected: using ::cppu::OPropertySetHelper::getFastPropertyValue; }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index ef3c8af0a61b..0efce9c4aa11 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -103,7 +103,7 @@ ODefinitionContainer_Impl::iterator ODefinitionContainer_Impl::find( TContentPtr DBG_NAME(ODefinitionContainer) ODefinitionContainer::ODefinitionContainer( const Reference< XMultiServiceFactory >& _xORB - , const Reference< XInterface >& _xParentContainer + , const Reference< XInterface >& _xParentContainer , const TContentPtr& _pImpl , bool _bCheckSlash ) @@ -118,7 +118,7 @@ ODefinitionContainer::ODefinitionContainer( const Reference< XMultiServiceFact const ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); ODefinitionContainer_Impl::const_iterator aEnd = rDefinitions.end(); - for ( ODefinitionContainer_Impl::const_iterator aDefinition = rDefinitions.begin(); + for ( ODefinitionContainer_Impl::const_iterator aDefinition = rDefinitions.begin(); aDefinition != aEnd; ++aDefinition ) @@ -144,7 +144,7 @@ void SAL_CALL ODefinitionContainer::disposing() Documents::iterator aIter = m_aDocumentMap.begin(); Documents::iterator aEnd = m_aDocumentMap.end(); - for (; aIter != aEnd; ++aIter) + for (; aIter != aEnd; ++aIter) { Reference xProp = aIter->second; if ( xProp.is() ) @@ -378,7 +378,7 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu Documents::iterator aPos = m_aDocuments[_nIndex]; Reference xProp = aPos->second; if (!xProp.is()) - { // that's the first access to the object + { // that's the first access to the object // -> create it xProp = createObject(aPos->first); aPos->second = Documents::mapped_type(); @@ -404,7 +404,7 @@ Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& Reference< XContent > xProp = aMapPos->second; if (_bReadIfNeccessary && !xProp.is()) - { // the object has never been accessed before, so we have to read it now + { // the object has never been accessed before, so we have to read it now // (that's the expensive part) // create the object and insert it into the map @@ -423,7 +423,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) t Sequence< ::rtl::OUString > aNames(m_aDocumentMap.size()); ::rtl::OUString* pNames = aNames.getArray(); Documents::iterator aEnd = m_aDocumentMap.end(); - for ( Documents::iterator aNameIter = m_aDocumentMap.begin(); + for ( Documents::iterator aNameIter = m_aDocumentMap.begin(); aNameIter != aEnd; ++pNames, ++aNameIter ) @@ -448,7 +448,7 @@ void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) thr // it's one of our documents .... Documents::iterator aIter = m_aDocumentMap.begin(); Documents::iterator aEnd = m_aDocumentMap.end(); - for (;aIter != aEnd;++aIter ) + for (;aIter != aEnd;++aIter ) { if ( xSource == aIter->second.get() ) { diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 498882f5885e..8c59233ce28c 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -106,7 +106,7 @@ void SAL_CALL LocalNameApproval::approveElement( const ::rtl::OUString& _rName, DBG_NAME(ODocumentContainer) ODocumentContainer::ODocumentContainer(const Reference< XMultiServiceFactory >& _xORB - ,const Reference< XInterface >& _xParentContainer + ,const Reference< XInterface >& _xParentContainer ,const TContentPtr& _pImpl , sal_Bool _bFormsContainer ) @@ -484,7 +484,7 @@ Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 Com ////////////////////////////////////////////////////////////////// Sequence< ::rtl::OUString> aSeq = getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) removeByName(*pIter); @@ -752,7 +752,7 @@ void SAL_CALL ODocumentContainer::removeByName( const ::rtl::OUString& _rName ) // do the removal implRemove(_rName); - // disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name + // disposeComponent(xContent); // no dispose here, the object may be inserted again under a different name notifyByName( aGuard, _rName, NULL, NULL, E_REMOVED, ContainerListemers ); } @@ -780,5 +780,5 @@ void SAL_CALL ODocumentContainer::rename( const ::rtl::OUString& newName ) throw } } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index dafeef03fabf..ffcdff6c9c19 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -42,28 +42,28 @@ namespace dbaccess { -typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XComponentLoader - , ::com::sun::star::lang::XMultiServiceFactory - , ::com::sun::star::container::XHierarchicalNameContainer - , ::com::sun::star::container::XHierarchicalName - , ::com::sun::star::embed::XTransactedObject - > ODocumentContainer_Base; +typedef ::cppu::ImplHelper5 < ::com::sun::star::frame::XComponentLoader + , ::com::sun::star::lang::XMultiServiceFactory + , ::com::sun::star::container::XHierarchicalNameContainer + , ::com::sun::star::container::XHierarchicalName + , ::com::sun::star::embed::XTransactedObject + > ODocumentContainer_Base; //========================================================================== -//= ODocumentContainer - collections of database documents (reports/forms) +//= ODocumentContainer - collections of database documents (reports/forms) //========================================================================== -class ODocumentContainer : public ODefinitionContainer +class ODocumentContainer : public ODefinitionContainer , public ODocumentContainer_Base , public ::comphelper::OPropertyStateContainer , public ::comphelper::OPropertyArrayUsageHelper< ODocumentContainer > { - sal_Bool m_bFormsContainer; + sal_Bool m_bFormsContainer; public: /** constructs the container.
*/ ODocumentContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl , sal_Bool _bFormsContainer ); @@ -139,7 +139,7 @@ protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_ diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 305a01363177..4bd8c8edfc72 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -175,13 +175,13 @@ namespace dbaccess //================================================================== // OEmbedObjectHolder //================================================================== - typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener > TEmbedObjectHolder; - class OEmbedObjectHolder : public ::comphelper::OBaseMutex + typedef ::cppu::WeakComponentImplHelper1< embed::XStateChangeListener > TEmbedObjectHolder; + class OEmbedObjectHolder : public ::comphelper::OBaseMutex ,public TEmbedObjectHolder { Reference< XEmbeddedObject > m_xBroadCaster; - ODocumentDefinition* m_pDefinition; - bool m_bInStateChange; + ODocumentDefinition* m_pDefinition; + bool m_bInStateChange; bool m_bInChangingState; protected: virtual void SAL_CALL disposing(); @@ -362,14 +362,14 @@ namespace dbaccess //================================================================== class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave > { - ::rtl::OUString m_sName; - Reference m_xParentContainer; + ::rtl::OUString m_sName; + Reference m_xParentContainer; public: ODocumentSaveContinuation() { } - inline Reference getContent() const { return m_xParentContainer; } - inline ::rtl::OUString getName() const { return m_sName; } + inline Reference getContent() const { return m_xParentContainer; } + inline ::rtl::OUString getName() const { return m_sName; } // XInteractionDocumentSave virtual void SAL_CALL setName( const ::rtl::OUString& _sName,const Reference& _xParent) throw(RuntimeException); @@ -2207,5 +2207,5 @@ void NameChangeNotifier::impl_fireEvent_throw( const sal_Bool i_bVetoable ) m_rClearForNotify.reset(); } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index d7109efa2582..f74b6acf6815 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -58,7 +58,7 @@ namespace dbaccess class OEmbeddedClientHelper; //========================================================================== //= ODocumentDefinition - a database "document" which is simply a link to a real -//= document +//= document //========================================================================== typedef ::cppu::ImplHelper4 < ::com::sun::star::embed::XComponentSupplier @@ -73,16 +73,16 @@ class ODocumentDefinition ,public ::comphelper::OPropertyArrayUsageHelper< ODocumentDefinition > ,public ODocumentDefinition_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject> m_xEmbeddedObject; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener > m_xListener; + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject> m_xEmbeddedObject; + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStateChangeListener > m_xListener; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xLastKnownConnection; - OInterceptor* m_pInterceptor; - sal_Bool m_bForm; // if it is a form - sal_Bool m_bOpenInDesign; - sal_Bool m_bInExecute; - sal_Bool m_bRemoveListener; - OEmbeddedClientHelper* m_pClientHelper; + OInterceptor* m_pInterceptor; + sal_Bool m_bForm; // if it is a form + sal_Bool m_bOpenInDesign; + sal_Bool m_bInExecute; + sal_Bool m_bRemoveListener; + OEmbeddedClientHelper* m_pClientHelper; protected: virtual ~ODocumentDefinition(); @@ -294,7 +294,7 @@ private: ); /** loads the EmbeddedObject if not already loaded - @param _aClassID + @param _aClassID If set, it will be used to create the embedded object. */ void loadEmbeddedObject( @@ -334,7 +334,7 @@ private: /** searches for read-only flag in the args of the model and sets it to the given value, if the value was not found, it will be appended. - @param _bReadOnly + @param _bReadOnly If the document will be switched to readonly mode */ void updateDocumentTitle(); @@ -379,7 +379,7 @@ private: void impl_fireEvent_throw( const sal_Bool i_bVetoable ); }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_ diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx index ee33fd145dff..dabd16a934fb 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx @@ -77,8 +77,8 @@ namespace dbaccess bool m_bInitialized; bool m_bDisposed; ::rtl::Reference< ::comphelper::AsyncEventNotifier > m_pEventBroadcaster; - ::cppu::OInterfaceContainerHelper m_aLegacyEventListeners; - ::cppu::OInterfaceContainerHelper m_aDocumentEventListeners; + ::cppu::OInterfaceContainerHelper m_aLegacyEventListeners; + ::cppu::OInterfaceContainerHelper m_aDocumentEventListeners; public: DocumentEventNotifier_Impl( ::cppu::OWeakObject& _rBroadcasterDocument, ::osl::Mutex& _rMutex ) diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index 7fe1d9089bbc..1b950f2851be 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -57,12 +57,12 @@ using namespace ::com::sun::star::container; using namespace ::comphelper; using namespace ::cppu; -#define DISPATCH_SAVEAS 0 -#define DISPATCH_SAVE 1 -#define DISPATCH_CLOSEDOC 2 -#define DISPATCH_CLOSEWIN 3 -#define DISPATCH_CLOSEFRAME 4 -#define DISPATCH_RELOAD 5 +#define DISPATCH_SAVEAS 0 +#define DISPATCH_SAVE 1 +#define DISPATCH_CLOSEDOC 2 +#define DISPATCH_CLOSEWIN 3 +#define DISPATCH_CLOSEFRAME 4 +#define DISPATCH_RELOAD 5 // the OSL_ENSURE in CTOR has to be changed too, when adding new defines void SAL_CALL OInterceptor::dispose() @@ -98,12 +98,12 @@ OInterceptor::OInterceptor( ODocumentDefinition* _pContentHolder,sal_Bool _bAllo OSL_ENSURE(DISPATCH_RELOAD < m_aInterceptedURL.getLength(),"Illegal size."); - m_aInterceptedURL[DISPATCH_SAVEAS] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); - m_aInterceptedURL[DISPATCH_SAVE] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); - m_aInterceptedURL[DISPATCH_CLOSEDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); - m_aInterceptedURL[DISPATCH_CLOSEWIN] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); - m_aInterceptedURL[DISPATCH_CLOSEFRAME] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); - m_aInterceptedURL[DISPATCH_RELOAD] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Reload")); + m_aInterceptedURL[DISPATCH_SAVEAS] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:SaveAs")); + m_aInterceptedURL[DISPATCH_SAVE] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Save")); + m_aInterceptedURL[DISPATCH_CLOSEDOC] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); + m_aInterceptedURL[DISPATCH_CLOSEWIN] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); + m_aInterceptedURL[DISPATCH_CLOSEFRAME] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); + m_aInterceptedURL[DISPATCH_RELOAD] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(".uno:Reload")); } @@ -326,7 +326,7 @@ void SAL_CALL OInterceptor::removeStatusListener( //XInterceptorInfo -Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) +Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) { // now implemented as update return m_aInterceptedURL; @@ -340,7 +340,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,con { osl::MutexGuard aGuard(m_aMutex); const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( _URL.Complete == *pIter ) @@ -353,7 +353,7 @@ Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,con return Reference(); } -Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence& Requests ) throw ( RuntimeException ) +Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( const Sequence& Requests ) throw ( RuntimeException ) { Sequence< Reference< XDispatch > > aRet; osl::MutexGuard aGuard(m_aMutex); @@ -365,7 +365,7 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons for(sal_Int32 i = 0; i < Requests.getLength(); ++i) { const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( Requests[i].FeatureURL.Complete == *pIter ) @@ -383,15 +383,15 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons //XDispatchProviderInterceptor -Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException ) +Reference< XDispatchProvider > SAL_CALL OInterceptor::getSlaveDispatchProvider( ) throw ( RuntimeException ) { osl::MutexGuard aGuard(m_aMutex); return m_xSlaveDispatchProvider; } void SAL_CALL -OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider ) - throw ( RuntimeException ) +OInterceptor::setSlaveDispatchProvider( const Reference< XDispatchProvider >& NewDispatchProvider ) + throw ( RuntimeException ) { osl::MutexGuard aGuard(m_aMutex); m_xSlaveDispatchProvider = NewDispatchProvider; @@ -421,7 +421,7 @@ void SAL_CALL OInterceptor::setMasterDispatchProvider( void SAL_CALL OInterceptor::notifyEvent( const ::com::sun::star::document::EventObject& Event ) throw (::com::sun::star::uno::RuntimeException) { osl::ResettableMutexGuard _rGuard(m_aMutex); - if ( m_pStatCL && Event.EventName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged")) ) + if ( m_pStatCL && Event.EventName == ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OnModifyChanged")) ) { OInterfaceContainerHelper* pListener = m_pStatCL->getContainer(m_aInterceptedURL[DISPATCH_SAVE]); if ( pListener ) @@ -442,5 +442,5 @@ void SAL_CALL OInterceptor::disposing( const ::com::sun::star::lang::EventObject { } -} // namespace dbaccess +} // namespace dbaccess /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index d1d4ffc27dd3..cb2cadc77c07 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -159,10 +159,10 @@ private: cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; PropertyChangeListenerContainer* m_pStatCL; - sal_Bool m_bAllowEditDoc; + sal_Bool m_bAllowEditDoc; }; -} // namespace dbaccess +} // namespace dbaccess #endif //DBA_INTERCEPT_HXX diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index 1a71fc0a3f65..93177d05b5fd 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -68,11 +68,11 @@ namespace dbaccess struct ResultListEntry { - rtl::OUString aId; - Reference< XContentIdentifier > xId; - ::rtl::Reference< OContentHelper > xContent; - Reference< XRow > xRow; - const ContentProperties& rData; + rtl::OUString aId; + Reference< XContentIdentifier > xId; + ::rtl::Reference< OContentHelper > xContent; + Reference< XRow > xRow; + const ContentProperties& rData; ResultListEntry( const ContentProperties& rEntry ) : rData( rEntry ) {} }; @@ -93,12 +93,12 @@ typedef std::vector< ResultListEntry* > ResultList; struct DataSupplier_Impl { - osl::Mutex m_aMutex; - ResultList m_aResults; - rtl::Reference< ODocumentContainer > m_xContent; - Reference< XMultiServiceFactory > m_xSMgr; - sal_Int32 m_nOpenMode; - sal_Bool m_bCountFinal; + osl::Mutex m_aMutex; + ResultList m_aResults; + rtl::Reference< ODocumentContainer > m_xContent; + Reference< XMultiServiceFactory > m_xSMgr; + sal_Int32 m_nOpenMode; + sal_Bool m_bCountFinal; DataSupplier_Impl( const Reference< XMultiServiceFactory >& rxSMgr, const rtl::Reference< ODocumentContainer >& rContent, @@ -266,7 +266,7 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) if ( nIndex < sal::static_int_cast< sal_uInt32 >( aSeq.getLength() ) ) { const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(pIter = pIter + nPos;pIter != pEnd;++pIter,++nPos) { m_pImpl->m_aResults.push_back( @@ -313,7 +313,7 @@ sal_uInt32 DataSupplier::totalCount() // @@@ Obtain data and put it into result list... Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) m_pImpl->m_aResults.push_back( new ResultListEntry( m_pImpl->m_xContent->getContent(*pIter)->getContentProperties() ) ); diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.cxx b/dbaccess/source/core/dataaccess/myucp_resultset.cxx index f2d5840f7c15..d59336d87527 100644 --- a/dbaccess/source/core/dataaccess/myucp_resultset.cxx +++ b/dbaccess/source/core/dataaccess/myucp_resultset.cxx @@ -79,7 +79,7 @@ void DynamicResultSet::initStatic() m_xResultSet1 = new ::ucbhelper::ResultSet( m_xSMgr, m_aCommand.Properties, - new DataSupplier( m_xSMgr, + new DataSupplier( m_xSMgr, m_xContent, m_aCommand.Mode ), m_xEnv ); @@ -90,7 +90,7 @@ void DynamicResultSet::initDynamic() m_xResultSet1 = new ::ucbhelper::ResultSet( m_xSMgr, m_aCommand.Properties, - new DataSupplier( m_xSMgr, + new DataSupplier( m_xSMgr, m_xContent, m_aCommand.Mode ), m_xEnv ); diff --git a/dbaccess/source/core/inc/ContainerListener.hxx b/dbaccess/source/core/inc/ContainerListener.hxx index 878f13dae47b..6db609e9473f 100644 --- a/dbaccess/source/core/inc/ContainerListener.hxx +++ b/dbaccess/source/core/inc/ContainerListener.hxx @@ -82,7 +82,7 @@ namespace dbaccess virtual ~OContainerListener(); }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CONTAINERLISTENER_HXX diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 15b754e3607e..ffea0538ae3f 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -46,7 +46,7 @@ namespace dbaccess class OPropertyForward; - class OContainerMediator : public ::comphelper::OBaseMutex + class OContainerMediator : public ::comphelper::OBaseMutex ,public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > { public: @@ -59,9 +59,9 @@ namespace dbaccess private: typedef ::rtl::Reference< OPropertyForward > TPropertyForward; typedef ::std::map< ::rtl::OUString, TPropertyForward > PropertyForwardList; - PropertyForwardList m_aForwardList; + PropertyForwardList m_aForwardList; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xSettings; // can not be weak - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak + ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_aConnection; ContainerType m_eType; @@ -98,7 +98,7 @@ namespace dbaccess ); }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CONTAINERMEDIATOR_HXX diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 2d659f066b90..c2115a931155 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -56,13 +56,13 @@ namespace dbaccess class ODatabaseModelImpl; struct ContentProperties { - ::rtl::OUString aTitle; // Title + ::rtl::OUString aTitle; // Title ::boost::optional< ::rtl::OUString > aContentType; // ContentType (aka MediaType aka MimeType) sal_Bool bIsDocument; // IsDocument - sal_Bool bIsFolder; // IsFolder - sal_Bool bAsTemplate; // AsTemplate - ::rtl::OUString sPersistentName;// persistent name of the document + sal_Bool bIsFolder; // IsFolder + sal_Bool bAsTemplate; // AsTemplate + ::rtl::OUString sPersistentName;// persistent name of the document ContentProperties() :bIsDocument( sal_True ) @@ -78,30 +78,30 @@ namespace dbaccess OContentHelper_Impl(); virtual ~OContentHelper_Impl(); - ContentProperties m_aProps; - ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists + ContentProperties m_aProps; + ODatabaseModelImpl* m_pDataSource; // this will stay alive as long as the content exists }; typedef ::boost::shared_ptr TContentPtr; - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, ::comphelper::UStringHash, ::comphelper::UStringEqual > PropertyChangeListenerContainer; - typedef ::comphelper::OBaseMutex OContentHelper_MBASE; - typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent - , ::com::sun::star::ucb::XCommandProcessor - , ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::beans::XPropertiesChangeNotifier - , ::com::sun::star::beans::XPropertyContainer - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XUnoTunnel - , ::com::sun::star::container::XChild - , ::com::sun::star::sdbcx::XRename - > OContentHelper_COMPBASE; - - class OContentHelper : public OContentHelper_MBASE + typedef ::comphelper::OBaseMutex OContentHelper_MBASE; + typedef ::cppu::WeakComponentImplHelper9 < ::com::sun::star::ucb::XContent + , ::com::sun::star::ucb::XCommandProcessor + , ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::beans::XPropertiesChangeNotifier + , ::com::sun::star::beans::XPropertyContainer + , ::com::sun::star::lang::XInitialization + , ::com::sun::star::lang::XUnoTunnel + , ::com::sun::star::container::XChild + , ::com::sun::star::sdbcx::XRename + > OContentHelper_COMPBASE; + + class OContentHelper : public OContentHelper_MBASE ,public OContentHelper_COMPBASE { ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > @@ -116,14 +116,14 @@ namespace dbaccess void impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify = true); protected: - ::cppu::OInterfaceContainerHelper m_aContentListeners; - PropertyChangeListenerContainer m_aPropertyChangeListeners; + ::cppu::OInterfaceContainerHelper m_aContentListeners; + PropertyChangeListenerContainer m_aPropertyChangeListeners; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xParentContainer; const ::comphelper::ComponentContext m_aContext; const ::connectivity::SQLError m_aErrorHelper; - TContentPtr m_pImpl; - sal_uInt32 m_nCommandId; + TContentPtr m_pImpl; + sal_uInt32 m_nCommandId; // helper virtual void SAL_CALL disposing(); @@ -142,13 +142,13 @@ namespace dbaccess public: OContentHelper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer ,const TContentPtr& _pImpl ); // com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); + static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // ::com::sun::star::lang::XServiceInfo virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); @@ -200,7 +200,7 @@ namespace dbaccess virtual ::rtl::OUString determineContentType() const = 0; }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CONTENTHELPER_HXX diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index eb6dba6f54b8..ecd3c4f13551 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -228,7 +228,7 @@ private: void impl_invalidateParameter_nothrow(); ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const; - template void set( const ::rtl::OUString& _sProperty + template void set( const ::rtl::OUString& _sProperty ,const T& _Value ,T& _member) { @@ -256,9 +256,9 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeXMLConversion> m_xRangeConversion; ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler> m_xHandler; // the object doin' most of the work - an SDB-rowset - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xAggregateSet; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_MasterFields; ::com::sun::star::uno::Sequence< ::rtl::OUString > m_DetailFields; diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx index 561ef67778f9..8ba05a516253 100644 --- a/dbaccess/source/core/inc/FilteredContainer.hxx +++ b/dbaccess/source/core/inc/FilteredContainer.hxx @@ -45,17 +45,17 @@ namespace dbaccess class OFilteredContainer : public ::connectivity::sdbcx::OCollection { private: - mutable sal_Bool m_bConstructed; // late ctor called + mutable sal_Bool m_bConstructed; // late ctor called protected: ::dbtools::IWarningsContainer* m_pWarningsContainer; - IRefreshListener* m_pRefreshListener; + IRefreshListener* m_pRefreshListener; oslInterlockedCount& m_nInAppend; // holds the original container which where set in construct but they can be null - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMasterContainer; - ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xMasterContainer; + ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XConnection > m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; /** returns a string denoting the only type of tables allowed in this container, or an empty string if there is no such restriction @@ -101,18 +101,18 @@ namespace dbaccess public: /** ctor of the container. The parent has to support the XConnection interface.
- @param _rParent the object which acts as parent for the container. + @param _rParent the object which acts as parent for the container. all refcounting is rerouted to this object - @param _rMutex the access safety object of the parent - @param _rTableFilter restricts the visible tables by name - @param _rTableTypeFilter restricts the visible tables by type - @see construct + @param _rMutex the access safety object of the parent + @param _rTableFilter restricts the visible tables by name + @param _rTableTypeFilter restricts the visible tables by type + @see construct */ OFilteredContainer( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon, sal_Bool _bCase, - IRefreshListener* _pRefreshListener, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer, oslInterlockedCount& _nInAppend ); diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index 4a685b037be0..a3bb17da4fd1 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -43,8 +43,8 @@ namespace dbaccess // =================================================================== // = OPropertyForward // =================================================================== - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener - > OPropertyForward_Base; + typedef ::cppu::WeakImplHelper1 < ::com::sun::star::beans::XPropertyChangeListener + > OPropertyForward_Base; class OPropertyForward :public ::comphelper::OBaseMutex ,public OPropertyForward_Base { @@ -52,8 +52,8 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDestContainer; - ::rtl::OUString m_sName; - sal_Bool m_bInInsert; + ::rtl::OUString m_sName; + sal_Bool m_bInInsert; protected: virtual ~OPropertyForward(); @@ -76,7 +76,7 @@ namespace dbaccess inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDefinition() const { return m_xDest; } }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_PROPERTYSETFORWARD_HXX diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx index 80e490c4a34c..b5fed70b8b9b 100644 --- a/dbaccess/source/core/inc/RefreshListener.hxx +++ b/dbaccess/source/core/inc/RefreshListener.hxx @@ -49,7 +49,7 @@ namespace dbaccess virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed) = 0; }; -} // namespace dbaccess +} // namespace dbaccess #endif // DBA_CORE_REFRESHLISTENER_HXX diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index 305d3493d353..cad13ae113f4 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -53,16 +53,16 @@ namespace com { namespace sun { namespace star { namespace util { namespace dbaccess { - typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSingleSelectQueryComposer, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSingleSelectQueryComposer, ::com::sun::star::sdb::XParametersSupplier, ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::sdbcx::XTablesSupplier, - ::com::sun::star::lang::XServiceInfo > OSingleSelectQueryComposer_BASE; + ::com::sun::star::lang::XServiceInfo > OSingleSelectQueryComposer_BASE; class OPrivateColumns; class OPrivateTables; - class OSingleSelectQueryComposer : public ::comphelper::OMutexAndBroadcastHelper + class OSingleSelectQueryComposer : public ::comphelper::OMutexAndBroadcastHelper ,public OSubComponent ,public ::comphelper::OPropertyContainer ,public ::comphelper::OPropertyArrayUsageHelper < OSingleSelectQueryComposer > @@ -80,42 +80,42 @@ namespace dbaccess inline void incSQLPart( SQLPart& e ) { e = (SQLPart)(1 + (size_t)e); } enum EColumnType { - SelectColumns = 0, - GroupByColumns = 1, - OrderColumns = 2, - ParameterColumns = 3 + SelectColumns = 0, + GroupByColumns = 1, + OrderColumns = 2, + ParameterColumns = 3 }; typedef ::std::const_mem_fun_t< const ::connectivity::OSQLParseNode*, ::connectivity::OSQLParseTreeIterator > TGetParseNode; - ::connectivity::OSQLParser m_aSqlParser; - ::connectivity::OSQLParseTreeIterator m_aSqlIterator; // the iterator for the complete statement - ::connectivity::OSQLParseTreeIterator m_aAdditiveIterator; // the iterator for the "additive statement" (means without the clauses of the elementary statement) - ::std::vector m_aColumnsCollection; // used for columns and parameters of old queries - ::std::vector m_aTablesCollection; + ::connectivity::OSQLParser m_aSqlParser; + ::connectivity::OSQLParseTreeIterator m_aSqlIterator; // the iterator for the complete statement + ::connectivity::OSQLParseTreeIterator m_aAdditiveIterator; // the iterator for the "additive statement" (means without the clauses of the elementary statement) + ::std::vector m_aColumnsCollection; // used for columns and parameters of old queries + ::std::vector m_aTablesCollection; ::std::vector< ::rtl::OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionTables; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionQueries; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionTables; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xConnectionQueries; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> m_xColumns; ::comphelper::ComponentContext m_aContext; - ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; + ::com::sun::star::uno::Reference< ::com::sun::star::script::XTypeConverter > m_xTypeConverter; - ::std::vector m_aCurrentColumns; - OPrivateTables* m_pTables; // currently used tables + ::std::vector m_aCurrentColumns; + OPrivateTables* m_pTables; // currently used tables - ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having - ::rtl::OUString m_sDecimalSep; - ::rtl::OUString m_sCommand; - ::com::sun::star::lang::Locale m_aLocale; - sal_Int32 m_nBoolCompareMode; // how to compare bool values - sal_Int32 m_nCommandType; + ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having + ::rtl::OUString m_sDecimalSep; + ::rtl::OUString m_sCommand; + ::com::sun::star::lang::Locale m_aLocale; + sal_Int32 m_nBoolCompareMode; // how to compare bool values + sal_Int32 m_nCommandType; // - ::rtl::OUString m_sOrignal; + ::rtl::OUString m_sOrignal; // @@ -147,7 +147,7 @@ namespace dbaccess ,sal_Int32 filterOperator); /** getStructuredCondition returns the structured condition for the where or having clause - @param _aGetFunctor + @param _aGetFunctor A member function to get the correct parse node. @return @@ -164,9 +164,9 @@ namespace dbaccess inline bool implSetHavingClause(::rtl::OUString _sFilter) { setHavingClause(_sFilter); return true;} /** returns the part of the seelect statement - @param _ePart + @param _ePart Which part should be returned. - @param _bWithKeyword + @param _bWithKeyword If the keyword will be added too. Otherwise not. @param _rIterator The iterator to use. @@ -196,7 +196,7 @@ namespace dbaccess virtual ~OSingleSelectQueryComposer(); public: - OSingleSelectQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTableSupplier, + OSingleSelectQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xTableSupplier, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::comphelper::ComponentContext& _rContext); diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index 659f667e0544..543081d8c2ce 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -51,7 +51,7 @@ namespace dbaccess { - typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbcx::XColumnsSupplier, + typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::sdbcx::XKeysSupplier, ::com::sun::star::container::XNamed, ::com::sun::star::lang::XServiceInfo, @@ -66,7 +66,7 @@ namespace dbaccess class ODBTableDecorator; typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTableDecorator > ODBTableDecorator_PROP; - class ODBTableDecorator :public comphelper::OBaseMutex + class ODBTableDecorator :public comphelper::OBaseMutex ,public OTableDescriptor_BASE ,public ODataSettings //ODataSettings_Base ,public IColumnFactory @@ -75,21 +75,21 @@ namespace dbaccess { void fillPrivileges() const; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xColumnMediator; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener > m_xColumnMediator; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier > m_xTable; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xConnection; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormats; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormats; // - mutable sal_Int32 m_nPrivileges; + mutable sal_Int32 m_nPrivileges; // - ::connectivity::sdbcx::OCollection* m_pColumns; - ::connectivity::sdbcx::OCollection* m_pTables; + ::connectivity::sdbcx::OCollection* m_pColumns; + ::connectivity::sdbcx::OCollection* m_pTables; // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); @@ -128,7 +128,7 @@ namespace dbaccess const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& _rxNumberFormats, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumnDefinitions - ) throw(::com::sun::star::sdbc::SQLException); + ) throw(::com::sun::star::sdbc::SQLException); diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index a65e967cc4c4..72bd63ee5df6 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -70,11 +70,11 @@ namespace dbaccess //************************************************************ // OColumn //************************************************************ - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::lang::XServiceInfo, + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::container::XNamed > OColumnBase; - class OColumn :public comphelper::OBaseMutex + class OColumn :public comphelper::OBaseMutex ,public OColumnBase ,public ::comphelper::OPropertyContainer ,public IPropertyContainer // convenience for the derived class which also derive from OColumnSettings @@ -167,18 +167,18 @@ namespace dbaccess class OColumns : public OColumns_BASE ,public TXChild { - OContainerMediator* m_pMediator; + OContainerMediator* m_pMediator; protected: // comes from the driver can be null - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDrvColumns; - ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xParent; - IColumnFactory* m_pColFactoryImpl; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDrvColumns; + ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface > m_xParent; + IColumnFactory* m_pColFactoryImpl; ::connectivity::sdbcx::IRefreshableColumns* m_pRefreshColumns; - sal_Bool m_bInitialized : 1; - sal_Bool m_bAddColumn : 1; - sal_Bool m_bDropColumn : 1; + sal_Bool m_bInitialized : 1; + sal_Bool m_bAddColumn : 1; + sal_Bool m_bDropColumn : 1; virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); @@ -193,17 +193,17 @@ namespace dbaccess } /** flag which determines whether the container is filled or not */ - inline sal_Bool isInitialized() const { return m_bInitialized; } - inline void setInitialized() {m_bInitialized = sal_True;} - inline void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; } + inline sal_Bool isInitialized() const { return m_bInitialized; } + inline void setInitialized() {m_bInitialized = sal_True;} + inline void setMediator(OContainerMediator* _pMediator) { m_pMediator = _pMediator; } public: /** constructs an empty container without configuration location. - @param rParent the parent object. This instance will be used for refcounting, so the parent + @param rParent the parent object. This instance will be used for refcounting, so the parent cannot die before the container does. - @param _rMutex the mutex of the parent. - @param _bCaseSensitive the initial case sensitivity flag - @see setCaseSensitive + @param _rMutex the mutex of the parent. + @param _bCaseSensitive the initial case sensitivity flag + @see setCaseSensitive */ OColumns( ::cppu::OWeakObject& _rParent, diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx index c407b60820a8..0fb7d4362cdd 100644 --- a/dbaccess/source/core/inc/columnsettings.hxx +++ b/dbaccess/source/core/inc/columnsettings.hxx @@ -69,17 +69,17 @@ namespace dbaccess //==================================================================== class OColumnSettings { - // - ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void - ::com::sun::star::uno::Any m_aFormatKey; // sal_Int32 or void - ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void - ::com::sun::star::uno::Any m_aAlignment; // sal_Int32 (::com::sun::star::awt::TextAlign) or void - ::com::sun::star::uno::Any m_aHelpText; // the description of the column which is visible in the helptext of the column - ::com::sun::star::uno::Any m_aControlDefault; // the default value which should be displayed as by a control when moving to a new row + // + ::com::sun::star::uno::Any m_aWidth; // sal_Int32 or void + ::com::sun::star::uno::Any m_aFormatKey; // sal_Int32 or void + ::com::sun::star::uno::Any m_aRelativePosition; // sal_Int32 or void + ::com::sun::star::uno::Any m_aAlignment; // sal_Int32 (::com::sun::star::awt::TextAlign) or void + ::com::sun::star::uno::Any m_aHelpText; // the description of the column which is visible in the helptext of the column + ::com::sun::star::uno::Any m_aControlDefault; // the default value which should be displayed as by a control when moving to a new row ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xControlModel; - sal_Bool m_bHidden; - // + sal_Bool m_bHidden; + // protected: virtual ~OColumnSettings(); diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index 05b9ca849276..cc82cdc59295 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -37,7 +37,7 @@ namespace dbaccess //========================================================================== //= OCommandBase - a base class (in fact just a container for some members) -//= for classes implementing the sdb.CommandDefinition service +//= for classes implementing the sdb.CommandDefinition service //========================================================================== class OCommandBase { @@ -45,11 +45,11 @@ public: // need public access // ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; - ::rtl::OUString m_sCommand; - sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer - ::rtl::OUString m_sUpdateTableName; - ::rtl::OUString m_sUpdateSchemaName; - ::rtl::OUString m_sUpdateCatalogName; + ::rtl::OUString m_sCommand; + sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer + ::rtl::OUString m_sUpdateTableName; + ::rtl::OUString m_sUpdateSchemaName; + ::rtl::OUString m_sUpdateCatalogName; // protected: @@ -57,7 +57,7 @@ protected: }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_COMMANDBASE_HXX_ diff --git a/dbaccess/source/core/inc/core_resource.hrc b/dbaccess/source/core/inc/core_resource.hrc index 05c8aebe0b26..77745302a602 100644 --- a/dbaccess/source/core/inc/core_resource.hrc +++ b/dbaccess/source/core/inc/core_resource.hrc @@ -32,44 +32,44 @@ #include #endif -#define RID_CORE_STRINGS_START RID_DBACCESS_START +#define RID_CORE_STRINGS_START RID_DBACCESS_START //- String-IDs -#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 ) -#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) -#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 ) -#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 ) -#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 ) -#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 ) -#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 ) -#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 ) -#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 ) -#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 ) -#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 ) -#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 ) -#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 ) -#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 ) -#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 ) -#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 ) -#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 ) -#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 ) -#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 ) -#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 ) -#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 ) -#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 ) -#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 ) -#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 ) -#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 ) -#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 ) -#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 ) -#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 ) -#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 ) -#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 ) -#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 ) -#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 ) -#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 ) -#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 ) -#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 ) +#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 ) +#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 ) +#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 ) +#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 ) +#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 ) +#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 ) +#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 ) +#define RID_STR_ONLY_QUERY ( RID_CORE_STRINGS_START + 7 ) +#define RID_STR_NO_VALUE_CHANGED ( RID_CORE_STRINGS_START + 8 ) +#define RID_STR_NO_XROWUPDATE ( RID_CORE_STRINGS_START + 9 ) +#define RID_STR_NO_XRESULTSETUPDATE ( RID_CORE_STRINGS_START + 10 ) +#define RID_STR_NO_UPDATE_MISSING_CONDITION ( RID_CORE_STRINGS_START + 11 ) +#define RID_STR_NO_COLUMN_ADD ( RID_CORE_STRINGS_START + 12 ) +#define RID_STR_NO_COLUMN_DROP ( RID_CORE_STRINGS_START + 13 ) +#define RID_STR_NO_CONDITION_FOR_PK ( RID_CORE_STRINGS_START + 14 ) +#define RID_STR_NO_XQUERIESSUPPLIER ( RID_CORE_STRINGS_START + 15 ) +#define RID_STR_NO_ABS_ZERO ( RID_CORE_STRINGS_START + 16 ) +#define RID_STR_NO_RELATIVE ( RID_CORE_STRINGS_START + 17 ) +#define RID_STR_NO_REFESH_AFTERLAST ( RID_CORE_STRINGS_START + 18 ) +#define RID_STR_NO_MOVETOINSERTROW_CALLED ( RID_CORE_STRINGS_START + 19 ) +#define RID_STR_NO_UPDATEROW ( RID_CORE_STRINGS_START + 20 ) +#define RID_STR_NO_DELETEROW ( RID_CORE_STRINGS_START + 21 ) +#define RID_STR_COLUMN_MUST_VISIBLE ( RID_CORE_STRINGS_START + 22 ) +#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 ) +#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 ) +#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 ) +#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 ) +#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 ) +#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 ) +#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 ) +#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 ) +#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 ) +#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 ) +#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 ) +#define RID_STR_DATASOURCE_NOT_STORED ( RID_CORE_STRINGS_START + 34 ) #define RID_STR_FILE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 35 ) #define RID_STR_TABLE_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 36 ) #define RID_STR_CONFLICTING_NAMES ( RID_CORE_STRINGS_START + 37 ) @@ -83,27 +83,27 @@ #define RID_STR_NAME_NOT_FOUND ( RID_CORE_STRINGS_START + 45 ) #define RID_STR_QUERY_DOES_NOT_EXIST ( RID_CORE_STRINGS_START + 46 ) #define RID_STR_ERROR_WHILE_SAVING ( RID_CORE_STRINGS_START + 47 ) -#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 ) +#define RID_STR_NO_SUB_FOLDER ( RID_CORE_STRINGS_START + 48 ) -#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 ) -#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 ) -#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 ) -#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 ) -#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 ) -#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 ) +#define RID_STR_NO_DELETE_BEFORE_AFTER ( RID_CORE_STRINGS_START + 49 ) +#define RID_STR_NO_DELETE_INSERT_ROW ( RID_CORE_STRINGS_START + 50 ) +#define RID_STR_RESULT_IS_READONLY ( RID_CORE_STRINGS_START + 51 ) +#define RID_STR_NO_DELETE_PRIVILEGE ( RID_CORE_STRINGS_START + 52 ) +#define RID_STR_ROW_ALREADY_DELETED ( RID_CORE_STRINGS_START + 53 ) +#define RID_STR_UPDATE_FAILED ( RID_CORE_STRINGS_START + 54 ) -#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 ) -#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 ) -#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 ) -#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 ) -#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 ) -#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 ) -#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 ) -#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 ) -#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 ) -#define RID_STR_NO_EMBEDDING ( RID_CORE_STRINGS_START + 64 ) -#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 ) -#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 ) +#define RID_STR_INVALID_INDEX ( RID_CORE_STRINGS_START + 55 ) +#define RID_STR_NO_INSERT_PRIVILEGE ( RID_CORE_STRINGS_START + 56 ) +#define RID_STR_INTERNAL_ERROR ( RID_CORE_STRINGS_START + 57 ) +#define RID_STR_EXPRESSION1 ( RID_CORE_STRINGS_START + 58 ) +#define RID_STR_NO_SQL_COMMAND ( RID_CORE_STRINGS_START + 59 ) +#define RID_STR_INVALID_CURSOR_STATE ( RID_CORE_STRINGS_START + 60 ) +#define RID_STR_CURSOR_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 61 ) +#define RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER ( RID_CORE_STRINGS_START + 62 ) +#define RID_STR_NO_BOOKMARK_DELETED ( RID_CORE_STRINGS_START + 63 ) +#define RID_STR_NO_EMBEDDING ( RID_CORE_STRINGS_START + 64 ) +#define RID_STR_CONNECTION_REQUEST ( RID_CORE_STRINGS_START + 65 ) +#define RID_STR_MISSING_EXTENSION ( RID_CORE_STRINGS_START + 66 ) #define RID_NO_SUCH_DATA_SOURCE ( RID_CORE_STRINGS_START + 67 ) diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx index 42677cd5a72d..87d52e689e01 100644 --- a/dbaccess/source/core/inc/core_resource.hxx +++ b/dbaccess/source/core/inc/core_resource.hxx @@ -51,9 +51,9 @@ namespace dbaccess class ResourceManager { friend class OModuleClient; - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static ResMgr* m_pImpl; + static ::osl::Mutex s_aMutex; /// access safety + static sal_Int32 s_nClients; /// number of registered clients + static ResMgr* m_pImpl; private: // no instantiation allowed @@ -63,9 +63,9 @@ namespace dbaccess protected: static void ensureImplExists(); /// register a client for the module - static void registerClient(); + static void registerClient(); /// revoke a client for the module - static void revokeClient(); + static void revokeClient(); public: /** loads the string with the specified resource id @@ -117,8 +117,8 @@ namespace dbaccess class OModuleClient { public: - OModuleClient() { ResourceManager::registerClient(); } - ~OModuleClient() { ResourceManager::revokeClient(); } + OModuleClient() { ResourceManager::registerClient(); } + ~OModuleClient() { ResourceManager::revokeClient(); } }; } diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index cd2b4e715702..ed28b409a0a5 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -41,25 +41,25 @@ namespace dbaccess //========================================================================== //= ODataSettings_Base - a base class which implements the property member -//= for an object implementing the sdb::DataSettings -//= service -//= the properties have to to be registered when used +//= for an object implementing the sdb::DataSettings +//= service +//= the properties have to to be registered when used //========================================================================== class ODataSettings_Base { public: // - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sHavingClause; - ::rtl::OUString m_sGroupBy; - ::rtl::OUString m_sOrder; - sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member ! - ::com::sun::star::awt::FontDescriptor m_aFont; - ::com::sun::star::uno::Any m_aRowHeight; - ::com::sun::star::uno::Any m_aTextColor; - ::com::sun::star::uno::Any m_aTextLineColor; - sal_Int16 m_nFontEmphasis; - sal_Int16 m_nFontRelief; + ::rtl::OUString m_sFilter; + ::rtl::OUString m_sHavingClause; + ::rtl::OUString m_sGroupBy; + ::rtl::OUString m_sOrder; + sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member ! + ::com::sun::star::awt::FontDescriptor m_aFont; + ::com::sun::star::uno::Any m_aRowHeight; + ::com::sun::star::uno::Any m_aTextColor; + ::com::sun::star::uno::Any m_aTextLineColor; + sal_Int16 m_nFontEmphasis; + sal_Int16 m_nFontRelief; // protected: @@ -69,8 +69,8 @@ protected: }; //========================================================================== //= ODataSettings - a base class which implements the property handling -//= for an object implementing the sdb::DataSettings -//= service +//= for an object implementing the sdb::DataSettings +//= service //========================================================================== class ODataSettings : public ::comphelper::OPropertyStateContainer @@ -82,13 +82,13 @@ protected: virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const; /** register the properties from the param given. The parameter instance must be alive as long as tis object live. - @param _pItem + @param _pItem The database settings, can be
this
*/ void registerPropertiesFor(ODataSettings_Base* _pItem); }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_DATASETTINGS_HXX_ diff --git a/dbaccess/source/core/inc/dbamiscres.hrc b/dbaccess/source/core/inc/dbamiscres.hrc index a383ed4189d2..dbb4713c075a 100644 --- a/dbaccess/source/core/inc/dbamiscres.hrc +++ b/dbaccess/source/core/inc/dbamiscres.hrc @@ -30,32 +30,32 @@ //======================================================================== // string ids (relative to other resources, that's why not unique) -#define STR_MYSQL_ODBC 1 -#define STR_MYSQL_JDBC 2 -#define STR_ADABAS 3 -#define STR_ORACLE_JDBC 4 -#define STR_JDBC 5 -#define STR_ODBC 6 -#define STR_DBASE 7 -#define STR_MSACCESS 8 +#define STR_MYSQL_ODBC 1 +#define STR_MYSQL_JDBC 2 +#define STR_ADABAS 3 +#define STR_ORACLE_JDBC 4 +#define STR_JDBC 5 +#define STR_ODBC 6 +#define STR_DBASE 7 +#define STR_MSACCESS 8 #define STR_MSACCESS2007 9 -#define STR_ADO 10 -#define STR_FLAT 11 -#define STR_CALC 12 -#define STR_MOZILLA 13 -#define STR_LDAP 14 -#define STR_OUTLOOK 15 -#define STR_OUTLOOKEXP 16 -#define STR_EVOLUTION 17 -#define STR_EVOLUTION_GROUPWISE 18 -#define STR_EVOLUTION_LDAP 19 -#define STR_KAB 20 -#define STR_MACAB 21 +#define STR_ADO 10 +#define STR_FLAT 11 +#define STR_CALC 12 +#define STR_MOZILLA 13 +#define STR_LDAP 14 +#define STR_OUTLOOK 15 +#define STR_OUTLOOKEXP 16 +#define STR_EVOLUTION 17 +#define STR_EVOLUTION_GROUPWISE 18 +#define STR_EVOLUTION_LDAP 19 +#define STR_KAB 20 +#define STR_MACAB 21 #define STR_EMBEDDED_HSQLDB 22 -#define STR_THUNDERBIRD 23 -#define STR_MYSQL_NATIVE 24 +#define STR_THUNDERBIRD 23 +#define STR_MYSQL_NATIVE 24 -#define STR_END STR_MYSQL_NATIVE + 1 +#define STR_END STR_MYSQL_NATIVE + 1 #endif // _DBA_MISCRES_HRC_ diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index f98c633a5396..5ad7d716f311 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -49,7 +49,7 @@ namespace dbaccess //= OTableColumnDescriptor // ========================================================================= /** - * provides the properties for description. A descriptor could be used to create a new table column. + * provides the properties for description. A descriptor could be used to create a new table column. */ class OTableColumnDescriptor : public OColumn ,public OColumnSettings @@ -60,19 +60,19 @@ namespace dbaccess const bool m_bActAsDescriptor; protected: - // - rtl::OUString m_aTypeName; - rtl::OUString m_aDescription; - rtl::OUString m_aDefaultValue; - rtl::OUString m_aAutoIncrementValue; - sal_Int32 m_nType; - sal_Int32 m_nPrecision; - sal_Int32 m_nScale; - sal_Int32 m_nIsNullable; - sal_Bool m_bAutoIncrement; - sal_Bool m_bRowVersion; - sal_Bool m_bCurrency; - // + // + rtl::OUString m_aTypeName; + rtl::OUString m_aDescription; + rtl::OUString m_aDefaultValue; + rtl::OUString m_aAutoIncrementValue; + sal_Int32 m_nType; + sal_Int32 m_nPrecision; + sal_Int32 m_nScale; + sal_Int32 m_nIsNullable; + sal_Bool m_bAutoIncrement; + sal_Bool m_bRowVersion; + sal_Bool m_bCurrency; + // public: OTableColumnDescriptor( const bool _bActAsDescriptor ) @@ -194,8 +194,8 @@ namespace dbaccess // = OColumnWrapper // ========================================================================= /** - * describes all properties for a columns of a table. Only the view parts are provided - * directly, all the other parts are derived from a driver implementation + * describes all properties for a columns of a table. Only the view parts are provided + * directly, all the other parts are derived from a driver implementation */ class OColumnWrapper :public OColumn { @@ -204,7 +204,7 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAggregate; - sal_Int32 m_nColTypeID; + sal_Int32 m_nColTypeID; protected: OColumnWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rCol, const bool _bNameIsReadOnly ); @@ -240,7 +240,7 @@ namespace dbaccess // = OTableColumnDescriptorWrapper // ========================================================================= /** - * provides the properties for description. A descriptor could be used to create a new table column. + * provides the properties for description. A descriptor could be used to create a new table column. */ class OTableColumnDescriptorWrapper :public OColumnWrapper ,public OColumnSettings @@ -289,8 +289,8 @@ namespace dbaccess // = OTableColumnWrapper // ========================================================================= /** - * describes all properties for a columns of a table. Only the view parts are provided - * directly, all the other parts are derived from a driver implementation + * describes all properties for a columns of a table. Only the view parts are provided + * directly, all the other parts are derived from a driver implementation */ class OTableColumnWrapper :public OTableColumnDescriptorWrapper ,public ::comphelper::OIdPropertyArrayUsageHelper < OTableColumnWrapper > diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index 72a5a9fbbfd7..478d2eefbc3c 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -85,8 +85,8 @@ private: }; //========================================================================== -//= ODefinitionContainer - base class of collections of database definition -//= documents +//= ODefinitionContainer - base class of collections of database definition +//= documents //========================================================================== typedef ::cppu::ImplHelper7 < ::com::sun::star::container::XIndexAccess , ::com::sun::star::container::XNameContainer @@ -124,15 +124,15 @@ private: protected: // we can't just hold a vector of XContentRefs, as after initialization they're all empty // cause we load them only on access - DocumentsIndexAccess m_aDocuments; // for a efficient index access - Documents m_aDocumentMap; // for a efficient name access + DocumentsIndexAccess m_aDocuments; // for a efficient index access + Documents m_aDocumentMap; // for a efficient name access ::cppu::OInterfaceContainerHelper m_aApproveListeners; ::cppu::OInterfaceContainerHelper m_aContainerListeners; - sal_Bool m_bInPropertyChange; + sal_Bool m_bInPropertyChange; bool m_bCheckSlash; protected: @@ -163,7 +163,7 @@ public: */ ODefinitionContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _xORB - , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer + , const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _xParentContainer , const TContentPtr& _pImpl , bool _bCheckSlash = true ); @@ -221,42 +221,42 @@ protected: virtual void SAL_CALL disposing(); /** create a object from it's persistent data within the configuration. To be overwritten by derived classes. - @param _rName the name the object has within the container - @return the newly created object or an empty reference if somthing went wrong + @param _rName the name the object has within the container + @return the newly created object or an empty reference if somthing went wrong */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName) = 0; /** get the object specified by the given name. If desired, the object will be read if not already done so.
- @param _rName the object name - @param _bReadIfNeccessary if sal_True, the object will be created if necessary - @return the property set interface of the object. Usually the return value is not NULL, but + @param _rName the object name + @param _bReadIfNeccessary if sal_True, the object will be created if necessary + @return the property set interface of the object. Usually the return value is not NULL, but if so, then the object could not be read from the configuration - @throws NoSuchElementException if there is no object with the given name. - @see createObject + @throws NoSuchElementException if there is no object with the given name. + @see createObject */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implGetByName(const ::rtl::OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); /** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e. if there is such an object which is not already loaded, it won't be loaded now. - @param _rName the object name to check - @return sal_True if there already exists such an object + @param _rName the object name to check + @return sal_True if there already exists such an object */ - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); /** append a new object to the container. No plausibility checks are done, e.g. if the object is non-NULL or if the name is already used by another object or anything like this. This method is for derived classes which may support different methods to create and/or append objects, and don't want to deal with the internal structures of this class.
The old component will not be disposed, this is the callers responsibility, too. - @param _rName the name of the new object - @param _rxNewObject the new object (not surprising, is it ?) - @see createConfigKey - @see implReplace - @see implRemove + @param _rName the name of the new object + @param _rxNewObject the new object (not surprising, is it ?) + @see createConfigKey + @see implReplace + @see implRemove */ - void implAppend( + void implAppend( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject ); @@ -265,9 +265,9 @@ protected: or not there exists an object with the given name. This is the responsibility of the caller.
Additionally the node for the given object will be removed from the registry (including all sub nodes).
The old component will not be disposed, this is the callers responsibility, too. - @param _rName the objects name - @see implReplace - @see implAppend + @param _rName the objects name + @see implReplace + @see implAppend */ void implRemove(const ::rtl::OUString& _rName); @@ -276,11 +276,11 @@ protected: Additionally all object-related informations within the registry will be deleted. The new object config node, where the caller may want to store the new objects information, is returned.
The old component will not be disposed, this is the callers responsibility, too. - @param _rName the objects name - @param _rxNewObject the new object - @param _rNewObjectNode the configuration node where the new object may be stored - @see implAppend - @see implRemove + @param _rName the objects name + @param _rxNewObject the new object + @param _rNewObjectNode the configuration node where the new object may be stored + @see implAppend + @see implRemove */ void implReplace( const ::rtl::OUString& _rName, @@ -304,8 +304,8 @@ protected: } private: - void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); - void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); + void addObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); + void removeObjectListener(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewObject); /** approve that the object given may be inserted into the container. Should be overloaded by derived classes, the default implementation just checks the object to be non-void. @@ -329,7 +329,7 @@ private: } }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_DEFINITIONCONTAINER_HXX_ diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index ff2337944a69..bdeb3391b48c 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -50,7 +50,7 @@ namespace dbaccess public ::com::sun::star::lang::XServiceInfo { protected: - OColumns* m_pColumns; + OColumns* m_pColumns; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters > m_xAggregateAsParameters; public: diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index e98ec650b632..02b574f7b942 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -51,21 +51,21 @@ namespace com { namespace sun { namespace star { namespace util { namespace dbaccess { - typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSQLQueryComposer, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdb::XSQLQueryComposer, ::com::sun::star::sdb::XParametersSupplier, ::com::sun::star::sdbcx::XTablesSupplier, ::com::sun::star::sdbcx::XColumnsSupplier, - ::com::sun::star::lang::XServiceInfo > OQueryComposer_BASE; + ::com::sun::star::lang::XServiceInfo > OQueryComposer_BASE; class OPrivateColumns; class OPrivateTables; - class OQueryComposer : public ::comphelper::OBaseMutex, + class OQueryComposer : public ::comphelper::OBaseMutex, public OSubComponent, public OQueryComposer_BASE { - ::std::vector< ::rtl::OUString> m_aFilters; - ::std::vector< ::rtl::OUString> m_aOrders; + ::std::vector< ::rtl::OUString> m_aFilters; + ::std::vector< ::rtl::OUString> m_aOrders; ::rtl::OUString m_sOrgFilter; ::rtl::OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposer; @@ -76,7 +76,7 @@ namespace dbaccess virtual ~OQueryComposer(); public: - OQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ); + OQueryComposer( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ); // ::com::sun::star::lang::XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index 46fea061727f..fce10a545d90 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -77,7 +77,7 @@ namespace dbaccess class OQueryContainer; class OContainerListener; class OQuery; - class OQueryContainer : public ODefinitionContainer + class OQueryContainer : public ODefinitionContainer , public OQueryContainer_Base { protected: @@ -88,17 +88,17 @@ namespace dbaccess m_xConnection; // possible actions on our "aggregate" enum AGGREGATE_ACTION { NONE, INSERTING, FLUSHING }; - AGGREGATE_ACTION m_eDoingCurrently; + AGGREGATE_ACTION m_eDoingCurrently; OContainerListener* m_pCommandsListener; /** a class which automatically resets m_eDoingCurrently in it's destructor */ - class OAutoActionReset; // just for the following friend declaration + class OAutoActionReset; // just for the following friend declaration friend class OAutoActionReset; class OAutoActionReset { - OQueryContainer* m_pActor; + OQueryContainer* m_pActor; public: OAutoActionReset(OQueryContainer* _pActor) : m_pActor(_pActor) { } ~OAutoActionReset() { m_pActor->m_eDoingCurrently = NONE; } @@ -106,7 +106,7 @@ namespace dbaccess // ODefinitionContainer virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName); - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); // helper virtual void SAL_CALL disposing(); @@ -179,7 +179,7 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxCommandDesc); }; -} // namespace dbaccess +} // namespace dbaccess #endif // _DBA_CORE_QUERYCONTAINER_HXX_ diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx index 6c057018e325..ad484201b646 100644 --- a/dbaccess/source/core/inc/sdbcoretools.hxx +++ b/dbaccess/source/core/inc/sdbcoretools.hxx @@ -75,7 +75,7 @@ namespace dbaccess } -} // namespace dbaccess +} // namespace dbaccess #endif // DBACORE_SDBCORETOOLS_HXX diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index b609aaf71213..b0a0f458334c 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -49,7 +49,7 @@ //************************************************************ // OStatementBase //************************************************************ -class OStatementBase : public comphelper::OBaseMutex, +class OStatementBase : public comphelper::OBaseMutex, public OSubComponent, public ::cppu::OPropertySetHelper, public ::comphelper::OPropertyArrayUsageHelper < OStatementBase >, @@ -61,12 +61,12 @@ class OStatementBase : public comphelper::OBaseMutex, public ::com::sun::star::sdbc::XGeneratedResultSet { protected: - ::osl::Mutex m_aCancelMutex; + ::osl::Mutex m_aCancelMutex; - ::com::sun::star::uno::WeakReferenceHelper m_aResultSet; + ::com::sun::star::uno::WeakReferenceHelper m_aResultSet; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xAggregateAsSet; ::com::sun::star::uno::Reference< ::com::sun::star::util::XCancellable > m_xAggregateAsCancellable; - sal_Bool m_bUseBookmarks; + sal_Bool m_bUseBookmarks; sal_Bool m_bEscapeProcessing; virtual ~OStatementBase(); diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 8c2d1eda7c14..c5262327dfb4 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -56,10 +56,10 @@ namespace dbaccess //========================================================================== class ODBTable; class OContainerMediator; - typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable > ODBTable_PROP; - typedef ::connectivity::OTableHelper OTable_Base; + typedef ::comphelper::OIdPropertyArrayUsageHelper< ODBTable > ODBTable_PROP; + typedef ::connectivity::OTableHelper OTable_Base; - class ODBTable :public ODataSettings_Base + class ODBTable :public ODataSettings_Base ,public ODBTable_PROP ,public OTable_Base ,public IColumnFactory @@ -68,36 +68,36 @@ namespace dbaccess ::rtl::Reference< OContainerMediator > m_pColumnMediator; protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDriverColumns; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xColumnDefinitions; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDriverColumns; // - sal_Int32 m_nPrivileges; + sal_Int32 m_nPrivileges; // virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); virtual void columnDropped(const ::rtl::OUString& _sName); /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual ::connectivity::sdbcx::OCollection* createColumns(const ::connectivity::TStringVector& _rNames); /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual ::connectivity::sdbcx::OCollection* createKeys(const ::connectivity::TStringVector& _rNames); /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual ::connectivity::sdbcx::OCollection* createIndexes(const ::connectivity::TStringVector& _rNames); @@ -106,13 +106,13 @@ namespace dbaccess virtual void SAL_CALL disposing(void); public: /** constructs a wrapper supporting the com.sun.star.sdb.Table service.
- @param _rxConn the connection the table belongs to - @param _rxTable the table from the driver can be null - @param _rCatalog the name of the catalog the table belongs to. May be empty. - @param _rSchema the name of the schema the table belongs to. May be empty. - @param _rName the name of the table - @param _rType the type of the table, as supplied by the driver - @param _rDesc the description of the table, as supplied by the driver + @param _rxConn the connection the table belongs to + @param _rxTable the table from the driver can be null + @param _rCatalog the name of the catalog the table belongs to. May be empty. + @param _rSchema the name of the schema the table belongs to. May be empty. + @param _rName the name of the table + @param _rType the type of the table, as supplied by the driver + @param _rDesc the description of the table, as supplied by the driver */ ODBTable(connectivity::sdbcx::OCollection* _pTables ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConn @@ -143,7 +143,7 @@ namespace dbaccess DECLARE_SERVICE_INFO(); // com::sun::star::beans::XPropertySet - // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); + // virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; // ::com::sun::star::sdbcx::XRename, diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index ab2eb7bfe293..577ab1bb8ab0 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -60,9 +60,9 @@ namespace dbaccess class OTableContainer : public OFilteredContainer, public OTableContainer_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xTableDefinitions; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > m_xTableDefinitions; ::rtl::Reference< OContainerMediator > m_pTableMediator; - sal_Bool m_bInDrop; // set when we are in the drop method + sal_Bool m_bInDrop; // set when we are in the drop method // OFilteredContainer @@ -71,8 +71,8 @@ namespace dbaccess virtual ::rtl::OUString getTableTypeRestriction() const; // ::connectivity::sdbcx::OCollection - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); + virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); @@ -93,19 +93,19 @@ namespace dbaccess public: /** ctor of the container. The parent has to support the XConnection interface.
- @param _rParent the object which acts as parent for the container. + @param _rParent the object which acts as parent for the container. all refcounting is rerouted to this object - @param _rMutex the access safety object of the parent - @param _rTableFilter restricts the visible tables by name - @param _rTableTypeFilter restricts the visible tables by type - @see construct + @param _rMutex the access safety object of the parent + @param _rTableFilter restricts the visible tables by name + @param _rTableTypeFilter restricts the visible tables by type + @see construct */ OTableContainer( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon, sal_Bool _bCase, - const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xTableDefinitions, - IRefreshListener* _pRefreshListener, + const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer >& _xTableDefinitions, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer, oslInterlockedCount& _nInAppend ); diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx index f3cbcc4fd643..7efbf6586a57 100644 --- a/dbaccess/source/core/inc/userinformation.hxx +++ b/dbaccess/source/core/inc/userinformation.hxx @@ -35,12 +35,12 @@ class UserInformation { - ::com::sun::star::lang::Locale m_aUserLocale; + ::com::sun::star::lang::Locale m_aUserLocale; public: UserInformation(); - ::com::sun::star::lang::Locale getUserLanguage() const { return m_aUserLocale; } + ::com::sun::star::lang::Locale getUserLanguage() const { return m_aUserLocale; } }; #endif // _DBA_CORE_USERINFORMATION_HXX_ diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index 97e4f1393ca3..95836f7ab07f 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -63,18 +63,18 @@ namespace dbaccess public: /** ctor of the container. The parent has to support the XConnection interface.
- @param _rParent the object which acts as parent for the container. + @param _rParent the object which acts as parent for the container. all refcounting is rerouted to this object - @param _rMutex the access safety object of the parent - @param _rTableFilter restricts the visible tables by name - @param _rTableTypeFilter restricts the visible tables by type - @see construct + @param _rMutex the access safety object of the parent + @param _rTableFilter restricts the visible tables by name + @param _rTableTypeFilter restricts the visible tables by type + @see construct */ OViewContainer( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xCon, sal_Bool _bCase, - IRefreshListener* _pRefreshListener, + IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer, oslInterlockedCount& _nInAppend ); @@ -99,8 +99,8 @@ namespace dbaccess virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // ::connectivity::sdbcx::OCollection - virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); + virtual ::connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); diff --git a/dbaccess/source/core/misc/ContainerListener.cxx b/dbaccess/source/core/misc/ContainerListener.cxx index 79772386d185..83f7f2507ad8 100644 --- a/dbaccess/source/core/misc/ContainerListener.cxx +++ b/dbaccess/source/core/misc/ContainerListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ namespace dbaccess return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveInsertElement( _Event ); } - + //-------------------------------------------------------------------- Reference< XVeto > SAL_CALL OContainerListener::approveReplaceElement( const ContainerEvent& _Event ) throw (WrappedTargetException, RuntimeException) { @@ -74,7 +74,7 @@ namespace dbaccess return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveReplaceElement( _Event ); } - + //-------------------------------------------------------------------- Reference< XVeto > SAL_CALL OContainerListener::approveRemoveElement( const ContainerEvent& _Event ) throw (WrappedTargetException, RuntimeException) { @@ -84,7 +84,7 @@ namespace dbaccess return dynamic_cast< XContainerApproveListener& >( m_rDestination ).approveRemoveElement( _Event ); } - + //-------------------------------------------------------------------- void SAL_CALL OContainerListener::elementInserted( const ContainerEvent& _Event ) throw(RuntimeException) { @@ -94,7 +94,7 @@ namespace dbaccess dynamic_cast< XContainerListener& >( m_rDestination ).elementInserted( _Event ); } - + //-------------------------------------------------------------------- void SAL_CALL OContainerListener::elementRemoved( const ContainerEvent& _Event ) throw(RuntimeException) { @@ -104,7 +104,7 @@ namespace dbaccess dynamic_cast< XContainerListener& >( m_rDestination ).elementRemoved( _Event ); } - + //-------------------------------------------------------------------- void SAL_CALL OContainerListener::elementReplaced( const ContainerEvent& _Event ) throw(RuntimeException) { @@ -114,7 +114,7 @@ namespace dbaccess dynamic_cast< XContainerListener& >( m_rDestination ).elementReplaced( _Event ); } - + //-------------------------------------------------------------------- void SAL_CALL OContainerListener::disposing( const EventObject& _Source ) throw(RuntimeException) { diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index cd1dd3c2907c..82b5f8523ee0 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,15 +61,15 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain , m_aConnection( _rxConnection ) , m_eType( _eType ) { - DBG_CTOR(OContainerMediator,NULL); - + DBG_CTOR(OContainerMediator,NULL); + if ( _xSettings.is() && _xContainer.is() ) { osl_incrementInterlockedCount(&m_refCount); try { m_xContainer->addContainerListener(this); - Reference< XContainer > xContainer(_xSettings, UNO_QUERY); + Reference< XContainer > xContainer(_xSettings, UNO_QUERY); if ( xContainer.is() ) xContainer->addContainerListener(this); } @@ -88,7 +88,7 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain // ----------------------------------------------------------------------------- OContainerMediator::~OContainerMediator() { - DBG_DTOR(OContainerMediator,NULL); + DBG_DTOR(OContainerMediator,NULL); acquire(); impl_cleanup_nothrow(); } @@ -98,7 +98,7 @@ void OContainerMediator::impl_cleanup_nothrow() { try { - Reference< XContainer > xContainer( m_xSettings, UNO_QUERY ); + Reference< XContainer > xContainer( m_xSettings, UNO_QUERY ); if ( xContainer.is() ) xContainer->removeContainerListener( this ); m_xSettings.clear(); @@ -118,7 +118,7 @@ void OContainerMediator::impl_cleanup_nothrow() // ----------------------------------------------------------------------------- void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException) -{ +{ ::osl::MutexGuard aGuard(m_aMutex); if ( _rEvent.Source == m_xSettings && m_xSettings.is() ) { @@ -162,7 +162,7 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent { ::rtl::OUString sElementName; _rEvent.ReplacedElement >>= sElementName; - + PropertyForwardList::iterator aFind = m_aForwardList.find(sElementName); if ( aFind != m_aForwardList.end() ) { @@ -191,7 +191,7 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) throw(RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - + impl_cleanup_nothrow(); } @@ -258,7 +258,7 @@ void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, co } // ----------------------------------------------------------------------------- //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index bb1fc1cf59b2..c9fac4862bb0 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -357,12 +357,12 @@ void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< } uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException) -{ +{ return m_xComplexDescriptionAccess->getRowDescriptions(); } uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException) -{ +{ return m_xComplexDescriptionAccess->getColumnDescriptions(); } @@ -789,7 +789,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat while( xRes->next() && (!m_RowLimit || nRowCount < m_RowLimit) ) { ++nRowCount; - + aValue.fill( aColumns[0].nResultSetPosition, aColumns[0].nDataType, xRow ); aRowLabels.push_back( aValue.getString() ); @@ -831,7 +831,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat ::std::vector< double > aRow; const sal_Int32 nSize = SAL_N_ELEMENTS(fDefaultData); for (size_t j = 0; j < (aColumns.size()-1); ++j,++k) - { + { if ( k >= nSize ) k = 0; aRow.push_back(fDefaultData[k]); @@ -839,7 +839,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat aDataValues.push_back(aRow); } } - + uno::Reference< chart::XChartDataArray> xData(m_xInternal,uno::UNO_QUERY); xData->setRowDescriptions(uno::Sequence< ::rtl::OUString >(&(*aRowLabels.begin()),aRowLabels.size())); diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 9940b3990562..3c5557b47401 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ namespace dbaccess using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::lang; - DBG_NAME(OPropertyForward) + DBG_NAME(OPropertyForward) //------------------------------------------------------------------------ OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer, @@ -62,7 +62,7 @@ namespace dbaccess ,m_sName( _sName ) ,m_bInInsert( sal_False ) { - DBG_CTOR(OPropertyForward,NULL); + DBG_CTOR(OPropertyForward,NULL); osl_incrementInterlockedCount(&m_refCount); try @@ -87,7 +87,7 @@ namespace dbaccess // ----------------------------------------------------------------------------- OPropertyForward::~OPropertyForward() { - DBG_DTOR(OPropertyForward,NULL); + DBG_DTOR(OPropertyForward,NULL); } // ----------------------------------------------------------------------------- @@ -169,7 +169,7 @@ namespace dbaccess } //........................................................................ -} // namespace dbaccess +} // namespace dbaccess //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx index 281fb4902a6b..db763f853dd2 100644 --- a/dbaccess/source/core/misc/apitools.cxx +++ b/dbaccess/source/core/misc/apitools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,7 +107,7 @@ void OSubComponent::release() throw ( ) } OSL_ENSURE( m_refCount == 1, "OSubComponent::release: invalid ref count (before dispose)!" ); - + // First dispose dispose(); diff --git a/dbaccess/source/core/misc/dbastrings.cxx b/dbaccess/source/core/misc/dbastrings.cxx index f8f53df0e866..479baa1df3ff 100644 --- a/dbaccess/source/core/misc/dbastrings.cxx +++ b/dbaccess/source/core/misc/dbastrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 39c29c4f4925..4ba3437ca095 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,8 +59,8 @@ namespace dbaccess { if ( _sUrl.GetTokenCount(':') >= 2 ) { - _sHostname = _sUrl.GetToken(0,':'); - _nPortNumber = _sUrl.GetToken(1,':').ToInt32(); + _sHostname = _sUrl.GetToken(0,':'); + _nPortNumber = _sUrl.GetToken(1,':').ToInt32(); } } } @@ -121,7 +121,7 @@ String ODsnTypeCollection::cutPrefix(const ::rtl::OUString& _sURL) const sOldPattern = *aIter; } } - + return sRet; } @@ -146,7 +146,7 @@ String ODsnTypeCollection::getPrefix(const ::rtl::OUString& _sURL) const sOldPattern = *aIter; } } - + return sRet; } @@ -214,14 +214,14 @@ String ODsnTypeCollection::getDatasourcePrefixFromMediaType(const ::rtl::OUStrin // ----------------------------------------------------------------------------- bool ODsnTypeCollection::isShowPropertiesEnabled( const ::rtl::OUString& _sURL ) const { - return !( _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlook",sizeof("sdbc:address:outlook")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlookexp",sizeof("sdbc:address:outlookexp")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:mozilla:",sizeof("sdbc:address:mozilla:")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:kab",sizeof("sdbc:address:kab")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:local",sizeof("sdbc:address:evolution:local")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:groupwise",sizeof("sdbc:address:evolution:groupwise")-1) - || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:ldap",sizeof("sdbc:address:evolution:ldap")-1) + return !( _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlook",sizeof("sdbc:address:outlook")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlookexp",sizeof("sdbc:address:outlookexp")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:mozilla:",sizeof("sdbc:address:mozilla:")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:kab",sizeof("sdbc:address:kab")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:local",sizeof("sdbc:address:evolution:local")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:groupwise",sizeof("sdbc:address:evolution:groupwise")-1) + || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:ldap",sizeof("sdbc:address:evolution:ldap")-1) || _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:macab",sizeof("sdbc:address:macab")-1) ); } // ----------------------------------------------------------------------------- @@ -329,7 +329,7 @@ bool ODsnTypeCollection::isEmbeddedDatabase( const ::rtl::OUString& _sURL ) cons if ( aInstalled.hasByName("EmbeddedDatabases/DefaultEmbeddedDatabase/Value") ) { static const ::rtl::OUString s_sValue(RTL_CONSTASCII_USTRINGPARAM("EmbeddedDatabases/DefaultEmbeddedDatabase/Value")); - + aInstalled.getNodeValue(s_sValue) >>= sEmbeddedDatabaseURL; if ( sEmbeddedDatabaseURL.getLength() ) aInstalled.getNodeValue(s_sValue + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")) + sEmbeddedDatabaseURL + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/URL"))) >>= sEmbeddedDatabaseURL; @@ -550,7 +550,7 @@ sal_Int32 ODsnTypeCollection::getIndexOf(const ::rtl::OUString& _sURL) const sOldPattern = *aIter; } } - + return nRet; } // ----------------------------------------------------------------------------- @@ -603,7 +603,7 @@ String ODsnTypeCollection::TypeIterator::getDisplayName() const return m_pContainer->m_aDsnPrefixes[m_nPosition]; } //------------------------------------------------------------------------- -const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator++() +const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator++() { DBG_ASSERT(m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size(), "ODsnTypeCollection::TypeIterator::operator++ : invalid position!"); if (m_nPosition < (sal_Int32)m_pContainer->m_aDsnTypesDisplayNames.size()) @@ -612,7 +612,7 @@ const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operat } //------------------------------------------------------------------------- -const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator--() +const ODsnTypeCollection::TypeIterator& ODsnTypeCollection::TypeIterator::operator--() { DBG_ASSERT(m_nPosition >= 0, "ODsnTypeCollection::TypeIterator::operator-- : invalid position!"); if (m_nPosition >= 0) @@ -627,7 +627,7 @@ bool operator==(const ODsnTypeCollection::TypeIterator& lhs, const ODsnTypeColle } //......................................................................... -} // namespace dbaccess +} // namespace dbaccess //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/module_dba.cxx b/dbaccess/source/core/misc/module_dba.cxx index c5653e6c02b0..1c4472f129ab 100644 --- a/dbaccess/source/core/misc/module_dba.cxx +++ b/dbaccess/source/core/misc/module_dba.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx index 3773680fe891..06ba682469b5 100644 --- a/dbaccess/source/core/misc/objectnameapproval.cxx +++ b/dbaccess/source/core/misc/objectnameapproval.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index a7f21ee4a3cf..01cdab86f7db 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -171,7 +171,7 @@ namespace dbaccess } } // tools::stor //......................................................................... -} // namespace dbaccess +} // namespace dbaccess //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 189e4f1e36e4..2b6255e13cbf 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace dba{ ::cppu::ImplementationEntry entries[] = { { &::dbaccess::DatabaseDataProvider::Create, &::dbaccess::DatabaseDataProvider::getImplementationName_Static, &::dbaccess::DatabaseDataProvider::getSupportedServiceNames_Static, &cppu::createSingleComponentFactory, 0, 0 }, - { 0, 0, 0, 0, 0, 0 } + { 0, 0, 0, 0, 0, 0 } }; } @@ -86,8 +86,8 @@ extern "C" void SAL_CALL createRegistryInfo_DBA() //--------------------------------------------------------------------------------------- extern "C" OOO_DLLPUBLIC_DBA void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_DBA(); diff --git a/dbaccess/source/core/misc/userinformation.cxx b/dbaccess/source/core/misc/userinformation.cxx index 27ea6bb51f8b..679236c69d66 100644 --- a/dbaccess/source/core/misc/userinformation.cxx +++ b/dbaccess/source/core/misc/userinformation.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx index ead0b705b3d6..80ec1e3fa2b3 100644 --- a/dbaccess/source/core/misc/veto.cxx +++ b/dbaccess/source/core/misc/veto.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ namespace dbaccess { return m_sReason; } - + //-------------------------------------------------------------------- Any SAL_CALL Veto::getDetails() throw (RuntimeException) { diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index f1e897764457..231f77f0e8cc 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 8ef984f585ee..37abcf3fb444 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx index 1101ce0cd0cc..ad241cacff64 100644 --- a/dbaccess/source/core/recovery/settingsimport.hxx +++ b/dbaccess/source/core/recovery/settingsimport.hxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx index 7c5589f864f6..4a7f9e603d45 100644 --- a/dbaccess/source/core/recovery/storagestream.cxx +++ b/dbaccess/source/core/recovery/storagestream.cxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index 4f724a93e906..efe9846f4aac 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx index b034b95b60a3..77b6d53dd005 100644 --- a/dbaccess/source/core/recovery/storagetextstream.cxx +++ b/dbaccess/source/core/recovery/storagetextstream.cxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index 5283687ce163..91d7592f4c90 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index 3e65d79387e7..860f7729879e 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index d14d9b62bc12..92be6dad3d68 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx index 48debe206c73..6c169c7ce113 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.cxx +++ b/dbaccess/source/core/recovery/subcomponentloader.cxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -165,14 +165,14 @@ namespace dbaccess // not interested in (void)i_rEvent; } - + //-------------------------------------------------------------------- void SAL_CALL SubComponentLoader::windowMoved( const WindowEvent& i_rEvent ) throw (RuntimeException) { // not interested in (void)i_rEvent; } - + //-------------------------------------------------------------------- void SAL_CALL SubComponentLoader::windowShown( const EventObject& i_rEvent ) throw (RuntimeException) { @@ -181,7 +181,7 @@ namespace dbaccess lcl_onWindowShown_nothrow( *m_pData ); m_pData->xAppComponentWindow->removeWindowListener( this ); } - + //-------------------------------------------------------------------- void SAL_CALL SubComponentLoader::windowHidden( const EventObject& i_rEvent ) throw (RuntimeException) { diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx index 30922c9d71d9..190ad0b4aea3 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.hxx +++ b/dbaccess/source/core/recovery/subcomponentloader.hxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index c579e014e657..32d213dbc151 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -322,12 +322,12 @@ namespace dbaccess void SAL_CALL SettingsDocumentHandler::startDocument( ) throw (SAXException, RuntimeException) { } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::endDocument( ) throw (SAXException, RuntimeException) { } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::startElement( const ::rtl::OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException) { @@ -359,7 +359,7 @@ namespace dbaccess m_aStates.push( pNewState ); } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::endElement( const ::rtl::OUString& i_Name ) throw (SAXException, RuntimeException) { @@ -370,7 +370,7 @@ namespace dbaccess pCurrentState->endElement(); m_aStates.pop(); } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::characters( const ::rtl::OUString& i_Chars ) throw (SAXException, RuntimeException) { @@ -379,14 +379,14 @@ namespace dbaccess ::rtl::Reference< SettingsImport > pCurrentState( m_aStates.top() ); pCurrentState->characters( i_Chars ); } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException) { // ignore them - that's why they're called "ignorable" (void)aWhitespaces; } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::processingInstruction( const ::rtl::OUString& i_Target, const ::rtl::OUString& i_Data ) throw (SAXException, RuntimeException) { @@ -394,7 +394,7 @@ namespace dbaccess (void)i_Target; (void)i_Data; } - + //-------------------------------------------------------------------- void SAL_CALL SettingsDocumentHandler::setDocumentLocator( const Reference< XLocator >& i_Locator ) throw (SAXException, RuntimeException) { diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx index cb5519cf5c77..6ddd121c3a82 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index 75dd161c09a9..77446b78ab76 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -1,7 +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 2009 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx index d197fe66eb20..123aeb11873a 100644 --- a/dbaccess/source/core/resource/core_resource.cxx +++ b/dbaccess/source/core/resource/core_resource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ namespace dbaccess //================================================================== //= ResourceManager //================================================================== - ::osl::Mutex ResourceManager::s_aMutex; - sal_Int32 ResourceManager::s_nClients = 0; + ::osl::Mutex ResourceManager::s_aMutex; + sal_Int32 ResourceManager::s_nClients = 0; ResMgr* ResourceManager::m_pImpl = NULL; //------------------------------------------------------------------ diff --git a/dbaccess/source/core/resource/strings.src b/dbaccess/source/core/resource/strings.src index dc7023ca6fba..bd20da391edd 100644 --- a/dbaccess/source/core/resource/strings.src +++ b/dbaccess/source/core/resource/strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -79,7 +79,7 @@ String RID_STR_DATASOURCE_NOT_STORED }; String RID_STR_ONLY_QUERY { - Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed."; + Text [ en-US ] = "The given command is not a SELECT statement.\nOnly queries are allowed."; }; String RID_STR_NO_VALUE_CHANGED { diff --git a/dbaccess/source/ext/adabas/ANewDb.cxx b/dbaccess/source/ext/adabas/ANewDb.cxx index 3fc0d952cf40..7db2de70aeb9 100644 --- a/dbaccess/source/ext/adabas/ANewDb.cxx +++ b/dbaccess/source/ext/adabas/ANewDb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,13 +56,13 @@ OAdabasCreateDialog::OAdabasCreateDialog(const Reference< XMultiServiceFactory > :OAdabasCreateDialogBase(_rxORB) ,m_pDialog(NULL) { - registerProperty(PROPERTY_CREATECATALOG, PROPERTY_ID_CREATECATALOG, PropertyAttribute::TRANSIENT,&m_xCreateCatalog, ::getCppuType(&m_xCreateCatalog)); - registerProperty(PROPERTY_DATABASENAME, PROPERTY_ID_DATABASENAME, PropertyAttribute::TRANSIENT,&m_sDatabaseName, ::getCppuType(&m_sDatabaseName)); - registerProperty(PROPERTY_CONTROL_USER, PROPERTY_ID_CONTROL_USER, PropertyAttribute::TRANSIENT,&m_sControlUser, ::getCppuType(&m_sControlUser)); - registerProperty(PROPERTY_CONTROL_PASSWORD, PROPERTY_ID_CONTROL_PASSWORD, PropertyAttribute::TRANSIENT,&m_sControlPassword, ::getCppuType(&m_sControlPassword)); - registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT,&m_sUser, ::getCppuType(&m_sUser)); - registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT,&m_sUserPassword, ::getCppuType(&m_sUserPassword)); - registerProperty(PROPERTY_CACHESIZE, PROPERTY_ID_CACHESIZE, PropertyAttribute::TRANSIENT,&m_nCacheSize, ::getCppuType(&m_nCacheSize)); + registerProperty(PROPERTY_CREATECATALOG, PROPERTY_ID_CREATECATALOG, PropertyAttribute::TRANSIENT,&m_xCreateCatalog, ::getCppuType(&m_xCreateCatalog)); + registerProperty(PROPERTY_DATABASENAME, PROPERTY_ID_DATABASENAME, PropertyAttribute::TRANSIENT,&m_sDatabaseName, ::getCppuType(&m_sDatabaseName)); + registerProperty(PROPERTY_CONTROL_USER, PROPERTY_ID_CONTROL_USER, PropertyAttribute::TRANSIENT,&m_sControlUser, ::getCppuType(&m_sControlUser)); + registerProperty(PROPERTY_CONTROL_PASSWORD, PROPERTY_ID_CONTROL_PASSWORD, PropertyAttribute::TRANSIENT,&m_sControlPassword, ::getCppuType(&m_sControlPassword)); + registerProperty(PROPERTY_USER, PROPERTY_ID_USER, PropertyAttribute::TRANSIENT,&m_sUser, ::getCppuType(&m_sUser)); + registerProperty(PROPERTY_PASSWORD, PROPERTY_ID_PASSWORD, PropertyAttribute::TRANSIENT,&m_sUserPassword, ::getCppuType(&m_sUserPassword)); + registerProperty(PROPERTY_CACHESIZE, PROPERTY_ID_CACHESIZE, PropertyAttribute::TRANSIENT,&m_nCacheSize, ::getCppuType(&m_nCacheSize)); } //------------------------------------------------------------------------- @@ -126,7 +126,7 @@ Reference SAL_CALL OAdabasCreateDialog::getPropertySetInfo() } //------------------------------------------------------------------------------ -Dialog* OAdabasCreateDialog::createDialog(Window* _pParent) +Dialog* OAdabasCreateDialog::createDialog(Window* _pParent) { if(!m_xCreateCatalog.is()) throw SQLException(); @@ -138,12 +138,12 @@ void OAdabasCreateDialog::executedDialog(sal_Int16 _nExecutionResult) { if(m_pDialog && _nExecutionResult == RET_OK) { // fill the variables - m_sDatabaseName = m_pDialog->GetDatabaseName(); - m_sControlUser = m_pDialog->GetControlUser(); - m_sControlPassword = m_pDialog->GetControlPassword(); - m_sUser = m_pDialog->GetUser(); - m_sUserPassword = m_pDialog->GetUserPassword(); - m_nCacheSize = m_pDialog->GetCacheSize(); + m_sDatabaseName = m_pDialog->GetDatabaseName(); + m_sControlUser = m_pDialog->GetControlUser(); + m_sControlPassword = m_pDialog->GetControlPassword(); + m_sUser = m_pDialog->GetUser(); + m_sUserPassword = m_pDialog->GetUserPassword(); + m_nCacheSize = m_pDialog->GetCacheSize(); } } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ext/adabas/ANewDb.hxx b/dbaccess/source/ext/adabas/ANewDb.hxx index cf725930dd0a..f1f0087be4df 100644 --- a/dbaccess/source/ext/adabas/ANewDb.hxx +++ b/dbaccess/source/ext/adabas/ANewDb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,12 +50,12 @@ namespace adabasui protected: OAdabasNewDbDlg* m_pDialog; // just to avoid a cast // - ::rtl::OUString m_sDatabaseName; - ::rtl::OUString m_sControlUser; - ::rtl::OUString m_sControlPassword; - ::rtl::OUString m_sUser; - ::rtl::OUString m_sUserPassword; - sal_Int32 m_nCacheSize; + ::rtl::OUString m_sDatabaseName; + ::rtl::OUString m_sControlUser; + ::rtl::OUString m_sControlPassword; + ::rtl::OUString m_sUser; + ::rtl::OUString m_sUserPassword; + sal_Int32 m_nCacheSize; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog; // @@ -85,11 +85,11 @@ namespace adabasui protected: // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); + virtual Dialog* createDialog(Window* _pParent); virtual void executedDialog(sal_Int16 _nExecutionResult); }; //......................................................................... -} // namespace adabasui +} // namespace adabasui //......................................................................... #endif // ADABASUI_NEWDB_HXX diff --git a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx index be2c27acf9d9..046a3fb9f175 100644 --- a/dbaccess/source/ext/adabas/ASQLNameEdit.hxx +++ b/dbaccess/source/ext/adabas/ASQLNameEdit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace adabasui ,public OSQLNameChecker { public: - OSQLNameEdit(Window* _pParent,const ResId& _rRes) + OSQLNameEdit(Window* _pParent,const ResId& _rRes) : Edit(_pParent,_rRes) { } diff --git a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx index 4745568c69e8..ae6071d6ae1a 100644 --- a/dbaccess/source/ext/adabas/ASqlNameEdit.cxx +++ b/dbaccess/source/ext/adabas/ASqlNameEdit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,14 +40,14 @@ namespace adabasui ); } //------------------------------------------------------------------ - sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, + sal_Bool OSQLNameChecker::checkString( const ::rtl::OUString& _sOldValue, const ::rtl::OUString& _sToCheck, ::rtl::OUString& _rsCorrected) { sal_Bool bCorrected = sal_False; - XubString sSavedValue = _sOldValue; - XubString sText = _sToCheck; - xub_StrLen nMatch = 0; + XubString sSavedValue = _sOldValue; + XubString sText = _sToCheck; + xub_StrLen nMatch = 0; for ( xub_StrLen i=nMatch;i < sText.Len(); ++i ) { if ( !isCharOk( sText.GetBuffer()[i]) ) diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.cxx b/dbaccess/source/ext/adabas/Acomponentmodule.cxx index cab3b7170bc2..943e60d4d96d 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.cxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,10 +34,10 @@ #include #include -#define ENTER_MOD_METHOD() \ - ::osl::MutexGuard aGuard(s_aMutex); \ +#define ENTER_MOD_METHOD() \ + ::osl::MutexGuard aGuard(s_aMutex); \ ensureImpl() - + //......................................................................... namespace COMPMOD_NAMESPACE { @@ -56,9 +56,9 @@ namespace COMPMOD_NAMESPACE */ class OModuleImpl { - ResMgr* m_pRessources; - sal_Bool m_bInitialized; - ByteString m_sFilePrefix; + ResMgr* m_pRessources; + sal_Bool m_bInitialized; + ByteString m_sFilePrefix; public: /// ctor @@ -66,8 +66,8 @@ namespace COMPMOD_NAMESPACE ~OModuleImpl(); /// get the manager for the ressources of the module - ResMgr* getResManager(); - void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; } + ResMgr* getResManager(); + void setResourceFilePrefix(const ::rtl::OString& _rPrefix) { m_sFilePrefix = _rPrefix; } }; //------------------------------------------------------------------------- @@ -85,7 +85,7 @@ namespace COMPMOD_NAMESPACE } //------------------------------------------------------------------------- - ResMgr* OModuleImpl::getResManager() + ResMgr* OModuleImpl::getResManager() { // note that this method is not threadsafe, which counts for the whole class ! if (!m_pRessources && !m_bInitialized) @@ -95,10 +95,10 @@ namespace COMPMOD_NAMESPACE ByteString aMgrName = m_sFilePrefix; m_pRessources = ResMgr::CreateResMgr(aMgrName.GetBuffer()); - DBG_ASSERT(m_pRessources, + DBG_ASSERT(m_pRessources, (ByteString("OModuleImpl::getResManager: could not create the resource manager (file name: ") - += aMgrName - += ByteString(")!")).GetBuffer()); + += aMgrName + += ByteString(")!")).GetBuffer()); m_bInitialized = sal_True; } @@ -108,12 +108,12 @@ namespace COMPMOD_NAMESPACE //========================================================================= //= OModule //========================================================================= - ::osl::Mutex OModule::s_aMutex; - sal_Int32 OModule::s_nClients = 0; - OModuleImpl* OModule::s_pImpl = NULL; - ::rtl::OString OModule::s_sResPrefix; + ::osl::Mutex OModule::s_aMutex; + sal_Int32 OModule::s_nClients = 0; + OModuleImpl* OModule::s_pImpl = NULL; + ::rtl::OString OModule::s_sResPrefix; //------------------------------------------------------------------------- - ResMgr* OModule::getResManager() + ResMgr* OModule::getResManager() { ENTER_MOD_METHOD(); return s_pImpl->getResManager(); @@ -159,10 +159,10 @@ namespace COMPMOD_NAMESPACE //- registration helper //-------------------------------------------------------------------------- - Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL; - Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL; - Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL; - Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL; + Sequence< ::rtl::OUString >* OModule::s_pImplementationNames = NULL; + Sequence< Sequence< ::rtl::OUString > >* OModule::s_pSupportedServices = NULL; + Sequence< sal_Int64 >* OModule::s_pCreationFunctionPointers = NULL; + Sequence< sal_Int64 >* OModule::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OModule::registerComponent( @@ -183,9 +183,9 @@ namespace COMPMOD_NAMESPACE OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModule::registerComponent : inconsistent state (the pointers (2)) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModule::registerComponent : inconsistent state !"); sal_Int32 nOldLen = s_pImplementationNames->getLength(); @@ -210,9 +210,9 @@ namespace COMPMOD_NAMESPACE } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModule::revokeComponent : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModule::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -252,9 +252,9 @@ namespace COMPMOD_NAMESPACE } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModule::writeComponentInfos : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModule::writeComponentInfos : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -301,9 +301,9 @@ namespace COMPMOD_NAMESPACE } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModule::getComponentFactory : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModule::getComponentFactory : inconsistent state !"); @@ -337,7 +337,7 @@ namespace COMPMOD_NAMESPACE //......................................................................... -} // namespace COMPMOD_NAMESPACE +} // namespace COMPMOD_NAMESPACE //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ext/adabas/Acomponentmodule.hxx b/dbaccess/source/ext/adabas/Acomponentmodule.hxx index 8ac75326a56e..d0c93c5b0663 100644 --- a/dbaccess/source/ext/adabas/Acomponentmodule.hxx +++ b/dbaccess/source/ext/adabas/Acomponentmodule.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,36 +76,36 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService protected: // resource administration - static ::osl::Mutex s_aMutex; /// access safety - static sal_Int32 s_nClients; /// number of registered clients - static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered - static ::rtl::OString s_sResPrefix; + static ::osl::Mutex s_aMutex; /// access safety + static sal_Int32 s_nClients; /// number of registered clients + static OModuleImpl* s_pImpl; /// impl class. lives as long as at least one client for the module is registered + static ::rtl::OString s_sResPrefix; // auto registration administration - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< ::rtl::OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* s_pSupportedServices; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pFactoryFunctionPointers; public: // cna be set as long as no resource has been accessed ... - static void setResourceFilePrefix(const ::rtl::OString& _rPrefix); + static void setResourceFilePrefix(const ::rtl::OString& _rPrefix); /// get the vcl res manager of the module - static ResMgr* getResManager(); + static ResMgr* getResManager(); /** register a component implementing a service with the given data. - @param _rImplementationName + @param _rImplementationName the implementation name of the component - @param _rServiceNames + @param _rServiceNames the services the component supports - @param _pCreateFunction + @param _pCreateFunction a function for creating an instance of the component - @param _pFactoryFunction + @param _pFactoryFunction a function for creating a factory for that component @see revokeComponent */ @@ -116,7 +116,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService FactoryInstantiation _pFactoryFunction); /** revoke the registration for the specified component - @param _rImplementationName + @param _rImplementationName the implementation name of the component */ static void revokeComponent( @@ -126,9 +126,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService

writes the registration information of all components which are currently registered into the specified registry.

Usually used from within component_writeInfo.

- @param _rxServiceManager + @param _rxServiceManager the service manager - @param _rRootKey + @param _rRootKey the registry key under which the information will be stored @return sal_True if the registration of all implementations was successfull, sal_False otherwise @@ -139,9 +139,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService /** creates a Factory for the component with the given implementation name.

Usually used from within component_getFactory.

- @param _rxServiceManager + @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory - @param _pImplementationName + @param _pImplementationName the implementation name of the component @return the XInterface access to a factory for the component @@ -153,9 +153,9 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService protected: /// register a client for the module - static void registerClient(); + static void registerClient(); /// revoke a client for the module - static void revokeClient(); + static void revokeClient(); private: /** ensure that the impl class exists @@ -167,13 +167,13 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService //========================================================================= //= OModuleResourceClient //========================================================================= - /** base class for objects which uses any global module-specific ressources + /** base class for objects which uses any global module-specific ressources */ class OModuleResourceClient { public: - OModuleResourceClient() { OModule::registerClient(); } - ~OModuleResourceClient() { OModule::revokeClient(); } + OModuleResourceClient() { OModule::registerClient(); } + ~OModuleResourceClient() { OModule::revokeClient(); } }; //========================================================================= @@ -272,7 +272,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService } //......................................................................... -} // namespace COMPMOD_NAMESPACE +} // namespace COMPMOD_NAMESPACE //......................................................................... #endif // _EXTENSIONS_COMPONENT_MODULE_HXX_ diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.cxx b/dbaccess/source/ext/adabas/AdabasNewDb.cxx index 5ba64ae9c5c7..d6833f01eaaa 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.cxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,11 +69,11 @@ namespace adabasui { class ODatabaseCreator : public ::osl::Thread { - Link m_aTerminateHandler; - Sequence< PropertyValue> m_aValues; - Reference m_xCreateCatalog; - Reference< XMultiServiceFactory > m_xORB; - Window* m_pErrorWindow; + Link m_aTerminateHandler; + Sequence< PropertyValue> m_aValues; + Reference m_xCreateCatalog; + Reference< XMultiServiceFactory > m_xORB; + Window* m_pErrorWindow; public: ODatabaseCreator(const Reference& _rxCreateCatalog ,Window* _pErrorWindow @@ -107,7 +107,7 @@ namespace adabasui catch(Exception&) { OSL_ASSERT(0); - // showError(::dbtools::SQLExceptionInfo(e),this,); + // showError(::dbtools::SQLExceptionInfo(e),this,); } } void SAL_CALL ODatabaseCreator::onTerminated() @@ -120,7 +120,7 @@ DBG_NAME( OAdabasNewDbDlg ) //======================================================================== OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, const Reference& _rxCreateCatalog, - const Reference< XMultiServiceFactory >& _rxORB, + const Reference< XMultiServiceFactory >& _rxORB, BOOL _bRestore) :ModalDialog( pParent, ModuleRes( DLG_ADABAS_NEWDB )) ,m_FT_DATABASENAME( this, ModuleRes( FT_DATABASENAME ) ) @@ -202,8 +202,8 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_ET_SYSUSR.SetText(String::CreateFromAscii("DUMMY")); m_BMP_SYS.Hide(); m_BMP_DOMAIN.Hide(); - m_ET_RESTORE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_ET_RESTORE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_RESTORE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_RESTORE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_ET_RESTORE.SetMaxTextLen(40); } else @@ -212,24 +212,24 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_ET_RESTORE.Hide(); m_PB_RESTORE.Hide(); - m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_SYSUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_CONUSR.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_ET_DOMAIN_USR.Enable(FALSE); } - m_ET_SYSDEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_ET_TRANSACTIONLOG.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_ET_DATADEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_SYSDEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_TRANSACTIONLOG.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_DATADEVSPACE.SetLoseFocusHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_ET_SYSDEVSPACE.SetMaxTextLen(40); m_ET_TRANSACTIONLOG.SetMaxTextLen(40); m_ET_DATADEVSPACE.SetMaxTextLen(40); - m_NF_TRANSACTIONLOG_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_NF_DATADEVSPACE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); - m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_NF_TRANSACTIONLOG_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_NF_DATADEVSPACE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_NF_CACHE_SIZE.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); m_NF_TRANSACTIONLOG_SIZE.SetMin(10); m_NF_DATADEVSPACE_SIZE.SetMin(10); @@ -249,19 +249,19 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_ET_DATABASENAME.SetMaxTextLen( 8 ); - m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); - m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); - m_PB_DOMAINPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); + m_PB_CONPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); + m_PB_SYSPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); + m_PB_DOMAINPWD.SetClickHdl( LINK(this,OAdabasNewDbDlg,PwdClickHdl)); - m_PB_RESTORE.SetClickHdl( LINK(this,OAdabasNewDbDlg,LoadButtonClickHdl)); + m_PB_RESTORE.SetClickHdl( LINK(this,OAdabasNewDbDlg,LoadButtonClickHdl)); - m_PB_SYSDEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); - m_PB_TRANSACTIONLOG.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); - m_PB_DATADEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); + m_PB_SYSDEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); + m_PB_TRANSACTIONLOG.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); + m_PB_DATADEVSPACE.SetClickHdl( LINK(this,OAdabasNewDbDlg,ButtonClickHdl)); - m_BMP_CON.SetImage( ModuleRes(UNCHECK_RED) ); - m_BMP_SYS.SetImage( ModuleRes(UNCHECK_RED) ); - m_BMP_DOMAIN.SetImage( ModuleRes(UNCHECK_RED) ); + m_BMP_CON.SetImage( ModuleRes(UNCHECK_RED) ); + m_BMP_SYS.SetImage( ModuleRes(UNCHECK_RED) ); + m_BMP_DOMAIN.SetImage( ModuleRes(UNCHECK_RED) ); static String s_sRoot(RTL_CONSTASCII_USTRINGPARAM("DBROOT")); static String s_sConfig(RTL_CONSTASCII_USTRINGPARAM("DBCONFIG")); @@ -344,7 +344,7 @@ OAdabasNewDbDlg::OAdabasNewDbDlg( Window* pParent, m_PB_OK.SetClickHdl(LINK(this,OAdabasNewDbDlg,ImplOKHdl)); m_PB_OK.Enable(FALSE); - m_ET_DATABASENAME.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); + m_ET_DATABASENAME.SetModifyHdl( LINK(this,OAdabasNewDbDlg,LoseFocusHdl)); } // ----------------------------------------------------------------------- @@ -378,11 +378,11 @@ IMPL_LINK(OAdabasNewDbDlg, OnNoAccessRights, void*, /*_pArg*/) // ----------------------------------------------------------------------- IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ ) { - m_SYSDEV_File = m_ET_SYSDEVSPACE.GetText(); + m_SYSDEV_File = m_ET_SYSDEVSPACE.GetText(); m_TRANSDEV_File = m_ET_TRANSACTIONLOG.GetText(); - m_DATADEV_File = m_ET_DATADEVSPACE.GetText(); + m_DATADEV_File = m_ET_DATADEVSPACE.GetText(); - m_Backup_File = m_ET_RESTORE.GetText(); + m_Backup_File = m_ET_RESTORE.GetText(); if(m_bRestore) { INetURLObject aURL; @@ -463,36 +463,36 @@ IMPL_LINK( OAdabasNewDbDlg, ImplOKHdl, OKButton*, /*EMPTYARG*/ ) sal_Int32 nPos = 0; Sequence< PropertyValue> aCreateArgs(m_bRestore ? 14 : 12); - aCreateArgs[nPos].Name = PROPERTY_CONTROL_USER; + aCreateArgs[nPos].Name = PROPERTY_CONTROL_USER; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_CONUSR.GetText().ToUpperAscii()); - aCreateArgs[nPos].Name = PROPERTY_CONTROL_PASSWORD; + aCreateArgs[nPos].Name = PROPERTY_CONTROL_PASSWORD; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ConPwd); - aCreateArgs[nPos].Name = PROPERTY_USER; + aCreateArgs[nPos].Name = PROPERTY_USER; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_SYSUSR.GetText().ToUpperAscii()); - aCreateArgs[nPos].Name = PROPERTY_PASSWORD; + aCreateArgs[nPos].Name = PROPERTY_PASSWORD; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_SysPwd); - aCreateArgs[nPos].Name = PROPERTY_DOMAINPASSWORD; + aCreateArgs[nPos].Name = PROPERTY_DOMAINPASSWORD; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_DomainPwd); - aCreateArgs[nPos].Name = PROPERTY_CACHESIZE; + aCreateArgs[nPos].Name = PROPERTY_CACHESIZE; aCreateArgs[nPos++].Value <<= ::rtl::OUString::valueOf(sal_Int32(m_NF_CACHE_SIZE.GetValue()*256)); - aCreateArgs[nPos].Name = PROPERTY_DATABASENAME; + aCreateArgs[nPos].Name = PROPERTY_DATABASENAME; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_ET_DATABASENAME.GetText().ToUpperAscii()); - aCreateArgs[nPos].Name = PROPERTY_DATADEVSPACE; + aCreateArgs[nPos].Name = PROPERTY_DATADEVSPACE; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_DATADEV_File); - aCreateArgs[nPos].Name = PROPERTY_SYSDEVSPACE; + aCreateArgs[nPos].Name = PROPERTY_SYSDEVSPACE; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_SYSDEV_File); - aCreateArgs[nPos].Name = PROPERTY_TRANSACTION_LOG; + aCreateArgs[nPos].Name = PROPERTY_TRANSACTION_LOG; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_TRANSDEV_File); - aCreateArgs[nPos].Name = PROPERTY_DATADEVSIZE; + aCreateArgs[nPos].Name = PROPERTY_DATADEVSIZE; aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_DATADEVSPACE_SIZE.GetValue()*256); - aCreateArgs[nPos].Name = PROPERTY_LOGDEVSIZE; - aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_TRANSACTIONLOG_SIZE.GetValue()*256); + aCreateArgs[nPos].Name = PROPERTY_LOGDEVSIZE; + aCreateArgs[nPos++].Value <<= sal_Int32(m_NF_TRANSACTIONLOG_SIZE.GetValue()*256); if(m_bRestore) { - aCreateArgs[nPos].Name = PROPERTY_RESTOREDATABASE; + aCreateArgs[nPos].Name = PROPERTY_RESTOREDATABASE; aCreateArgs[nPos++].Value <<= ::cppu::bool2any(sal_True); - aCreateArgs[nPos].Name = PROPERTY_BACKUPNAME; + aCreateArgs[nPos].Name = PROPERTY_BACKUPNAME; aCreateArgs[nPos++].Value <<= ::rtl::OUString(m_Backup_File); } @@ -574,8 +574,8 @@ IMPL_LINK( OAdabasNewDbDlg, LoadButtonClickHdl, Button *, /*pButton*/ ) //------------------------------------------------------------------------ IMPL_LINK( OAdabasNewDbDlg, ButtonClickHdl, Button *, pButton ) { - WinBits nBits(WB_3DLOOK|WB_STDMODAL|WB_SAVEAS); - ::sfx2::FileDialogHelper aFileDlg( static_cast(nBits) ); // new FileDialog( this, nBits ); + WinBits nBits(WB_3DLOOK|WB_STDMODAL|WB_SAVEAS); + ::sfx2::FileDialogHelper aFileDlg( static_cast(nBits) ); // new FileDialog( this, nBits ); String aPath; if(pButton == &m_PB_SYSDEVSPACE) diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hrc b/dbaccess/source/ext/adabas/AdabasNewDb.hrc index 30216a30e6b7..e38a808ae645 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.hrc +++ b/dbaccess/source/ext/adabas/AdabasNewDb.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -29,50 +29,50 @@ #define ADABASUI_ADABASNEWDB_HRC -#define PB_SYSDEVSPACE 1 -#define PB_TRANSACTIONLOG 2 -#define PB_DATADEVSPACE 3 -#define PB_DOMAINPWD 4 -#define PB_CONPWD 5 -#define PB_SYSPWD 6 -#define PB_OK 7 -#define PB_CANCEL 8 -#define PB_RESTORE 9 +#define PB_SYSDEVSPACE 1 +#define PB_TRANSACTIONLOG 2 +#define PB_DATADEVSPACE 3 +#define PB_DOMAINPWD 4 +#define PB_CONPWD 5 +#define PB_SYSPWD 6 +#define PB_OK 7 +#define PB_CANCEL 8 +#define PB_RESTORE 9 -#define NF_TRANSACTIONLOG_SIZE 1 -#define NF_DATADEVSPACE_SIZE 2 -#define NF_CACHE_SIZE 3 +#define NF_TRANSACTIONLOG_SIZE 1 +#define NF_DATADEVSPACE_SIZE 2 +#define NF_CACHE_SIZE 3 -#define ET_SYSUSR 1 -#define ET_DOMAIN_USR 2 -#define ET_CONUSR 3 -#define ET_SYSDEVSPACE 4 -#define ET_TRANSACTIONLOG 5 -#define ET_DATADEVSPACE 6 -#define ET_RESTORE 7 -#define ET_DATABASENAME 8 +#define ET_SYSUSR 1 +#define ET_DOMAIN_USR 2 +#define ET_CONUSR 3 +#define ET_SYSDEVSPACE 4 +#define ET_TRANSACTIONLOG 5 +#define ET_DATADEVSPACE 6 +#define ET_RESTORE 7 +#define ET_DATABASENAME 8 -#define FT_SYSUSR 1 -#define FT_DOMAIN_USR 2 -#define FT_TRANSACTIONLOG_SIZE 3 -#define FT_DATADEVSPACE_SIZE 4 -#define FT_CONUSR 6 -#define FT_SYSDEVSPACE 7 -#define FT_TRANSACTIONLOG 8 -#define FT_DATADEVSPACE 9 -#define FT_CACHE_SIZE 10 -#define FT_RESTORE 11 -#define FT_DATABASENAME 12 +#define FT_SYSUSR 1 +#define FT_DOMAIN_USR 2 +#define FT_TRANSACTIONLOG_SIZE 3 +#define FT_DATADEVSPACE_SIZE 4 +#define FT_CONUSR 6 +#define FT_SYSDEVSPACE 7 +#define FT_TRANSACTIONLOG 8 +#define FT_DATADEVSPACE 9 +#define FT_CACHE_SIZE 10 +#define FT_RESTORE 11 +#define FT_DATABASENAME 12 #define FL_USER 1 #define FL_DBSETTINGS 2 #define FL_END 3 -#define BMP_CON 1 -#define BMP_SYS 2 -#define BMP_DOMAIN 3 +#define BMP_CON 1 +#define BMP_SYS 2 +#define BMP_DOMAIN 3 -#define STR_BACKUPFILE_LOAD 1 +#define STR_BACKUPFILE_LOAD 1 #endif // ADABASUI_ADABASNEWDB_HRC diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.hxx b/dbaccess/source/ext/adabas/AdabasNewDb.hxx index 9ab36e88060c..a271c438ddb1 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.hxx +++ b/dbaccess/source/ext/adabas/AdabasNewDb.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,76 +53,76 @@ namespace adabasui class OAdabasNewDbDlg : public ModalDialog { private: - FixedText m_FT_DATABASENAME; - OSQLNameEdit m_ET_DATABASENAME; + FixedText m_FT_DATABASENAME; + OSQLNameEdit m_ET_DATABASENAME; FixedLine m_FL_USER; - FixedText m_FT_SYSUSR; - FixedText m_FT_CONUSR; - FixedText m_FT_DOMAIN_USR; + FixedText m_FT_SYSUSR; + FixedText m_FT_CONUSR; + FixedText m_FT_DOMAIN_USR; - OSQLNameEdit m_ET_SYSUSR; - PushButton m_PB_SYSPWD; - OSQLNameEdit m_ET_CONUSR; - PushButton m_PB_CONPWD; - OSQLNameEdit m_ET_DOMAIN_USR; - PushButton m_PB_DOMAINPWD; + OSQLNameEdit m_ET_SYSUSR; + PushButton m_PB_SYSPWD; + OSQLNameEdit m_ET_CONUSR; + PushButton m_PB_CONPWD; + OSQLNameEdit m_ET_DOMAIN_USR; + PushButton m_PB_DOMAINPWD; - FixedImage m_BMP_CON; - FixedImage m_BMP_SYS; - FixedImage m_BMP_DOMAIN; + FixedImage m_BMP_CON; + FixedImage m_BMP_SYS; + FixedImage m_BMP_DOMAIN; - FixedText m_FT_RESTORE; - Edit m_ET_RESTORE; - PushButton m_PB_RESTORE; + FixedText m_FT_RESTORE; + Edit m_ET_RESTORE; + PushButton m_PB_RESTORE; FixedLine m_FL_DBSETTINGS; - FixedText m_FT_SYSDEVSPACE; - FixedText m_FT_TRANSACTIONLOG; - FixedText m_FT_DATADEVSPACE; - Edit m_ET_SYSDEVSPACE; - PushButton m_PB_SYSDEVSPACE; - Edit m_ET_TRANSACTIONLOG; - PushButton m_PB_TRANSACTIONLOG; - Edit m_ET_DATADEVSPACE; - PushButton m_PB_DATADEVSPACE; - - FixedText m_FT_TRANSACTIONLOG_SIZE; - NumericField m_NF_TRANSACTIONLOG_SIZE; - FixedText m_FT_DATADEVSPACE_SIZE; - NumericField m_NF_DATADEVSPACE_SIZE; - FixedText m_FT_CACHE_SIZE; - NumericField m_NF_CACHE_SIZE; + FixedText m_FT_SYSDEVSPACE; + FixedText m_FT_TRANSACTIONLOG; + FixedText m_FT_DATADEVSPACE; + Edit m_ET_SYSDEVSPACE; + PushButton m_PB_SYSDEVSPACE; + Edit m_ET_TRANSACTIONLOG; + PushButton m_PB_TRANSACTIONLOG; + Edit m_ET_DATADEVSPACE; + PushButton m_PB_DATADEVSPACE; + + FixedText m_FT_TRANSACTIONLOG_SIZE; + NumericField m_NF_TRANSACTIONLOG_SIZE; + FixedText m_FT_DATADEVSPACE_SIZE; + NumericField m_NF_DATADEVSPACE_SIZE; + FixedText m_FT_CACHE_SIZE; + NumericField m_NF_CACHE_SIZE; FixedLine m_FL_END; - OKButton m_PB_OK; - CancelButton m_PB_CANCEL; - - String m_SYSDEV_File; - String m_TRANSDEV_File; - String m_DATADEV_File; - String m_Backup_File; - String m_ConPwd; - String m_SysPwd; - String m_DomainPwd; - String m_DBName; - String m_sDbWork; - String m_sDbConfig; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xORB; - BOOL m_bRestore; - INT8 m_nSetBitmap; - - ::std::auto_ptr m_aCreatorWait; - ::std::auto_ptr m_aCreatorThread; - - DECL_LINK( LoadButtonClickHdl, Button * ); - DECL_LINK( ButtonClickHdl, Button * ); - DECL_LINK( PwdClickHdl, Button * ); - DECL_LINK( ImplOKHdl, OKButton * ); - DECL_LINK( LoseFocusHdl, Edit * ); - DECL_LINK( TerminateHdl, void * ); + OKButton m_PB_OK; + CancelButton m_PB_CANCEL; + + String m_SYSDEV_File; + String m_TRANSDEV_File; + String m_DATADEV_File; + String m_Backup_File; + String m_ConPwd; + String m_SysPwd; + String m_DomainPwd; + String m_DBName; + String m_sDbWork; + String m_sDbConfig; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog> m_xCreateCatalog; + com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xORB; + BOOL m_bRestore; + INT8 m_nSetBitmap; + + ::std::auto_ptr m_aCreatorWait; + ::std::auto_ptr m_aCreatorThread; + + DECL_LINK( LoadButtonClickHdl, Button * ); + DECL_LINK( ButtonClickHdl, Button * ); + DECL_LINK( PwdClickHdl, Button * ); + DECL_LINK( ImplOKHdl, OKButton * ); + DECL_LINK( LoseFocusHdl, Edit * ); + DECL_LINK( TerminateHdl, void * ); void CheckBitmaps(); @@ -134,16 +134,16 @@ namespace adabasui public: OAdabasNewDbDlg(Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XCreateCatalog>& _rxCreateCatalog, - const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB, + const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& _rxORB, BOOL _bRestore=FALSE); virtual ~OAdabasNewDbDlg(); - ::rtl::OUString GetDatabaseName() const { return m_ET_DATABASENAME.GetText(); } - ::rtl::OUString GetControlUser() const { return m_ET_CONUSR.GetText(); } - ::rtl::OUString GetControlPassword() const { return m_ConPwd; } - ::rtl::OUString GetUser() const { return m_ET_SYSUSR.GetText(); } - ::rtl::OUString GetUserPassword() const { return m_SysPwd; } - sal_Int32 GetCacheSize() const { return static_cast(m_NF_CACHE_SIZE.GetValue()); } + ::rtl::OUString GetDatabaseName() const { return m_ET_DATABASENAME.GetText(); } + ::rtl::OUString GetControlUser() const { return m_ET_CONUSR.GetText(); } + ::rtl::OUString GetControlPassword() const { return m_ConPwd; } + ::rtl::OUString GetUser() const { return m_ET_SYSUSR.GetText(); } + ::rtl::OUString GetUserPassword() const { return m_SysPwd; } + sal_Int32 GetCacheSize() const { return static_cast(m_NF_CACHE_SIZE.GetValue()); } }; } #endif // adabasui_ADABAS_CREATEDB_HXX diff --git a/dbaccess/source/ext/adabas/AdabasNewDb.src b/dbaccess/source/ext/adabas/AdabasNewDb.src index 33915b06266b..ae3cd2e2d24c 100644 --- a/dbaccess/source/ext/adabas/AdabasNewDb.src +++ b/dbaccess/source/ext/adabas/AdabasNewDb.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,23 +33,23 @@ //================================================================== // NEWDB Admin //================================================================== -#define WIN_X 268 -#define WIN_Y 210 -#define MOVE_Y 21 +#define WIN_X 268 +#define WIN_Y 210 +#define MOVE_Y 21 #define ADJUST_X 45 ModalDialog DLG_ADABAS_NEWDB { - Moveable = TRUE ; - Closeable = TRUE ; - OutputSize = TRUE ; - SVLook = TRUE; - HelpID = HID_DLG_ADABAS_NEWDB ; - Size = MAP_APPFONT ( WIN_X , WIN_Y + MOVE_Y) ; + Moveable = TRUE ; + Closeable = TRUE ; + OutputSize = TRUE ; + SVLook = TRUE; + HelpID = HID_DLG_ADABAS_NEWDB ; + Size = MAP_APPFONT ( WIN_X , WIN_Y + MOVE_Y) ; FixedText FT_DATABASENAME { - Pos = MAP_APPFONT ( 12 , 6) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 6) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "Database ~name"; }; Edit ET_DATABASENAME @@ -58,50 +58,50 @@ ModalDialog DLG_ADABAS_NEWDB Pos = MAP_APPFONT ( 77 + ADJUST_X, 5) ; Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_DBNAME ; + HelpID = HID_DLG_ADABAS_DBNAME ; }; FixedLine FL_USER { - Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ; + Pos = MAP_APPFONT ( 6 , 3 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ; Text[ en-US ] = "User settings"; }; FixedText FT_CONUSR { - Pos = MAP_APPFONT ( 12 , 31 + MOVE_Y) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 31 + MOVE_Y) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Control user"; }; FixedText FT_SYSUSR { - Pos = MAP_APPFONT ( 12 , 14 + MOVE_Y) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 14 + MOVE_Y) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Administrator"; }; FixedText FT_DOMAIN_USR { - Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 48 + MOVE_Y) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Domain user"; }; Edit ET_SYSUSR { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; + Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_SYSUSR ; + HelpID = HID_DLG_ADABAS_SYSUSR ; }; PushButton PB_SYSPWD { Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_SYSPWD ; + HelpID = HID_DLG_ADABAS_SYSPWD ; Text[ en-US ] = "P~assword..."; }; @@ -109,87 +109,87 @@ ModalDialog DLG_ADABAS_NEWDB { Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 30 + MOVE_Y) ; - Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; + Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_CONUSR ; + HelpID = HID_DLG_ADABAS_CONUSR ; }; PushButton PB_CONPWD { Pos = MAP_APPFONT ( 188 , 30 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_CONPWD ; + HelpID = HID_DLG_ADABAS_CONPWD ; Text[ en-US ] = "~Password..."; }; Edit ET_DOMAIN_USR { Pos = MAP_APPFONT ( 77 + ADJUST_X, 47 + MOVE_Y) ; - Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; - Border = TRUE ; + Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; + Border = TRUE ; TabStop = TRUE ; ReadOnly= TRUE; - HelpID = HID_DLG_ADABAS_USR ; + HelpID = HID_DLG_ADABAS_USR ; Text = "adabas"; }; PushButton PB_DOMAINPWD { Pos = MAP_APPFONT ( 188 , 47 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_DOMAINPWD ; + HelpID = HID_DLG_ADABAS_DOMAINPWD ; Text[ en-US ] = "Passwo~rd..."; }; FixedImage BMP_CON { Pos = MAP_APPFONT ( 240 , 27 + MOVE_Y) ; - Size = MAP_APPFONT ( 20 , 20 ) ; - HelpID = HID_DLG_ADABAS_CON_PWD ; + Size = MAP_APPFONT ( 20 , 20 ) ; + HelpID = HID_DLG_ADABAS_CON_PWD ; }; FixedImage BMP_SYS { Pos = MAP_APPFONT ( 240 , 11 + MOVE_Y) ; - Size = MAP_APPFONT ( 20 , 20 ) ; - HelpID = HID_DLG_ADABAS_SYS_PWD ; + Size = MAP_APPFONT ( 20 , 20 ) ; + HelpID = HID_DLG_ADABAS_SYS_PWD ; }; FixedImage BMP_DOMAIN { Pos = MAP_APPFONT ( 240 , 44 + MOVE_Y) ; - Size = MAP_APPFONT ( 20 , 20 ) ; - HelpID = HID_DLG_ADABAS_DOMAIN_PWD ; + Size = MAP_APPFONT ( 20 , 20 ) ; + HelpID = HID_DLG_ADABAS_DOMAIN_PWD ; }; FixedText FT_RESTORE { - Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; + Pos = MAP_APPFONT ( 12 , 13 + MOVE_Y) ; + Size = MAP_APPFONT ( 64 + ADJUST_X, 10 ) ; Text[ en-US ] = "~Backup file"; }; Edit ET_RESTORE { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; + Size = MAP_APPFONT ( 105 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_RESTORE ; + HelpID = HID_DLG_ADABAS_RESTORE ; }; PushButton PB_RESTORE { Pos = MAP_APPFONT ( 188 , 13 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_PBRESTORE ; - Text[ en-US ] = "..."; + HelpID = HID_DLG_ADABAS_PBRESTORE ; + Text[ en-US ] = "..."; }; /* DEVSPACE positions */ FixedLine FL_DBSETTINGS { - Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ; + Pos = MAP_APPFONT ( 6 , 70 + MOVE_Y) ; Size = MAP_APPFONT ( WIN_X - 12 , 8 ) ; Text[ en-US ] = "Database settings"; }; @@ -217,37 +217,37 @@ ModalDialog DLG_ADABAS_NEWDB Edit ET_SYSDEVSPACE { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 81 + MOVE_Y) ; Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_SYSDEVSPACE ; + HelpID = HID_DLG_ADABAS_SYSDEVSPACE ; }; PushButton PB_SYSDEVSPACE { - Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y) ; - Size = MAP_APPFONT ( 12 , 12 ) ; + Pos = MAP_APPFONT ( WIN_X - 24, 81 + MOVE_Y) ; + Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ; - Text[ en-US ] = "..."; + HelpID = HID_DLG_ADABAS_PBSYSDEVSPACE ; + Text[ en-US ] = "..."; }; Edit ET_TRANSACTIONLOG { - Border = TRUE ; + Border = TRUE ; Pos = MAP_APPFONT ( 77 + ADJUST_X, 97 + MOVE_Y) ; Size = MAP_APPFONT ( 161 - ADJUST_X, 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ; + HelpID = HID_DLG_ADABAS_TRANSACTIONLOG ; }; PushButton PB_TRANSACTIONLOG { - Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y) ; - Size = MAP_APPFONT ( 12 , 12 ) ; + Pos = MAP_APPFONT ( WIN_X - 24, 97+ MOVE_Y) ; + Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ; + HelpID = HID_DLG_ADABAS_PBTRANSACTIONLOG ; Text[ en-US ] = "..."; }; @@ -255,18 +255,18 @@ ModalDialog DLG_ADABAS_NEWDB { Pos = MAP_APPFONT ( 77 + ADJUST_X, 114 + MOVE_Y) ; Size = MAP_APPFONT ( 161 - ADJUST_X, 12) ; - Border = TRUE ; + Border = TRUE ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_DATADEVSPACE ; + HelpID = HID_DLG_ADABAS_DATADEVSPACE ; }; PushButton PB_DATADEVSPACE { - Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ; - Size = MAP_APPFONT ( 12 , 12 ) ; + Pos = MAP_APPFONT ( WIN_X - 24, 114 + MOVE_Y) ; + Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; - HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ; + HelpID = HID_DLG_ADABAS_PBDATADEVSPACE ; Text[ en-US ] = "..."; }; /* DEVSPACE sizes */ @@ -280,11 +280,11 @@ ModalDialog DLG_ADABAS_NEWDB { Pos = MAP_APPFONT ( 77 + ADJUST_X, 131 + MOVE_Y) ; Size = MAP_APPFONT ( 40 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; StrictFormat = TRUE; - HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ; + HelpID = HID_DLG_ADABAS_TRANSACTIONLOG_SIZE ; }; FixedText FT_DATADEVSPACE_SIZE { @@ -296,11 +296,11 @@ StrictFormat = TRUE; { Pos = MAP_APPFONT ( 77 + ADJUST_X, 148 + MOVE_Y) ; Size = MAP_APPFONT ( 40 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; StrictFormat = TRUE; - HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ; + HelpID = HID_DLG_ADABAS_DATADEVSPACE_SIZE ; }; FixedText FT_CACHE_SIZE { @@ -312,11 +312,11 @@ StrictFormat = TRUE; { Pos = MAP_APPFONT ( 77 + ADJUST_X, 165 + MOVE_Y) ; Size = MAP_APPFONT ( 40 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Spin = TRUE ; + Border = TRUE ; + TabStop = TRUE ; + Spin = TRUE ; StrictFormat = TRUE; - HelpID = HID_DLG_ADABAS_CACHE_SIZE ; + HelpID = HID_DLG_ADABAS_CACHE_SIZE ; }; FixedLine FL_END { @@ -325,21 +325,21 @@ StrictFormat = TRUE; }; OKButton PB_OK { - Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; + Pos = MAP_APPFONT ( WIN_X - 112, WIN_Y - 20 + MOVE_Y) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; + DefButton = TRUE ; }; CancelButton PB_CANCEL { - Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; + Pos = MAP_APPFONT ( WIN_X - 56 , WIN_Y - 20+ MOVE_Y) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TabStop = TRUE ; }; String STR_BACKUPFILE_LOAD { - Text[ en-US ] = "Backup file information"; + Text[ en-US ] = "Backup file information"; }; Text[ en-US ] = "Create New Adabas D Database"; @@ -348,42 +348,42 @@ StrictFormat = TRUE; Image CHECK_GREEN { ImageBitmap = Bitmap { File = "nu07.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; + MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; Image UNCHECK_RED { ImageBitmap = Bitmap { File = "nu08.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; + MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; Image DEFAULT_BLUE { ImageBitmap = Bitmap { File = "nu09.bmp"; }; - MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; + MaskColor = Color { Red = 0xFFFF; Green = 0x0; Blue = 0xFFFF; }; }; /* Fehlermeldungen beim Erstellen einer Adabas DB */ String STR_ADABAS_NO_PARAM_SET { - Text[ en-US ] = "No entry could be written in the configuration file."; + Text[ en-US ] = "No entry could be written in the configuration file."; }; String STR_ADABAS_NO_DB_CREATED { - Text[ en-US ] = "An error occurred as the DB files were being created."; + Text[ en-US ] = "An error occurred as the DB files were being created."; }; String STR_ADABAS_NO_SYSTEM_TABLES { - Text[ en-US ] = "An error occurred as the system tables were being created."; + Text[ en-US ] = "An error occurred as the system tables were being created."; }; String STR_ADABAS_NO_BACKUP_FILE { - Text[ en-US ] = "The backup file entered does not exist."; + Text[ en-US ] = "The backup file entered does not exist."; }; InfoBox INFO_STR_MAX_FILE_LENGTH { - Message[ en-US ] = "The fully qualified file cannot be longer than \'#\' characters."; + Message[ en-US ] = "The fully qualified file cannot be longer than \'#\' characters."; }; String STR_NO_SAME_USER diff --git a/dbaccess/source/ext/adabas/Aservices.cxx b/dbaccess/source/ext/adabas/Aservices.cxx index 62f7f87d183d..b530783cc4cb 100644 --- a/dbaccess/source/ext/adabas/Aservices.cxx +++ b/dbaccess/source/ext/adabas/Aservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ extern "C" void SAL_CALL createRegistryInfo_adabasui() extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_adabasui(); @@ -74,8 +74,8 @@ extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { return OModule::writeComponentInfos( static_cast(pServiceManager), diff --git a/dbaccess/source/ext/adabas/Astringconstants.cxx b/dbaccess/source/ext/adabas/Astringconstants.cxx index 6fe34c212a00..4375af2eec1a 100644 --- a/dbaccess/source/ext/adabas/Astringconstants.cxx +++ b/dbaccess/source/ext/adabas/Astringconstants.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/adabas/Astringconstants.hrc b/dbaccess/source/ext/adabas/Astringconstants.hrc index 49697f556024..2a1bed02f850 100644 --- a/dbaccess/source/ext/adabas/Astringconstants.hrc +++ b/dbaccess/source/ext/adabas/Astringconstants.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,13 +62,13 @@ struct _ConstAsciiString_ //= property ids //============================================================ -#define PROPERTY_ID_CREATECATALOG 3 -#define PROPERTY_ID_DATABASENAME 4 -#define PROPERTY_ID_CONTROL_USER 5 -#define PROPERTY_ID_CONTROL_PASSWORD 6 -#define PROPERTY_ID_USER 7 -#define PROPERTY_ID_PASSWORD 8 -#define PROPERTY_ID_CACHESIZE 9 +#define PROPERTY_ID_CREATECATALOG 3 +#define PROPERTY_ID_DATABASENAME 4 +#define PROPERTY_ID_CONTROL_USER 5 +#define PROPERTY_ID_CONTROL_PASSWORD 6 +#define PROPERTY_ID_USER 7 +#define PROPERTY_ID_PASSWORD 8 +#define PROPERTY_ID_CACHESIZE 9 //============================================================ //= property names diff --git a/dbaccess/source/ext/adabas/adabasui_resource.hrc b/dbaccess/source/ext/adabas/adabasui_resource.hrc index b0b0e63e91c7..922a897bdbd2 100644 --- a/dbaccess/source/ext/adabas/adabasui_resource.hrc +++ b/dbaccess/source/ext/adabas/adabasui_resource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,60 +32,60 @@ #include #endif -#define RID_DIALOG_START RID_DB_EXTENSIONS_START -#define RID_PAGE_START RID_DB_EXTENSIONS_START -#define RID_ERRORBOX_START RID_DB_EXTENSIONS_START -#define RID_QUERYBOX_START RID_DB_EXTENSIONS_START -#define RID_TOOLBOX_START RID_DB_EXTENSIONS_START -#define RID_BITMAP_START RID_DB_EXTENSIONS_START -#define RID_IMAGE_START RID_DB_EXTENSIONS_START -#define RID_IMAGELIST_START RID_DB_EXTENSIONS_START -#define RID_MENU_START RID_DB_EXTENSIONS_START -#define RID_STRING_START RID_DB_EXTENSIONS_START -#define RID_UNTYPED_START RID_DB_EXTENSIONS_START -#define RID_WARN_START RID_DB_EXTENSIONS_START +#define RID_DIALOG_START RID_DB_EXTENSIONS_START +#define RID_PAGE_START RID_DB_EXTENSIONS_START +#define RID_ERRORBOX_START RID_DB_EXTENSIONS_START +#define RID_QUERYBOX_START RID_DB_EXTENSIONS_START +#define RID_TOOLBOX_START RID_DB_EXTENSIONS_START +#define RID_BITMAP_START RID_DB_EXTENSIONS_START +#define RID_IMAGE_START RID_DB_EXTENSIONS_START +#define RID_IMAGELIST_START RID_DB_EXTENSIONS_START +#define RID_MENU_START RID_DB_EXTENSIONS_START +#define RID_STRING_START RID_DB_EXTENSIONS_START +#define RID_UNTYPED_START RID_DB_EXTENSIONS_START +#define RID_WARN_START RID_DB_EXTENSIONS_START //======================================================================== // dialog ids -#define DLG_ADABAS_NEWDB RID_DIALOG_START + 0 +#define DLG_ADABAS_NEWDB RID_DIALOG_START + 0 //======================================================================== // images -#define CHECK_GREEN RID_IMAGE_START + 0 -#define UNCHECK_RED RID_IMAGE_START + 1 -#define DEFAULT_BLUE RID_IMAGE_START + 2 +#define CHECK_GREEN RID_IMAGE_START + 0 +#define UNCHECK_RED RID_IMAGE_START + 1 +#define DEFAULT_BLUE RID_IMAGE_START + 2 //======================================================================== // warning boxes -#define INFO_STR_MAX_FILE_LENGTH RID_WARN_START + 0 +#define INFO_STR_MAX_FILE_LENGTH RID_WARN_START + 0 //======================================================================== // strings -#define STR_ADABAS_NO_BACKUP_FILE RID_STRING_START + 0 +#define STR_ADABAS_NO_BACKUP_FILE RID_STRING_START + 0 // -#define STR_NO_SAME_USER RID_STRING_START + 2 -#define STR_DEVSPACE_NO_FILE RID_STRING_START + 3 -#define STR_NO_PERMISSION RID_STRING_START + 4 -#define STR_FILE_OR_DIR_UNKNOWN RID_STRING_START + 5 -#define STR_STAT_WARNING RID_STRING_START + 6 +#define STR_NO_SAME_USER RID_STRING_START + 2 +#define STR_DEVSPACE_NO_FILE RID_STRING_START + 3 +#define STR_NO_PERMISSION RID_STRING_START + 4 +#define STR_FILE_OR_DIR_UNKNOWN RID_STRING_START + 5 +#define STR_STAT_WARNING RID_STRING_START + 6 // -#define STR_ADABAS_NO_PARAM_SET RID_STRING_START + 8 +#define STR_ADABAS_NO_PARAM_SET RID_STRING_START + 8 // // -#define STR_ADABAS_NO_DB_CREATED RID_STRING_START + 11 -#define STR_ADABAS_NO_SYSTEM_TABLES RID_STRING_START + 12 -#define STR_ERROR_IN_ADABAS_INSTALLATION RID_STRING_START + 13 -#define STR_ADABAS_CREATEFILES RID_STRING_START + 14 -#define STR_ADABAS_CREATEPARAM_FILE RID_STRING_START + 15 -#define STR_ADABAS_START_DATABASE RID_STRING_START + 16 -#define STR_ADABAS_DB_EXISTS RID_STRING_START + 17 -#define STR_ADABAS_NO_DEFAULTNAME RID_STRING_START + 18 -#define STR_ADABAS_NO_ACCESSRIGHTS RID_STRING_START + 19 -#define STR_ADABAS_CANNOT_CONVERT RID_STRING_START + 20 -#define STR_ADABAS_PASSWORD_ILLEGAL RID_STRING_START + 21 +#define STR_ADABAS_NO_DB_CREATED RID_STRING_START + 11 +#define STR_ADABAS_NO_SYSTEM_TABLES RID_STRING_START + 12 +#define STR_ERROR_IN_ADABAS_INSTALLATION RID_STRING_START + 13 +#define STR_ADABAS_CREATEFILES RID_STRING_START + 14 +#define STR_ADABAS_CREATEPARAM_FILE RID_STRING_START + 15 +#define STR_ADABAS_START_DATABASE RID_STRING_START + 16 +#define STR_ADABAS_DB_EXISTS RID_STRING_START + 17 +#define STR_ADABAS_NO_DEFAULTNAME RID_STRING_START + 18 +#define STR_ADABAS_NO_ACCESSRIGHTS RID_STRING_START + 19 +#define STR_ADABAS_CANNOT_CONVERT RID_STRING_START + 20 +#define STR_ADABAS_PASSWORD_ILLEGAL RID_STRING_START + 21 #endif // _ADABASUI_RESOURCE_HRC_ diff --git a/dbaccess/source/ext/adabas/adabasuistrings.cxx b/dbaccess/source/ext/adabas/adabasuistrings.cxx index cf1edccedc07..ec71721e7363 100644 --- a/dbaccess/source/ext/adabas/adabasuistrings.cxx +++ b/dbaccess/source/ext/adabas/adabasuistrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/adabas/adabasuistrings.hrc b/dbaccess/source/ext/adabas/adabasuistrings.hrc index 7ee5fd19275c..6ef536e99380 100644 --- a/dbaccess/source/ext/adabas/adabasuistrings.hrc +++ b/dbaccess/source/ext/adabas/adabasuistrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc index b0a76aa0907e..8ea3dc724cf9 100644 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,13 +74,13 @@ #define STR_JAVA ( RID_DBMM_STRING_START + 9 ) #define STR_PYTHON ( RID_DBMM_STRING_START + 10 ) #define STR_DIALOG ( RID_DBMM_STRING_START + 11 ) -#define STR_MIGRATING_LIBS ( RID_DBMM_STRING_START + 12 ) +#define STR_MIGRATING_LIBS ( RID_DBMM_STRING_START + 12 ) #define STR_ERRORS ( RID_DBMM_STRING_START + 13 ) #define STR_WARNINGS ( RID_DBMM_STRING_START + 14 ) #define STR_EXCEPTION ( RID_DBMM_STRING_START + 15 ) #define STR_LIBRARY_TYPE_AND_NAME ( RID_DBMM_STRING_START + 16 ) -#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 ) -#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 ) -#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 ) +#define STR_INVALID_NUMBER_ARGS ( RID_DBMM_STRING_START + 17 ) +#define STR_NO_DATABASE ( RID_DBMM_STRING_START + 18 ) +#define STR_NOT_READONLY ( RID_DBMM_STRING_START + 19 ) #endif // DBACCESS_DBMM_GLOBAL_HRC diff --git a/dbaccess/source/ext/macromigration/dbmm_module.cxx b/dbaccess/source/ext/macromigration/dbmm_module.cxx index d133dc0fcae2..45553b7251ab 100644 --- a/dbaccess/source/ext/macromigration/dbmm_module.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_module.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/dbmm_module.hxx b/dbaccess/source/ext/macromigration/dbmm_module.hxx index 4e27f8c18401..8342a7aa8e57 100644 --- a/dbaccess/source/ext/macromigration/dbmm_module.hxx +++ b/dbaccess/source/ext/macromigration/dbmm_module.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/dbmm_services.cxx b/dbaccess/source/ext/macromigration/dbmm_services.cxx index f1dd54aa312f..998db95203ae 100644 --- a/dbaccess/source/ext/macromigration/dbmm_services.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/dbmm_types.cxx b/dbaccess/source/ext/macromigration/dbmm_types.cxx index ee0c32b7eef7..988c4591bce7 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.cxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.cxx @@ -1,7 +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 diff --git a/dbaccess/source/ext/macromigration/dbmm_types.hxx b/dbaccess/source/ext/macromigration/dbmm_types.hxx index 13c02005b68c..6c65002390d2 100644 --- a/dbaccess/source/ext/macromigration/dbmm_types.hxx +++ b/dbaccess/source/ext/macromigration/dbmm_types.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index 63670e88b323..1fe9c1616373 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx index 524aa981aac4..9575fd8c9974 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.hxx +++ b/dbaccess/source/ext/macromigration/docinteraction.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -67,7 +67,7 @@ namespace dbmm /** requests a document password @param _rDocumentName the document name - @param _io_rPassword + @param _io_rPassword the initial password on method entry, the password as entered by the user on method leave @return if and only if the user entered a password, and confirmed with OK, diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc b/dbaccess/source/ext/macromigration/macromigration.hrc index ab6ea726868d..ac1a5c244e17 100644 --- a/dbaccess/source/ext/macromigration/macromigration.hrc +++ b/dbaccess/source/ext/macromigration/macromigration.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/macromigration.src b/dbaccess/source/ext/macromigration/macromigration.src index 9742dcdfec71..97cc72f5f30e 100644 --- a/dbaccess/source/ext/macromigration/macromigration.src +++ b/dbaccess/source/ext/macromigration/macromigration.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -222,7 +222,7 @@ TabPage TP_MIGRATE }; FixedText FT_CURRENT_OBJECT - { + { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60, CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED ); Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ), FIXED_TEXT_HEIGHT ); @@ -238,7 +238,7 @@ TabPage TP_MIGRATE }; FixedText FT_CURRENT_PROGRESS - { + { Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60, CONTENT_POS_X + 2 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + FIXED_TEXT_HEIGHT + SPACING_UNRELATED ); Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 ), FIXED_TEXT_HEIGHT ); diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index 4054f67189c0..7070414cbd10 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,7 +134,7 @@ namespace dbmm bool bMigrationFailure; bool bMigrationSuccess; - MacroMigrationDialog_Data( + MacroMigrationDialog_Data( const ::comphelper::ComponentContext& _rContext, const Reference< XOfficeDatabaseDocument >& _rxDocument ) :aContext( _rContext ) diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index a4a6852909d0..156f52c1e80c 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ namespace dbmm // Dialog overridables virtual BOOL Close(); - virtual short Execute(); + virtual short Execute(); private: void impl_showCloseDocsError( bool _bShow ); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 54051841b9f5..cd4608b74ad5 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -336,7 +336,7 @@ namespace dbmm m_aChangesLabel.SetText( _bSuccessful ? m_aSuccessful : m_aUnsuccessful ); m_aChanges.SetText( _rSummary ); - // resize m_aChangesLabel and m_aChances as needed for the label text to fit + // resize m_aChangesLabel and m_aChances as needed for the label text to fit Rectangle aOriginalLabelSize( m_aChangesLabel.GetPosPixel(), m_aChangesLabel.GetSizePixel() ); // assume 3 lines, at most Rectangle aNewLabelSize( aOriginalLabelSize ); diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx index 93cfd04bf864..5b23e81059a3 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ namespace dbmm protected: FixedText m_aExplanation; FixedText m_aSaveAsLabel; - ::svt::OFileURLControl m_aSaveAsLocation; + ::svt::OFileURLControl m_aSaveAsLocation; PushButton m_aBrowseSaveAsLocation; FixedText m_aStartMigration; ::svx::DatabaseLocationInputController diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx index 9a03a8e4f63e..75dcfcadcad5 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,7 +108,7 @@ namespace dbmm ~MacroMigrationDialogService(); protected: - virtual Dialog* createDialog( Window* _pParent ); + virtual Dialog* createDialog( Window* _pParent ); virtual void destroyDialog(); private: @@ -147,7 +147,7 @@ namespace dbmm } //-------------------------------------------------------------------- - Dialog* MacroMigrationDialogService::createDialog( Window* _pParent ) + Dialog* MacroMigrationDialogService::createDialog( Window* _pParent ) { return new MacroMigrationDialog( _pParent, m_aContext, m_xDocument ); } diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index ec884adb3474..c3543358cacf 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1133,7 +1133,7 @@ namespace dbmm bool MigrationEngine_Impl::impl_handleDocument_nothrow( const SubDocument& _rDocument ) const { OSL_ENSURE( m_nCurrentDocumentID == -1, - "MigrationEngine_Impl::impl_handleDocument_nothrow: there already is a current document!"); + "MigrationEngine_Impl::impl_handleDocument_nothrow: there already is a current document!"); m_nCurrentDocumentID = m_rLogger.startedDocument( _rDocument.eType, _rDocument.sHierarchicalName ); // start the progress diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx index 8cecd2faac2b..986bba551f39 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.hxx +++ b/dbaccess/source/ext/macromigration/migrationengine.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx index aee93d10bdc6..d76a0b1bc36c 100644 --- a/dbaccess/source/ext/macromigration/migrationerror.hxx +++ b/dbaccess/source/ext/macromigration/migrationerror.hxx @@ -1,7 +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 diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index d5b391532863..c9e917dbf79a 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx index 554b95763e95..1bcd0411c128 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.hxx +++ b/dbaccess/source/ext/macromigration/migrationlog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx index 9c1598a43855..44dbaf838e2c 100644 --- a/dbaccess/source/ext/macromigration/migrationprogress.hxx +++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/progresscapture.cxx b/dbaccess/source/ext/macromigration/progresscapture.cxx index a151edee2a58..f0580ed613d1 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.cxx +++ b/dbaccess/source/ext/macromigration/progresscapture.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -100,7 +100,7 @@ namespace dbmm if ( !m_pData->bDisposed ) m_pData->rMasterProgress.startObject( m_pData->sObjectName, _rText, _nRange ); } - + //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::end( ) throw (RuntimeException) { @@ -108,7 +108,7 @@ namespace dbmm if ( !m_pData->bDisposed ) m_pData->rMasterProgress.endObject(); } - + //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::setText( const ::rtl::OUString& _rText ) throw (RuntimeException) { @@ -116,7 +116,7 @@ namespace dbmm if ( !m_pData->bDisposed ) m_pData->rMasterProgress.setObjectProgressText( _rText ); } - + //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::setValue( ::sal_Int32 _nValue ) throw (RuntimeException) { @@ -124,7 +124,7 @@ namespace dbmm if ( !m_pData->bDisposed ) m_pData->rMasterProgress.setObjectProgressValue( _nValue ); } - + //-------------------------------------------------------------------- void SAL_CALL ProgressCapture::reset( ) throw (RuntimeException) { diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx index eb507e6d63c1..720c76a74c55 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.hxx +++ b/dbaccess/source/ext/macromigration/progresscapture.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index bed5f7f33b8f..a461eedae571 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.cxx +++ b/dbaccess/source/ext/macromigration/progressmixer.cxx @@ -1,7 +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 diff --git a/dbaccess/source/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx index dd52a72d134d..50506f931737 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.hxx +++ b/dbaccess/source/ext/macromigration/progressmixer.hxx @@ -1,7 +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 diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx index 6ecaabac6981..cbf432500262 100644 --- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx +++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/migration/cfgimport.cxx b/dbaccess/source/filter/migration/cfgimport.cxx index a6eb5b7b073b..75b23ccac7d7 100644 --- a/dbaccess/source/filter/migration/cfgimport.cxx +++ b/dbaccess/source/filter/migration/cfgimport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,21 +78,21 @@ extern "C" void SAL_CALL createRegistryInfo_OCfgImport( ) static ::dbacfg::OMultiInstanceAutoRegistration< ::dbacfg::OCfgImport > aAutoRegistration; } -#define DATASOURCES 1 -#define DATASOURCE 2 -#define DATASOURCESETTINGS 3 -#define TABLES 4 -#define QUERIES 5 -#define BOOKMARKS 6 -#define DATASOURCESETTING 7 -#define BOOKMARK 8 -#define QUERY 9 -#define TABLE 10 -#define DATASETTINGS 11 -#define COLUMNS 12 -#define COLUMN 13 -#define NO_PROP 14 -#define LOGINTIMEOUT 15 +#define DATASOURCES 1 +#define DATASOURCE 2 +#define DATASOURCESETTINGS 3 +#define TABLES 4 +#define QUERIES 5 +#define BOOKMARKS 6 +#define DATASOURCESETTING 7 +#define BOOKMARK 8 +#define QUERY 9 +#define TABLE 10 +#define DATASETTINGS 11 +#define COLUMNS 12 +#define COLUMN 13 +#define NO_PROP 14 +#define LOGINTIMEOUT 15 //-------------------------------------------------------------------------- using namespace dbacfg; @@ -297,20 +297,20 @@ void LoadTableFields(const Reference< XObjectInputStream>& _rxIn,Sequence& _rxIn,PropertyValue& _rProperty) { - ::rtl::OUString aTableName; - ::rtl::OUString aAliasName; // table range - ::rtl::OUString aFieldName; // column - ::rtl::OUString aFieldAlias; // column alias - ::rtl::OUString aDatabaseName; // qualifier or catalog - ::rtl::OUString aFunctionName; // enth"alt den Funktionsnamen, nur wenn eFunctionType != FKT_NONE gesetzt - - sal_Int32 eDataType; - sal_Int32 eFunctionType; - sal_Int32 eFieldType; - sal_Int32 eOrderDir; - sal_Int32 nColWidth; - sal_Bool bGroupBy; - sal_Bool bVisible; + ::rtl::OUString aTableName; + ::rtl::OUString aAliasName; // table range + ::rtl::OUString aFieldName; // column + ::rtl::OUString aFieldAlias; // column alias + ::rtl::OUString aDatabaseName; // qualifier or catalog + ::rtl::OUString aFunctionName; // enth"alt den Funktionsnamen, nur wenn eFunctionType != FKT_NONE gesetzt + + sal_Int32 eDataType; + sal_Int32 eFunctionType; + sal_Int32 eFieldType; + sal_Int32 eOrderDir; + sal_Int32 nColWidth; + sal_Bool bGroupBy; + sal_Bool bVisible; OStreamSection aSection(_rxIn.get()); _rxIn >> aTableName; @@ -403,7 +403,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const : // get TypeName ::rtl::OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aMedDescr, sal_True ); const PropertyValue* pIter = aMedDescr.getConstArray(); - const PropertyValue* pEnd = pIter + aMedDescr.getLength(); + const PropertyValue* pEnd = pIter + aMedDescr.getLength(); for( ; pIter != pEnd && !pIter->Name.equalsAscii( "FilterName" ); ++pIter) ; if ( aTypeName.getLength() && pIter == pEnd ) @@ -461,7 +461,7 @@ sal_Bool isDocumentReport(const Reference< XMultiServiceFactory >& _xORB,const : Reference< XNameContainer> xControls(xForms->getByName(*elementNames),UNO_QUERY); Sequence< ::rtl::OUString> aControlSeq = xControls.is() ? xControls->getElementNames() : Sequence< ::rtl::OUString>(); const ::rtl::OUString* pControlIter = aControlSeq.getConstArray(); - const ::rtl::OUString* pControlEnd = pControlIter + aControlSeq.getLength(); + const ::rtl::OUString* pControlEnd = pControlIter + aControlSeq.getLength(); for(;pControlIter != pControlEnd && !bForm;++pControlIter) { Reference xProp(xControls->getByName(*pControlIter),UNO_QUERY); @@ -575,7 +575,7 @@ void OCfgImport::setProperties(sal_Int16 _eType) OSL_ENSURE(m_aProperties[_eType].getLength() == m_aValues[_eType].getLength(),"Count is not equal!"); try { - Reference< XMultiPropertySet > xFormMultiSet; + Reference< XMultiPropertySet > xFormMultiSet; if ( _eType == COLUMN ) xFormMultiSet.set(m_xCurrentColumn,UNO_QUERY); else if ( _eType == TABLE || _eType == QUERY ) @@ -961,7 +961,7 @@ void SAL_CALL OCfgImport::overrideProperty( { m_bPropertyMayBeVoid = sal_False; ::rtl::OUString sProp; - if ( aName == CONFIGKEY_DEFSET_FILTER ) sProp = PROPERTY_FILTER; + if ( aName == CONFIGKEY_DEFSET_FILTER ) sProp = PROPERTY_FILTER; else if ( aName == CONFIGKEY_DEFSET_FONT_NAME ) sProp = PROPERTY_FONTNAME; else if ( aName == CONFIGKEY_DEFSET_ORDER ) sProp = PROPERTY_ORDER; else if ( aName == CONFIGKEY_DEFSET_APPLYFILTER ) sProp = PROPERTY_APPLYFILTER; @@ -1110,7 +1110,7 @@ void SAL_CALL OCfgImport::setPropertyValue( Sequence< PropertyValue > aLayout; if ( aInputSequence.getLength() ) { - Reference< XInputStream> xInStreamHelper = new SequenceInputStream(aInputSequence);; // used for wrapping sequence to xinput + Reference< XInputStream> xInStreamHelper = new SequenceInputStream(aInputSequence);; // used for wrapping sequence to xinput Reference< XObjectInputStream> xInStream = Reference< XObjectInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.ObjectInputStream")),UNO_QUERY); Reference< XInputStream> xMarkInStream = Reference< XInputStream >(m_xORB->createInstance(::rtl::OUString::createFromAscii("com.sun.star.io.MarkableInputStream")),UNO_QUERY); Reference< XActiveDataSink >(xMarkInStream,UNO_QUERY)->setInputStream(xInStreamHelper); diff --git a/dbaccess/source/filter/migration/cfgimport.hxx b/dbaccess/source/filter/migration/cfgimport.hxx index fcccadae42b0..dc558731e0e3 100644 --- a/dbaccess/source/filter/migration/cfgimport.hxx +++ b/dbaccess/source/filter/migration/cfgimport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,37 +52,37 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; -typedef ::cppu::WeakImplHelper4 < ::com::sun::star::lang::XServiceInfo - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::task::XJob - , ::com::sun::star::configuration::backend::XLayerHandler - > OCfgImport_COMPBASE; +typedef ::cppu::WeakImplHelper4 < ::com::sun::star::lang::XServiceInfo + , ::com::sun::star::lang::XInitialization + , ::com::sun::star::task::XJob + , ::com::sun::star::configuration::backend::XLayerHandler + > OCfgImport_COMPBASE; // ------------- // - OCfgImport - // ------------- class OCfgImport : public OCfgImport_COMPBASE { private: - typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; - typedef ::std::stack< TElementType > TElementStack; - typedef ::std::vector< PropertyValue > TDataSourceSettings; - - Reference< XMultiServiceFactory > m_xORB; - Reference< XMultiServiceFactory > m_xOldORB; - Reference< ::com::sun::star::configuration::backend::XLayer> m_xLayer; - Reference m_xCurrentDS; - Reference m_xModel; - Reference m_xCurrentObject; /// can either be a query or a table - Reference m_xCurrentColumn; - ::std::map< sal_Int16 ,Sequence< ::rtl::OUString> > m_aProperties; + typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; + typedef ::std::stack< TElementType > TElementStack; + typedef ::std::vector< PropertyValue > TDataSourceSettings; + + Reference< XMultiServiceFactory > m_xORB; + Reference< XMultiServiceFactory > m_xOldORB; + Reference< ::com::sun::star::configuration::backend::XLayer> m_xLayer; + Reference m_xCurrentDS; + Reference m_xModel; + Reference m_xCurrentObject; /// can either be a query or a table + Reference m_xCurrentColumn; + ::std::map< sal_Int16 ,Sequence< ::rtl::OUString> > m_aProperties; ::std::map< sal_Int16 ,Sequence< Any> > m_aValues; - ::rtl::OUString m_sCurrentDataSourceName; - ::rtl::OUString m_sBookmarkName; - ::rtl::OUString m_sDocumentLocation; + ::rtl::OUString m_sCurrentDataSourceName; + ::rtl::OUString m_sBookmarkName; + ::rtl::OUString m_sDocumentLocation; - TElementStack m_aStack; - TDataSourceSettings m_aDataSourceSettings; - sal_Bool m_bPropertyMayBeVoid; + TElementStack m_aStack; + TDataSourceSettings m_aDataSourceSettings; + sal_Bool m_bPropertyMayBeVoid; /** convert the old configuration settings into new database documents. */ @@ -92,9 +92,9 @@ private: void setProperties(sal_Int16 _eType); protected: - virtual ~OCfgImport() throw(); + virtual ~OCfgImport() throw(); public: - + OCfgImport( const Reference< XMultiServiceFactory >& _rxMSF ); @@ -109,88 +109,88 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Arguments ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XLayerHandler - virtual void SAL_CALL startLayer() + virtual void SAL_CALL startLayer() throw(::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL endLayer() - throw( + virtual void SAL_CALL endLayer() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL overrideNode( - const rtl::OUString& aName, - sal_Int16 aAttributes, + virtual void SAL_CALL overrideNode( + const rtl::OUString& aName, + sal_Int16 aAttributes, sal_Bool bClear) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addOrReplaceNode( - const rtl::OUString& aName, - sal_Int16 aAttributes) - throw( + const rtl::OUString& aName, + sal_Int16 aAttributes) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addOrReplaceNodeFromTemplate( + virtual void SAL_CALL addOrReplaceNodeFromTemplate( const rtl::OUString& aName, const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate, - sal_Int16 aAttributes ) + sal_Int16 aAttributes ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endNode() - throw( + virtual void SAL_CALL endNode() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL dropNode( - const rtl::OUString& aName ) - throw( + virtual void SAL_CALL dropNode( + const rtl::OUString& aName ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL overrideProperty( + virtual void SAL_CALL overrideProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const Type& aType, - sal_Bool bClear ) - throw( + sal_Bool bClear ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValue( - const Any& aValue ) - throw( + virtual void SAL_CALL setPropertyValue( + const Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL setPropertyValueForLocale( + virtual void SAL_CALL setPropertyValueForLocale( const Any& aValue, - const rtl::OUString& aLocale ) - throw( + const rtl::OUString& aLocale ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL endProperty() - throw( + virtual void SAL_CALL endProperty() + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addProperty( + virtual void SAL_CALL addProperty( const rtl::OUString& aName, sal_Int16 aAttributes, const Type& aType ) - throw( + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL addPropertyWithValue( + virtual void SAL_CALL addPropertyWithValue( const rtl::OUString& aName, sal_Int16 aAttributes, - const Any& aValue ) - throw( + const Any& aValue ) + throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); }; diff --git a/dbaccess/source/filter/migration/cfgservices.cxx b/dbaccess/source/filter/migration/cfgservices.cxx index a5c256488ebc..a2591ff70040 100644 --- a/dbaccess/source/filter/migration/cfgservices.cxx +++ b/dbaccess/source/filter/migration/cfgservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,8 +60,8 @@ extern "C" void SAL_CALL createRegistryInfo_dbacfg() //--------------------------------------------------------------------------------------- extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_dbacfg(); @@ -74,8 +74,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { return ::dbacfg::OModuleRegistration::writeComponentInfos( static_cast(pServiceManager), diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 715e58000ec2..c293c8405751 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,12 +115,12 @@ public: DBTypeDetection(const Reference< XMultiServiceFactory >&); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + ::rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods - static ::rtl::OUString getImplementationName_Static() throw( ) + static ::rtl::OUString getImplementationName_Static() throw( ) { return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBTypeDetection"); } @@ -213,8 +213,8 @@ Reference< XInterface > SAL_CALL DBTypeDetection::Create( const Reference< XMult sal_Bool SAL_CALL DBTypeDetection::supportsService(const ::rtl::OUString& ServiceName) throw( ) { Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pBegin = aSNL.getConstArray(); - const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); + const ::rtl::OUString * pBegin = aSNL.getConstArray(); + const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); for( ; pBegin != pEnd; ++pBegin) if( *pBegin == ServiceName ) return sal_True; @@ -245,9 +245,9 @@ class DBContentLoader : public ::cppu::WeakImplHelper2< XFrameLoader, XServiceIn { private: ::comphelper::ComponentContext m_aContext; - Reference< XFrameLoader > m_xMySelf; - ::rtl::OUString m_sCurrentURL; - ULONG m_nStartWizard; + Reference< XFrameLoader > m_xMySelf; + ::rtl::OUString m_sCurrentURL; + ULONG m_nStartWizard; DECL_LINK( OnStartTableWizard, void* ); public: @@ -255,12 +255,12 @@ public: ~DBContentLoader(); // XServiceInfo - ::rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); - Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + ::rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const ::rtl::OUString& ServiceName) throw( ); + Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); // static methods - static ::rtl::OUString getImplementationName_Static() throw( ) + static ::rtl::OUString getImplementationName_Static() throw( ) { return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBContentLoader2"); } @@ -269,7 +269,7 @@ public: SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&); // XLoader - virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL, + virtual void SAL_CALL load( const Reference< XFrame > & _rFrame, const ::rtl::OUString& _rURL, const Sequence< PropertyValue >& _rArgs, const Reference< XLoadEventListener > & _rListener) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL cancel(void) throw(); @@ -312,8 +312,8 @@ Reference< XInterface > SAL_CALL DBContentLoader::Create( const Reference< XMult sal_Bool SAL_CALL DBContentLoader::supportsService(const ::rtl::OUString& ServiceName) throw( ) { Sequence< ::rtl::OUString > aSNL = getSupportedServiceNames(); - const ::rtl::OUString * pBegin = aSNL.getConstArray(); - const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); + const ::rtl::OUString * pBegin = aSNL.getConstArray(); + const ::rtl::OUString * pEnd = pBegin + aSNL.getLength(); for( ; pBegin != pEnd; ++pBegin) if( *pBegin == ServiceName ) return sal_True; diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index a84b69dfa43b..50c72a14e3c7 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( ::std::vector< XMLPropertyState >::const_iterator i = rProperties.begin(); ::std::vector< XMLPropertyState >::const_iterator aEnd = rProperties.end(); for ( ; i != aEnd ; ++i ) - { + { sal_Int16 nContextID = aPropMapper->GetEntryContextId(i->mnIndex); switch (nContextID) { @@ -73,7 +73,7 @@ void OXMLAutoStylePoolP::exportStyleAttributes( } } break; - } + } } } } diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx index 6d3da1fa34aa..5d7083794f74 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef DBA_XMLAUTOSTYLE_HXX +#ifndef DBA_XMLAUTOSTYLE_HXX #define DBA_XMLAUTOSTYLE_HXX #include #include diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index ba826ebdc721..068538c55f4f 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -135,7 +135,7 @@ void OXMLColumn::EndElement() if ( m_aDefaultValue.hasValue() ) xProp->setPropertyValue(PROPERTY_CONTROLDEFAULT,m_aDefaultValue); - + Reference xAppend(m_xParentContainer,UNO_QUERY); if ( xAppend.is() ) xAppend->appendByDescriptor(xProp); @@ -167,7 +167,7 @@ void OXMLColumn::EndElement() } } } - + } } // if ( xFac.is() && m_sName.getLength() ) else if ( m_sCellStyleName.getLength() ) diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx index e417e0398825..583a0a7272b9 100644 --- a/dbaccess/source/filter/xml/xmlColumn.hxx +++ b/dbaccess/source/filter/xml/xmlColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace dbaxml ::rtl::OUString m_sCellStyleName; ::rtl::OUString m_sHelpMessage; ::com::sun::star::uno::Any m_aDefaultValue; - sal_Bool m_bHidden; + sal_Bool m_bHidden; ODBFilter& GetOwnImport(); public: diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index 2af3b4d9c102..f2cbf64875ee 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 1d950173b1b4..0aa1fde81fc9 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace dbaxml ::rtl::OUString m_sName; ::rtl::OUString m_sHREF; ::rtl::OUString m_sComponentServiceName; - sal_Bool m_bAsTemplate; + sal_Bool m_bAsTemplate; ODBFilter& GetOwnImport(); public: diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index 25ec65a48c7b..96b1db0595d4 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ SvXMLImportContext* OXMLConnectionData::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 2cf32047c99c..0dd3bd493634 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx index 5b0b6aeee3de..fad4a022760c 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index ea6be03655fb..ecae54328735 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index b2e87883a62b..cf6dcba35d7a 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -225,7 +225,7 @@ SvXMLImportContext* OXMLDataSource::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); const sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); switch( nToken ) diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index 87038f05ef30..1f95f9c14090 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index 5aac0f307824..150ee8142fcd 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -138,7 +138,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport aProperty.Name = INFO_CHARSET; aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("utf8")); rImport.addInfo(aProperty); - } + } } } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index 89f9dde6a242..56274429a590 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index 8e5f2652244f..cae75bf87158 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ DBG_NAME(OXMLDataSourceSetting) OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XAttributeList > & _xAttrList ,OXMLDataSourceSetting* _pContainer) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) ,m_pContainer(_pContainer) @@ -82,13 +82,13 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport static MapString2Type s_aTypeNameMap; if (!s_aTypeNameMap.size()) { - s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); - s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); - s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); + s_aTypeNameMap[GetXMLToken( XML_BOOLEAN)] = ::getBooleanCppuType(); + s_aTypeNameMap[GetXMLToken( XML_FLOAT)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_DOUBLE)] = ::getCppuType( static_cast< double* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_STRING)] = ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_INT)] = ::getCppuType( static_cast< sal_Int32* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_SHORT)] = ::getCppuType( static_cast< sal_Int16* >(NULL) ); + s_aTypeNameMap[GetXMLToken( XML_VOID)] = ::getVoidCppuType(); } const ConstMapString2TypeIterator aTypePos = s_aTypeNameMap.find(sValue); @@ -102,7 +102,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport break; } } - + } // ----------------------------------------------------------------------------- @@ -117,7 +117,7 @@ SvXMLImportContext* OXMLDataSourceSetting::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -167,7 +167,7 @@ void OXMLDataSourceSetting::addValue(const ::rtl::OUString& _sValue) if ( !m_bIsList ) m_aSetting.Value = aValue; - else + else { sal_Int32 nPos = m_aInfoSequence.getLength(); m_aInfoSequence.realloc(nPos+1); @@ -186,7 +186,7 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx Any aReturn; switch (_rExpectedType.getTypeClass()) { - case TypeClass_BOOLEAN: // sal_Bool + case TypeClass_BOOLEAN: // sal_Bool { bool bValue; #if OSL_DEBUG_LEVEL > 0 @@ -195,14 +195,14 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a boolean!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a boolean!")); aReturn <<= bValue; } break; - case TypeClass_SHORT: // sal_Int16 - case TypeClass_LONG: // sal_Int32 - { // it's a real int32/16 property + case TypeClass_SHORT: // sal_Int16 + case TypeClass_LONG: // sal_Int32 + { // it's a real int32/16 property sal_Int32 nValue(0); #if OSL_DEBUG_LEVEL > 0 sal_Bool bSuccess = @@ -210,8 +210,8 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into an integer!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into an integer!")); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; else @@ -232,8 +232,8 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, ::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a double!")); + += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) + += ::rtl::OString("\" into a double!")); aReturn <<= (double)nValue; } break; diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index 4740a7834306..ccea90fe1a8a 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace dbaxml ::com::sun::star::beans::PropertyValue m_aSetting; ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any> m_aInfoSequence; OXMLDataSourceSetting* m_pContainer; - ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently + ::com::sun::star::uno::Type m_aPropType; // the type of the property the instance imports currently sal_Bool m_bIsList; ODBFilter& GetOwnImport(); @@ -64,7 +64,7 @@ namespace dbaxml /** adds value to property - @param _sValue + @param _sValue The value to add. */ void addValue(const ::rtl::OUString& _sValue); diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index 284971fd8a07..93547a4d3bcf 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ SvXMLImportContext* OXMLDataSourceSettings::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceInfoElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx index 67d3f02e432d..9d14fc40ced6 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index 6bb928b2b541..8628ae065852 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ SvXMLImportContext* OXMLDatabase::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx index ed70500fdca3..588ef668f985 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlDatabase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 73faf3a5a64a..b01f7b496039 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ SvXMLImportContext* OXMLDatabaseDescription::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseDescriptionElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDatabaseDescriptionElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index 6a056412e57a..1f3224683cac 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 99e981a581d7..4a16889a1ac1 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -89,7 +89,7 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -105,7 +105,7 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext( GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName ); break; - // case XML_TOK_QUERY_COLLECTION: + // case XML_TOK_QUERY_COLLECTION: case XML_TOK_COMPONENT_COLLECTION: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName ); diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 1a84dfa4c94e..98f415360829 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,8 +39,8 @@ namespace dbaxml { private: ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + ::rtl::OUString m_sCollectionServiceName; + ::rtl::OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx index 2248050d09b3..c43ab6b0099d 100644 --- a/dbaccess/source/filter/xml/xmlEnums.hxx +++ b/dbaccess/source/filter/xml/xmlEnums.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,21 +51,21 @@ namespace dbaxml }; enum XMLDataSource { - XML_TOK_CONNECTION_RESOURCE, - XML_TOK_SUPPRESS_VERSION_COLUMNS, - XML_TOK_JAVA_DRIVER_CLASS, - XML_TOK_EXTENSION, - XML_TOK_IS_FIRST_ROW_HEADER_LINE, - XML_TOK_SHOW_DELETED, - XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED, - XML_TOK_SYSTEM_DRIVER_SETTINGS, - XML_TOK_ENABLE_SQL92_CHECK, - XML_TOK_APPEND_TABLE_ALIAS_NAME, - XML_TOK_PARAMETER_NAME_SUBSTITUTION, - XML_TOK_IGNORE_DRIVER_PRIVILEGES, - XML_TOK_BOOLEAN_COMPARISON_MODE, - XML_TOK_USE_CATALOG, - XML_TOK_BASE_DN, + XML_TOK_CONNECTION_RESOURCE, + XML_TOK_SUPPRESS_VERSION_COLUMNS, + XML_TOK_JAVA_DRIVER_CLASS, + XML_TOK_EXTENSION, + XML_TOK_IS_FIRST_ROW_HEADER_LINE, + XML_TOK_SHOW_DELETED, + XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED, + XML_TOK_SYSTEM_DRIVER_SETTINGS, + XML_TOK_ENABLE_SQL92_CHECK, + XML_TOK_APPEND_TABLE_ALIAS_NAME, + XML_TOK_PARAMETER_NAME_SUBSTITUTION, + XML_TOK_IGNORE_DRIVER_PRIVILEGES, + XML_TOK_BOOLEAN_COMPARISON_MODE, + XML_TOK_USE_CATALOG, + XML_TOK_BASE_DN, XML_TOK_MAX_ROW_COUNT, XML_TOK_LOGIN, XML_TOK_TABLE_FILTER, @@ -127,12 +127,12 @@ namespace dbaxml }; enum XMLComponent { - XML_TOK_HREF , - XML_TOK_TYPE , - XML_TOK_SHOW , + XML_TOK_HREF , + XML_TOK_TYPE , + XML_TOK_SHOW , XML_TOK_ACTUATE , XML_TOK_AS_TEMPLATE , - XML_TOK_COMPONENT_NAME + XML_TOK_COMPONENT_NAME }; enum XMLType { diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index 40e2341cdecc..b299a6a5d578 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -152,12 +152,12 @@ namespace dbaxml { // possible types we can write (either because we recognize them directly or because we convert _rValue // into one of these types) - static const ::rtl::OUString s_sTypeBoolean (RTL_CONSTASCII_USTRINGPARAM("boolean")); - static const ::rtl::OUString s_sTypeShort (RTL_CONSTASCII_USTRINGPARAM("short")); - static const ::rtl::OUString s_sTypeInteger (RTL_CONSTASCII_USTRINGPARAM("int")); - static const ::rtl::OUString s_sTypeLong (RTL_CONSTASCII_USTRINGPARAM("long")); - static const ::rtl::OUString s_sTypeDouble (RTL_CONSTASCII_USTRINGPARAM("double")); - static const ::rtl::OUString s_sTypeString (RTL_CONSTASCII_USTRINGPARAM("string")); + static const ::rtl::OUString s_sTypeBoolean (RTL_CONSTASCII_USTRINGPARAM("boolean")); + static const ::rtl::OUString s_sTypeShort (RTL_CONSTASCII_USTRINGPARAM("short")); + static const ::rtl::OUString s_sTypeInteger (RTL_CONSTASCII_USTRINGPARAM("int")); + static const ::rtl::OUString s_sTypeLong (RTL_CONSTASCII_USTRINGPARAM("long")); + static const ::rtl::OUString s_sTypeDouble (RTL_CONSTASCII_USTRINGPARAM("double")); + static const ::rtl::OUString s_sTypeString (RTL_CONSTASCII_USTRINGPARAM("string")); // handle the type description switch (_rType.getTypeClass()) @@ -804,7 +804,7 @@ void ODBExport::exportSequence(const Sequence< ::rtl::OUString>& _aValue SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, _eTokenFilter, sal_True, sal_True); const ::rtl::OUString* pIter = _aValue.getConstArray(); - const ::rtl::OUString* pEnd = pIter + _aValue.getLength(); + const ::rtl::OUString* pEnd = pIter + _aValue.getLength(); for(;pIter != pEnd;++pIter) { SvXMLElementExport aDataSource(*this,XML_NAMESPACE_DB, _eTokenType, sal_True, sal_False); @@ -845,7 +845,7 @@ void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection pComponents.reset( new SvXMLElementExport(*this,XML_NAMESPACE_DB, _eComponents, sal_True, sal_True)); Sequence< ::rtl::OUString> aSeq = _xCollection->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { Reference xProp(_xCollection->getByName(*pIter),UNO_QUERY); @@ -1011,7 +1011,7 @@ void ODBExport::exportColumns(const Reference& _xColSup) SvXMLElementExport aColumns(*this,XML_NAMESPACE_DB, XML_COLUMNS, sal_True, sal_True); Sequence< ::rtl::OUString> aSeq = xNameAccess->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for( ; pIter != pEnd ; ++pIter) { Reference xProp(xNameAccess->getByName(*pIter),UNO_QUERY); @@ -1118,7 +1118,7 @@ void ODBExport::exportQueries(sal_Bool _bExportContext) Reference< XNameAccess > xCollection = xSup->getQueryDefinitions(); if ( xCollection.is() && xCollection->hasElements() ) { - ::std::auto_ptr< ::comphelper::mem_fun1_t > pMemFunc; + ::std::auto_ptr< ::comphelper::mem_fun1_t > pMemFunc; if ( _bExportContext ) pMemFunc.reset( new ::comphelper::mem_fun1_t(&ODBExport::exportQuery) ); else @@ -1314,7 +1314,7 @@ void ODBExport::GetViewSettings(Sequence& aProps) aProps[nLength].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Queries")); Sequence< ::rtl::OUString> aSeq = xCollection->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); Sequence aQueries(aSeq.getLength()); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) @@ -1368,7 +1368,7 @@ void ODBExport::GetConfigurationSettings(Sequence& aProps) switch (_rValue.getValueTypeClass()) { case TypeClass_STRING: - { // extract the string + { // extract the string ::rtl::OUString sCurrentValue; _rValue >>= sCurrentValue; aBuffer.append(sCurrentValue); @@ -1438,7 +1438,7 @@ void SAL_CALL ODBExport::setSourceDocument( const Reference< XComponent >& xDoc // ----------------------------------------------------------------------------- void ODBExport::_ExportFontDecls() { - GetFontAutoStylePool(); // make sure the pool is created + GetFontAutoStylePool(); // make sure the pool is created collectComponentStyles(); SvXMLExport::_ExportFontDecls(); } diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 7e957cf554a0..279ebc345655 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,86 +103,86 @@ class ODBExport : public SvXMLExport } }; - ::std::auto_ptr< TStringPair > m_aAutoIncrement; - ::std::auto_ptr< TDelimiter > m_aDelimiter; + ::std::auto_ptr< TStringPair > m_aAutoIncrement; + ::std::auto_ptr< TDelimiter > m_aDelimiter; ::std::vector< TypedPropertyValue > m_aDataSourceSettings; ::std::vector< XMLPropertyState > m_aCurrentPropertyStates; - TPropertyStyleMap m_aAutoStyleNames; - TPropertyStyleMap m_aCellAutoStyleNames; - TPropertyStyleMap m_aRowAutoStyleNames; + TPropertyStyleMap m_aAutoStyleNames; + TPropertyStyleMap m_aCellAutoStyleNames; + TPropertyStyleMap m_aRowAutoStyleNames; TTableColumnMap m_aTableDummyColumns; - ::rtl::OUString m_sCharSet; - UniReference < SvXMLExportPropertyMapper> m_xExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xColumnExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xCellExportHelper; - UniReference < SvXMLExportPropertyMapper> m_xRowExportHelper; - - mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; - - Reference m_xDataSource; + ::rtl::OUString m_sCharSet; + UniReference < SvXMLExportPropertyMapper> m_xExportHelper; + UniReference < SvXMLExportPropertyMapper> m_xColumnExportHelper; + UniReference < SvXMLExportPropertyMapper> m_xCellExportHelper; + UniReference < SvXMLExportPropertyMapper> m_xRowExportHelper; + + mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xRowStylesPropertySetMapper; + + Reference m_xDataSource; ::dbaccess::ODsnTypeCollection m_aTypeCollection; sal_Bool m_bAllreadyFilled; - void exportDataSource(); + void exportDataSource(); void exportConnectionData(); void exportDriverSettings(const TSettingsMap& _aSettings); void exportApplicationConnectionSettings(const TSettingsMap& _aSettings); - void exportLogin(); - void exportSequence(const Sequence< ::rtl::OUString>& _aValue + void exportLogin(); + void exportSequence(const Sequence< ::rtl::OUString>& _aValue ,::xmloff::token::XMLTokenEnum _eTokenFilter ,::xmloff::token::XMLTokenEnum _eTokenType); - void exportDelimiter(); - void exportAutoIncrement(); - void exportCharSet(); - void exportDataSourceSettings(); - void exportForms(); - void exportReports(); - void exportQueries(sal_Bool _bExportContext); - void exportTables(sal_Bool _bExportContext); - void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt); + void exportDelimiter(); + void exportAutoIncrement(); + void exportCharSet(); + void exportDataSourceSettings(); + void exportForms(); + void exportReports(); + void exportQueries(sal_Bool _bExportContext); + void exportTables(sal_Bool _bExportContext); + void exportStyleName(XPropertySet* _xProp,SvXMLAttributeList& _rAtt); void exportStyleName(const ::xmloff::token::XMLTokenEnum _eToken,const Reference& _xProp,SvXMLAttributeList& _rAtt,TPropertyStyleMap& _rMap); - void exportCollection(const Reference< XNameAccess >& _xCollection + void exportCollection(const Reference< XNameAccess >& _xCollection ,enum ::xmloff::token::XMLTokenEnum _eComponents ,enum ::xmloff::token::XMLTokenEnum _eSubComponents ,sal_Bool _bExportContext ,const ::comphelper::mem_fun1_t& _aMemFunc ); - void exportComponent(XPropertySet* _xProp); - void exportQuery(XPropertySet* _xProp); - void exportTable(XPropertySet* _xProp); - void exportFilter(XPropertySet* _xProp + void exportComponent(XPropertySet* _xProp); + void exportQuery(XPropertySet* _xProp); + void exportTable(XPropertySet* _xProp); + void exportFilter(XPropertySet* _xProp ,const ::rtl::OUString& _sProp ,enum ::xmloff::token::XMLTokenEnum _eStatementType); - void exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate); - void exportAutoStyle(XPropertySet* _xProp); - void exportColumns(const Reference& _xColSup); + void exportTableName(XPropertySet* _xProp,sal_Bool _bUpdate); + void exportAutoStyle(XPropertySet* _xProp); + void exportColumns(const Reference& _xColSup); void collectComponentStyles(); - ::rtl::OUString implConvertAny(const Any& _rValue); + ::rtl::OUString implConvertAny(const Any& _rValue); UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; - + private: ODBExport(); protected: - virtual void _ExportStyles( BOOL bUsed ); - virtual void _ExportAutoStyles(); - virtual void _ExportContent(); - virtual void _ExportMasterStyles(); - virtual void _ExportFontDecls(); - virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); - virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); + virtual void _ExportStyles( BOOL bUsed ); + virtual void _ExportAutoStyles(); + virtual void _ExportContent(); + virtual void _ExportMasterStyles(); + virtual void _ExportFontDecls(); + virtual sal_uInt32 exportDoc( enum ::xmloff::token::XMLTokenEnum eClass ); + virtual SvXMLAutoStylePoolP* CreateAutoStylePool(); virtual void GetViewSettings(com::sun::star::uno::Sequence& aProps); virtual void GetConfigurationSettings(com::sun::star::uno::Sequence& aProps); - - virtual ~ODBExport(){}; -public: - + + virtual ~ODBExport(){}; +public: + ODBExport(const Reference< XMultiServiceFactory >& _rxMSF, sal_uInt16 nExportFlag = EXPORT_CONTENT | EXPORT_AUTOSTYLES | EXPORT_PRETTY | EXPORT_FONTDECLS | EXPORT_SCRIPTS ); // XServiceInfo DECLARE_SERVICE_INFO_STATIC( ); diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index c4a9893f8493..605b0cbea13c 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index 9f58f4b0f03f..fc5767cff989 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index 99807b88a5b6..b5fa3c951224 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,8 +69,8 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 { static SvXMLEnumMapEntry aDisplayMap[] = { - { XML_VISIBLE, sal_True }, - { XML_COLLAPSE, sal_False }, + { XML_VISIBLE, sal_True }, + { XML_COLLAPSE, sal_False }, { XML_TOKEN_INVALID, 0 } }; m_pDisplayHandler.reset(new XMLConstantsPropertyHandler(aDisplayMap, XML_TOKEN_INVALID )); @@ -83,42 +83,42 @@ const XMLPropertyHandler* OPropertyHandlerFactory::GetPropertyHandler(sal_Int32 return pHandler; } // ----------------------------------------------------------------------------- -#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TABLE, context, SvtSaveOptions::ODFVER_010 } #define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0 , 0, SvtSaveOptions::ODFVER_010} // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMapper() { static const XMLPropertyMapEntry s_aTableStylesProperties[] = { - //MAP_CONST( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ), - //MAP_CONST( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ), - //MAP_CONST( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), + //MAP_CONST( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ), + //MAP_CONST( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ), + //MAP_CONST( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - //MAP_CONST( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ), - //MAP_CONST( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), - //MAP_CONST( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), - //MAP_CONST( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), - //MAP_CONST( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ), - //MAP_CONST( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ), - //MAP_CONST( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ), + //MAP_CONST( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ), + //MAP_CONST( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), + //MAP_CONST( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), + //MAP_CONST( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), + //MAP_CONST( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ), + //MAP_CONST( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ), + //MAP_CONST( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ), // - //MAP_CONST( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ), - //MAP_CONST( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ), - //MAP_CONST( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ), - //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ), - //MAP_CONST( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ), - //MAP_CONST( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ), - //MAP_CONST( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE, 0 ), + //MAP_CONST( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ), + //MAP_CONST( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ), + //MAP_CONST( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ), + //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0), + //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0), + //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0), + //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0), + //MAP_CONST( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ), + //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ), + //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ), + //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ), + //MAP_CONST_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), + //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + //MAP_CONST( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ), + //MAP_CONST( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ), + //MAP_CONST( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE, 0 ), MAP_END() }; UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); @@ -127,12 +127,12 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMappe // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapper() { -#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_COLUMN( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_COLUMN, context, SvtSaveOptions::ODFVER_010 } static const XMLPropertyMapEntry s_aColumnStylesProperties[] = { - MAP_CONST_COLUMN( PROPERTY_WIDTH, XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0), - MAP_CONST_COLUMN( PROPERTY_HIDDEN, XML_NAMESPACE_TABLE, XML_DISPLAY, XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_DB_ISVISIBLE ), - MAP_CONST_COLUMN( PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM, CTF_DB_NUMBERFORMAT), + MAP_CONST_COLUMN( PROPERTY_WIDTH, XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_MEASURE, 0), + MAP_CONST_COLUMN( PROPERTY_HIDDEN, XML_NAMESPACE_TABLE, XML_DISPLAY, XML_DB_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_DB_ISVISIBLE ), + MAP_CONST_COLUMN( PROPERTY_NUMBERFORMAT, XML_NAMESPACE_STYLE, XML_DATA_STYLE_NAME, XML_TYPE_NUMBER|MID_FLAG_SPECIAL_ITEM, CTF_DB_NUMBERFORMAT), MAP_END() }; UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory(); @@ -141,40 +141,40 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetColumnStylesPropertySetMapp // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper() { -#define MAP_CONST_CELL( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } -#define MAP_CONST_TEXT_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_CELL( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_PARAGRAPH, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_TEXT( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_TEXT_ASCII( name, prefix, token, type, context ) { name, sizeof(name)-1, prefix, token, type|XML_TYPE_PROP_TEXT, context, SvtSaveOptions::ODFVER_010 } static const XMLPropertyMapEntry s_aCellStylesProperties[] = { - MAP_CONST_CELL( PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN), - MAP_CONST_TEXT( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ), - MAP_CONST_TEXT( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ), - MAP_CONST_TEXT( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - - MAP_CONST_TEXT( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ), - MAP_CONST_TEXT( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ), + MAP_CONST_CELL( PROPERTY_ALIGN, XML_NAMESPACE_FO, XML_TEXT_ALIGN, XML_TYPE_TEXT_ALIGN, CTF_DB_COLUMN_TEXT_ALIGN), + MAP_CONST_TEXT( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ), + MAP_CONST_TEXT( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ), + MAP_CONST_TEXT( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ), - MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0), - MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0), - MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0), - MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0), - MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - MAP_CONST_TEXT_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ), - MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ), + MAP_CONST_TEXT( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_TEXT( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ), + + MAP_CONST_TEXT( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ), + MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0), + MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0), + MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0), + MAP_CONST_TEXT_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0), + MAP_CONST_TEXT( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), + MAP_CONST_TEXT_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ), + MAP_CONST_TEXT( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE|MID_FLAG_MERGE_PROPERTY, 0 ), MAP_END() }; UniReference < XMLPropertyHandlerFactory> xFac = new /*OPropertyHandlerFactory*/::xmloff::OControlPropertyHandlerFactory(); @@ -183,10 +183,10 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetCellStylesPropertySetMapper // ----------------------------------------------------------------------------- UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper() { -#define MAP_CONST_ROW( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010 } +#define MAP_CONST_ROW( name, prefix, token, type, context ) { name.ascii, name.length, prefix, token, type|XML_TYPE_PROP_TABLE_ROW, context, SvtSaveOptions::ODFVER_010 } static const XMLPropertyMapEntry s_aStylesProperties[] = { - MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0), + MAP_CONST_ROW( PROPERTY_ROW_HEIGHT, XML_NAMESPACE_STYLE, XML_ROW_HEIGHT, XML_TYPE_MEASURE, 0), MAP_END() }; UniReference < XMLPropertyHandlerFactory> xFac = new OPropertyHandlerFactory(); diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index fcc9ca8af74e..50c9d71682f4 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,21 +34,21 @@ #include -#define CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1) -#define CTF_DB_ISVISIBLE (XML_DB_CTF_START + 2) -#define CTF_DB_MASTERPAGENAME (XML_DB_CTF_START + 3) -#define CTF_DB_NUMBERFORMAT (XML_DB_CTF_START + 4) -#define CTF_DB_COLUMN_TEXT_ALIGN (XML_DB_CTF_START + 5) +#define CTF_DB_ROWHEIGHT (XML_DB_CTF_START + 1) +#define CTF_DB_ISVISIBLE (XML_DB_CTF_START + 2) +#define CTF_DB_MASTERPAGENAME (XML_DB_CTF_START + 3) +#define CTF_DB_NUMBERFORMAT (XML_DB_CTF_START + 4) +#define CTF_DB_COLUMN_TEXT_ALIGN (XML_DB_CTF_START + 5) -#define XML_DB_TYPE_EQUAL (XML_DB_TYPES_START + 1) +#define XML_DB_TYPE_EQUAL (XML_DB_TYPES_START + 1) namespace dbaxml { class OPropertyHandlerFactory : public ::xmloff::OControlPropertyHandlerFactory { protected: - mutable ::std::auto_ptr m_pDisplayHandler; - mutable ::std::auto_ptr m_pTextAlignHandler; + mutable ::std::auto_ptr m_pDisplayHandler; + mutable ::std::auto_ptr m_pTextAlignHandler; public: OPropertyHandlerFactory(); virtual ~OPropertyHandlerFactory(); diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index d132f7666151..3b3e31c1d576 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ DBG_NAME(OXMLHierarchyCollection) OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XAttributeList > & _xAttrList ,const Reference< XNameAccess >& _xParentContainer ,const ::rtl::OUString& _sCollectionServiceName ,const ::rtl::OUString& _sComponentServiceName) : @@ -140,13 +140,13 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext( const Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDocumentsElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { -// case XML_TOK_QUERY: -// pContext = new OXMLQuery( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer ); -// break; +// case XML_TOK_QUERY: +// pContext = new OXMLQuery( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer ); +// break; case XML_TOK_COMPONENT: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName ); @@ -155,7 +155,7 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext( GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLColumn( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_xTable); break; - // case XML_TOK_QUERY_COLLECTION: + // case XML_TOK_QUERY_COLLECTION: case XML_TOK_COMPONENT_COLLECTION: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName); diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index 3d87826a928d..8a85e14104bb 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,9 +42,9 @@ namespace dbaxml ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xContainer; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; - ::rtl::OUString m_sName; - ::rtl::OUString m_sCollectionServiceName; - ::rtl::OUString m_sComponentServiceName; + ::rtl::OUString m_sName; + ::rtl::OUString m_sCollectionServiceName; + ::rtl::OUString m_sComponentServiceName; ODBFilter& GetOwnImport(); public: diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx index 21d30473872b..487ec48c388a 100644 --- a/dbaccess/source/filter/xml/xmlLogin.cxx +++ b/dbaccess/source/filter/xml/xmlLogin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport, if ( !bUserFound ) { bUserFound = true; - PropertyValue aProperty; + PropertyValue aProperty; aProperty.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UseSystemUser")); aProperty.Value <<= (sValue == s_sTRUE ? sal_True : sal_False); rImport.addInfo(aProperty); diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index 6f2751eb300b..a6734a28ebf0 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index 6c35f416b5c2..8a024535fdf9 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ DBG_NAME(OXMLQuery) OXMLQuery::OXMLQuery( ODBFilter& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList + ,const Reference< XAttributeList > & _xAttrList ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ) : OXMLTable( rImport, nPrfx, _sLocalName,_xAttrList,_xParentContainer,SERVICE_SDB_COMMAND_DEFINITION ) @@ -136,7 +136,7 @@ void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp ) _xProp->setPropertyValue(PROPERTY_UPDATE_CATALOGNAME,makeAny(m_sCatalog)); if ( m_sSchema.getLength() ) _xProp->setPropertyValue(PROPERTY_UPDATE_SCHEMANAME,makeAny(m_sSchema)); - + const ODBFilter::TPropertyNameMap& rSettings = GetOwnImport().getQuerySettings(); ODBFilter::TPropertyNameMap::const_iterator aFind = rSettings.find(m_sName); if ( aFind != rSettings.end() ) diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index 4e4bfde87be0..9ac948c04be8 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace dbaxml { ::rtl::OUString m_sCommand; ::rtl::OUString m_sTable; - sal_Bool m_bEscapeProcessing; + sal_Bool m_bEscapeProcessing; protected: virtual void setProperties(::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _xProp); public: diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx index 112524ddbe98..61ef570b06f7 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -136,7 +136,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport, sURL.append(sPortNumber); } } - else + else { sURL.append(sType); sURL.appendAscii(":"); diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index c94d2184f793..99349b1006e0 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index 67ea8c5bc77e..f0251878adad 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -290,7 +290,7 @@ Reference < XNameContainer > case XML_STYLE_FAMILY_TABLE_CELL: sServiceName = sCellStyleServiceName; break; - + } } return sServiceName; diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index 16bea01cc12b..dc85ae5a8145 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,15 +47,15 @@ namespace dbaxml class OTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString m_sDataStyleName; - ::rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; - SvXMLStylesContext* pStyles; - // std::vector aMaps; - com::sun::star::uno::Any aConditionalFormat; - sal_Int32 m_nNumberFormat; - sal_Bool bConditionalFormatCreated : 1; - sal_Bool bParentSet : 1; + ::rtl::OUString m_sDataStyleName; + ::rtl::OUString sPageStyle; + const rtl::OUString sNumberFormat; + SvXMLStylesContext* pStyles; + // std::vector aMaps; + com::sun::star::uno::Any aConditionalFormat; + sal_Int32 m_nNumberFormat; + sal_Bool bConditionalFormatCreated : 1; + sal_Bool bParentSet : 1; ODBFilter& GetOwnImport(); diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index a64a3ac40360..0f2beb18a17f 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ DBG_NAME(OXMLTable) OXMLTable::OXMLTable( ODBFilter& _rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const uno::Reference< XAttributeList > & _xAttrList + ,const uno::Reference< XAttributeList > & _xAttrList ,const uno::Reference< ::com::sun::star::container::XNameAccess >& _xParentContainer ,const ::rtl::OUString& _sServiceName ) @@ -126,7 +126,7 @@ SvXMLImportContext* OXMLTable::CreateChildContext( const uno::Reference< XAttributeList > & xAttrList ) { SvXMLImportContext *pContext = 0; - const SvXMLTokenMap& rTokenMap = GetOwnImport().GetQueryElemTokenMap(); + const SvXMLTokenMap& rTokenMap = GetOwnImport().GetQueryElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLocalName ) ) { @@ -200,7 +200,7 @@ void OXMLTable::EndElement() if ( m_xTable.is() ) { setProperties(m_xTable); - + if ( m_sStyleName.getLength() ) { const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles(); @@ -213,7 +213,7 @@ void OXMLTable::EndElement() } } } - + xNameContainer->insertByName(m_sName,makeAny(m_xTable)); } } @@ -222,7 +222,7 @@ void OXMLTable::EndElement() OSL_ENSURE(0,"OXMLQuery::EndElement -> exception catched"); } } - + } // ----------------------------------------------------------------------------- void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/ diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index 925497ce92a8..68127045655d 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,8 +38,8 @@ namespace dbaxml class OXMLTable : public SvXMLImportContext { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xParentContainer; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xTable; ::rtl::OUString m_sFilterStatement; ::rtl::OUString m_sOrderStatement; ::rtl::OUString m_sName; @@ -47,13 +47,13 @@ namespace dbaxml ::rtl::OUString m_sCatalog; ::rtl::OUString m_sStyleName; ::rtl::OUString m_sServiceName; - sal_Bool m_bApplyFilter; - sal_Bool m_bApplyOrder; - + sal_Bool m_bApplyFilter; + sal_Bool m_bApplyOrder; + ODBFilter& GetOwnImport(); - void fillAttributes( sal_uInt16 nPrfx + void fillAttributes( sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName ,const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList , ::rtl::OUString& _rsCommand diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index 4291c244a341..94915d046ce4 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ SvXMLImportContext* OXMLTableFilterList::CreateChildContext( else if ( IsXMLToken( rLocalName, XML_TABLE_TYPE ) ) pContext = new OXMLTableFilterPattern( GetImport(), nPrefix, rLocalName,sal_False,*this); else if ( IsXMLToken( rLocalName, XML_TABLE_INCLUDE_FILTER ) ) - pContext = new OXMLTableFilterList( GetImport(), nPrefix, rLocalName ); + pContext = new OXMLTableFilterList( GetImport(), nPrefix, rLocalName ); } if( !pContext ) diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index d288b23ae7d1..07162624cf5d 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ namespace dbaxml virtual void EndElement(); /** pushes a new TableFilterPattern to the list of patterns - @param _sTableFilterPattern + @param _sTableFilterPattern The new filter pattern. */ inline void pushTableFilterPattern(const ::rtl::OUString& _sTableFilterPattern) @@ -63,7 +63,7 @@ namespace dbaxml } /** pushes a new TableTypeFilter to the list of patterns - @param _sTypeFilter + @param _sTypeFilter The new type filter. */ inline void pushTableTypeFilter(const ::rtl::OUString& _sTypeFilter) diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx index 12ce89a823f1..b4c62f34b035 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx index 460d896ecc89..80452c8d6a96 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,10 @@ namespace dbaxml class OXMLTableFilterList; class OXMLTableFilterPattern : public SvXMLImportContext { - OXMLTableFilterList& m_rParent; - sal_Bool m_bNameFilter; + OXMLTableFilterList& m_rParent; + sal_Bool m_bNameFilter; public: - OXMLTableFilterPattern( SvXMLImport& rImport + OXMLTableFilterPattern( SvXMLImport& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& rLName ,sal_Bool _bNameFilter diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 25c48491af22..9805eda5dfe9 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -609,15 +609,15 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - { XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_DATABASE, XML_TOK_DOC_DATABASE }, - { XML_NAMESPACE_OOO, XML_DATABASE, XML_TOK_DOC_DATABASE }, - { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT }, + { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OOO, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OOO, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OFFICE, XML_DATABASE, XML_TOK_DOC_DATABASE }, + { XML_NAMESPACE_OOO, XML_DATABASE, XML_TOK_DOC_DATABASE }, + { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPT }, XML_TOKEN_MAP_END }; m_pDocElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -631,13 +631,13 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_DATASOURCE, XML_TOK_DATASOURCE }, - { XML_NAMESPACE_DB, XML_FORMS, XML_TOK_FORMS}, - { XML_NAMESPACE_DB, XML_REPORTS, XML_TOK_REPORTS}, - { XML_NAMESPACE_DB, XML_QUERIES, XML_TOK_QUERIES}, - { XML_NAMESPACE_DB, XML_TABLES, XML_TOK_TABLES}, - { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATIONS, XML_TOK_TABLES}, - { XML_NAMESPACE_DB, XML_SCHEMA_DEFINITION, XML_TOK_SCHEMA_DEFINITION}, + { XML_NAMESPACE_DB, XML_DATASOURCE, XML_TOK_DATASOURCE }, + { XML_NAMESPACE_DB, XML_FORMS, XML_TOK_FORMS}, + { XML_NAMESPACE_DB, XML_REPORTS, XML_TOK_REPORTS}, + { XML_NAMESPACE_DB, XML_QUERIES, XML_TOK_QUERIES}, + { XML_NAMESPACE_DB, XML_TABLES, XML_TOK_TABLES}, + { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATIONS, XML_TOK_TABLES}, + { XML_NAMESPACE_DB, XML_SCHEMA_DEFINITION, XML_TOK_SCHEMA_DEFINITION}, XML_TOKEN_MAP_END }; m_pDatabaseElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -651,44 +651,44 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE}, - { XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS}, - { XML_NAMESPACE_DB, XML_JAVA_DRIVER_CLASS, XML_TOK_JAVA_DRIVER_CLASS}, - { XML_NAMESPACE_DB, XML_EXTENSION, XML_TOK_EXTENSION}, - { XML_NAMESPACE_DB, XML_IS_FIRST_ROW_HEADER_LINE, XML_TOK_IS_FIRST_ROW_HEADER_LINE}, - { XML_NAMESPACE_DB, XML_SHOW_DELETED, XML_TOK_SHOW_DELETED}, - { XML_NAMESPACE_DB, XML_IS_TABLE_NAME_LENGTH_LIMITED, XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED}, - { XML_NAMESPACE_DB, XML_SYSTEM_DRIVER_SETTINGS, XML_TOK_SYSTEM_DRIVER_SETTINGS}, - { XML_NAMESPACE_DB, XML_ENABLE_SQL92_CHECK, XML_TOK_ENABLE_SQL92_CHECK}, - { XML_NAMESPACE_DB, XML_APPEND_TABLE_ALIAS_NAME, XML_TOK_APPEND_TABLE_ALIAS_NAME}, - { XML_NAMESPACE_DB, XML_PARAMETER_NAME_SUBSTITUTION, XML_TOK_PARAMETER_NAME_SUBSTITUTION}, - { XML_NAMESPACE_DB, XML_IGNORE_DRIVER_PRIVILEGES, XML_TOK_IGNORE_DRIVER_PRIVILEGES}, - { XML_NAMESPACE_DB, XML_BOOLEAN_COMPARISON_MODE, XML_TOK_BOOLEAN_COMPARISON_MODE}, - { XML_NAMESPACE_DB, XML_USE_CATALOG, XML_TOK_USE_CATALOG}, - { XML_NAMESPACE_DB, XML_BASE_DN, XML_TOK_BASE_DN}, - { XML_NAMESPACE_DB, XML_MAX_ROW_COUNT, XML_TOK_MAX_ROW_COUNT}, - { XML_NAMESPACE_DB, XML_LOGIN, XML_TOK_LOGIN}, - { XML_NAMESPACE_DB, XML_TABLE_FILTER, XML_TOK_TABLE_FILTER}, - { XML_NAMESPACE_DB, XML_TABLE_TYPE_FILTER, XML_TOK_TABLE_TYPE_FILTER}, - { XML_NAMESPACE_DB, XML_AUTO_INCREMENT, XML_TOK_AUTO_INCREMENT}, - { XML_NAMESPACE_DB, XML_DELIMITER, XML_TOK_DELIMITER}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, XML_TOK_DATA_SOURCE_SETTINGS}, - { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET}, + { XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE}, + { XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS}, + { XML_NAMESPACE_DB, XML_JAVA_DRIVER_CLASS, XML_TOK_JAVA_DRIVER_CLASS}, + { XML_NAMESPACE_DB, XML_EXTENSION, XML_TOK_EXTENSION}, + { XML_NAMESPACE_DB, XML_IS_FIRST_ROW_HEADER_LINE, XML_TOK_IS_FIRST_ROW_HEADER_LINE}, + { XML_NAMESPACE_DB, XML_SHOW_DELETED, XML_TOK_SHOW_DELETED}, + { XML_NAMESPACE_DB, XML_IS_TABLE_NAME_LENGTH_LIMITED, XML_TOK_IS_TABLE_NAME_LENGTH_LIMITED}, + { XML_NAMESPACE_DB, XML_SYSTEM_DRIVER_SETTINGS, XML_TOK_SYSTEM_DRIVER_SETTINGS}, + { XML_NAMESPACE_DB, XML_ENABLE_SQL92_CHECK, XML_TOK_ENABLE_SQL92_CHECK}, + { XML_NAMESPACE_DB, XML_APPEND_TABLE_ALIAS_NAME, XML_TOK_APPEND_TABLE_ALIAS_NAME}, + { XML_NAMESPACE_DB, XML_PARAMETER_NAME_SUBSTITUTION, XML_TOK_PARAMETER_NAME_SUBSTITUTION}, + { XML_NAMESPACE_DB, XML_IGNORE_DRIVER_PRIVILEGES, XML_TOK_IGNORE_DRIVER_PRIVILEGES}, + { XML_NAMESPACE_DB, XML_BOOLEAN_COMPARISON_MODE, XML_TOK_BOOLEAN_COMPARISON_MODE}, + { XML_NAMESPACE_DB, XML_USE_CATALOG, XML_TOK_USE_CATALOG}, + { XML_NAMESPACE_DB, XML_BASE_DN, XML_TOK_BASE_DN}, + { XML_NAMESPACE_DB, XML_MAX_ROW_COUNT, XML_TOK_MAX_ROW_COUNT}, + { XML_NAMESPACE_DB, XML_LOGIN, XML_TOK_LOGIN}, + { XML_NAMESPACE_DB, XML_TABLE_FILTER, XML_TOK_TABLE_FILTER}, + { XML_NAMESPACE_DB, XML_TABLE_TYPE_FILTER, XML_TOK_TABLE_TYPE_FILTER}, + { XML_NAMESPACE_DB, XML_AUTO_INCREMENT, XML_TOK_AUTO_INCREMENT}, + { XML_NAMESPACE_DB, XML_DELIMITER, XML_TOK_DELIMITER}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTINGS, XML_TOK_DATA_SOURCE_SETTINGS}, + { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET}, // db odf 12 - { XML_NAMESPACE_DB, XML_CONNECTION_DATA, XML_TOK_CONNECTION_DATA}, - { XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, XML_TOK_DATABASE_DESCRIPTION}, - { XML_NAMESPACE_DB, XML_COMPOUND_DATABASE, XML_TOK_COMPOUND_DATABASE}, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_DB_HREF}, - { XML_NAMESPACE_DB, XML_MEDIA_TYPE, XML_TOK_MEDIA_TYPE}, - { XML_NAMESPACE_DB, XML_TYPE, XML_TOK_DB_TYPE}, - { XML_NAMESPACE_DB, XML_HOSTNAME, XML_TOK_HOSTNAME}, - { XML_NAMESPACE_DB, XML_PORT, XML_TOK_PORT}, - { XML_NAMESPACE_DB, XML_LOCAL_SOCKET, XML_TOK_LOCAL_SOCKET}, - { XML_NAMESPACE_DB, XML_DATABASE_NAME, XML_TOK_DATABASE_NAME}, - { XML_NAMESPACE_DB, XML_DRIVER_SETTINGS, XML_TOK_DRIVER_SETTINGS}, - { XML_NAMESPACE_DB, XML_JAVA_CLASSPATH, XML_TOK_JAVA_CLASSPATH}, - { XML_NAMESPACE_DB, XML_CHARACTER_SET, XML_TOK_CHARACTER_SET}, - { XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS,XML_TOK_APPLICATION_CONNECTION_SETTINGS}, + { XML_NAMESPACE_DB, XML_CONNECTION_DATA, XML_TOK_CONNECTION_DATA}, + { XML_NAMESPACE_DB, XML_DATABASE_DESCRIPTION, XML_TOK_DATABASE_DESCRIPTION}, + { XML_NAMESPACE_DB, XML_COMPOUND_DATABASE, XML_TOK_COMPOUND_DATABASE}, + { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_DB_HREF}, + { XML_NAMESPACE_DB, XML_MEDIA_TYPE, XML_TOK_MEDIA_TYPE}, + { XML_NAMESPACE_DB, XML_TYPE, XML_TOK_DB_TYPE}, + { XML_NAMESPACE_DB, XML_HOSTNAME, XML_TOK_HOSTNAME}, + { XML_NAMESPACE_DB, XML_PORT, XML_TOK_PORT}, + { XML_NAMESPACE_DB, XML_LOCAL_SOCKET, XML_TOK_LOCAL_SOCKET}, + { XML_NAMESPACE_DB, XML_DATABASE_NAME, XML_TOK_DATABASE_NAME}, + { XML_NAMESPACE_DB, XML_DRIVER_SETTINGS, XML_TOK_DRIVER_SETTINGS}, + { XML_NAMESPACE_DB, XML_JAVA_CLASSPATH, XML_TOK_JAVA_CLASSPATH}, + { XML_NAMESPACE_DB, XML_CHARACTER_SET, XML_TOK_CHARACTER_SET}, + { XML_NAMESPACE_DB, XML_APPLICATION_CONNECTION_SETTINGS,XML_TOK_APPLICATION_CONNECTION_SETTINGS}, XML_TOKEN_MAP_END }; m_pDataSourceElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -702,10 +702,10 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_USER_NAME, XML_TOK_USER_NAME}, - { XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED, XML_TOK_IS_PASSWORD_REQUIRED}, - { XML_NAMESPACE_DB, XML_USE_SYSTEM_USER, XML_TOK_USE_SYSTEM_USER}, - { XML_NAMESPACE_DB, XML_LOGIN_TIMEOUT, XML_TOK_LOGIN_TIMEOUT}, + { XML_NAMESPACE_DB, XML_USER_NAME, XML_TOK_USER_NAME}, + { XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED, XML_TOK_IS_PASSWORD_REQUIRED}, + { XML_NAMESPACE_DB, XML_USE_SYSTEM_USER, XML_TOK_USE_SYSTEM_USER}, + { XML_NAMESPACE_DB, XML_LOGIN_TIMEOUT, XML_TOK_LOGIN_TIMEOUT}, XML_TOKEN_MAP_END }; m_pLoginElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -719,8 +719,8 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, XML_TOK_FILE_BASED_DATABASE}, - { XML_NAMESPACE_DB, XML_SERVER_DATABASE, XML_TOK_SERVER_DATABASE}, + { XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, XML_TOK_FILE_BASED_DATABASE}, + { XML_NAMESPACE_DB, XML_SERVER_DATABASE, XML_TOK_SERVER_DATABASE}, XML_TOKEN_MAP_END }; m_pDatabaseDescriptionElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -734,19 +734,19 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT}, - { XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT, XML_TOK_ROW_RETRIEVING_STATEMENT}, - { XML_NAMESPACE_DB, XML_STRING, XML_TOK_STRING}, - { XML_NAMESPACE_DB, XML_FIELD, XML_TOK_FIELD}, - { XML_NAMESPACE_DB, XML_DECIMAL, XML_TOK_DECIMAL}, - { XML_NAMESPACE_DB, XML_THOUSAND, XML_TOK_THOUSAND}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, XML_TOK_DATA_SOURCE_SETTING}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, XML_TOK_DATA_SOURCE_SETTING_VALUE}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,XML_TOK_DATA_SOURCE_SETTING_IS_LIST}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, XML_TOK_DATA_SOURCE_SETTING_TYPE}, - { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, XML_TOK_DATA_SOURCE_SETTING_NAME}, - { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET}, - { XML_NAMESPACE_DB, XML_ENCODING, XML_TOK_ENCODING}, + { XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT}, + { XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT, XML_TOK_ROW_RETRIEVING_STATEMENT}, + { XML_NAMESPACE_DB, XML_STRING, XML_TOK_STRING}, + { XML_NAMESPACE_DB, XML_FIELD, XML_TOK_FIELD}, + { XML_NAMESPACE_DB, XML_DECIMAL, XML_TOK_DECIMAL}, + { XML_NAMESPACE_DB, XML_THOUSAND, XML_TOK_THOUSAND}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING, XML_TOK_DATA_SOURCE_SETTING}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, XML_TOK_DATA_SOURCE_SETTING_VALUE}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_IS_LIST,XML_TOK_DATA_SOURCE_SETTING_IS_LIST}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_TYPE, XML_TOK_DATA_SOURCE_SETTING_TYPE}, + { XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_NAME, XML_TOK_DATA_SOURCE_SETTING_NAME}, + { XML_NAMESPACE_DB, XML_FONT_CHARSET, XML_TOK_FONT_CHARSET}, + { XML_NAMESPACE_DB, XML_ENCODING, XML_TOK_ENCODING}, XML_TOKEN_MAP_END }; m_pDataSourceInfoElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -760,13 +760,13 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_COMPONENT, XML_TOK_COMPONENT}, - { XML_NAMESPACE_DB, XML_COMPONENT_COLLECTION, XML_TOK_COMPONENT_COLLECTION}, - { XML_NAMESPACE_DB, XML_QUERY_COLLECTION, XML_TOK_QUERY_COLLECTION}, - { XML_NAMESPACE_DB, XML_QUERY, XML_TOK_QUERY}, - { XML_NAMESPACE_DB, XML_TABLE, XML_TOK_TABLE}, - { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATION, XML_TOK_TABLE}, - { XML_NAMESPACE_DB, XML_COLUMN, XML_TOK_COLUMN}, + { XML_NAMESPACE_DB, XML_COMPONENT, XML_TOK_COMPONENT}, + { XML_NAMESPACE_DB, XML_COMPONENT_COLLECTION, XML_TOK_COMPONENT_COLLECTION}, + { XML_NAMESPACE_DB, XML_QUERY_COLLECTION, XML_TOK_QUERY_COLLECTION}, + { XML_NAMESPACE_DB, XML_QUERY, XML_TOK_QUERY}, + { XML_NAMESPACE_DB, XML_TABLE, XML_TOK_TABLE}, + { XML_NAMESPACE_DB, XML_TABLE_REPRESENTATION, XML_TOK_TABLE}, + { XML_NAMESPACE_DB, XML_COLUMN, XML_TOK_COLUMN}, XML_TOKEN_MAP_END }; m_pDocumentsElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -780,12 +780,12 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_HREF }, - { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_TYPE }, - { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_SHOW }, - { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_ACTUATE}, - { XML_NAMESPACE_DB, XML_AS_TEMPLATE, XML_TOK_AS_TEMPLATE }, - { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COMPONENT_NAME }, + { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_HREF }, + { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_TYPE }, + { XML_NAMESPACE_XLINK, XML_SHOW, XML_TOK_SHOW }, + { XML_NAMESPACE_XLINK, XML_ACTUATE, XML_TOK_ACTUATE}, + { XML_NAMESPACE_DB, XML_AS_TEMPLATE, XML_TOK_AS_TEMPLATE }, + { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COMPONENT_NAME }, XML_TOKEN_MAP_END }; m_pComponentElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -799,17 +799,17 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_COMMAND, XML_TOK_COMMAND }, - { XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, - { XML_NAMESPACE_DB, XML_NAME, XML_TOK_QUERY_NAME }, - { XML_NAMESPACE_DB, XML_FILTER_STATEMENT, XML_TOK_FILTER_STATEMENT }, - { XML_NAMESPACE_DB, XML_ORDER_STATEMENT, XML_TOK_ORDER_STATEMENT }, - { XML_NAMESPACE_DB, XML_CATALOG_NAME, XML_TOK_CATALOG_NAME }, - { XML_NAMESPACE_DB, XML_SCHEMA_NAME, XML_TOK_SCHEMA_NAME }, - { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_STYLE_NAME}, - { XML_NAMESPACE_DB, XML_APPLY_FILTER, XML_TOK_APPLY_FILTER}, - { XML_NAMESPACE_DB, XML_APPLY_ORDER, XML_TOK_APPLY_ORDER}, - { XML_NAMESPACE_DB, XML_COLUMNS, XML_TOK_COLUMNS}, + { XML_NAMESPACE_DB, XML_COMMAND, XML_TOK_COMMAND }, + { XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, + { XML_NAMESPACE_DB, XML_NAME, XML_TOK_QUERY_NAME }, + { XML_NAMESPACE_DB, XML_FILTER_STATEMENT, XML_TOK_FILTER_STATEMENT }, + { XML_NAMESPACE_DB, XML_ORDER_STATEMENT, XML_TOK_ORDER_STATEMENT }, + { XML_NAMESPACE_DB, XML_CATALOG_NAME, XML_TOK_CATALOG_NAME }, + { XML_NAMESPACE_DB, XML_SCHEMA_NAME, XML_TOK_SCHEMA_NAME }, + { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_STYLE_NAME}, + { XML_NAMESPACE_DB, XML_APPLY_FILTER, XML_TOK_APPLY_FILTER}, + { XML_NAMESPACE_DB, XML_APPLY_ORDER, XML_TOK_APPLY_ORDER}, + { XML_NAMESPACE_DB, XML_COLUMNS, XML_TOK_COLUMNS}, XML_TOKEN_MAP_END }; m_pQueryElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); @@ -823,14 +823,14 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const { static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= { - { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME }, - { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME }, - { XML_NAMESPACE_DB, XML_HELP_MESSAGE, XML_TOK_COLUMN_HELP_MESSAGE }, - { XML_NAMESPACE_DB, XML_VISIBILITY, XML_TOK_COLUMN_VISIBILITY }, - { XML_NAMESPACE_DB, XML_DEFAULT_VALUE, XML_TOK_COLUMN_DEFAULT_VALUE }, - { XML_NAMESPACE_DB, XML_TYPE_NAME, XML_TOK_COLUMN_TYPE_NAME }, - { XML_NAMESPACE_DB, XML_VISIBLE, XML_TOK_COLUMN_VISIBLE }, - { XML_NAMESPACE_DB, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_DEFAULT_CELL_STYLE_NAME }, + { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME }, + { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME }, + { XML_NAMESPACE_DB, XML_HELP_MESSAGE, XML_TOK_COLUMN_HELP_MESSAGE }, + { XML_NAMESPACE_DB, XML_VISIBILITY, XML_TOK_COLUMN_VISIBILITY }, + { XML_NAMESPACE_DB, XML_DEFAULT_VALUE, XML_TOK_COLUMN_DEFAULT_VALUE }, + { XML_NAMESPACE_DB, XML_TYPE_NAME, XML_TOK_COLUMN_TYPE_NAME }, + { XML_NAMESPACE_DB, XML_VISIBLE, XML_TOK_COLUMN_VISIBLE }, + { XML_NAMESPACE_DB, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_DEFAULT_CELL_STYLE_NAME }, XML_TOKEN_MAP_END }; m_pColumnElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index c4e2a16dc856..6a7488e0804e 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,35 +72,35 @@ public: DECLARE_STL_USTRINGACCESS_MAP(Sequence,TPropertyNameMap); typedef ::std::vector< ::com::sun::star::beans::PropertyValue> TInfoSequence; private: - TPropertyNameMap m_aQuerySettings; - TPropertyNameMap m_aTablesSettings; + TPropertyNameMap m_aQuerySettings; + TPropertyNameMap m_aTablesSettings; TInfoSequence m_aInfoSequence; - Reference< XComponent > m_xSrcDoc; - mutable ::std::auto_ptr m_pDocElemTokenMap; - mutable ::std::auto_ptr m_pDatabaseElemTokenMap; - mutable ::std::auto_ptr m_pDataSourceElemTokenMap; - mutable ::std::auto_ptr m_pLoginElemTokenMap; - mutable ::std::auto_ptr m_pDatabaseDescriptionElemTokenMap; - mutable ::std::auto_ptr m_pDataSourceInfoElemTokenMap; - mutable ::std::auto_ptr m_pDocumentsElemTokenMap; - mutable ::std::auto_ptr m_pComponentElemTokenMap; - mutable ::std::auto_ptr m_pQueryElemTokenMap; - mutable ::std::auto_ptr m_pColumnElemTokenMap; - - mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; - mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; - Reference m_xDataSource; - sal_Int32 m_nPreviewMode; + Reference< XComponent > m_xSrcDoc; + mutable ::std::auto_ptr m_pDocElemTokenMap; + mutable ::std::auto_ptr m_pDatabaseElemTokenMap; + mutable ::std::auto_ptr m_pDataSourceElemTokenMap; + mutable ::std::auto_ptr m_pLoginElemTokenMap; + mutable ::std::auto_ptr m_pDatabaseDescriptionElemTokenMap; + mutable ::std::auto_ptr m_pDataSourceInfoElemTokenMap; + mutable ::std::auto_ptr m_pDocumentsElemTokenMap; + mutable ::std::auto_ptr m_pComponentElemTokenMap; + mutable ::std::auto_ptr m_pQueryElemTokenMap; + mutable ::std::auto_ptr m_pColumnElemTokenMap; + + mutable UniReference < XMLPropertySetMapper > m_xTableStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xColumnStylesPropertySetMapper; + mutable UniReference < XMLPropertySetMapper > m_xCellStylesPropertySetMapper; + Reference m_xDataSource; + sal_Int32 m_nPreviewMode; bool m_bNewFormat; - sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); + sal_Bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException); /** fills the map with the Properties - @param _rValue + @param _rValue The Any where the sequence resists in. - @param _rMap + @param _rMap The map to fill. */ void fillPropertyMap(const Any& _rValue,TPropertyNameMap& _rMap); @@ -115,9 +115,9 @@ protected: const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual ~ODBFilter() throw(); + virtual ~ODBFilter() throw(); public: - + ODBFilter( const Reference< XMultiServiceFactory >& _rxMSF ); // XFilter @@ -152,7 +152,7 @@ public: UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const; /** add a Info to the sequence which will be appened to the data source - @param _rInfo The property to append. + @param _rInfo The property to append. */ inline void addInfo(const ::com::sun::star::beans::PropertyValue& _rInfo) { diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index 95464c7d6896..8836532b99b2 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,8 +70,8 @@ extern "C" void SAL_CALL createRegistryInfo_dbaxml() //--------------------------------------------------------------------------------------- extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { createRegistryInfo_dbaxml(); @@ -84,8 +84,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { writeDBLoaderInfo2(pRegistryKey); return ::dbaxml::OModuleRegistration::writeComponentInfos( diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx index 743772cdc506..fc8a2a61221a 100644 --- a/dbaccess/source/inc/OAuthenticationContinuation.hxx +++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ namespace dbaccess { //........................................................................ -class OOO_DLLPUBLIC_DBA OAuthenticationContinuation : +class OOO_DLLPUBLIC_DBA OAuthenticationContinuation : public comphelper::OInteraction< com::sun::star::ucb::XInteractionSupplyAuthentication > { sal_Bool m_bRemberPassword : 1; // remember the password for this session ? diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index f5e85f426877..85b73c382e12 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ DECLARE_STL_VECTOR(::com::sun::star::uno::WeakReferenceHelper, OWeakRefArray); //================================================================================== //= OSubComponent - a component which holds a hard ref to it's parent -//= and is been hold itself (by the parent) with a weak ref +//= and is been hold itself (by the parent) with a weak ref //================================================================================== class OSubComponent : public ::cppu::OComponentHelper { @@ -76,263 +76,263 @@ public: //---------------------------------------------------------------------------------- // (internal - not to be used outside - usually) -#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ - } \ - -#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return getImplementationName_Static(); \ - } \ - ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ - } \ - -#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ - const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ - for (sal_Int32 i=0; iequals(_rServiceName)) \ - return sal_True; \ +#define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::rtl::OUString::createFromAscii(implasciiname); \ + } \ + +#define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ + ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return getImplementationName_Static(); \ + } \ + ::rtl::OUString SAL_CALL classname::getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::rtl::OUString::createFromAscii(implasciiname); \ + } \ + +#define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ + const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ + for (sal_Int32 i=0; iequals(_rServiceName)) \ + return sal_True; \ \ - return sal_False; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - return getSupportedServiceNames_Static(); \ - } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - return getSupportedServiceNames_Static(); \ - } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ - aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ - aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \ - return aSupported; \ - } \ - -#define IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ - SAL_CALL classname::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) \ - { \ - return static_cast< XServiceInfo* >(new classname(_rxORB)); \ - } \ + return sal_False; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + return getSupportedServiceNames_Static(); \ + } \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1, serviceasciiname2) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + return getSupportedServiceNames_Static(); \ + } \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(2); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(3); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname1); \ + aSupported[1] = ::rtl::OUString::createFromAscii(serviceasciiname2); \ + aSupported[2] = ::rtl::OUString::createFromAscii(serviceasciiname3); \ + return aSupported; \ + } \ + +#define IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ + SAL_CALL classname::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) \ + { \ + return static_cast< XServiceInfo* >(new classname(_rxORB)); \ + } \ //---------------------------------------------------------------------------------- // declare service info methods - no getImplementationName, so the class is abstract -#define DECLARE_SERVICE_INFO_ABSTRACT() \ - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ +#define DECLARE_SERVICE_INFO_ABSTRACT() \ + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ //---------------------------------------------------------------------------------- // declare service info methods -#define DECLARE_SERVICE_INFO() \ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - -#define DECLARE_SERVICE_INFO_STATIC() \ - DECLARE_SERVICE_INFO(); \ - static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ +#define DECLARE_SERVICE_INFO() \ + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + +#define DECLARE_SERVICE_INFO_STATIC() \ + DECLARE_SERVICE_INFO(); \ + static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ + SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ +#define IMPLEMENT_SERVICE_INFO1(classname, implasciiname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ +#define IMPLEMENT_SERVICE_INFO1_STATIC(classname, implasciiname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1_STATIC(classname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ +#define IMPLEMENT_SERVICE_INFO2(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) - + //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ +#define IMPLEMENT_SERVICE_INFO2_STATIC(classname, implasciiname, serviceasciiname1, serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED2_STATIC(classname, serviceasciiname1,serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_CREATE_STATIC(classname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ - IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ +#define IMPLEMENT_SERVICE_INFO3(classname, implasciiname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ + IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED3(classname, serviceasciiname1, serviceasciiname2, serviceasciiname3) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ +#define IMPLEMENT_SERVICE_INFO1_ABSTRACT(classname, serviceasciiname) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED1(classname, serviceasciiname) \ //---------------------------------------------------------------------------------- -#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \ - IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ - IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ +#define IMPLEMENT_SERVICE_INFO2_ABSTRACT(classname, serviceasciiname1, serviceasciiname2) \ + IMPLEMENT_SERVICE_INFO_SUPPORTS(classname) \ + IMPLEMENT_SERVICE_INFO_GETSUPPORTED2(classname, serviceasciiname1, serviceasciiname2) \ //================================================================================== //= XTypeProvider helpers //-------------------------------------------------------------------------- -#define DECLARE_IMPLEMENTATION_ID( ) \ +#define DECLARE_IMPLEMENTATION_ID( ) \ virtual ::com::sun::star::uno::Sequence SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \ + static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId() \ //-------------------------------------------------------------------------- -#define DECLARE_GETTYPES( ) \ +#define DECLARE_GETTYPES( ) \ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); //-------------------------------------------------------------------------- -#define DECLARE_TYPEPROVIDER( ) \ - DECLARE_GETTYPES( ) \ +#define DECLARE_TYPEPROVIDER( ) \ + DECLARE_GETTYPES( ) \ DECLARE_IMPLEMENTATION_ID( ) //-------------------------------------------------------------------------- -#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \ -::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \ -{ \ - static ::cppu::OImplementationId* pId = 0; \ - if ( !pId ) \ - { \ - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ - if ( !pId ) \ - { \ - static ::cppu::OImplementationId aId; \ - pId = &aId; \ - } \ - } \ - return pId->getImplementationId(); \ +#define IMPLEMENT_IMPLEMENTATION_ID( classname ) \ +::com::sun::star::uno::Sequence< sal_Int8 > classname::getUnoTunnelImplementationId() \ +{ \ + static ::cppu::OImplementationId* pId = 0; \ + if ( !pId ) \ + { \ + ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); \ + if ( !pId ) \ + { \ + static ::cppu::OImplementationId aId; \ + pId = &aId; \ + } \ + } \ + return pId->getImplementationId(); \ } \ -::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (::com::sun::star::uno::RuntimeException) \ -{ \ +::com::sun::star::uno::Sequence< sal_Int8 > classname::getImplementationId() throw (::com::sun::star::uno::RuntimeException) \ +{ \ return classname::getUnoTunnelImplementationId(); \ } //-------------------------------------------------------------------------- -#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::comphelper::concatSequences( \ - baseclass1::getTypes( ), \ - baseclass2::getTypes( ) \ - ); \ +#define IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::comphelper::concatSequences( \ + baseclass1::getTypes( ), \ + baseclass2::getTypes( ) \ + ); \ } //-------------------------------------------------------------------------- -#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::comphelper::concatSequences( \ - baseclass1::getTypes( ), \ - baseclass2::getTypes( ), \ - baseclass3::getTypes( ) \ - ); \ +#define IMPLEMENT_GETTYPES3( classname, baseclass1, baseclass2, baseclass3 ) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > classname::getTypes() throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::comphelper::concatSequences( \ + baseclass1::getTypes( ), \ + baseclass2::getTypes( ), \ + baseclass3::getTypes( ) \ + ); \ } //-------------------------------------------------------------------------- -#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ - IMPLEMENT_IMPLEMENTATION_ID( classname) \ +#define IMPLEMENT_TYPEPROVIDER2( classname, baseclass1, baseclass2 ) \ + IMPLEMENT_IMPLEMENTATION_ID( classname) \ IMPLEMENT_GETTYPES2( classname, baseclass1, baseclass2 ) //-------------------------------------------------------------------------- -#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \ - IMPLEMENT_IMPLEMENTATION_ID( classname) \ +#define IMPLEMENT_TYPEPROVIDER3( classname, baseclass1, baseclass2, baseclass3 ) \ + IMPLEMENT_IMPLEMENTATION_ID( classname) \ IMPLEMENT_GETTYPES3(classname, baseclass1, baseclass2, baseclass3 ) //================================================================================== //= helper for declaring/implementing classes based on the OPropertyContainer and an OPropertyArrayUsageHelper //---------------------------------------------------------------------------------- -#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \ - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \ - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \ +#define DECLARE_PROPERTYCONTAINER_DEFAULTS( ) \ + virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException); \ + virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); \ virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const - + //---------------------------------------------------------------------------------- -#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \ - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \ - { \ - Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); \ - return xInfo; \ - } \ - ::cppu::IPropertyArrayHelper& classname::getInfoHelper() \ - { \ - return *baseclass1::getArrayHelper(); \ - } \ - ::cppu::IPropertyArrayHelper* classname::createArrayHelper( ) const \ - { \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; \ - describeProperties(aProps); \ - return new ::cppu::OPropertyArrayHelper(aProps); \ +#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname , baseclass1) \ + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL classname::getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException) \ + { \ + Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); \ + return xInfo; \ + } \ + ::cppu::IPropertyArrayHelper& classname::getInfoHelper() \ + { \ + return *baseclass1::getArrayHelper(); \ + } \ + ::cppu::IPropertyArrayHelper* classname::createArrayHelper( ) const \ + { \ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property > aProps; \ + describeProperties(aProps); \ + return new ::cppu::OPropertyArrayHelper(aProps); \ } //---------------------------------------------------------------------------------- -#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( classname ) \ +#define IMPLEMENT_PROPERTYCONTAINER_DEFAULTS( classname ) \ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS2( classname, classname ) //================================================================================== //= helper for implementing the createArrayHelper //---------------------------------------------------------------------------------- -#define BEGIN_PROPERTY_SEQUENCE(count) \ - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aDescriptor(count); \ - ::com::sun::star::beans::Property* pDesc = aDescriptor.getArray(); \ - sal_Int32 nPos = 0; \ +#define BEGIN_PROPERTY_SEQUENCE(count) \ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property> aDescriptor(count); \ + ::com::sun::star::beans::Property* pDesc = aDescriptor.getArray(); \ + sal_Int32 nPos = 0; \ //---------------------------------------------------------------------------------- -#define BEGIN_PROPERTY_HELPER(count) \ +#define BEGIN_PROPERTY_HELPER(count) \ BEGIN_PROPERTY_SEQUENCE(count) //---------------------------------------------------------------------------------- @@ -340,103 +340,103 @@ public: pDesc[nPos++] = ::com::sun::star::beans::Property(PROPERTY_##varname, PROPERTY_ID_##varname, cpputype, //---------------------------------------------------------------------------------- -#define DECL_PROP0(varname, type) \ +#define DECL_PROP0(varname, type) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) 0) //---------------------------------------------------------------------------------- -#define DECL_PROP0_BOOL(varname) \ +#define DECL_PROP0_BOOL(varname) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) 0) //---------------------------------------------------------------------------------- -#define DECL_PROP0_IFACE(varname, iface) \ +#define DECL_PROP0_IFACE(varname, iface) \ DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) 0) //---------------------------------------------------------------------------------- -#define DECL_PROP1(varname, type, attrib1) \ +#define DECL_PROP1(varname, type, attrib1) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- -#define DECL_PROP1_BOOL(varname, attrib1) \ +#define DECL_PROP1_BOOL(varname, attrib1) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- -#define DECL_PROP1_IFACE(varname, iface, attrib1) \ +#define DECL_PROP1_IFACE(varname, iface, attrib1) \ DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1) //---------------------------------------------------------------------------------- -#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \ +#define DECL_PROP2_IFACE(varname, iface, attrib1, attrib2) \ DECL_PROP_IMPL(varname, ::getCppuType(static_cast< ::com::sun::star::uno::Reference< iface >* >(NULL))) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- -#define DECL_PROP2(varname, type, attrib1, attrib2) \ +#define DECL_PROP2(varname, type, attrib1, attrib2) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- -#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \ +#define DECL_PROP2_BOOL(varname, attrib1, attrib2) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2) //---------------------------------------------------------------------------------- -#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ +#define DECL_PROP3(varname, type, attrib1, attrib2, attrib3) \ DECL_PROP_IMPL(varname, ::getCppuType((const type *)0)) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3) //---------------------------------------------------------------------------------- -#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \ +#define DECL_PROP3_BOOL(varname, attrib1, attrib2, attrib3) \ DECL_PROP_IMPL(varname, ::getBooleanCppuType()) ::com::sun::star::beans::PropertyAttribute::attrib1 | ::com::sun::star::beans::PropertyAttribute::attrib2 | ::com::sun::star::beans::PropertyAttribute::attrib3) //---------------------------------------------------------------------------------- -#define END_PROPERTY_SEQUENCE() \ - OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \ +#define END_PROPERTY_SEQUENCE() \ + OSL_ENSURE(nPos == aDescriptor.getLength(), "forgot to adjust the count ?"); \ //---------------------------------------------------------------------------------- -#define END_PROPERTY_HELPER() \ - END_PROPERTY_SEQUENCE() \ +#define END_PROPERTY_HELPER() \ + END_PROPERTY_SEQUENCE() \ return new ::cppu::OPropertyArrayHelper(aDescriptor); -#define NOTIFY_LISTERNERS(_rListeners,T,method) \ +#define NOTIFY_LISTERNERS(_rListeners,T,method) \ Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \ \ - const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ + const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \ \ - _rGuard.clear(); \ - while( pxInt > pxIntBegin ) \ - { \ - try \ - { \ - while( pxInt > pxIntBegin ) \ - { \ - --pxInt; \ - static_cast< T* >( pxInt->get() )->method(aEvt); \ - } \ - } \ - catch( RuntimeException& ) \ - { \ - } \ - } \ + _rGuard.clear(); \ + while( pxInt > pxIntBegin ) \ + { \ + try \ + { \ + while( pxInt > pxIntBegin ) \ + { \ + --pxInt; \ + static_cast< T* >( pxInt->get() )->method(aEvt); \ + } \ + } \ + catch( RuntimeException& ) \ + { \ + } \ + } \ _rGuard.reset(); -#define NOTIFY_LISTERNERS1(_rListeners,T,method,arg1) \ +#define NOTIFY_LISTERNERS1(_rListeners,T,method,arg1) \ Sequence< Reference< XInterface > > aListenerSeq = _rListeners.getElements(); \ \ - const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ + const Reference< XInterface >* pxIntBegin = aListenerSeq.getConstArray(); \ const Reference< XInterface >* pxInt = pxIntBegin + aListenerSeq.getLength(); \ \ - _rGuard.clear(); \ - while( pxInt > pxIntBegin ) \ - { \ - try \ - { \ - while( pxInt > pxIntBegin ) \ - { \ - --pxInt; \ - static_cast< T* >( pxInt->get() )->method(aEvt,arg1); \ - } \ - } \ - catch( RuntimeException& ) \ - { \ - } \ - } \ + _rGuard.clear(); \ + while( pxInt > pxIntBegin ) \ + { \ + try \ + { \ + while( pxInt > pxIntBegin ) \ + { \ + --pxInt; \ + static_cast< T* >( pxInt->get() )->method(aEvt,arg1); \ + } \ + } \ + catch( RuntimeException& ) \ + { \ + } \ + } \ _rGuard.reset(); //================================================================================== // miscellaneous -#define UNUSED(x) x; +#define UNUSED(x) x; #endif // _DBASHARED_APITOOLS_HXX_ diff --git a/dbaccess/source/inc/cfg_reghelper.hxx b/dbaccess/source/inc/cfg_reghelper.hxx index e7edf6004423..51fef4ea28e7 100644 --- a/dbaccess/source/inc/cfg_reghelper.hxx +++ b/dbaccess/source/inc/cfg_reghelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/cfgstrings.hrc b/dbaccess/source/inc/cfgstrings.hrc index 82f46a60a96e..5364dca5acf0 100644 --- a/dbaccess/source/inc/cfgstrings.hrc +++ b/dbaccess/source/inc/cfgstrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/constasciistring.hxx b/dbaccess/source/inc/constasciistring.hxx index 2179e2d7ffdd..3b86e19e209b 100644 --- a/dbaccess/source/inc/constasciistring.hxx +++ b/dbaccess/source/inc/constasciistring.hxx @@ -14,17 +14,17 @@ // string constants struct ConstAsciiString { - const sal_Char* ascii; - sal_Int32 length; + const sal_Char* ascii; + sal_Int32 length; - inline operator const ::rtl::OUString& () const; - inline operator const sal_Char* () const { return ascii; } + inline operator const ::rtl::OUString& () const; + inline operator const sal_Char* () const { return ascii; } inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength); inline ~ConstAsciiString(); private: - mutable ::rtl::OUString* ustring; + mutable ::rtl::OUString* ustring; }; //------------------------------------------------------------ diff --git a/dbaccess/source/inc/dbadllapi.hxx b/dbaccess/source/inc/dbadllapi.hxx index 9dfd5c3269fc..b505ae135949 100644 --- a/dbaccess/source/inc/dbadllapi.hxx +++ b/dbaccess/source/inc/dbadllapi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/dbastrings.hrc b/dbaccess/source/inc/dbastrings.hrc index eb6b98d5bd8b..db629f1ce220 100644 --- a/dbaccess/source/inc/dbastrings.hrc +++ b/dbaccess/source/inc/dbastrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace dbaccess //= SQLSTATE //============================================================ DECLARE_CONSTASCII_USTRING(SQLSTATE_GENERAL); - + //============================================================ //= Properties //============================================================ diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx index fa2b70c1bde0..f9ba053b3139 100644 --- a/dbaccess/source/inc/dbu_reghelper.hxx +++ b/dbaccess/source/inc/dbu_reghelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/dbustrings.hrc b/dbaccess/source/inc/dbustrings.hrc index aeef19d752dd..9bd4325eedb8 100644 --- a/dbaccess/source/inc/dbustrings.hrc +++ b/dbaccess/source/inc/dbustrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ namespace dbaui //= service names //============================================================ DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG); - + //============================================================ //= other DBU relevant strings //============================================================ diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index b781c1b77316..e25809b12156 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,11 +69,11 @@ enum DATASOURCE_TYPE DST_KAB = 20, DST_MACAB = 21, DST_MSACCESS_2007 = 22, - DST_EMBEDDED_HSQLDB = 23, + DST_EMBEDDED_HSQLDB = 23, DST_MYSQL_NATIVE = 24, DST_MYSQL_NATIVE_DIRECT = 25, - DST_USERDEFINE1, /// first user defined driver + DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, DST_USERDEFINE3, DST_USERDEFINE4, @@ -85,18 +85,18 @@ enum DATASOURCE_TYPE DST_USERDEFINE10, - DST_UNKNOWN /// unrecognized type + DST_UNKNOWN /// unrecognized type }; #define PAGE_DBSETUPWIZARD_INTRO 0 -#define PAGE_DBSETUPWIZARD_DBASE 1 +#define PAGE_DBSETUPWIZARD_DBASE 1 #define PAGE_DBSETUPWIZARD_TEXT 2 #define PAGE_DBSETUPWIZARD_MSACCESS 3 #define PAGE_DBSETUPWIZARD_LDAP 4 #define PAGE_DBSETUPWIZARD_ADABAS 5 #define PAGE_DBSETUPWIZARD_MYSQL_INTRO 6 #define PAGE_DBSETUPWIZARD_MYSQL_JDBC 7 -#define PAGE_DBSETUPWIZARD_MYSQL_ODBC 8 +#define PAGE_DBSETUPWIZARD_MYSQL_ODBC 8 #define PAGE_DBSETUPWIZARD_ORACLE 9 #define PAGE_DBSETUPWIZARD_JDBC 10 #define PAGE_DBSETUPWIZARD_ADO 11 @@ -117,13 +117,13 @@ class OOO_DLLPUBLIC_DBA ODsnTypeCollection protected: DECLARE_STL_VECTOR(String, StringVector); - StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types - StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource + StringVector m_aDsnTypesDisplayNames; /// user readable names for the datasource types + StringVector m_aDsnPrefixes; /// DSN prefixes which determine the type of a datasource ::connectivity::DriversConfig m_aDriverConfig; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; #ifdef DBG_UTIL - sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators + sal_Int32 m_nLivingIterators; /// just for debugging reasons, counts the living iterators #endif public: @@ -138,7 +138,7 @@ public: /// on a given string, cut the type prefix and return the result String cutPrefix(const ::rtl::OUString& _sURL) const; - + /// on a given string, return the type prefix String getPrefix(const ::rtl::OUString& _sURL) const; @@ -161,7 +161,7 @@ public: /// check if the given data source allows to show column description. sal_Bool supportsColumnDescription(const ::rtl::OUString& _sURL) const; - + // check if a Browse button may be shown to insert connection url sal_Bool supportsBrowsing(const ::rtl::OUString& _sURL) const; @@ -184,9 +184,9 @@ public: getDefaultDBSettings( const ::rtl::OUString& _sURL ) const; /// get access to the first element of the types collection - TypeIterator begin() const; + TypeIterator begin() const; /// get access to the (last + 1st) element of the types collection - TypeIterator end() const; + TypeIterator end() const; void fillPageIds(const ::rtl::OUString& _sURL,::std::vector& _rOutPathIds) const; @@ -210,32 +210,32 @@ class OOO_DLLPUBLIC_DBA ODsnTypeCollection::TypeIterator friend bool OOO_DLLPUBLIC_DBA operator!=(const TypeIterator& lhs, const TypeIterator& rhs) { return !(lhs == rhs); } protected: - const ODsnTypeCollection* m_pContainer; - sal_Int32 m_nPosition; + const ODsnTypeCollection* m_pContainer; + sal_Int32 m_nPosition; public: TypeIterator(const TypeIterator& _rSource); ~TypeIterator(); ::rtl::OUString getURLPrefix() const; - String getDisplayName() const; + String getDisplayName() const; /// prefix increment - const TypeIterator& operator++(); + const TypeIterator& operator++(); /// postfix increment - const TypeIterator operator++(int) { TypeIterator hold(*this); ++*this; return hold; } + const TypeIterator operator++(int) { TypeIterator hold(*this); ++*this; return hold; } /// prefix decrement - const TypeIterator& operator--(); + const TypeIterator& operator--(); /// postfix decrement - const TypeIterator operator--(int) { TypeIterator hold(*this); --*this; return hold; } + const TypeIterator operator--(int) { TypeIterator hold(*this); --*this; return hold; } protected: TypeIterator(const ODsnTypeCollection* _pContainer, sal_Int32 _nInitialPos = 0); }; //......................................................................... -} // namespace dbaccess +} // namespace dbaccess //......................................................................... #endif // _DBACCESS_DSNTYPES_HXX_ diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx index a68555add95a..e572d494eff7 100644 --- a/dbaccess/source/inc/flt_reghelper.hxx +++ b/dbaccess/source/inc/flt_reghelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/registrationhelper.hxx b/dbaccess/source/inc/registrationhelper.hxx index dd02ed5226a3..f53e7da9518e 100644 --- a/dbaccess/source/inc/registrationhelper.hxx +++ b/dbaccess/source/inc/registrationhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,20 +35,20 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleService const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rServiceManager, const ::rtl::OUString & _rComponentName, ::cppu::ComponentInstantiation _pCreateFunction, - const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, + const ::com::sun::star::uno::Sequence< ::rtl::OUString > & _rServiceNames, rtl_ModuleCount* _p ); //========================================================================== class OModuleRegistration { - static ::com::sun::star::uno::Sequence< ::rtl::OUString >* + static ::com::sun::star::uno::Sequence< ::rtl::OUString >* s_pImplementationNames; - static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >* s_pSupportedServices; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pCreationFunctionPointers; - static ::com::sun::star::uno::Sequence< sal_Int64 >* + static ::com::sun::star::uno::Sequence< sal_Int64 >* s_pFactoryFunctionPointers; // no direct instantiation, only static members/methods @@ -56,10 +56,10 @@ class OModuleRegistration public: /** register a component implementing a service with the given data. - @param _rImplementationName the implementation name of the component - @param _rServiceNames the services the component supports - @param _pCreateFunction a function for creating an instance of the component - @param _pFactoryFunction a function for creating a factory for that component + @param _rImplementationName the implementation name of the component + @param _rServiceNames the services the component supports + @param _pCreateFunction a function for creating an instance of the component + @param _pFactoryFunction a function for creating a factory for that component @see revokeComponent */ static void registerComponent( @@ -69,25 +69,25 @@ public: FactoryInstantiation _pFactoryFunction); /** revoke the registration for the specified component - @param _rImplementationName the implementation name of the component + @param _rImplementationName the implementation name of the component */ static void revokeComponent( const ::rtl::OUString& _rImplementationName); /** writes the registration information of all components which are currently registered into the specified registry. Usually used from within component_writeInfo. - @param _rxServiceManager the service manager - @param _rRootKey the registry key under which the information will be stored - @return sal_True if the registration of all implementations was successfull, sal_False otherwise + @param _rxServiceManager the service manager + @param _rRootKey the registry key under which the information will be stored + @return sal_True if the registration of all implementations was successfull, sal_False otherwise */ static sal_Bool writeComponentInfos( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxServiceManager, const ::com::sun::star::uno::Reference< ::com::sun::star::registry::XRegistryKey >& _rRootKey); /** creates a Factory for the component with the given implementation name. Usually used from within component_getFactory. - @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory - @param _pImplementationName the implementation name of the component - @return the XInterface access to a factory for the component + @param _rxServiceManager a pointer to an XMultiServiceFactory interface as got in component_getFactory + @param _pImplementationName the implementation name of the component + @return the XInterface access to a factory for the component */ static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getComponentFactory( const ::rtl::OUString& _rImplementationName, diff --git a/dbaccess/source/inc/sdbtstrings.hrc b/dbaccess/source/inc/sdbtstrings.hrc index c4837f52bce1..b7490d4af078 100644 --- a/dbaccess/source/inc/sdbtstrings.hrc +++ b/dbaccess/source/inc/sdbtstrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/inc/stringconstants.hrc b/dbaccess/source/inc/stringconstants.hrc index 48fb8312839c..651600613647 100644 --- a/dbaccess/source/inc/stringconstants.hrc +++ b/dbaccess/source/inc/stringconstants.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,133 +39,133 @@ //============================================================ //= property ids //============================================================ -#define PROPERTY_ID_TITLE 1 -#define PROPERTY_ID_URL 2 -#define PROPERTY_ID_INFO 4 -#define PROPERTY_ID_ISPASSWORDREQUIRED 5 -#define PROPERTY_ID_TABLEFILTER 6 -#define PROPERTY_ID_NAME 7 -#define PROPERTY_ID_SCHEMANAME 8 -#define PROPERTY_ID_CATALOGNAME 9 -#define PROPERTY_ID_PRIVILEGES 10 -#define PROPERTY_ID_ESCAPE_PROCESSING 11 -#define PROPERTY_ID_COMMAND 12 -#define PROPERTY_ID_TYPE 13 -#define PROPERTY_ID_TYPENAME 14 -#define PROPERTY_ID_PRECISION 15 -#define PROPERTY_ID_SCALE 16 -#define PROPERTY_ID_ISNULLABLE 17 -#define PROPERTY_ID_ISAUTOINCREMENT 18 -#define PROPERTY_ID_ISROWVERSION 19 -#define PROPERTY_ID_DESCRIPTION 20 -#define PROPERTY_ID_DEFAULTVALUE 21 -#define PROPERTY_ID_NUMBERFORMAT 22 -#define PROPERTY_ID_QUERYTIMEOUT 23 -#define PROPERTY_ID_MAXFIELDSIZE 24 -#define PROPERTY_ID_MAXROWS 25 -#define PROPERTY_ID_CURSORNAME 26 -#define PROPERTY_ID_RESULTSETCONCURRENCY 27 -#define PROPERTY_ID_RESULTSETTYPE 28 -#define PROPERTY_ID_FETCHDIRECTION 29 -#define PROPERTY_ID_FETCHSIZE 30 -#define PROPERTY_ID_USEBOOKMARKS 31 -#define PROPERTY_ID_ISSEARCHABLE 32 -#define PROPERTY_ID_ISCURRENCY 33 -#define PROPERTY_ID_ISSIGNED 34 -#define PROPERTY_ID_DISPLAYSIZE 35 -#define PROPERTY_ID_LABEL 36 -#define PROPERTY_ID_ISREADONLY 37 -#define PROPERTY_ID_ISWRITABLE 38 -#define PROPERTY_ID_ISDEFINITELYWRITABLE 39 -#define PROPERTY_ID_VALUE 40 -#define PROPERTY_ID_TABLENAME 41 -#define PROPERTY_ID_ISCASESENSITIVE 42 -#define PROPERTY_ID_SERVICENAME 43 -#define PROPERTY_ID_ISBOOKMARKABLE 44 -#define PROPERTY_ID_CANUPDATEINSERTEDROWS 45 -#define PROPERTY_ID_ISSET 46 -#define PROPERTY_ID_ISOUTPARAMETER 47 -#define PROPERTY_ID_NUMBERFORMATSSUPPLIER 48 -#define PROPERTY_ID_ISCALCULATED 49 -#define PROPERTY_ID_DATASOURCENAME 50 -#define PROPERTY_ID_TRANSACTIONISOLATION 51 -#define PROPERTY_ID_TYPEMAP 52 -#define PROPERTY_ID_USER 53 -#define PROPERTY_ID_PASSWORD 54 +#define PROPERTY_ID_TITLE 1 +#define PROPERTY_ID_URL 2 +#define PROPERTY_ID_INFO 4 +#define PROPERTY_ID_ISPASSWORDREQUIRED 5 +#define PROPERTY_ID_TABLEFILTER 6 +#define PROPERTY_ID_NAME 7 +#define PROPERTY_ID_SCHEMANAME 8 +#define PROPERTY_ID_CATALOGNAME 9 +#define PROPERTY_ID_PRIVILEGES 10 +#define PROPERTY_ID_ESCAPE_PROCESSING 11 +#define PROPERTY_ID_COMMAND 12 +#define PROPERTY_ID_TYPE 13 +#define PROPERTY_ID_TYPENAME 14 +#define PROPERTY_ID_PRECISION 15 +#define PROPERTY_ID_SCALE 16 +#define PROPERTY_ID_ISNULLABLE 17 +#define PROPERTY_ID_ISAUTOINCREMENT 18 +#define PROPERTY_ID_ISROWVERSION 19 +#define PROPERTY_ID_DESCRIPTION 20 +#define PROPERTY_ID_DEFAULTVALUE 21 +#define PROPERTY_ID_NUMBERFORMAT 22 +#define PROPERTY_ID_QUERYTIMEOUT 23 +#define PROPERTY_ID_MAXFIELDSIZE 24 +#define PROPERTY_ID_MAXROWS 25 +#define PROPERTY_ID_CURSORNAME 26 +#define PROPERTY_ID_RESULTSETCONCURRENCY 27 +#define PROPERTY_ID_RESULTSETTYPE 28 +#define PROPERTY_ID_FETCHDIRECTION 29 +#define PROPERTY_ID_FETCHSIZE 30 +#define PROPERTY_ID_USEBOOKMARKS 31 +#define PROPERTY_ID_ISSEARCHABLE 32 +#define PROPERTY_ID_ISCURRENCY 33 +#define PROPERTY_ID_ISSIGNED 34 +#define PROPERTY_ID_DISPLAYSIZE 35 +#define PROPERTY_ID_LABEL 36 +#define PROPERTY_ID_ISREADONLY 37 +#define PROPERTY_ID_ISWRITABLE 38 +#define PROPERTY_ID_ISDEFINITELYWRITABLE 39 +#define PROPERTY_ID_VALUE 40 +#define PROPERTY_ID_TABLENAME 41 +#define PROPERTY_ID_ISCASESENSITIVE 42 +#define PROPERTY_ID_SERVICENAME 43 +#define PROPERTY_ID_ISBOOKMARKABLE 44 +#define PROPERTY_ID_CANUPDATEINSERTEDROWS 45 +#define PROPERTY_ID_ISSET 46 +#define PROPERTY_ID_ISOUTPARAMETER 47 +#define PROPERTY_ID_NUMBERFORMATSSUPPLIER 48 +#define PROPERTY_ID_ISCALCULATED 49 +#define PROPERTY_ID_DATASOURCENAME 50 +#define PROPERTY_ID_TRANSACTIONISOLATION 51 +#define PROPERTY_ID_TYPEMAP 52 +#define PROPERTY_ID_USER 53 +#define PROPERTY_ID_PASSWORD 54 #define PROPERTY_ID_COMMAND_TYPE 55 -#define PROPERTY_ID_ACTIVECOMMAND 56 -#define PROPERTY_ID_ACTIVE_CONNECTION 57 -#define PROPERTY_ID_FILTER 58 -#define PROPERTY_ID_APPLYFILTER 59 -#define PROPERTY_ID_ORDER 60 -#define PROPERTY_ID_ISMODIFIED 61 -#define PROPERTY_ID_ISNEW 62 -#define PROPERTY_ID_ROWCOUNT 63 -#define PROPERTY_ID_ISROWCOUNTFINAL 64 -#define PROPERTY_ID_HELPFILENAME 65 -#define PROPERTY_ID_REALNAME 66 -#define PROPERTY_ID_HIDDEN 67 -#define PROPERTY_ID_ALIGN 68 -#define PROPERTY_ID_WIDTH 69 -#define PROPERTY_ID_TABLETYPEFILTER 70 +#define PROPERTY_ID_ACTIVECOMMAND 56 +#define PROPERTY_ID_ACTIVE_CONNECTION 57 +#define PROPERTY_ID_FILTER 58 +#define PROPERTY_ID_APPLYFILTER 59 +#define PROPERTY_ID_ORDER 60 +#define PROPERTY_ID_ISMODIFIED 61 +#define PROPERTY_ID_ISNEW 62 +#define PROPERTY_ID_ROWCOUNT 63 +#define PROPERTY_ID_ISROWCOUNTFINAL 64 +#define PROPERTY_ID_HELPFILENAME 65 +#define PROPERTY_ID_REALNAME 66 +#define PROPERTY_ID_HIDDEN 67 +#define PROPERTY_ID_ALIGN 68 +#define PROPERTY_ID_WIDTH 69 +#define PROPERTY_ID_TABLETYPEFILTER 70 #define PROPERTY_ID_DATABASE_LOCATION 71 -#define PROPERTY_ID_FONT 72 -#define PROPERTY_ID_ROW_HEIGHT 73 -#define PROPERTY_ID_TEXTCOLOR 74 -#define PROPERTY_ID_UPDATE_TABLENAME 75 -#define PROPERTY_ID_UPDATE_SCHEMANAME 76 -#define PROPERTY_ID_UPDATE_CATALOGNAME 77 -#define PROPERTY_ID_CONTROLMODEL 78 -#define PROPERTY_ID_RELATIVEPOSITION 79 -#define PROPERTY_ID_ISASCENDING 80 -#define PROPERTY_ID_RELATEDCOLUMN 81 -#define PROPERTY_ID_ISUNIQUE 82 -#define PROPERTY_ID_ISPRIMARYKEYINDEX 83 -#define PROPERTY_ID_IGNORERESULT 84 -#define PROPERTY_ID_DELETERULE 85 -#define PROPERTY_ID_UPDATERULE 86 -#define PROPERTY_ID_REFERENCEDTABLE 87 -#define PROPERTY_ID_REFERENCEDCOLUMN 88 -#define PROPERTY_ID_PARENTWINDOW 89 -#define PROPERTY_ID_SQLEXCEPTION 90 -#define PROPERTY_ID_ISHIDDEN 91 -#define PROPERTY_ID_SUPPRESSVERSIONCL 92 -#define PROPERTY_ID_LAYOUTINFORMATION 93 -#define PROPERTY_ID_TEXTLINECOLOR 94 -#define PROPERTY_ID_TEXTEMPHASIS 95 -#define PROPERTY_ID_TEXTRELIEF 96 -#define PROPERTY_ID_HELPTEXT 97 -#define PROPERTY_ID_CONTROLDEFAULT 98 -#define PROPERTY_ID_AUTOINCREMENTCREATION 99 -#define PROPERTY_ID_SPECIAL_OPTIONS 100 -#define PROPERTY_ID_FONTCHARWIDTH 101 -#define PROPERTY_ID_FONTCHARSET 102 -#define PROPERTY_ID_FONTFAMILY 103 -#define PROPERTY_ID_FONTHEIGHT 104 -#define PROPERTY_ID_FONTKERNING 105 -#define PROPERTY_ID_FONTNAME 106 -#define PROPERTY_ID_FONTORIENTATION 107 -#define PROPERTY_ID_FONTPITCH 108 -#define PROPERTY_ID_FONTSLANT 109 -#define PROPERTY_ID_FONTSTRIKEOUT 110 -#define PROPERTY_ID_FONTSTYLENAME 111 -#define PROPERTY_ID_FONTUNDERLINE 112 -#define PROPERTY_ID_FONTWEIGHT 113 -#define PROPERTY_ID_FONTWIDTH 114 -#define PROPERTY_ID_FONTWORDLINEMODE 115 -#define PROPERTY_ID_FONTTYPE 116 -#define PROPERTY_ID_PERSISTENT_NAME 117 -#define PROPERTY_ID_ORIGINAL 118 -#define PROPERTY_ID_TABSTOP 119 -#define PROPERTY_ID_DEFAULTCONTROL 120 -#define PROPERTY_ID_ENABLED 121 -#define PROPERTY_ID_BORDER 122 -#define PROPERTY_ID_COLUMN 123 -#define PROPERTY_ID_AS_TEMPLATE 124 -#define PROPERTY_ID_IS_FORM 125 -#define PROPERTY_ID_HAVING_CLAUSE 126 -#define PROPERTY_ID_GROUP_BY 127 -#define PROPERTY_ID_EDIT_WIDTH 128 +#define PROPERTY_ID_FONT 72 +#define PROPERTY_ID_ROW_HEIGHT 73 +#define PROPERTY_ID_TEXTCOLOR 74 +#define PROPERTY_ID_UPDATE_TABLENAME 75 +#define PROPERTY_ID_UPDATE_SCHEMANAME 76 +#define PROPERTY_ID_UPDATE_CATALOGNAME 77 +#define PROPERTY_ID_CONTROLMODEL 78 +#define PROPERTY_ID_RELATIVEPOSITION 79 +#define PROPERTY_ID_ISASCENDING 80 +#define PROPERTY_ID_RELATEDCOLUMN 81 +#define PROPERTY_ID_ISUNIQUE 82 +#define PROPERTY_ID_ISPRIMARYKEYINDEX 83 +#define PROPERTY_ID_IGNORERESULT 84 +#define PROPERTY_ID_DELETERULE 85 +#define PROPERTY_ID_UPDATERULE 86 +#define PROPERTY_ID_REFERENCEDTABLE 87 +#define PROPERTY_ID_REFERENCEDCOLUMN 88 +#define PROPERTY_ID_PARENTWINDOW 89 +#define PROPERTY_ID_SQLEXCEPTION 90 +#define PROPERTY_ID_ISHIDDEN 91 +#define PROPERTY_ID_SUPPRESSVERSIONCL 92 +#define PROPERTY_ID_LAYOUTINFORMATION 93 +#define PROPERTY_ID_TEXTLINECOLOR 94 +#define PROPERTY_ID_TEXTEMPHASIS 95 +#define PROPERTY_ID_TEXTRELIEF 96 +#define PROPERTY_ID_HELPTEXT 97 +#define PROPERTY_ID_CONTROLDEFAULT 98 +#define PROPERTY_ID_AUTOINCREMENTCREATION 99 +#define PROPERTY_ID_SPECIAL_OPTIONS 100 +#define PROPERTY_ID_FONTCHARWIDTH 101 +#define PROPERTY_ID_FONTCHARSET 102 +#define PROPERTY_ID_FONTFAMILY 103 +#define PROPERTY_ID_FONTHEIGHT 104 +#define PROPERTY_ID_FONTKERNING 105 +#define PROPERTY_ID_FONTNAME 106 +#define PROPERTY_ID_FONTORIENTATION 107 +#define PROPERTY_ID_FONTPITCH 108 +#define PROPERTY_ID_FONTSLANT 109 +#define PROPERTY_ID_FONTSTRIKEOUT 110 +#define PROPERTY_ID_FONTSTYLENAME 111 +#define PROPERTY_ID_FONTUNDERLINE 112 +#define PROPERTY_ID_FONTWEIGHT 113 +#define PROPERTY_ID_FONTWIDTH 114 +#define PROPERTY_ID_FONTWORDLINEMODE 115 +#define PROPERTY_ID_FONTTYPE 116 +#define PROPERTY_ID_PERSISTENT_NAME 117 +#define PROPERTY_ID_ORIGINAL 118 +#define PROPERTY_ID_TABSTOP 119 +#define PROPERTY_ID_DEFAULTCONTROL 120 +#define PROPERTY_ID_ENABLED 121 +#define PROPERTY_ID_BORDER 122 +#define PROPERTY_ID_COLUMN 123 +#define PROPERTY_ID_AS_TEMPLATE 124 +#define PROPERTY_ID_IS_FORM 125 +#define PROPERTY_ID_HAVING_CLAUSE 126 +#define PROPERTY_ID_GROUP_BY 127 +#define PROPERTY_ID_EDIT_WIDTH 128 #define PROPERTY_ID_SETTINGS 129 #define PROPERTY_ID_CONNECTION_RESOURCE 130 #define PROPERTY_ID_RESULT_SET 131 @@ -184,7 +184,7 @@ #define PROPERTY_ID_CURRENT_QUERY_DESIGN 144 #define PROPERTY_ID_SINGLESELECTQUERYCOMPOSER 145 #define PROPERTY_ID_PROPCHANGE_NOTIFY 146 - + //============================================================ //= property names //============================================================ diff --git a/dbaccess/source/inc/xmlstrings.hrc b/dbaccess/source/inc/xmlstrings.hrc index db5a729e2ea6..82fcbab8b94d 100644 --- a/dbaccess/source/inc/xmlstrings.hrc +++ b/dbaccess/source/inc/xmlstrings.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx index ed756b98a76c..12aa55645211 100644 --- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx +++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace sdbtools //==================================================================== //= ConnectionDependentComponent //==================================================================== - class ConnectionDependentComponent + class ConnectionDependentComponent { private: mutable ::osl::Mutex m_aMutex; diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index 5f1e8153f278..cba20331f537 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,14 +92,14 @@ namespace sdbtools EntryGuard aGuard( *this ); return new TableName( getContext(), getConnection() ); } - + //-------------------------------------------------------------------- Reference< XObjectNames > SAL_CALL ConnectionTools::getObjectNames() throw (RuntimeException) { EntryGuard aGuard( *this ); return new ObjectNames( getContext(), getConnection() ); } - + //-------------------------------------------------------------------- Reference< XDataSourceMetaData > SAL_CALL ConnectionTools::getDataSourceMetaData() throw (RuntimeException) { @@ -130,7 +130,7 @@ namespace sdbtools { return getImplementationName_static(); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL ConnectionTools::supportsService(const ::rtl::OUString & _ServiceName) throw (RuntimeException) { @@ -139,7 +139,7 @@ namespace sdbtools const ::rtl::OUString* end = aSupported.getConstArray() + aSupported.getLength(); return ::std::find( begin, end, _ServiceName ) != end; } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames() throw (RuntimeException) { @@ -151,7 +151,7 @@ namespace sdbtools { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.dbaccess.ConnectionTools" ) ); } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static() { @@ -159,13 +159,13 @@ namespace sdbtools aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.tools.ConnectionTools" ) ); return aSupported; } - + //-------------------------------------------------------------------- Reference< XInterface > SAL_CALL ConnectionTools::Create(const Reference< XComponentContext >& _rxContext ) { return *( new ConnectionTools( ::comphelper::ComponentContext( _rxContext ) ) ); } - + //-------------------------------------------------------------------- void SAL_CALL ConnectionTools::initialize(const Sequence< Any > & _rArguments) throw (RuntimeException, Exception) { diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx index ed1372e5eb89..a85ade7020ca 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx index ef76d96eed95..169230063d58 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx index 440b1f6c2c81..41f19047b2e8 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 0b64bca252ef..d7a487289df8 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -200,7 +200,7 @@ namespace sdbtools if ( ( _rName.indexOf( (sal_Unicode)34 ) >= 0 ) // " || ( _rName.indexOf( (sal_Unicode)39 ) >= 0 ) // ' || ( _rName.indexOf( (sal_Unicode)96 ) >= 0 ) // - || ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) // + || ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) // || ( _rName.indexOf( (sal_Unicode)146 ) >= 0 ) // || ( _rName.indexOf( (sal_Unicode)180 ) >= 0 ) // #86621# removed unparsable chars ) @@ -448,7 +448,7 @@ namespace sdbtools return sName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL ObjectNames::convertToSQLName( const ::rtl::OUString& Name ) throw (RuntimeException) { @@ -456,7 +456,7 @@ namespace sdbtools Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), UNO_QUERY_THROW ); return ::dbtools::convertName2SQLName( Name, xMeta->getExtraNameCharacters() ); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException) { @@ -465,7 +465,7 @@ namespace sdbtools PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), _CommandType, getConnection()) ); return !pNameCheck->validateName( _Name ); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException) { @@ -474,7 +474,7 @@ namespace sdbtools PNameValidation pNameCheck( NameCheckFactory::createValidityCheck( getContext(), _CommandType, getConnection()) ); return pNameCheck->validateName( _Name ); } - + //-------------------------------------------------------------------- void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (SQLException, RuntimeException) { diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index de2b95951c62..4a9609a0d064 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index 4d6357a88d1b..cc704122134e 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,49 +108,49 @@ namespace sdbtools EntryGuard aGuard( *this ); return m_pImpl->sCatalog; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setCatalogName( const ::rtl::OUString& _catalogName ) throw (RuntimeException) { EntryGuard aGuard( *this ); m_pImpl->sCatalog = _catalogName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL TableName::getSchemaName() throw (RuntimeException) { EntryGuard aGuard( *this ); return m_pImpl->sSchema; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setSchemaName( const ::rtl::OUString& _schemaName ) throw (RuntimeException) { EntryGuard aGuard( *this ); m_pImpl->sSchema = _schemaName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL TableName::getTableName() throw (RuntimeException) { EntryGuard aGuard( *this ); return m_pImpl->sName; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setTableName( const ::rtl::OUString& _tableName ) throw (RuntimeException) { EntryGuard aGuard( *this ); m_pImpl->sName = _tableName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL TableName::getNameForSelect() throw (RuntimeException) { EntryGuard aGuard( *this ); return composeTableNameForSelect( getConnection(), m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName ); } - + //-------------------------------------------------------------------- Reference< XPropertySet > SAL_CALL TableName::getTable() throw (NoSuchElementException, RuntimeException) { @@ -178,7 +178,7 @@ namespace sdbtools return xTable; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setTable( const Reference< XPropertySet >& _table ) throw (IllegalArgumentException, RuntimeException) { @@ -208,7 +208,7 @@ namespace sdbtools throw IllegalArgumentException( e.Message, e.Context, 0 ); } } - + //-------------------------------------------------------------------- namespace { @@ -218,7 +218,7 @@ namespace sdbtools */ EComposeRule lcl_translateCompositionType_throw( sal_Int32 _nType ) { - struct + struct { sal_Int32 nCompositionType; EComposeRule eComposeRule; @@ -258,7 +258,7 @@ namespace sdbtools m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName, _Quote, lcl_translateCompositionType_throw( _Type ) ); } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setComposedName( const ::rtl::OUString& _ComposedName, ::sal_Int32 _Type ) throw (RuntimeException) { diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index d165fc8680fe..073a6ed34791 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx index 938ec38c6aca..185d9b1adef9 100644 --- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx +++ b/dbaccess/source/sdbtools/inc/module_sdbt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc index 1a23ab206fd8..5b94f748b7ae 100644 --- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc +++ b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #endif //------------------------------------------------------------------------------ -#define RID_SDBT_STRINGS_START RID_DBACCESS_START +#define RID_SDBT_STRINGS_START RID_DBACCESS_START //------------------------------------------------------------------------------ //- String-IDs diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx index f84822c1d25a..e90999ced2be 100644 --- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx +++ b/dbaccess/source/sdbtools/misc/module_sdbt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index dcea32927e21..06bfebaf2602 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ extern "C" void SAL_CALL sdbt_initializeModule() //--------------------------------------------------------------------------------------- extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { sdbt_initializeModule(); @@ -70,8 +70,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { return ::sdbtools::SdbtModule::getInstance().writeComponentInfos( static_cast(pServiceManager), diff --git a/dbaccess/source/sdbtools/resource/sdbt_strings.src b/dbaccess/source/sdbtools/resource/sdbt_strings.src index bd6d7d49f5c1..f19a52c4b2c0 100644 --- a/dbaccess/source/sdbtools/resource/sdbt_strings.src +++ b/dbaccess/source/sdbtools/resource/sdbt_strings.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/cfg_reghelper.cxx b/dbaccess/source/shared/cfg_reghelper.cxx index e4565b27e9f3..5d88ab515bb3 100644 --- a/dbaccess/source/shared/cfg_reghelper.cxx +++ b/dbaccess/source/shared/cfg_reghelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/cfgstrings.cxx b/dbaccess/source/shared/cfgstrings.cxx index a08cb3227a28..b13623ed3c4f 100644 --- a/dbaccess/source/shared/cfgstrings.cxx +++ b/dbaccess/source/shared/cfgstrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ namespace dbacfg IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_PASSWORDREQUIRED, "IsPasswordRequired"); IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_SUPPRESSVERSIONCL, "SuppressVersionColumns"); IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_BOOKMARKS, "Bookmarks"); - + IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COMMAND, "Command"); IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_ESCAPE_PROCESSING, "EscapeProcessing"); IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_TABLENAME, "UpdateTableName"); diff --git a/dbaccess/source/shared/dbu_reghelper.cxx b/dbaccess/source/shared/dbu_reghelper.cxx index 3acbee9d2d91..51e258d47be3 100644 --- a/dbaccess/source/shared/dbu_reghelper.cxx +++ b/dbaccess/source/shared/dbu_reghelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/dbustrings.cxx b/dbaccess/source/shared/dbustrings.cxx index 6352e15fb72c..6224ca151962 100644 --- a/dbaccess/source/shared/dbustrings.cxx +++ b/dbaccess/source/shared/dbustrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,13 +50,13 @@ namespace dbaui //============================================================ //= service names //============================================================ - IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG, "org.openoffice.comp.dbu.DirectSqlDialog"); + IMPLEMENT_CONSTASCII_USTRING(SERVICE_SDB_DIRECTSQLDIALOG, "org.openoffice.comp.dbu.DirectSqlDialog"); //============================================================ //= other //============================================================ - IMPLEMENT_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW, "QueryPreview"); - IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTROLDEFAULT, "com.sun.star.comp.dbu.OColumnControl"); + IMPLEMENT_CONSTASCII_USTRING(FRAME_NAME_QUERY_PREVIEW, "QueryPreview"); + IMPLEMENT_CONSTASCII_USTRING(SERVICE_CONTROLDEFAULT, "com.sun.star.comp.dbu.OColumnControl"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_QUERYDESIGNVIEW, "QueryDesignView"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_GRAPHICAL_DESIGN, "GraphicalDesign"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HELP_URL, "HelpURL"); @@ -64,8 +64,8 @@ namespace dbaui //============================================================ //= properties //============================================================ - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE, "TriState"); - IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLEOUTERJOIN, "EnableOuterJoinEscape"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRISTATE, "TriState"); + IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLEOUTERJOIN, "EnableOuterJoinEscape"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABSTOP, "TabStop"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL, "DefaultControl"); diff --git a/dbaccess/source/shared/flt_reghelper.cxx b/dbaccess/source/shared/flt_reghelper.cxx index bf98c4ddd82d..bbe5063295da 100644 --- a/dbaccess/source/shared/flt_reghelper.cxx +++ b/dbaccess/source/shared/flt_reghelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/registrationhelper.cxx b/dbaccess/source/shared/registrationhelper.cxx index 56246cee507a..4b2f1cba944b 100644 --- a/dbaccess/source/shared/registrationhelper.cxx +++ b/dbaccess/source/shared/registrationhelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,10 +37,10 @@ using namespace ::com::sun::star; using namespace ::comphelper; using namespace ::cppu; -uno::Sequence< ::rtl::OUString >* OModuleRegistration::s_pImplementationNames = NULL; -uno::Sequence< uno::Sequence< ::rtl::OUString > >* OModuleRegistration::s_pSupportedServices = NULL; -uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = NULL; -uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = NULL; +uno::Sequence< ::rtl::OUString >* OModuleRegistration::s_pImplementationNames = NULL; +uno::Sequence< uno::Sequence< ::rtl::OUString > >* OModuleRegistration::s_pSupportedServices = NULL; +uno::Sequence< sal_Int64 >* OModuleRegistration::s_pCreationFunctionPointers = NULL; +uno::Sequence< sal_Int64 >* OModuleRegistration::s_pFactoryFunctionPointers = NULL; //-------------------------------------------------------------------------- void OModuleRegistration::registerComponent( @@ -61,9 +61,9 @@ void OModuleRegistration::registerComponent( OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModuleRegistration::registerComponent : inconsistent state (the pointers (2)) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModuleRegistration::registerComponent : inconsistent state !"); sal_Int32 nOldLen = s_pImplementationNames->getLength(); @@ -88,9 +88,9 @@ void OModuleRegistration::revokeComponent(const ::rtl::OUString& _rImplementatio } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModuleRegistration::revokeComponent : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModuleRegistration::revokeComponent : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -130,9 +130,9 @@ sal_Bool OModuleRegistration::writeComponentInfos( } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModuleRegistration::writeComponentInfos : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModuleRegistration::writeComponentInfos : inconsistent state !"); sal_Int32 nLen = s_pImplementationNames->getLength(); @@ -179,9 +179,9 @@ uno::Reference< uno::XInterface > OModuleRegistration::getComponentFactory( } OSL_ENSURE(s_pImplementationNames && s_pSupportedServices && s_pCreationFunctionPointers && s_pFactoryFunctionPointers, "OModuleRegistration::getComponentFactory : inconsistent state (the pointers) !"); - OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) - && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) - && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), + OSL_ENSURE( (s_pImplementationNames->getLength() == s_pSupportedServices->getLength()) + && (s_pImplementationNames->getLength() == s_pCreationFunctionPointers->getLength()) + && (s_pImplementationNames->getLength() == s_pFactoryFunctionPointers->getLength()), "OModuleRegistration::getComponentFactory : inconsistent state !"); diff --git a/dbaccess/source/shared/sdbtstrings.cxx b/dbaccess/source/shared/sdbtstrings.cxx index aa531d01f59d..6203ffb710b5 100644 --- a/dbaccess/source/shared/sdbtstrings.cxx +++ b/dbaccess/source/shared/sdbtstrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/shared/xmlstrings.cxx b/dbaccess/source/shared/xmlstrings.cxx index 4ae1bf472495..b531cf0bac2a 100644 --- a/dbaccess/source/shared/xmlstrings.cxx +++ b/dbaccess/source/shared/xmlstrings.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 68d5aac5fa33..ab511cb54efa 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -426,8 +426,8 @@ void SAL_CALL OApplicationController::disposing() ::comphelper::NamedValueCollection aArgs( m_xModel->getArgs() ); if ( true == aArgs.getOrDefault( "PickListEntry", true ) ) { - ::rtl::OUString aFilter; - INetURLObject aURL( m_xModel->getURL() ); + ::rtl::OUString aFilter; + INetURLObject aURL( m_xModel->getURL() ); const SfxFilter* pFilter = getStandardDatabaseFilter(); if ( pFilter ) aFilter = pFilter->GetFilterName(); @@ -1449,7 +1449,7 @@ void OApplicationController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:Save", ID_BROWSER_SAVEDOC, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( ".uno:SaveAs", ID_BROWSER_SAVEASDOC, CommandGroup::DOCUMENT ); - implDescribeSupportedFeature( ".uno:SendMail", SID_MAIL_SENDDOC, CommandGroup::DOCUMENT ); + implDescribeSupportedFeature( ".uno:SendMail", SID_MAIL_SENDDOC, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( ".uno:DBSendReportAsMail",SID_DB_APP_SENDREPORTASMAIL, CommandGroup::DOCUMENT ); implDescribeSupportedFeature( ".uno:DBSendReportToWriter",SID_DB_APP_SENDREPORTTOWRITER, @@ -1461,7 +1461,7 @@ void OApplicationController::describeSupportedFeatures() SID_FORM_CREATE_REPWIZ_PRE_SEL, CommandGroup::APPLICATION ); - implDescribeSupportedFeature( ".uno:DBNewReport", SID_APP_NEW_REPORT, CommandGroup::INSERT ); + implDescribeSupportedFeature( ".uno:DBNewReport", SID_APP_NEW_REPORT, CommandGroup::INSERT ); implDescribeSupportedFeature( ".uno:DBNewReportAutoPilot", ID_DOCUMENT_CREATE_REPWIZ, CommandGroup::INSERT ); implDescribeSupportedFeature( ".uno:DBNewReportAutoPilotWithPreSelection", @@ -1478,7 +1478,7 @@ void OApplicationController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:DBNewViewSQL", SID_DB_NEW_VIEW_SQL, CommandGroup::INSERT ); implDescribeSupportedFeature( ".uno:DBDelete", SID_DB_APP_DELETE, CommandGroup::EDIT ); - implDescribeSupportedFeature( ".uno:Delete", SID_DB_APP_DELETE, CommandGroup::EDIT ); + implDescribeSupportedFeature( ".uno:Delete", SID_DB_APP_DELETE, CommandGroup::EDIT ); implDescribeSupportedFeature( ".uno:DBRename", SID_DB_APP_RENAME, CommandGroup::EDIT ); implDescribeSupportedFeature( ".uno:DBEdit", SID_DB_APP_EDIT, CommandGroup::EDIT ); implDescribeSupportedFeature( ".uno:DBEditSqlView", SID_DB_APP_EDIT_SQL_VIEW, CommandGroup::EDIT ); @@ -1539,18 +1539,18 @@ void OApplicationController::describeSupportedFeatures() // this one should not appear under Tools->Customize->Keyboard implDescribeSupportedFeature( ".uno:DBNewReportWithPreSelection", SID_APP_NEW_REPORT_PRE_SEL,CommandGroup::INTERNAL ); - implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBDBAdmin", SID_DB_APP_DBADMIN, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBDSImport", SID_DB_APP_DSIMPORT, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBDSExport", SID_DB_APP_DSEXPORT, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBDBAdmin", SID_DB_APP_DBADMIN, CommandGroup::INTERNAL); // status info - implDescribeSupportedFeature( ".uno:DBStatusType", SID_DB_APP_STATUS_TYPE, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBStatusDBName", SID_DB_APP_STATUS_DBNAME, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBStatusUserName", SID_DB_APP_STATUS_USERNAME, CommandGroup::INTERNAL); - implDescribeSupportedFeature( ".uno:DBStatusHostName", SID_DB_APP_STATUS_HOSTNAME, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusType", SID_DB_APP_STATUS_TYPE, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusDBName", SID_DB_APP_STATUS_DBNAME, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusUserName", SID_DB_APP_STATUS_USERNAME, CommandGroup::INTERNAL); + implDescribeSupportedFeature( ".uno:DBStatusHostName", SID_DB_APP_STATUS_HOSTNAME, CommandGroup::INTERNAL); } // ----------------------------------------------------------------------------- -OApplicationView* OApplicationController::getContainer() const +OApplicationView* OApplicationController::getContainer() const { return static_cast< OApplicationView* >( getView() ); } @@ -1667,7 +1667,7 @@ void SAL_CALL OApplicationController::elementReplaced( const ContainerEvent& _rE default: break; } - // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName); + // getContainer()->elementReplaced(getContainer()->getElementType(),sName,sNewName); } catch( Exception& ) { @@ -2167,7 +2167,7 @@ void OApplicationController::renameEntry() { ::rtl::OUString sName = aDialog->getName(); ::rtl::OUString sCatalog = aDialog->getCatalog(); - ::rtl::OUString sSchema = aDialog->getSchema(); + ::rtl::OUString sSchema = aDialog->getSchema(); sNewName = ::dbtools::composeTableName( m_xMetaData, sCatalog, sSchema, sName, sal_False, ::dbtools::eInDataManipulation ); } @@ -2533,18 +2533,18 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) m_nAsyncDrop = 0; m_aAsyncDrop.aDroppedData.clear(); - m_aAsyncDrop.nType = pView->getElementType(); - m_aAsyncDrop.nAction = _rEvt.mnAction; - m_aAsyncDrop.bError = sal_False; - m_aAsyncDrop.bHtml = sal_False; - m_aAsyncDrop.aUrl = ::rtl::OUString(); + m_aAsyncDrop.nType = pView->getElementType(); + m_aAsyncDrop.nAction = _rEvt.mnAction; + m_aAsyncDrop.bError = sal_False; + m_aAsyncDrop.bHtml = sal_False; + m_aAsyncDrop.aUrl = ::rtl::OUString(); // loop through the available formats and see what we can do ... // first we have to check if it is our own format, if not we have to copy the stream :-( if ( ODataAccessObjectTransferable::canExtractObjectDescriptor(aDroppedData.GetDataFlavorExVector()) ) { - m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); + m_aAsyncDrop.aDroppedData = ODataAccessObjectTransferable::extractObjectDescriptor(aDroppedData); // asyncron because we some dialogs and we aren't allowed to show them while in D&D m_nAsyncDrop = Application::PostUserEvent(LINK(this, OApplicationController, OnAsyncDrop)); @@ -2850,7 +2850,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer { ElementType eType = E_NONE; const NamedValue* pIter = aCurrentSelection.getConstArray(); - const NamedValue* pEnd = pIter + aCurrentSelection.getLength(); + const NamedValue* pEnd = pIter + aCurrentSelection.getLength(); for(;pIter != pEnd;++pIter) { if ( pIter->Name.equalsAscii("Type") ) @@ -3012,7 +3012,7 @@ void OApplicationController::impl_migrateScripts_nothrow() } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx index fd484c686616..a56989731b44 100644 --- a/dbaccess/source/ui/app/AppController.hxx +++ b/dbaccess/source/ui/app/AppController.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -88,7 +88,7 @@ namespace dbaui , ::com::sun::star::sdb::application::XDatabaseDocumentUI , ::com::sun::star::ui::XContextMenuInterception , ::com::sun::star::view::XSelectionSupplier - > OApplicationController_Base; + > OApplicationController_Base; class SelectionNotifier; @@ -103,14 +103,14 @@ namespace dbaui private: - OTableCopyHelper::DropDescriptor m_aAsyncDrop; + OTableCopyHelper::DropDescriptor m_aAsyncDrop; SharedConnection m_xDataSourceConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - OModuleClient m_aModuleClient; - TransferableDataHelper m_aSystemClipboard; // content of the clipboard + OModuleClient m_aModuleClient; + TransferableDataHelper m_aSystemClipboard; // content of the clipboard ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDataSource; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > @@ -120,21 +120,21 @@ namespace dbaui ::cppu::OInterfaceContainerHelper m_aContextMenuInterceptors; - TContainerVector m_aCurrentContainers; // the containers where we are listener on + TContainerVector m_aCurrentContainers; // the containers where we are listener on ::rtl::Reference< SubComponentManager > m_pSubComponentManager; - ::dbaccess::ODsnTypeCollection + ::dbaccess::ODsnTypeCollection m_aTypeCollection; OTableCopyHelper m_aTableCopyHelper; TransferableClipboardListener* - m_pClipbordNotifier; // notifier for changes in the clipboard - ULONG m_nAsyncDrop; + m_pClipbordNotifier; // notifier for changes in the clipboard + ULONG m_nAsyncDrop; OAsyncronousLink m_aControllerConnectedEvent; OAsyncronousLink m_aSelectContainerEvent; - PreviewMode m_ePreviewMode; // the mode of the preview - ElementType m_eCurrentType; - sal_Bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date - sal_Bool m_bSuspended; // is true when the controller was already suspended + PreviewMode m_ePreviewMode; // the mode of the preview + ElementType m_eCurrentType; + sal_Bool m_bNeedToReconnect; // true when the settings of the data source were modified and the connection is no longer up to date + sal_Bool m_bSuspended; // is true when the controller was already suspended ::std::auto_ptr< SelectionNotifier > m_pSelectionNotifier; @@ -143,7 +143,7 @@ namespace dbaui private: - OApplicationView* getContainer() const; + OApplicationView* getContainer() const; /** returns the database name @@ -159,17 +159,17 @@ namespace dbaui ::rtl::OUString getStrippedDatabaseName() const; /** return the element type for given container - @param _xContainer The container where the element type has to be found - @return the element type coressponding to the given container + @param _xContainer The container where the element type has to be found + @return the element type coressponding to the given container */ ElementType getElementType(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer >& _xContainer) const; /** opens a new frame with either the table or the query or report or form or view - @param _sName + @param _sName The name of the object to open - @param _eType + @param _eType Defines the type to open - @param _eOpenMode + @param _eOpenMode denotes the mode in which to open the object @param _nInstigatorCommand denotes the command which instigated the action. Might be 0. @@ -193,9 +193,9 @@ namespace dbaui ); /** opens a new frame for creation or auto pilot - @param _eType + @param _eType Defines the type to open - @param i_rAdditionalArguments + @param i_rAdditionalArguments Additional arguments to pass when creating the component */ ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > @@ -215,7 +215,7 @@ namespace dbaui void newElementWithPilot( ElementType _eType ); /** converts the query to a view - @param _sName + @param _sName The name of the query. */ void convertToView(const ::rtl::OUString& _sName); @@ -236,19 +236,19 @@ namespace dbaui void renameEntry(); /** deletes queries, forms, or reports - @param _eType + @param _eType the type of the objects - @param _rList + @param _rList The names of the elements to delete - @param _bConfirm + @param _bConfirm determines whether the user must confirm the deletion */ - void deleteObjects( ElementType _eType, + void deleteObjects( ElementType _eType, const ::std::vector< ::rtl::OUString>& _rList, bool _bConfirm ); /** deletes tables. - @param _rList + @param _rList The list of tables. */ void deleteTables(const ::std::vector< ::rtl::OUString>& _rList); @@ -260,9 +260,9 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > getElements(ElementType _eType); /** returns the document access for the specific type - @param _eType + @param _eType the type - @return ::std::auto_ptr + @return ::std::auto_ptr */ ::std::auto_ptr getDocumentsAccess(ElementType _eType); @@ -270,19 +270,19 @@ namespace dbaui ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer> getQueryDefintions() const; /** pastes a special format from the system clipboard to the currently selected object types - @param _nFormatId + @param _nFormatId The format to be copied. */ void pasteFormat(sal_uInt32 _nFormatId); /** pastes a query, form or report into the data source - @param _eType + @param _eType The type of the object to paste. - @param _rPasteData + @param _rPasteData The data descriptor. - @param _sParentFolder + @param _sParentFolder The name of the parent folder if it exists. - @param _bMove + @param _bMove if the name of the content must be inserted without any change, otherwise not. @return if the paste opertions was successfull, otherwise . @@ -296,21 +296,21 @@ namespace dbaui sal_Bool isTableFormat() const; /** fills the vector with all supported formats - @param _eType + @param _eType The type for which we need the formats - @param _rFormatIds + @param _rFormatIds The vector to be filled up. */ void getSupportedFormats(ElementType _eType,::std::vector& _rFormatIds) const; /** adds a listener to the current name access. - @param _xCollection + @param _xCollection The collection where we want to listen on. */ void addContainerListener(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xCollection); /** opens a uno dialog withthe currently selected data source as initialize argument - @param _sServiceName + @param _sServiceName The serivce name of the dialog to be executed. */ void openDialog(const ::rtl::OUString& _sServiceName); @@ -344,35 +344,35 @@ namespace dbaui ); /** Inserts a new object into the hierachy given be the type. - @param _eType + @param _eType Where to insert the new item. - @param _sParentFolder + @param _sParentFolder The name of the parent folder if it exists. - @param _xContent + @param _xContent The content to insert. - @param _bMove + @param _bMove if the name of the content must be inserted without any change, otherwise not. @return if the insert opertions was successfull, otherwise . */ - sal_Bool insertHierachyElement( ElementType _eType + sal_Bool insertHierachyElement( ElementType _eType ,const String& _sParentFolder ,sal_Bool _bCollection = sal_True ,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>() ,sal_Bool _bMove = sal_False); /** checks if delete command or rename comamnd is allowed - @param _eType + @param _eType The element type. - @param _bDelete + @param _bDelete If then the delete command should be checked. @return if the command is allowed */ sal_Bool isRenameDeleteAllowed(ElementType _eType,sal_Bool _bDelete) const; /** all selected entries will be opened, or edited, or converted to a view - @param _nId + @param _nId The slot which should be executed. - @param _eOpenMode + @param _eOpenMode Defines the mode of opening. @see ElementOpenMode */ void doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMode); @@ -413,12 +413,12 @@ namespace dbaui /** forces usage of a connection which we do not own

To be used from within XInitialization::initialize only.

*/ - void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); + void initializeConnection( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxForeignConn ); // state of a feature. 'feature' may be the handle of a ::com::sun::star::util::URL somebody requested a dispatch interface for OR a toolbar slot. - virtual FeatureState GetState(sal_uInt16 nId) const; + virtual FeatureState GetState(sal_uInt16 nId) const; // execute a feature - virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); + virtual void Execute(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& aArgs); // OGenericUnoController virtual void onLoadedMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& _xLayoutManager ); @@ -531,9 +531,9 @@ namespace dbaui // IControlActionListener overridables virtual sal_Bool requestQuickHelp( const SvLBoxEntry* _pEntry, String& _rText ) const; - virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); - virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); - virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel ); + virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors ); + virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt ); // IContextMenuProvider (base of IApplicationController) virtual PopupMenu* getContextMenu( Control& _rControl ) const; @@ -555,11 +555,11 @@ namespace dbaui /** disconnects from our XConnection, and cleans up this connection */ - virtual void disconnect(); + virtual void disconnect(); // late construction - virtual sal_Bool Construct(Window* pParent); - virtual void describeSupportedFeatures(); + virtual sal_Bool Construct(Window* pParent); + virtual void describeSupportedFeatures(); protected: // XEventListener @@ -570,7 +570,7 @@ namespace dbaui }; //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ #endif // DBAUI_APPCONTROLLER_HXX diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index b89f72956344..a5d3f331283f 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -512,7 +512,7 @@ TransferableHelper* OApplicationController::copyObject() ::rtl::OUString sName = getContainer()->getQualifiedName( NULL ); if ( sName.getLength() ) { - ::rtl::OUString sDataSource = getDatabaseName(); + ::rtl::OUString sDataSource = getDatabaseName(); if ( eType == E_TABLE ) { @@ -564,22 +564,22 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc { sal_Int32 nCommandType = CommandType::TABLE; if ( _rPasteData.has(daCommandType) ) - _rPasteData[daCommandType] >>= nCommandType; + _rPasteData[daCommandType] >>= nCommandType; if ( CommandType::QUERY == nCommandType || CommandType::COMMAND == nCommandType ) { // read all nescessary data - ::rtl::OUString sCommand; + ::rtl::OUString sCommand; sal_Bool bEscapeProcessing = sal_True; _rPasteData[daCommand] >>= sCommand; if ( _rPasteData.has(daEscapeProcessing) ) - _rPasteData[daEscapeProcessing] >>= bEscapeProcessing; + _rPasteData[daEscapeProcessing] >>= bEscapeProcessing; // plausibility check sal_Bool bValidDescriptor = sal_False; - ::rtl::OUString sDataSourceName = _rPasteData.getDataSource(); + ::rtl::OUString sDataSourceName = _rPasteData.getDataSource(); if (CommandType::QUERY == nCommandType) bValidDescriptor = sDataSourceName.getLength() && sCommand.getLength(); else if (CommandType::COMMAND == nCommandType) @@ -629,7 +629,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc bSuccess = true; } } - catch(SQLException&) { throw; } // caught and handled by the outer catch + catch(SQLException&) { throw; } // caught and handled by the outer catch catch( const Exception& ) { DBG_UNHANDLED_EXCEPTION(); @@ -665,7 +665,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc has a /table/ with that name) */ if ( bNeedAskForName ) { - OSaveAsDlg aAskForName( getView(), + OSaveAsDlg aAskForName( getView(), CommandType::QUERY, getORB(), getConnection(), @@ -710,7 +710,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc Sequence< ::rtl::OUString> aSeq = xSrcNameAccess->getElementNames(); const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); for( ; pIter != pEnd ; ++pIter) { Reference xSrcProp(xSrcNameAccess->getByName(*pIter),UNO_QUERY); @@ -811,7 +811,7 @@ IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ ) return 0L; } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx index 906607406e3a..f84b2293fa73 100644 --- a/dbaccess/source/ui/app/AppControllerGen.cxx +++ b/dbaccess/source/ui/app/AppControllerGen.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -164,7 +164,7 @@ void OApplicationController::convertToView(const ::rtl::OUString& _sName) { ::rtl::OUString sName = aDlg.getName(); ::rtl::OUString sCatalog = aDlg.getCatalog(); - ::rtl::OUString sSchema = aDlg.getSchema(); + ::rtl::OUString sSchema = aDlg.getSchema(); ::rtl::OUString sNewName( ::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, sal_False, ::dbtools::eInTableDefinitions ) ); Reference xView = ::dbaui::createView(sNewName,xConnection,xSourceObject); @@ -794,7 +794,7 @@ void OApplicationController::doAction(sal_uInt16 _nId ,ElementOpenMode _eOpenMod // special handling for mail, if more than one document is selected attach them all if ( _eOpenMode == E_OPEN_FOR_MAIL ) { - + ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentIter = aCompoments.begin(); ::std::vector< ::std::pair< ::rtl::OUString ,Reference< XModel > > >::iterator componentEnd = aCompoments.end(); ::rtl::OUString aDocTypeString; @@ -839,7 +839,7 @@ ElementType OApplicationController::getElementType(const Reference< XContainer > } //........................................................................ -} // namespace dbaui +} // namespace dbaui //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index d89c495e5106..12f75c8db281 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index cb4a79970fca..663f69c02a98 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,15 +58,15 @@ namespace dbaui class OPreviewWindow : public Window { - GraphicObject m_aGraphicObj; - Rectangle m_aPreviewRect; + GraphicObject m_aGraphicObj; + Rectangle m_aPreviewRect; /** gets the graphic cnter rect - @param rGraphic + @param rGraphic the graphic - @param rResultRect + @param rResultRect the resulting rectangle - + @return when successfull */ @@ -88,17 +88,17 @@ namespace dbaui //================================================================== class OAppDetailPageHelper : public Window { - DBTreeListBox* m_pLists[ELEMENT_COUNT]; - OAppBorderWindow& m_rBorderWin; - FixedLine m_aFL; - ToolBox m_aTBPreview; - Window m_aBorder; - OPreviewWindow m_aPreview; + DBTreeListBox* m_pLists[ELEMENT_COUNT]; + OAppBorderWindow& m_rBorderWin; + FixedLine m_aFL; + ToolBox m_aTBPreview; + Window m_aBorder; + OPreviewWindow m_aPreview; ::svtools::ODocumentInfoPreview m_aDocumentInfo; - Window* m_pTablePreview; + Window* m_pTablePreview; ::std::auto_ptr m_aMenu; - PreviewMode m_ePreviewMode; + PreviewMode m_ePreviewMode; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > m_xFrame; ::com::sun::star::uno::Reference < ::com::sun::star::io::XPersist > @@ -110,9 +110,9 @@ namespace dbaui int getVisibleControlIndex() const; /** sorts the entries in the tree list box. - @param _nPos + @param _nPos Which list should be sorted. - @param _eSortMode + @param _eSortMode How should be sorted. */ void sort(int _nPos,SvSortMode _eSortMode ); @@ -122,15 +122,15 @@ namespace dbaui void getElementIcons( ElementType _eType, USHORT& _rImageId, USHORT& _rHighContrastImageId ); /** fills the names in the listbox - @param _xContainer + @param _xContainer This can either be the queries, forms or report names. - @param _eType + @param _eType the type of elements which are being filled @param _nImageId the resource id of the image to use for non-container entries @param _nHighContrastImageId the resource id of the high contrast image to use for non-container entries - @param _pParent + @param _pParent The parent of the entries to be inserted. */ void fillNames( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer, @@ -140,17 +140,17 @@ namespace dbaui SvLBoxEntry* _pParent ); /** sets the detail page - @param _pWindow + @param _pWindow The control which should be visible. */ void setDetailPage(Window* _pWindow); /** sets all HandleCallbacks - @param _pTreeView + @param _pTreeView The newly created DBTreeListBox - @param _rImage + @param _rImage the resource id of the default icon - @param _rImageHC + @param _rImageHC the resource id of the default icon (HC version) @return The new tree. @@ -158,24 +158,24 @@ namespace dbaui DBTreeListBox* createTree( DBTreeListBox* _pTreeView, const Image& _rImage, const Image& _rImageHC ); /** creates the tree and sets all HandleCallbacks - @param _nHelpId + @param _nHelpId The help id of the control - @param _nCollapsedBitmap + @param _nCollapsedBitmap The image to use for tree entries. - @param _rImageHC + @param _rImageHC The image to use in high contrast mode. @return The new tree. */ DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC ); - DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); - DECL_LINK( OnEntrySelChange, void* ); + DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); + DECL_LINK( OnEntrySelChange, void* ); - DECL_LINK( OnCutEntry, void* ); - DECL_LINK( OnCopyEntry, void* ); - DECL_LINK( OnPasteEntry, void* ); - DECL_LINK( OnDeleteEntry, void* ); + DECL_LINK( OnCutEntry, void* ); + DECL_LINK( OnCopyEntry, void* ); + DECL_LINK( OnPasteEntry, void* ); + DECL_LINK( OnDeleteEntry, void* ); DECL_LINK(PreviewChangeHdl, void*); // click a TB slot @@ -200,27 +200,27 @@ namespace dbaui void paste(); /** creates the tables page - @param _xConnection + @param _xConnection The connection to get the table names */ void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** creates the page for the specific type. - @param _eType + @param _eType The type which should be created. E_TABLE isn't allowed. - @param _xContainer + @param _xContainer The container of the elements to be inserted. */ void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer); /** returns the current visible tree list box */ - inline DBTreeListBox* getCurrentView() const - { + inline DBTreeListBox* getCurrentView() const + { ElementType eType = getElementType(); - return (eType != E_NONE ) ? m_pLists[static_cast(eType)] : NULL; + return (eType != E_NONE ) ? m_pLists[static_cast(eType)] : NULL; } - + /// select all entries in the visible control void selectAll(); @@ -234,7 +234,7 @@ namespace dbaui void sortUp(); /** returns the element names which are selected - @param _rNames + @param _rNames The list will be filled. */ void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; @@ -260,8 +260,8 @@ namespace dbaui void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); /** return the qualified name. - @param _pEntry - The entry of a table, or query, form, report to get the qualified name. + @param _pEntry + The entry of a table, or query, form, report to get the qualified name. If the entry is , the first selected is chosen. @return the qualified name @@ -300,13 +300,13 @@ namespace dbaui sal_Bool isFilled() const; /** adds a new object to the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the object to be inserted - @param _rObject + @param _rObject The object to add. - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ SvLBoxEntry* elementAdded(ElementType eType @@ -314,13 +314,13 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one - @param _eType + @param _eType The type where the entry shold be appended. - @param _rOldName + @param _rOldName The old name of the object to be replaced - @param _rNewName + @param _rNewName The new name of the object to be replaced - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ void elementReplaced(ElementType eType @@ -328,17 +328,17 @@ namespace dbaui ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the element to be removed. - @param _rxConn + @param _rxConn If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType ,const ::rtl::OUString& _rName ); - + /// returns the preview mode PreviewMode getPreviewMode(); @@ -346,29 +346,29 @@ namespace dbaui sal_Bool isPreviewEnabled(); /** switches to the given preview mode - @param _eMode + @param _eMode the mode to set for the preview - @param _bForce + @param _bForce Force the preview to be resetted */ void switchPreview(PreviewMode _eMode,BOOL _bForce = FALSE); /** shows the Preview of the content when it is enabled. - @param _xContent + @param _xContent The content which must support the "preview" command. */ void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); /** shows the Preview of a table or query - @param _sDataSourceName + @param _sDataSourceName the name of the data source - @param _sName + @param _sName the name of table or query - @param _bTable + @param _bTable if it is a table, otherwise - @return void + @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const ::rtl::OUString& _sDataSourceName, const ::rtl::OUString& _sName, sal_Bool _bTable); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 4003c14e854c..60b26dc005d9 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,7 +68,7 @@ using namespace ::com::sun::star::beans; using ::com::sun::star::util::URL; using ::com::sun::star::sdb::application::NamedDatabaseObject; -#define SPACEBETWEENENTRIES 4 +#define SPACEBETWEENENTRIES 4 // ----------------------------------------------------------------------------- TaskEntry::TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled ) @@ -360,7 +360,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView ,m_aFL(this,WB_VERT) ,m_pDetailView(_pDetailView) { - DBG_CTOR(OTasksWindow,NULL); + DBG_CTOR(OTasksWindow,NULL); SetUniqueId(UID_APP_TASKS_WINDOW); m_aCreation.SetHelpId(HID_APP_CREATION_LIST); m_aCreation.SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl)); @@ -372,7 +372,7 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView // ----------------------------------------------------------------------------- OTasksWindow::~OTasksWindow() { - DBG_DTOR(OTasksWindow,NULL); + DBG_DTOR(OTasksWindow,NULL); Clear(); } // ----------------------------------------------------------------------- @@ -388,7 +388,7 @@ void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { DBG_CHKTHIS(OTasksWindow,NULL); @@ -461,13 +461,13 @@ void OTasksWindow::Resize() ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); Size aFLSize = LogicToPixel( Size( 2, 6 ), MAP_APPFONT ); sal_Int32 n6PPT = aFLSize.Height(); long nHalfOutputWidth = static_cast(nOutputWidth * 0.5); - + m_aCreation.SetPosSizePixel( Point(0, 0), Size(nHalfOutputWidth - n6PPT, nOutputHeight) ); // i77897 make the m_aHelpText a little bit smaller. (-5) sal_Int32 nNewWidth = nOutputWidth - nHalfOutputWidth - aFLSize.Width() - 5; @@ -477,15 +477,15 @@ void OTasksWindow::Resize() m_aDescription.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, 0), Size(nNewWidth, nOutputHeight) ); Size aDesc = m_aDescription.CalcMinimumSize(); m_aHelpText.SetPosSizePixel( Point(nHalfOutputWidth + n6PPT, aDesc.Height() ), Size(nNewWidth, nOutputHeight - aDesc.Height() - n6PPT) ); - + m_aFL.SetPosSizePixel( Point(nHalfOutputWidth , 0), Size(aFLSize.Width(), nOutputHeight ) ); } // ----------------------------------------------------------------------------- void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) -{ +{ DBG_CHKTHIS(OTasksWindow,NULL); Clear(); - + try { Reference xModuleCfgMgrSupplier(getDetailView()->getBorderWin().getView()->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ui.ModuleUIConfigurationManagerSupplier"))),UNO_QUERY); @@ -523,7 +523,7 @@ void OTasksWindow::fillTaskEntryList( const TaskEntryList& _rList ) { } - m_aCreation.Show(); + m_aCreation.Show(); m_aCreation.SelectAll(FALSE); m_aHelpText.Show(); m_aDescription.Show(); @@ -542,7 +542,7 @@ void OTasksWindow::Clear() delete reinterpret_cast< TaskEntry* >( pEntry->GetUserData() ); pEntry = m_aCreation.Next(pEntry); } - m_aCreation.Clear(); + m_aCreation.Clear(); } //================================================================== // class OApplicationDetailView @@ -554,7 +554,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe ,m_aContainer(this,0,WB_BORDER | WB_DIALOGCONTROL ) ,m_rBorderWin(_rParent) { - DBG_CTOR(OApplicationDetailView,NULL); + DBG_CTOR(OApplicationDetailView,NULL); SetUniqueId(UID_APP_DETAIL_VIEW); ImplInitSettings( sal_True, sal_True, sal_True ); @@ -572,7 +572,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe m_aContainer.SetUniqueId(UID_APP_CONTAINER_VIEW); m_aContainer.Show(); - const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); + const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); m_aHorzSplitter.SetPosSizePixel( Point(0,50), Size(0,nFrameWidth) ); // now set the components at the base class set(&m_aContainer,&m_aTasks); @@ -589,7 +589,7 @@ OApplicationDetailView::~OApplicationDetailView() setSplitter(NULL); m_pControlHelper = NULL; } -// ----------------------------------------------------------------------------- +// ----------------------------------------------------------------------------- void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { DBG_CHKTHIS(OApplicationDetailView,NULL); @@ -878,23 +878,23 @@ SvLBoxEntry* OApplicationDetailView::getEntry( const Point& _aPoint ) const return m_pControlHelper->getEntry(_aPoint); } // ----------------------------------------------------------------------------- -sal_Bool OApplicationDetailView::isCutAllowed() -{ +sal_Bool OApplicationDetailView::isCutAllowed() +{ DBG_CHKTHIS(OApplicationDetailView,NULL); - return m_pControlHelper->isCutAllowed(); + return m_pControlHelper->isCutAllowed(); } -sal_Bool OApplicationDetailView::isCopyAllowed() -{ +sal_Bool OApplicationDetailView::isCopyAllowed() +{ DBG_CHKTHIS(OApplicationDetailView,NULL); - return m_pControlHelper->isCopyAllowed(); + return m_pControlHelper->isCopyAllowed(); } -sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); } -void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); } -void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); } -void OApplicationDetailView::paste() -{ +sal_Bool OApplicationDetailView::isPasteAllowed() { DBG_CHKTHIS(OApplicationDetailView,NULL);return m_pControlHelper->isPasteAllowed(); } +void OApplicationDetailView::copy() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->copy(); } +void OApplicationDetailView::cut() { DBG_CHKTHIS(OApplicationDetailView,NULL);m_pControlHelper->cut(); } +void OApplicationDetailView::paste() +{ DBG_CHKTHIS(OApplicationDetailView,NULL); - m_pControlHelper->paste(); + m_pControlHelper->paste(); } // ----------------------------------------------------------------------------- SvLBoxEntry* OApplicationDetailView::elementAdded(ElementType _eType,const ::rtl::OUString& _rName, const Any& _rObject ) @@ -941,7 +941,7 @@ void OApplicationDetailView::showPreview(const Reference< XContent >& _xContent) m_pControlHelper->showPreview(_xContent); } // ----------------------------------------------------------------------------- -void OApplicationDetailView::showPreview( const ::rtl::OUString& _sDataSourceName, +void OApplicationDetailView::showPreview( const ::rtl::OUString& _sDataSourceName, const ::rtl::OUString& _sName, sal_Bool _bTable) { diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx index ef2001ab65fb..eee11b21d8fb 100644 --- a/dbaccess/source/ui/app/AppDetailView.hxx +++ b/dbaccess/source/ui/app/AppDetailView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,7 +80,7 @@ namespace dbaui void updateHelpText(); protected: - virtual void PreparePaint( SvLBoxEntry* _pEntry ); + virtual void PreparePaint( SvLBoxEntry* _pEntry ); virtual Rectangle GetFocusRect( SvLBoxEntry* _pEntry, long _nLine ); virtual void ModelHasCleared(); @@ -108,7 +108,7 @@ namespace dbaui TaskEntry( const sal_Char* _pAsciiUNOCommand, USHORT _nHelpID, USHORT _nTitleResourceID, bool _bHideWhenDisabled = false ); }; - typedef ::std::vector< TaskEntry > TaskEntryList; + typedef ::std::vector< TaskEntry > TaskEntryList; struct TaskPaneData { @@ -120,13 +120,13 @@ namespace dbaui class OTasksWindow : public Window { - OCreationList m_aCreation; - FixedText m_aDescription; - FixedText m_aHelpText; - FixedLine m_aFL; - OApplicationDetailView* m_pDetailView; + OCreationList m_aCreation; + FixedText m_aDescription; + FixedText m_aHelpText; + FixedLine m_aFL; + OApplicationDetailView* m_pDetailView; - DECL_LINK( OnEntrySelectHdl, SvTreeListBox* ); + DECL_LINK( OnEntrySelectHdl, SvTreeListBox* ); void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); @@ -137,7 +137,7 @@ namespace dbaui // window overloads virtual void Resize(); - OApplicationDetailView* getDetailView() const { return m_pDetailView; } + OApplicationDetailView* getDetailView() const { return m_pDetailView; } /// fills the Creation listbox with the necessary strings and images void fillTaskEntryList( const TaskEntryList& _rList ); @@ -154,11 +154,11 @@ namespace dbaui class OApplicationDetailView : public OSplitterView , public IClipboardTest { - Splitter m_aHorzSplitter; - OTitleWindow m_aTasks; - OTitleWindow m_aContainer; - OAppBorderWindow& m_rBorderWin; // my parent - OAppDetailPageHelper* m_pControlHelper; + Splitter m_aHorzSplitter; + OTitleWindow m_aTasks; + OTitleWindow m_aContainer; + OAppBorderWindow& m_rBorderWin; // my parent + OAppDetailPageHelper* m_pControlHelper; ::std::vector< TaskPaneData > m_aTaskPaneData; MnemonicGenerator m_aExternalMnemonics; @@ -171,19 +171,19 @@ namespace dbaui OApplicationDetailView(OAppBorderWindow& _rParent,PreviewMode _ePreviewMode); virtual ~OApplicationDetailView(); // window overloads - // virtual void Resize(); + // virtual void Resize(); virtual void GetFocus(); /** creates the tables page - @param _xConnection + @param _xConnection The connection to get the table names */ void createTablesPage(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** creates the page for the specific type. - @param _eType + @param _eType The type which should be created. E_TABLE isn't allowed. - @param _xContainer + @param _xContainer The container of the elements to be inserted. */ void createPage(ElementType _eType,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _xContainer); @@ -201,17 +201,17 @@ namespace dbaui inline OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } inline OTasksWindow& getTasksWindow() const { return *static_cast< OTasksWindow* >( m_aTasks.getChildWindow() ); } - sal_Bool isCutAllowed() ; - sal_Bool isCopyAllowed() ; - sal_Bool isPasteAllowed(); + sal_Bool isCutAllowed() ; + sal_Bool isCopyAllowed() ; + sal_Bool isPasteAllowed(); virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); } void copy(); void cut(); void paste(); /** return the qualified name. - @param _pEntry - The entry of a table, or query, form, report to get the qualified name. + @param _pEntry + The entry of a table, or query, form, report to get the qualified name. If the entry is , the first selected is chosen. @return the qualified name @@ -252,7 +252,7 @@ namespace dbaui ElementType getElementType() const; /** clears the detail pages. - @param _bTaskAlso + @param _bTaskAlso If the task window will also be cleared. */ void clearPages(sal_Bool _bTaskAlso = sal_True); @@ -264,7 +264,7 @@ namespace dbaui sal_Int32 getSelectionCount(); /** returns the element names which are selected - @param _rNames + @param _rNames The list will be filled. */ void getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames ) const; @@ -290,13 +290,13 @@ namespace dbaui void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); /** adds a new object to the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the object to be inserted - @param _rObject + @param _rObject The object to add. - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ SvLBoxEntry* elementAdded(ElementType eType @@ -304,13 +304,13 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one - @param _eType + @param _eType The type where the entry shold be appended. - @param _rOldName + @param _rOldName The old name of the object to be replaced - @param _rNewName + @param _rNewName The new name of the object to be replaced - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. @param _xObject The object which was replaced @@ -320,11 +320,11 @@ namespace dbaui ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the element to be removed. - @param _rxConn + @param _rxConn If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType @@ -338,27 +338,27 @@ namespace dbaui /** switches to the given preview mode - @param _eMode + @param _eMode the mode to set for the preview */ void switchPreview(PreviewMode _eMode); /** shows the Preview of the content when it is enabled. - @param _xContent + @param _xContent The content which must support the "preview" command. */ void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); /** shows the Preview of a table or query - @param _sDataSourceName + @param _sDataSourceName the name of the data source - @param _sName + @param _sName the name of table or query - @param _bTable + @param _bTable if it is a table, otherwise - @return void + @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const ::rtl::OUString& _sDataSourceName, const ::rtl::OUString& _sName, sal_Bool _bTable); diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx index 939d174b23e9..8aa7ed471ef6 100644 --- a/dbaccess/source/ui/app/AppIconControl.cxx +++ b/dbaccess/source/ui/app/AppIconControl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ using namespace ::dbaui; // class OApplicationIconControl DBG_NAME(OApplicationIconControl) //================================================================== -OApplicationIconControl::OApplicationIconControl(Window* _pParent) +OApplicationIconControl::OApplicationIconControl(Window* _pParent) : SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/ WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER) ,DropTargetHelper(this) @@ -69,7 +69,7 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent) String( ModuleRes( aCategories[i].nLabelResId ) ), Image( ModuleRes( aCategories[i].nImageResId ) ), Image( ModuleRes( aCategories[i].nImageResIdHC ) ) ); - if ( pEntry ) + if ( pEntry ) pEntry->SetUserData( new ElementType( aCategories[i].eType ) ); } @@ -98,8 +98,8 @@ sal_Int8 OApplicationIconControl::AcceptDrop( const AcceptDropEvent& _rEvt ) sal_Int8 nDropOption = DND_ACTION_NONE; if ( m_pActionListener ) { - - SvxIconChoiceCtrlEntry* pEntry = GetEntry(_rEvt.maPosPixel); + + SvxIconChoiceCtrlEntry* pEntry = GetEntry(_rEvt.maPosPixel); if ( pEntry ) { SetCursor(pEntry); diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx index 3bd27a99a56b..be650da5034e 100644 --- a/dbaccess/source/ui/app/AppIconControl.hxx +++ b/dbaccess/source/ui/app/AppIconControl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,23 +36,23 @@ namespace dbaui { class IControlActionListener; //================================================================== - class OApplicationIconControl :public SvtIconChoiceCtrl + class OApplicationIconControl :public SvtIconChoiceCtrl ,public DropTargetHelper { - Point m_aMousePos; - IControlActionListener* m_pActionListener; + Point m_aMousePos; + IControlActionListener* m_pActionListener; public: OApplicationIconControl(Window* _pParent); virtual ~OApplicationIconControl(); - void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } - IControlActionListener* getControlActionListener( ) const { return m_pActionListener; } + void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; } + IControlActionListener* getControlActionListener( ) const { return m_pActionListener; } protected: // DropTargetHelper overridables - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); - virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); + virtual sal_Int8 AcceptDrop( const AcceptDropEvent& _rEvt ); + virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& _rEvt ); }; } #endif // DBAUI_APPICONCONTROL_HXX diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index e8b0393dec54..5becb111bd9d 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind ,m_rBorderWin( _rBorderWindow ) { DBG_CTOR(OApplicationSwapWindow,NULL); -// SetCompoundControl( TRUE ); +// SetCompoundControl( TRUE ); ImplInitSettings( sal_True, sal_True, sal_True ); @@ -84,7 +84,7 @@ void OApplicationSwapWindow::Resize() Size aOutputSize = GetOutputSize(); - m_aIconControl.SetPosSizePixel( Point(static_cast((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height())); + m_aIconControl.SetPosSizePixel( Point(static_cast((aOutputSize.Width() - nX)*0.5), 0) ,Size(nX,aOutputSize.Height())); m_aIconControl.ArrangeIcons(); } // ----------------------------------------------------------------------------- @@ -179,7 +179,7 @@ bool OApplicationSwapWindow::onContainerSelected( ElementType _eType ) IMPL_LINK(OApplicationSwapWindow, OnContainerSelectHdl, SvtIconChoiceCtrl*, _pControl) { ULONG nPos = 0; - SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos ); + SvxIconChoiceCtrlEntry* pEntry = _pControl->GetSelectedEntry( nPos ); ElementType eType = E_NONE; if ( pEntry ) { @@ -199,7 +199,7 @@ IMPL_LINK(OApplicationSwapWindow, ChangeToLastSelected, void*, EMPTYARG) void OApplicationSwapWindow::selectContainer(ElementType _eType) { ULONG nCount = m_aIconControl.GetEntryCount(); - SvxIconChoiceCtrlEntry* pEntry = NULL; + SvxIconChoiceCtrlEntry* pEntry = NULL; for (ULONG i=0; i < nCount; ++i) { pEntry = m_aIconControl.GetEntry(i); diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx index bc5cd2abb1df..2ef77e73ab7d 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.hxx +++ b/dbaccess/source/ui/app/AppSwapWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,16 +37,16 @@ namespace dbaui { class OAppBorderWindow; //================================================================== - class OApplicationSwapWindow : public Window, + class OApplicationSwapWindow : public Window, public IClipboardTest { - OApplicationIconControl m_aIconControl; - ElementType m_eLastType; - OAppBorderWindow& m_rBorderWin; + OApplicationIconControl m_aIconControl; + ElementType m_eLastType; + OAppBorderWindow& m_rBorderWin; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* ); + DECL_LINK( OnContainerSelectHdl, SvtIconChoiceCtrl* ); DECL_LINK( ChangeToLastSelected, void* ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); @@ -57,17 +57,17 @@ namespace dbaui virtual void Resize(); - inline sal_Bool isCutAllowed() { return sal_False; } - inline sal_Bool isCopyAllowed() { return sal_False; } - inline sal_Bool isPasteAllowed() { return sal_False; } + inline sal_Bool isCutAllowed() { return sal_False; } + inline sal_Bool isCopyAllowed() { return sal_False; } + inline sal_Bool isPasteAllowed() { return sal_False; } virtual sal_Bool hasChildPathFocus() { return HasChildPathFocus(); } - inline void copy() { } - inline void cut() { } - inline void paste() { } + inline void copy() { } + inline void cut() { } + inline void paste() { } - inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); } - inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); } - inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); } + inline ULONG GetEntryCount() const { return m_aIconControl.GetEntryCount(); } + inline SvxIconChoiceCtrlEntry* GetEntry( ULONG nPos ) const { return m_aIconControl.GetEntry(nPos); } + inline Rectangle GetBoundingBox( SvxIconChoiceCtrlEntry* pEntry ) const { return m_aIconControl.GetBoundingBox(pEntry); } /** automatically creates mnemonics for the icon/texts in our left hand side panel */ @@ -90,7 +90,7 @@ namespace dbaui void clearSelection(); /** changes the container which should be displayed. The select handler will also be called. - @param _eType + @param _eType Which container to show. */ void selectContainer(ElementType _eType); diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx b/dbaccess/source/ui/app/AppTitleWindow.cxx index f0166e49d69a..3c5c2362919a 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.cxx +++ b/dbaccess/source/ui/app/AppTitleWindow.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,7 +36,7 @@ namespace dbaui { - + DBG_NAME(OTitleWindow) OTitleWindow::OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift) : Window(_pParent,_nBits | WB_DIALOGCONTROL) @@ -73,30 +73,30 @@ void OTitleWindow::setChildWindow(Window* _pChild) { m_pChild = _pChild; } -#define SPACE_BORDER 1 +#define SPACE_BORDER 1 // ----------------------------------------------------------------------------- void OTitleWindow::Resize() { ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); - + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); + Size aTextSize = LogicToPixel( Size( 6, 3 ), MAP_APPFONT ); sal_Int32 nXOffset = aTextSize.Width(); sal_Int32 nYOffset = aTextSize.Height(); sal_Int32 nHeight = GetTextHeight() + 2*nYOffset; - m_aSpace1.SetPosSizePixel( Point(SPACE_BORDER, SPACE_BORDER ), + m_aSpace1.SetPosSizePixel( Point(SPACE_BORDER, SPACE_BORDER ), Size(nXOffset , nHeight - SPACE_BORDER) ); - m_aSpace2.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, SPACE_BORDER ), + m_aSpace2.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, SPACE_BORDER ), Size(nOutputWidth - nXOffset - 2*SPACE_BORDER, nYOffset) ); - m_aTitle.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, nYOffset + SPACE_BORDER), + m_aTitle.SetPosSizePixel( Point(nXOffset + SPACE_BORDER, nYOffset + SPACE_BORDER), Size(nOutputWidth - nXOffset - 2*SPACE_BORDER, nHeight - nYOffset - SPACE_BORDER) ); if ( m_pChild ) { - m_pChild->SetPosSizePixel( Point(m_bShift ? (nXOffset+SPACE_BORDER) : sal_Int32(SPACE_BORDER), nHeight + nXOffset + SPACE_BORDER), + m_pChild->SetPosSizePixel( Point(m_bShift ? (nXOffset+SPACE_BORDER) : sal_Int32(SPACE_BORDER), nHeight + nXOffset + SPACE_BORDER), Size(nOutputWidth - ( m_bShift ? (2*nXOffset - 2*SPACE_BORDER) : sal_Int32(SPACE_BORDER) ), nOutputHeight - nHeight - 2*nXOffset - 2*SPACE_BORDER) ); } } @@ -145,7 +145,7 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B StyleSettings aStyle = aAllSettings.GetStyleSettings(); aStyle.SetMonoColor(aStyle.GetActiveBorderColor());//GetMenuBorderColor()); aAllSettings.SetStyleSettings(aStyle); - SetSettings(aAllSettings); + SetSettings(aAllSettings); const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); if( bFont ) @@ -174,7 +174,7 @@ void OTitleWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_B pWindows[i]->SetFont(aFont); pWindows[i]->SetTextColor( aStyle.GetLightColor() ); pWindows[i]->SetBackground( Wallpaper( aStyle.GetShadowColor() ) ); - } + } } // ............................................................. } // namespace dbaui diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index 8f230d9d9e1c..306ed964946e 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,44 +34,44 @@ namespace dbaui { class OTitleWindow : public Window { - FixedText m_aSpace1; - FixedText m_aSpace2; - FixedText m_aTitle; - Window* m_pChild; - BOOL m_bShift; + FixedText m_aSpace1; + FixedText m_aSpace2; + FixedText m_aTitle; + Window* m_pChild; + BOOL m_bShift; void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); protected: virtual void DataChanged(const DataChangedEvent& rDCEvt); public: OTitleWindow(Window* _pParent,USHORT _nTitleId,WinBits _nBits,BOOL _bShift = TRUE); virtual ~OTitleWindow(); - + // window overloads virtual void Resize(); virtual void GetFocus(); /** sets the child window which should be displayed below the title. It will be destroyed at the end. - @param _pChild + @param _pChild The child window. */ void setChildWindow(Window* _pChild); /** gets the child window. - + @return The child winodw. */ inline Window* getChildWindow() const { return m_pChild; } /** sets the title text out of the resource - @param _nTitleId + @param _nTitleId The resource id of the title text. */ void setTitle(USHORT _nTitleId); /** Gets the min Width in Pixel which is needed to display the whole - + @return the min width */ diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 17a16c5ea2b4..889d716b5fe2 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -130,8 +130,8 @@ void OAppBorderWindow::Resize() ////////////////////////////////////////////////////////////////////// // Abmessungen parent window Size aOutputSize( GetOutputSize() ); - long nOutputWidth = aOutputSize.Width(); - long nOutputHeight = aOutputSize.Height(); + long nOutputWidth = aOutputSize.Width(); + long nOutputHeight = aOutputSize.Height(); long nX = 0; Size aFLSize = LogicToPixel( Size( 3, 8 ), MAP_APPFONT ); @@ -197,13 +197,13 @@ OApplicationView* OAppBorderWindow::getView() const } // ----------------------------------------------------------------------------- -OApplicationSwapWindow* OAppBorderWindow::getPanel() const +OApplicationSwapWindow* OAppBorderWindow::getPanel() const { return static_cast< OApplicationSwapWindow* >( m_pPanel->getChildWindow() ); } // ----------------------------------------------------------------------------- -OApplicationDetailView* OAppBorderWindow::getDetailView() const +OApplicationDetailView* OAppBorderWindow::getDetailView() const { return m_pDetailView; } @@ -530,7 +530,7 @@ void OApplicationView::showPreview(const Reference< XContent >& _xContent) getDetailView()->showPreview(_xContent); } // ----------------------------------------------------------------------------- -void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName, +void OApplicationView::showPreview( const ::rtl::OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sName, sal_Bool _bTable) diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx index d4fa76c35849..371a58daf393 100644 --- a/dbaccess/source/ui/app/AppView.hxx +++ b/dbaccess/source/ui/app/AppView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,9 +55,9 @@ namespace dbaui //================================================================== class OAppBorderWindow : public Window { - OTitleWindow* m_pPanel; - OApplicationDetailView* m_pDetailView; - OApplicationView* m_pView; + OTitleWindow* m_pPanel; + OApplicationDetailView* m_pDetailView; + OApplicationView* m_pView; void ImplInitSettings(); protected: @@ -68,12 +68,12 @@ namespace dbaui virtual ~OAppBorderWindow(); // window overloads - virtual void GetFocus(); + virtual void GetFocus(); virtual void Resize(); - OApplicationView* getView() const; - OApplicationSwapWindow* getPanel() const; - OApplicationDetailView* getDetailView() const; + OApplicationView* getView() const; + OApplicationSwapWindow* getPanel() const; + OApplicationDetailView* getDetailView() const; }; //================================================================== @@ -88,18 +88,18 @@ namespace dbaui NONE }; private: - ::com::sun::star::lang::Locale m_aLocale; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > + ::com::sun::star::lang::Locale m_aLocale; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xObject; - OAppBorderWindow* m_pWin; + OAppBorderWindow* m_pWin; IApplicationController& m_rAppController; - ChildFocusState m_eChildFocus; + ChildFocusState m_eChildFocus; IClipboardTest* getActiveChild() const; void ImplInitSettings(); protected: - + // return the Rectangle where I can paint myself virtual void resizeDocumentView(Rectangle& rRect); @@ -110,7 +110,7 @@ namespace dbaui // Window virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: - OApplicationView( Window* pParent + OApplicationView( Window* pParent ,const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ,IApplicationController& _rAppController ,PreviewMode _ePreviewMode @@ -128,7 +128,7 @@ namespace dbaui virtual void GetFocus(); inline IApplicationController& getAppController() const { return m_rAppController; } - inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;} + inline const ::com::sun::star::lang::Locale& getLocale() const { return m_aLocale;} // IClipboardTest virtual sal_Bool isCutAllowed(); @@ -140,13 +140,13 @@ namespace dbaui virtual void paste(); /// get the left panel - inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); } + inline OApplicationSwapWindow* getPanel() const { return m_pWin->getPanel(); } /// get the detail page - inline OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); } + inline OApplicationDetailView* getDetailView() const { return m_pWin->getDetailView(); } /** return the qualified name. - @param _pEntry - The entry of a table, or query, form, report to get the qualified name. + @param _pEntry + The entry of a table, or query, form, report to get the qualified name. If the entry is , the first selected is chosen. @return the qualified name @@ -193,13 +193,13 @@ namespace dbaui sal_Int32 getSelectionCount(); /** clears the detail page and the selection on the left side. - @param _bTaskAlso + @param _bTaskAlso If the task window will also be cleared. */ void clearPages(sal_Bool _bTaskAlso = sal_True); /** returns the element names which are selected - @param _rNames + @param _rNames The list will be filled. */ void getSelectionElementNames( ::std::vector< ::rtl::OUString>& _rNames ) const; @@ -225,13 +225,13 @@ namespace dbaui void selectElements(const ::com::sun::star::uno::Sequence< ::rtl::OUString>& _aNames); /** adds a new object to the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the object to be inserted - @param _rObject + @param _rObject The object to add. - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. */ SvLBoxEntry* elementAdded(ElementType _eType @@ -239,13 +239,13 @@ namespace dbaui ,const ::com::sun::star::uno::Any& _rObject ); /** replaces a objects name with a new one - @param _eType + @param _eType The type where the entry shold be appended. - @param _rOldName + @param _rOldName The old name of the object to be replaced - @param _rNewName + @param _rNewName The new name of the object to be replaced - @param _rxConn + @param _rxConn If we insert a table, the connection must be set. @param _xObject The object which was replaced @@ -255,11 +255,11 @@ namespace dbaui ,const ::rtl::OUString& _rNewName ); /** removes an element from the detail page. - @param _eType + @param _eType The type where the entry shold be appended. - @param _rName + @param _rName The name of the element to be removed. - @param _rxConn + @param _rxConn If we remove a table, the connection must be set. */ void elementRemoved(ElementType _eType @@ -267,7 +267,7 @@ namespace dbaui /** changes the container which should be displayed. The select handler will also be called. - @param _eType + @param _eType Which container to show. */ void selectContainer(ElementType _eType); @@ -279,29 +279,29 @@ namespace dbaui sal_Bool isPreviewEnabled(); /** switches to the given preview mode - @param _eMode + @param _eMode the mode to set for the preview */ void switchPreview(PreviewMode _eMode); /** shows the Preview of the content when it is enabled. - @param _xContent + @param _xContent The content which must support the "preview" command. */ void showPreview(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xContent); /** shows the Preview of a table or query - @param _sDataSourceName + @param _sDataSourceName the name of the data source - @param _xConnection + @param _xConnection the connection which will be shared - @param _sName + @param _sName the name of table or query - @param _bTable + @param _bTable if it is a table, otherwise - @return void + @return void */ - void showPreview( const ::rtl::OUString& _sDataSourceName, + void showPreview( const ::rtl::OUString& _sDataSourceName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sName, sal_Bool _bTable); diff --git a/dbaccess/source/ui/app/IApplicationController.hxx b/dbaccess/source/ui/app/IApplicationController.hxx index 5e7123e4d3ed..2dc4ab87192b 100644 --- a/dbaccess/source/ui/app/IApplicationController.hxx +++ b/dbaccess/source/ui/app/IApplicationController.hxx @@ -1,7 +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 @@ -49,7 +49,7 @@ namespace dbaui { public: /** called when an entry in a tree list box has been double-clicked - @param _rTree + @param _rTree The tree list box. @return if the double click event has been handled by the called, and should not @@ -58,7 +58,7 @@ namespace dbaui virtual bool onEntryDoubleClick( SvTreeListBox& _rTree ) = 0; /** called when a container (category) in the application view has been selected - @param _pTree + @param _pTree The tree list box. @return if the cotainer could be changed otherwise @@ -66,7 +66,7 @@ namespace dbaui virtual sal_Bool onContainerSelect(ElementType _eType) = 0; /** called when an entry in a tree view has been selected - @param _pEntry + @param _pEntry the selected entry */ virtual void onSelectionChanged() = 0; diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index 2dec9005f847..ab325968f68a 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ #include "toolbox.hrc" #endif -#define MN_PROPS 25 +#define MN_PROPS 25 String RID_STR_NEW_FORM diff --git a/dbaccess/source/ui/app/dbu_app.hrc b/dbaccess/source/ui/app/dbu_app.hrc index 7412dd85786d..1fc719762a8f 100644 --- a/dbaccess/source/ui/app/dbu_app.hrc +++ b/dbaccess/source/ui/app/dbu_app.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,42 +31,42 @@ #include "dbu_resource.hrc" #endif -#define TBI_SWITCH_PREVIEW RID_DBACCESS_START +#define TBI_SWITCH_PREVIEW RID_DBACCESS_START -#define RID_STR_NEW_FORM RID_STR_APP_START -#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 -#define RID_STR_NEW_REPORT RID_STR_APP_START + 2 -#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3 -#define RID_STR_NEW_TABLE RID_STR_APP_START + 4 -#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5 -#define RID_STR_NEW_VIEW RID_STR_APP_START + 6 -#define RID_STR_NEW_VIEW_AUTO RID_STR_APP_START + 7 -#define RID_STR_NEW_QUERY RID_STR_APP_START + 8 -#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9 -#define STR_QUERY_DELETE_DATASOURCE RID_STR_APP_START + 10 -#define STR_APP_TITLE RID_STR_APP_START + 11 -#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12 -#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13 -#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14 -#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15 -#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16 -#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17 -#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18 -#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19 -#define RID_STR_VIEWS_HELP_TEXT_WIZARD RID_STR_APP_START + 20 -#define STR_DATABASE RID_STR_APP_START + 21 -#define STR_TASKS RID_STR_APP_START + 22 -#define STR_DESCRIPTION RID_STR_APP_START + 23 -#define STR_PREVIEW RID_STR_APP_START + 24 -#define STR_DISABLEPREVIEW RID_STR_APP_START + 25 -#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26 -#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27 -#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28 -#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29 -#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30 +#define RID_STR_NEW_FORM RID_STR_APP_START +#define RID_STR_NEW_FORM_AUTO RID_STR_APP_START + 1 +#define RID_STR_NEW_REPORT RID_STR_APP_START + 2 +#define RID_STR_NEW_REPORT_AUTO RID_STR_APP_START + 3 +#define RID_STR_NEW_TABLE RID_STR_APP_START + 4 +#define RID_STR_NEW_TABLE_AUTO RID_STR_APP_START + 5 +#define RID_STR_NEW_VIEW RID_STR_APP_START + 6 +#define RID_STR_NEW_VIEW_AUTO RID_STR_APP_START + 7 +#define RID_STR_NEW_QUERY RID_STR_APP_START + 8 +#define RID_STR_NEW_QUERY_AUTO RID_STR_APP_START + 9 +#define STR_QUERY_DELETE_DATASOURCE RID_STR_APP_START + 10 +#define STR_APP_TITLE RID_STR_APP_START + 11 +#define RID_STR_NEW_QUERY_SQL RID_STR_APP_START + 12 +#define RID_STR_REPORTS_CONTAINER RID_STR_APP_START + 13 +#define RID_STR_FORMS_CONTAINER RID_STR_APP_START + 14 +#define RID_STR_REPORTS_HELP_TEXT_WIZARD RID_STR_APP_START + 15 +#define RID_STR_FORMS_HELP_TEXT RID_STR_APP_START + 16 +#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17 +#define RID_STR_QUERIES_HELP_TEXT_SQL RID_STR_APP_START + 18 +#define RID_STR_VIEWS_HELP_TEXT_DESIGN RID_STR_APP_START + 19 +#define RID_STR_VIEWS_HELP_TEXT_WIZARD RID_STR_APP_START + 20 +#define STR_DATABASE RID_STR_APP_START + 21 +#define STR_TASKS RID_STR_APP_START + 22 +#define STR_DESCRIPTION RID_STR_APP_START + 23 +#define STR_PREVIEW RID_STR_APP_START + 24 +#define STR_DISABLEPREVIEW RID_STR_APP_START + 25 +#define RID_STR_QUERIES_HELP_TEXT_WIZARD RID_STR_APP_START + 26 +#define RID_STR_TABLES_HELP_TEXT_DESIGN RID_STR_APP_START + 27 +#define RID_STR_TABLES_HELP_TEXT_WIZARD RID_STR_APP_START + 28 +#define RID_STR_FORMS_HELP_TEXT_WIZARD RID_STR_APP_START + 29 +#define RID_STR_REPORT_HELP_TEXT RID_STR_APP_START + 30 #define RID_STR_EMBEDDED_DATABASE RID_STR_APP_START + 31 -#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32 -#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33 +#define RID_STR_NO_DIFF_CAT RID_STR_APP_START + 32 +#define RID_STR_UNSUPPORTED_OBJECT_TYPE RID_STR_APP_START + 33 // please adjust checking before insert new strings diff --git a/dbaccess/source/ui/app/subcomponentmanager.cxx b/dbaccess/source/ui/app/subcomponentmanager.cxx index 641051f20d49..7193d7098519 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.cxx +++ b/dbaccess/source/ui/app/subcomponentmanager.cxx @@ -1,7 +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 diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx index c66732528471..1a653141ea12 100644 --- a/dbaccess/source/ui/app/subcomponentmanager.hxx +++ b/dbaccess/source/ui/app/subcomponentmanager.hxx @@ -1,7 +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 diff --git a/dbaccess/source/ui/browser/AsyncronousLink.cxx b/dbaccess/source/ui/browser/AsyncronousLink.cxx index 7cc0ac71d23b..9e615095a19b 100644 --- a/dbaccess/source/ui/browser/AsyncronousLink.cxx +++ b/dbaccess/source/ui/browser/AsyncronousLink.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/bcommon.src b/dbaccess/source/ui/browser/bcommon.src index 8c79179eda20..41ccc595ff5a 100644 --- a/dbaccess/source/ui/browser/bcommon.src +++ b/dbaccess/source/ui/browser/bcommon.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 66e774b22a53..999a6bca6f66 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -114,24 +114,24 @@ using namespace ::dbtools; using namespace ::comphelper; using namespace ::svt; -#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ - try \ - { \ - successflag = sal_False; \ - action; \ - successflag = sal_True; \ - } \ - catch(SQLException& e) \ - { \ +#define HANDLE_SQL_ERRORS( action, successflag, context, message ) \ + try \ + { \ + successflag = sal_False; \ + action; \ + successflag = sal_True; \ + } \ + catch(SQLException& e) \ + { \ SQLException aError = ::dbtools::prependErrorInfo(e, *this, context); \ - ::com::sun::star::sdb::SQLErrorEvent aEvent; \ - aEvent.Reason <<= aError; \ - errorOccured(aEvent); \ - } \ - catch(Exception&) \ - { \ + ::com::sun::star::sdb::SQLErrorEvent aEvent; \ + aEvent.Reason <<= aError; \ + errorOccured(aEvent); \ + } \ + catch(Exception&) \ + { \ DBG_UNHANDLED_EXCEPTION(); \ - } \ + } \ #define DO_SAFE( action, message ) try { action; } catch(Exception&) { DBG_ERROR(message); } ; @@ -145,12 +145,12 @@ namespace dbaui //================================================================== class OParameterContinuation : public OInteraction< XInteractionSupplyParameters > { - Sequence< PropertyValue > m_aValues; + Sequence< PropertyValue > m_aValues; public: OParameterContinuation() { } - Sequence< PropertyValue > getValues() const { return m_aValues; } + Sequence< PropertyValue > getValues() const { return m_aValues; } // XInteractionSupplyParameters virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException); @@ -172,8 +172,8 @@ class SbaXDataBrowserController::FormControllerImpl ::com::sun::star::frame::XFrameActionListener > { friend class SbaXDataBrowserController; - ::cppu::OInterfaceContainerHelper m_aActivateListeners; - SbaXDataBrowserController* m_pOwner; + ::cppu::OInterfaceContainerHelper m_aActivateListeners; + SbaXDataBrowserController* m_pOwner; public: FormControllerImpl(SbaXDataBrowserController* pOwner); @@ -241,7 +241,7 @@ public: // XTabController, base of XFormController virtual void SAL_CALL setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > & Model) throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel > SAL_CALL getModel(void) throw( ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL setContainer(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > & _Container) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > SAL_CALL getContainer(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl > > SAL_CALL getControls(void) throw( ::com::sun::star::uno::RuntimeException ); @@ -579,7 +579,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const ::c //= SbaXDataBrowserController //================================================================== //------------------------------------------------------------------ -Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException) +Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getTypes" ); return ::comphelper::concatSequences( @@ -657,7 +657,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun SbaXDataBrowserController::~SbaXDataBrowserController() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::~SbaXDataBrowserController" ); - // deleteView(); + // deleteView(); // release the aggregated form controller if (m_xFormControllerImpl.is()) { @@ -674,7 +674,7 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::startFrameListening" ); SbaXDataBrowserController_Base::startFrameListening( _rxFrame ); - Reference< XFrameActionListener > xAggListener; + Reference< XFrameActionListener > xAggListener; if ( m_xFormControllerImpl.is() ) m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener; @@ -688,7 +688,7 @@ void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _ RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::stopFrameListening" ); SbaXDataBrowserController_Base::stopFrameListening( _rxFrame ); - Reference< XFrameActionListener > xAggListener; + Reference< XFrameActionListener > xAggListener; if ( m_xFormControllerImpl.is() ) m_xFormControllerImpl->queryAggregation( XFrameActionListener::static_type() ) >>= xAggListener; @@ -855,7 +855,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent) if (!bSuccess) { - // deleteView(); + // deleteView(); return sal_False; } @@ -900,7 +900,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent) if (m_xLoadable.is()) m_xLoadable->addLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); + Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); if (xFormParameter.is()) xFormParameter->addParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this); @@ -997,7 +997,7 @@ void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun: xBroadcaster->addModifyListener(static_cast(this)); // introduce ourself as dispatch provider for the grid - Reference< XDispatchProviderInterception > xInterception(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< XDispatchProviderInterception > xInterception(getBrowserView()->getGridControl(), UNO_QUERY); if (xInterception.is()) xInterception->registerDispatchProviderInterceptor(static_cast(this)); @@ -1015,7 +1015,7 @@ void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::s if (xBroadcaster.is()) xBroadcaster->removeModifyListener(static_cast(this)); - Reference< XDispatchProviderInterception > xInterception(_xGridControl, UNO_QUERY); + Reference< XDispatchProviderInterception > xInterception(_xGridControl, UNO_QUERY); if (xInterception.is()) xInterception->releaseDispatchProviderInterceptor(static_cast(this)); @@ -1108,7 +1108,7 @@ void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang: if (m_xLoadable.is()) m_xLoadable->removeLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY); + Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(Source.Source, UNO_QUERY); if (xFormParameter.is()) xFormParameter->removeParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this); } @@ -1187,16 +1187,16 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t SolarMutexGuard aGuard; // the IsModified changed to sal_False ? - if ( (evt.PropertyName.equals(PROPERTY_ISMODIFIED)) - && (::comphelper::getBOOL(evt.NewValue) == sal_False) + if ( (evt.PropertyName.equals(PROPERTY_ISMODIFIED)) + && (::comphelper::getBOOL(evt.NewValue) == sal_False) ) - { // -> the current field isn't modified anymore, too + { // -> the current field isn't modified anymore, too setCurrentModified( sal_False ); } // switching to a new record ? - if ( (evt.PropertyName.equals(PROPERTY_ISNEW)) - && (::comphelper::getBOOL(evt.NewValue) == sal_True) + if ( (evt.PropertyName.equals(PROPERTY_ISNEW)) + && (::comphelper::getBOOL(evt.NewValue) == sal_True) ) { if (::comphelper::getINT32(xSource->getPropertyValue(PROPERTY_ROWCOUNT)) == 0) @@ -1205,7 +1205,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t InvalidateAll(); } - + // the filter or the sort criterias have changed ? -> update our parser if (evt.PropertyName.equals(PROPERTY_ACTIVECOMMAND)) { @@ -1216,7 +1216,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t { // if ( m_xParser.is() && m_xParser->getFilter() != ::comphelper::getString(evt.NewValue)) //{ - // DO_SAFE( m_xParser->setFilter(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); + // DO_SAFE( m_xParser->setFilter(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); //} InvalidateFeature(ID_BROWSER_REMOVEFILTER); } @@ -1224,7 +1224,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t { //if ( m_xParser.is() && m_xParser->getHavingClause() != ::comphelper::getString(evt.NewValue)) //{ - // DO_SAFE( m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); + // DO_SAFE( m_xParser->setHavingClause(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new filter to my parser !" ); //} InvalidateFeature(ID_BROWSER_REMOVEFILTER); } @@ -1232,7 +1232,7 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t { //if ( m_xParser.is() && m_xParser->getOrder() != ::comphelper::getString(evt.NewValue)) //{ - // DO_SAFE( m_xParser->setOrder(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new order to my parser !" ); + // DO_SAFE( m_xParser->setOrder(::comphelper::getString(evt.NewValue)), "SbaXDataBrowserController::propertyChange : could not forward the new order to my parser !" ); //} InvalidateFeature(ID_BROWSER_REMOVEFILTER); } @@ -1332,7 +1332,7 @@ void SbaXDataBrowserController::disposing() if (m_xLoadable.is()) m_xLoadable->removeLoadListener(this); - Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); + Reference< ::com::sun::star::form::XDatabaseParameterBroadcaster > xFormParameter(getRowSet(), UNO_QUERY); if (xFormParameter.is()) xFormParameter->removeParameterListener((::com::sun::star::form::XDatabaseParameterListener*)this); @@ -1361,9 +1361,9 @@ void SbaXDataBrowserController::disposing() { ::comphelper::disposeComponent(m_xRowSet); - m_xRowSet = NULL; - m_xColumnsSupplier = NULL; - m_xLoadable = NULL; + m_xRowSet = NULL; + m_xColumnsSupplier = NULL; + m_xLoadable = NULL; } catch(Exception&) { @@ -1454,7 +1454,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for return sal_True; } - Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters; + Reference< ::com::sun::star::container::XIndexAccess > xParameters = aEvent.Parameters; SolarMutexGuard aSolarGuard; // this may be executed in a non-main thread and we want to use vcl ... Window* pParent = Application::GetDefDialogParent(); @@ -1486,7 +1486,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for xHandler->handle(xParamRequest); if (!pParamValues->wasSelected()) - { // canceled + { // canceled setLoadingCancelled(); return sal_False; } @@ -1581,7 +1581,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const } // no chance without valid models if (isValid() && !isValidCursor()) - return aReturn; + return aReturn; switch (nId) { @@ -1638,9 +1638,9 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const break; } // run through - case ID_BROWSER_PASTE: + case ID_BROWSER_PASTE: case ID_BROWSER_CUT: - { + { CellControllerRef xCurrentController = getBrowserView()->getVclControl()->Controller(); if (xCurrentController.Is() && xCurrentController->ISA(EditCellController)) { @@ -1649,8 +1649,8 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const sal_Bool bIsReadOnly = rEdit.IsReadOnly(); switch (nId) { - case ID_BROWSER_CUT: aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen && !bIsReadOnly; break; - case SID_COPY : aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen; break; + case ID_BROWSER_CUT: aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen && !bIsReadOnly; break; + case SID_COPY : aReturn.bEnabled = m_aCurrentFrame.isActive() && bHasLen; break; case ID_BROWSER_PASTE: aReturn.bEnabled = m_aCurrentFrame.isActive() && !bIsReadOnly; if(aReturn.bEnabled) @@ -1710,7 +1710,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const break; case ID_BROWSER_REDO: - aReturn.bEnabled = sal_False; // simply forget it ;). no redo possible. + aReturn.bEnabled = sal_False; // simply forget it ;). no redo possible. break; case ID_BROWSER_UNDORECORD: @@ -1733,17 +1733,17 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const // check if it is available Reference< XPropertySet > xDataSourceSet(getRowSet(), UNO_QUERY); if (!xDataSourceSet.is()) - break; // no datasource -> no edit mode + break; // no datasource -> no edit mode sal_Int32 nDataSourcePrivileges = ::comphelper::getINT32(xDataSourceSet->getPropertyValue(PROPERTY_PRIVILEGES)); sal_Bool bInsertAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::INSERT) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowInserts"))); sal_Bool bUpdateAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::UPDATE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowUpdates"))); sal_Bool bDeleteAllowedAndPossible = ((nDataSourcePrivileges & ::com::sun::star::sdbcx::Privilege::DELETE) != 0) && ::comphelper::getBOOL(xDataSourceSet->getPropertyValue(::rtl::OUString::createFromAscii("AllowDeletes"))); if (!bInsertAllowedAndPossible && !bUpdateAllowedAndPossible && !bDeleteAllowedAndPossible) - break; // no insert/update/delete -> no edit mode + break; // no insert/update/delete -> no edit mode if (!isValidCursor() || !isLoaded()) - break; // no cursor -> no edit mode + break; // no cursor -> no edit mode aReturn.bEnabled = sal_True; @@ -1968,10 +1968,10 @@ void SbaXDataBrowserController::ExecuteSearch() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ExecuteSearch" ); // calculate the control source of the active field - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); DBG_ASSERT(xGrid.is(), "SbaXDataBrowserController::ExecuteSearch : the control should have an ::com::sun::star::form::XGrid interface !"); - Reference< ::com::sun::star::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); + Reference< ::com::sun::star::form::XGridPeer > xGridPeer(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); Reference< ::com::sun::star::container::XIndexContainer > xColumns = xGridPeer->getColumns(); DBG_ASSERT(xGridPeer.is() && xColumns.is(), "SbaXDataBrowserController::ExecuteSearch : invalid peer !"); @@ -1983,7 +1983,7 @@ void SbaXDataBrowserController::ExecuteSearch() // the text within the current cell String sInitialText; - Reference< ::com::sun::star::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > xColControls(xGridPeer, UNO_QUERY); Reference< XInterface > xCurControl(xColControls->getByIndex(nViewCol),UNO_QUERY); ::rtl::OUString aInitialText; if (IsSearchableControl(xCurControl, &aInitialText)) @@ -2051,7 +2051,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property } break; case SID_FM_DELETEROWS: - + if (SaveModified()) { SbaGridControl* pVclGrid = getBrowserView()->getVclControl(); @@ -2126,8 +2126,8 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property switch (nId) { case ID_BROWSER_CUT : rEdit.Cut(); break; - case SID_COPY : rEdit.Copy(); break; - case ID_BROWSER_PASTE : rEdit.Paste(); break; + case SID_COPY : rEdit.Copy(); break; + case ID_BROWSER_PASTE : rEdit.Paste(); break; } if (ID_BROWSER_CUT == nId || ID_BROWSER_PASTE == nId) { @@ -2359,7 +2359,7 @@ sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor) } } - if ( !CommitCurrent() ) // das aktuelle Control committen lassen + if ( !CommitCurrent() ) // das aktuelle Control committen lassen return sal_False; Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); @@ -2398,7 +2398,7 @@ sal_Bool SbaXDataBrowserController::CommitCurrent() return sal_True; Reference< ::com::sun::star::awt::XControl > xActiveControl(getBrowserView()->getGridControl()); - Reference< ::com::sun::star::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY); + Reference< ::com::sun::star::form::XBoundControl > xLockingTest(xActiveControl, UNO_QUERY); sal_Bool bControlIsLocked = xLockingTest.is() && xLockingTest->getLock(); if (xActiveControl.is() && !bControlIsLocked) { @@ -2498,7 +2498,7 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n // get the current column from the grid if (nViewPos == (sal_uInt16)-1) { - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); if (!xGrid.is()) return xEmptyReturn; nViewPos = xGrid->getCurrentColumnPosition(); @@ -2520,10 +2520,10 @@ Reference< XPropertySet > SbaXDataBrowserController::getBoundField(sal_uInt16 n //------------------------------------------------------------------------------ IMPL_LINK(SbaXDataBrowserController, OnSearchContextRequest, FmSearchContext*, pContext) { - Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > xPeerContainer(getBrowserView()->getGridControl(), UNO_QUERY); // check all grid columns for their control source - Reference< ::com::sun::star::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > xModelColumns(getFormComponent(), UNO_QUERY); DBG_ASSERT(xModelColumns.is(), "SbaXDataBrowserController::OnSearchContextRequest : there is a grid control without columns !"); // the case 'no columns' should be indicated with an empty container, I think ... DBG_ASSERT(xModelColumns->getCount() >= xPeerContainer->getCount(), "SbaXDataBrowserController::OnSearchContextRequest : impossible : have more view than model columns !"); @@ -2582,7 +2582,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn xModelSet->setPropertyValue(::rtl::OUString::createFromAscii("DisplayIsSynchron"), aOld); // and move to the field - Reference< ::com::sun::star::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); + Reference< ::com::sun::star::container::XIndexAccess > aColumnControls(getBrowserView()->getGridControl()->getPeer(), UNO_QUERY); sal_uInt16 nViewPos; for ( nViewPos = 0; nViewPos < aColumnControls->getCount(); ++nViewPos ) @@ -2597,7 +2597,7 @@ IMPL_LINK(SbaXDataBrowserController, OnFoundData, FmFoundRecordInformation*, pIn } } - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); xGrid->setCurrentColumnPosition(nViewPos); return 0; @@ -2679,7 +2679,7 @@ void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/) { DBG_UNHANDLED_EXCEPTION(); } - + // -------------------------------- // switch the control to alive mode getBrowserView()->getGridControl()->setDesignMode(sal_False); @@ -2705,7 +2705,7 @@ void SbaXDataBrowserController::initializeParser() const { const Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY); if (::comphelper::getBOOL(xFormSet->getPropertyValue(PROPERTY_ESCAPE_PROCESSING))) - { // (only if the statement isn't native) + { // (only if the statement isn't native) // (it is allowed to use the PROPERTY_ISPASSTHROUGH : _after_ loading a form it is valid) xFormSet->getPropertyValue(PROPERTY_SINGLESELECTQUERYCOMPOSER) >>= m_xParser; /* @@ -2738,7 +2738,7 @@ void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( Run { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::loaded" ); // not interested in - // we're loading within an separate thread and have a handling for it's "finished event" + // we're loading within an separate thread and have a handling for it's "finished event" } //------------------------------------------------------------------------------ @@ -2850,11 +2850,11 @@ class LoadFormHelper :public ::cppu::WeakImplHelper2< ::com::sun::star::form::XL XRowSetListener> { enum STATE { STARTED, LOADED, POSITIONED, DISPOSED }; - STATE m_eState; + STATE m_eState; - Reference< XRowSet > m_xForm; + Reference< XRowSet > m_xForm; - ::osl::Mutex m_aAccessSafety; + ::osl::Mutex m_aAccessSafety; public: LoadFormHelper(const Reference< XRowSet > & _rxForm); @@ -3017,7 +3017,7 @@ bool LoadFormHelper::WaitUntilReallyLoaded(bool _bOnlyIfLoaded) sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getCurrentColumnPosition" ); - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); sal_Int16 nViewPos = -1; try { @@ -3031,7 +3031,7 @@ sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition() void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setCurrentColumnPosition" ); - Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); + Reference< ::com::sun::star::form::XGrid > xGrid(getBrowserView()->getGridControl(), UNO_QUERY); try { if ( -1 != _nPos ) @@ -3078,7 +3078,7 @@ sal_Bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com:: return sal_True; } //.................................................................. -} // namespace dbaui +} // namespace dbaui //.................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 6929a9ee162b..47881727c6dd 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,17 +47,17 @@ using namespace dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::form; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -namespace +namespace { sal_Bool isGrabVclControlFocusAllowed(const UnoDataBrowserView* _pView) { - sal_Bool bGrabFocus = sal_False; + sal_Bool bGrabFocus = sal_False; SbaGridControl* pVclControl = _pView->getVclControl(); Reference< ::com::sun::star::awt::XControl > xGrid = _pView->getGridControl(); if (pVclControl && xGrid.is()) @@ -81,7 +81,7 @@ namespace DBG_NAME(UnoDataBrowserView) // ------------------------------------------------------------------------- -UnoDataBrowserView::UnoDataBrowserView( Window* pParent, +UnoDataBrowserView::UnoDataBrowserView( Window* pParent, IController& _rController, const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rFactory) :ODataView(pParent,_rController,_rFactory) @@ -121,7 +121,7 @@ void UnoDataBrowserView::Construct(const Reference< ::com::sun::star::awt::XCont // get the VCL-control m_pVclControl = NULL; - getVclControl(); + getVclControl(); DBG_ASSERT(m_pVclControl != NULL, "UnoDataBrowserView::Construct : no real grid control !"); } @@ -139,7 +139,7 @@ UnoDataBrowserView::~UnoDataBrowserView() m_pSplitter = NULL; } setTreeView(NULL); - + if ( m_pStatus ) { delete m_pStatus; @@ -215,17 +215,17 @@ void UnoDataBrowserView::hideStatus() // ------------------------------------------------------------------------- void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) { - Point aSplitPos; - Size aSplitSize; - Point aPlaygroundPos( _rPlayground.TopLeft() ); - Size aPlaygroundSize( _rPlayground.GetSize() ); + Point aSplitPos; + Size aSplitSize; + Point aPlaygroundPos( _rPlayground.TopLeft() ); + Size aPlaygroundSize( _rPlayground.GetSize() ); if (m_pTreeView && m_pTreeView->IsVisible() && m_pSplitter) { // calculate the splitter pos and size - aSplitPos = m_pSplitter->GetPosPixel(); + aSplitPos = m_pSplitter->GetPosPixel(); aSplitPos.Y() = aPlaygroundPos.Y(); - aSplitSize = m_pSplitter->GetOutputSizePixel(); + aSplitSize = m_pSplitter->GetOutputSizePixel(); aSplitSize.Height() = aPlaygroundSize.Height(); if( ( aSplitPos.X() + aSplitSize.Width() ) > ( aPlaygroundSize.Width() )) @@ -235,8 +235,8 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) aSplitPos.X() = aPlaygroundPos.X() + sal_Int32(aPlaygroundSize.Width() * 0.2); // the tree pos and size - Point aTreeViewPos( aPlaygroundPos ); - Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); + Point aTreeViewPos( aPlaygroundPos ); + Size aTreeViewSize( aSplitPos.X(), aPlaygroundSize.Height() ); // the status pos and size if (m_pStatus && m_pStatus->IsVisible()) @@ -249,7 +249,7 @@ void UnoDataBrowserView::resizeDocumentView(Rectangle& _rPlayground) m_pStatus->SetPosSizePixel( aStatusPos, aStatusSize ); aTreeViewSize.Height() -= aStatusSize.Height(); } - + // set the size of treelistbox m_pTreeView->SetPosSizePixel( aTreeViewPos, aTreeViewSize ); @@ -276,8 +276,8 @@ sal_uInt16 UnoDataBrowserView::View2ModelPos(sal_uInt16 nPos) const } // ----------------------------------------------------------------------------- -SbaGridControl* UnoDataBrowserView::getVclControl() const -{ +SbaGridControl* UnoDataBrowserView::getVclControl() const +{ if ( !m_pVclControl ) { OSL_ENSURE(m_xGrid.is(),"Grid not set!"); @@ -296,7 +296,7 @@ SbaGridControl* UnoDataBrowserView::getVclControl() const } } } - return m_pVclControl; + return m_pVclControl; } // ----------------------------------------------------------------------------- void UnoDataBrowserView::GetFocus() diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index c0e3157bfb75..71d7e95a1bfc 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace dbaui class ColorChanger { protected: - OutputDevice* m_pDev; + OutputDevice* m_pDev; public: ColorChanger( OutputDevice* _pDev, const Color& _rNewLineColor, const Color& _rNewFillColor ) @@ -77,9 +77,9 @@ namespace dbaui DBG_NAME(ODataView) // ------------------------------------------------------------------------- - ODataView::ODataView( Window* pParent, + ODataView::ODataView( Window* pParent, IController& _rController, - const Reference< XMultiServiceFactory >& _rFactory, + const Reference< XMultiServiceFactory >& _rFactory, WinBits nStyle) :Window(pParent,nStyle) ,m_xServiceFactory(_rFactory) @@ -102,7 +102,7 @@ namespace dbaui DBG_DTOR(ODataView,NULL); enableSeparator( sal_False ); - m_rController.release(); + m_rController.release(); } // ------------------------------------------------------------------------- @@ -176,7 +176,7 @@ namespace dbaui { case EVENT_KEYINPUT: { - const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); + const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent(); const KeyCode& aKeyCode = pKeyEvent->GetKeyCode(); if ( m_pAccel.get() && m_pAccel->execute( aKeyCode ) ) // the accelerator consumed the event diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index 21b4fc2d2172..fb834691c963