subject:"\[Libreoffice\-commits\] core.git\: dbaccess\/qa dbaccess\/source"

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2023-10-19 Thread Stephan Bergmann (via logerrit)

 dbaccess/qa/extras/dialog-save.cxx |2 +-
 dbaccess/qa/extras/empty-stdlib-save.cxx   |2 +-
 dbaccess/qa/extras/nolib-save.cxx  |2 +-
 dbaccess/qa/unit/embeddeddb_performancetest.cxx|4 ++--
 dbaccess/source/core/api/FilteredContainer.cxx |8 
 dbaccess/source/core/api/KeySet.cxx|2 +-
 dbaccess/source/core/api/SingleSelectQueryComposer.cxx |   10 +-
 dbaccess/source/core/dataaccess/databasedocument.cxx   |2 +-
 dbaccess/source/core/dataaccess/datasource.cxx |2 +-
 dbaccess/source/core/misc/DatabaseDataProvider.cxx |2 +-
 dbaccess/source/core/recovery/dbdocrecovery.cxx|4 ++--
 dbaccess/source/core/recovery/storagetextstream.cxx|2 +-
 dbaccess/source/core/recovery/subcomponentrecovery.cxx |6 +++---
 dbaccess/source/filter/hsqldb/hsqlimport.cxx   |2 +-
 dbaccess/source/filter/hsqldb/parseschema.cxx  |6 +++---
 dbaccess/source/filter/xml/xmlExport.cxx   |2 +-
 dbaccess/source/ui/app/AppControllerGen.cxx|2 +-
 dbaccess/source/ui/dlg/dbadmin.cxx |2 +-
 dbaccess/source/ui/dlg/dbfindex.cxx|2 +-
 dbaccess/source/ui/dlg/queryfilter.cxx |4 ++--
 dbaccess/source/ui/dlg/tablespage.cxx  |2 +-
 dbaccess/source/ui/misc/indexcollection.cxx|2 +-
 dbaccess/source/ui/querydesign/querycontroller.cxx |4 ++--
 23 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 7eda35a36c8837c620722e5c26c90324ae9b48e9
Author: Stephan Bergmann 
AuthorDate: Thu Oct 19 10:30:10 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Oct 19 18:49:53 2023 +0200

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: dbaccess

Change-Id: I5f92e390ef57ae8f2aba43782c11ca5ee31dba93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158187
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/dbaccess/qa/extras/dialog-save.cxx 
b/dbaccess/qa/extras/dialog-save.cxx
index 4b07eebff459..04c12b1c5e8b 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -56,7 +56,7 @@ void DialogSaveTest::test()
 uno::Reference< script::XStorageBasedLibraryContainer > 
xStorDlgLib(xDocScr->getDialogLibraries());
 CPPUNIT_ASSERT(xStorDlgLib.is());
 uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, 
UNO_QUERY_THROW);
-static constexpr OUStringLiteral sStandard(u"Standard");
+static constexpr OUString sStandard(u"Standard"_ustr);
 xBasLib->loadLibrary(sStandard);
 CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
 // the whole point of this test is to test the "save" operation
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx 
b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 41074d909c89..5c3b5d028d8c 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -54,7 +54,7 @@ void DialogSaveTest::test()
 uno::Reference< script::XStorageBasedLibraryContainer > 
xStorDlgLib(xDocScr->getDialogLibraries());
 CPPUNIT_ASSERT(xStorDlgLib.is());
 uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, 
UNO_QUERY_THROW);
-static constexpr OUStringLiteral sStandard(u"Standard");
+static constexpr OUString sStandard(u"Standard"_ustr);
 xBasLib->loadLibrary(sStandard);
 xDlgLib->loadLibrary(sStandard);
 CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
diff --git a/dbaccess/qa/extras/nolib-save.cxx 
b/dbaccess/qa/extras/nolib-save.cxx
index 054ad9a369ca..614c4f03794a 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -54,7 +54,7 @@ void DialogSaveTest::test()
 uno::Reference< script::XStorageBasedLibraryContainer > 
xStorDlgLib(xDocScr->getDialogLibraries());
 CPPUNIT_ASSERT(xStorDlgLib.is());
 uno::Reference< script::XLibraryContainer > xDlgLib(xStorDlgLib, 
UNO_QUERY_THROW);
-static constexpr OUStringLiteral sStandard(u"Standard");
+static constexpr OUString sStandard(u"Standard"_ustr);
 xBasLib->loadLibrary(sStandard);
 xDlgLib->loadLibrary(sStandard);
 CPPUNIT_ASSERT(xBasLib->isLibraryLoaded(sStandard));
diff --git a/dbaccess/qa/unit/embeddeddb_performancetest.cxx 
b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
index 921fc9977d98..184ef0831ad1 100644
--- a/dbaccess/qa/unit/embeddeddb_performancetest.cxx
+++ b/dbaccess/qa/unit/embeddeddb_performancetest.cxx
@@ -82,7 +82,7 @@ class EmbeddedDBPerformanceTest
 : public DBTestBase
 {
 private:
-static constexpr OUStringLiteral our_sEnableTestEnvVar = u"DBA_PERFTEST";
+static constexpr OUString our_sEnableTestEnvVar = u"DBA_PERFTEST"_ustr;
 
 
 // We store the results and print

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2022-04-14 Thread Noel Grandin (via logerrit)

 dbaccess/qa/extras/hsql_schema_import.cxx  |   16 +++---
 dbaccess/source/filter/hsqldb/createparser.cxx |   60 -
 dbaccess/source/filter/hsqldb/createparser.hxx |4 -
 dbaccess/source/filter/hsqldb/utils.cxx|   12 ++---
 dbaccess/source/filter/hsqldb/utils.hxx|2 
 5 files changed, 48 insertions(+), 46 deletions(-)

New commits:
commit 590323f4235e5ec3de2dc6dee28a4f03288ac6d7
Author: Noel Grandin 
AuthorDate: Thu Apr 14 12:19:57 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Apr 14 16:00:47 2022 +0200

use more string_view in dbaccess

Change-Id: I256ffe22fa060be6a6fc32e73d845879d71a187d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133007
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/dbaccess/qa/extras/hsql_schema_import.cxx 
b/dbaccess/qa/extras/hsql_schema_import.cxx
index 6d714ae9a8ae..f5f34d38b69a 100644
--- a/dbaccess/qa/extras/hsql_schema_import.cxx
+++ b/dbaccess/qa/extras/hsql_schema_import.cxx
@@ -62,7 +62,7 @@ public:
 void HsqlSchemaImportTest::testIntegerPrimaryKeyNotNull()
 {
 FbCreateStmtParser aCreateParser;
-aCreateParser.parse("CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT 
NULL PRIMARY KEY)");
+aCreateParser.parse(u"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT 
NULL PRIMARY KEY)");
 
 CPPUNIT_ASSERT_EQUAL(OUString{ "\"myTable\"" }, 
aCreateParser.getTableName());
 const auto& columns = aCreateParser.getColumnDef();
@@ -79,7 +79,7 @@ void HsqlSchemaImportTest::testVarcharWithParam()
 {
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
+u"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
 "VARCHAR(50))");
 
 const auto& columns = aCreateParser.getColumnDef();
@@ -101,7 +101,7 @@ void HsqlSchemaImportTest::testVarcharWithoutParam()
 {
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
+u"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
 "VARCHAR)");
 
 const auto& columns = aCreateParser.getColumnDef();
@@ -116,7 +116,7 @@ void HsqlSchemaImportTest::testNumericWithTwoParam()
 {
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"Betrag\" "
+u"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"Betrag\" "
 "NUMERIC(8,2))");
 
 const auto& columns = aCreateParser.getColumnDef();
@@ -137,7 +137,7 @@ void HsqlSchemaImportTest::testIntegerAutoincremental()
 {
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY 
GENERATED "
+u"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY 
GENERATED "
 "BY DEFAULT AS IDENTITY(START WITH 0), \"myText\" VARCHAR(50))");
 
 const auto& columns = aCreateParser.getColumnDef();
@@ -157,7 +157,7 @@ void HsqlSchemaImportTest::testTimestampWithParam()
 {
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
+u"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
 "TIMESTAMP(0))");
 
 const auto& columns = aCreateParser.getColumnDef();
@@ -179,7 +179,7 @@ void HsqlSchemaImportTest::testDefaultValueNow()
 {
 FbCreateStmtParser aCreateParser;
 aCreateParser.parse(
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myDate\" "
+u"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myDate\" "
 "TIMESTAMP DEFAULT NOW)");
 
 const auto& columns = aCreateParser.getColumnDef();
@@ -194,7 +194,7 @@ void HsqlSchemaImportTest::testDefaultValueNow()
 void HsqlSchemaImportTest::testEvilNullColumnName()
 {
 FbCreateStmtParser aCreateParser;
-aCreateParser.parse("CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT 
NULL PRIMARY KEY, "
+aCreateParser.parse(u"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT 
NULL PRIMARY KEY, "
 "\"myEvilNOT NULLName\" "
 "VARCHAR(20))");
 
diff --git a/dbaccess/source/filter/hsqldb/createparser.cxx 
b/dbaccess/source/filter/hsqldb/createparser.cxx
index c62640e8bc3f..03952655dfd8 100644
--- a/dbaccess/source/filter/hsqldb/createparser.cxx
+++ b/dbaccess/source/filter/hsqldb/createparser.cxx
@@ -23,6 +23,7 @@
 #include "createparser.hxx"
 #include "utils.hxx"
 #include 
+#include 
 
 using namespace ::comphelper;
 using namespace css::sdbc;
@@ -31,16 +32,17 @@ namespace
 {
 /// Returns substring of sSql from the first occurrence of '(' until the
 /// last

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2021-10-29 Thread Mike Kaganski (via logerrit)

 dbaccess/qa/extras/dialog-save.cxx   |3 
 dbaccess/qa/extras/empty-stdlib-save.cxx |3 
 dbaccess/qa/extras/nolib-save.cxx|3 
 dbaccess/source/core/api/FilteredContainer.cxx   |   15 +---
 dbaccess/source/core/api/KeySet.cxx  |3 
 dbaccess/source/core/dataaccess/ContentHelper.cxx|   25 +++
 dbaccess/source/core/dataaccess/ModelImpl.cxx|9 --
 dbaccess/source/core/dataaccess/connection.cxx   |5 -
 dbaccess/source/core/dataaccess/databasedocument.cxx |   23 ++
 dbaccess/source/core/dataaccess/datasource.cxx   |   34 +
 dbaccess/source/core/dataaccess/documentcontainer.cxx|7 --
 dbaccess/source/core/dataaccess/documentdefinition.cxx   |   16 ++--
 dbaccess/source/core/dataaccess/intercept.cxx|   25 +++
 dbaccess/source/core/misc/DatabaseDataProvider.cxx   |5 -
 dbaccess/source/filter/hsqldb/rowinputbinary.cxx |4 -
 dbaccess/source/filter/xml/xmlDataSourceSetting.cxx  |2 
 dbaccess/source/filter/xml/xmlExport.cxx |   15 ++--
 dbaccess/source/ui/app/AppController.cxx |   13 ++-
 dbaccess/source/ui/app/AppControllerGen.cxx  |7 +-
 dbaccess/source/ui/browser/formadapter.cxx   |3 
 dbaccess/source/ui/browser/sbagrid.cxx   |   16 +---
 dbaccess/source/ui/control/dbtreelistbox.cxx |9 +-
 dbaccess/source/ui/dlg/ConnectionHelper.cxx  |6 -
 dbaccess/source/ui/dlg/paramdialog.cxx   |2 
 dbaccess/source/ui/dlg/queryfilter.cxx   |   52 ---
 dbaccess/source/ui/dlg/tablespage.cxx|5 -
 dbaccess/source/ui/misc/TokenWriter.cxx  |3 
 dbaccess/source/ui/misc/WCopyTable.cxx   |9 +-
 dbaccess/source/ui/misc/databaseobjectview.cxx   |   19 +
 dbaccess/source/ui/misc/linkeddocuments.cxx  |   34 -
 dbaccess/source/ui/misc/singledoccontroller.cxx  |6 +
 dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx  |6 -
 dbaccess/source/ui/querydesign/TableFieldDescription.cxx |5 -
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx |3 
 dbaccess/source/ui/querydesign/limitboxcontroller.cxx|6 -
 dbaccess/source/ui/querydesign/querycontroller.cxx   |8 +-
 dbaccess/source/ui/uno/textconnectionsettings_uno.cxx|   13 ++-
 37 files changed, 185 insertions(+), 237 deletions(-)

New commits:
commit 3412c0f091c54da74ea6964062b9be302e126fe9
Author: Mike Kaganski 
AuthorDate: Fri Oct 29 08:14:44 2021 +0300
Commit: Mike Kaganski 
CommitDate: Fri Oct 29 13:22:00 2021 +0200

Prepare for removal of non-const operator[] from Sequence in dbaccess

Change-Id: Iddb96d39a512ef68827ecf89f3b5650950f88096
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124357
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/dbaccess/qa/extras/dialog-save.cxx 
b/dbaccess/qa/extras/dialog-save.cxx
index 1eb4720cbcd1..ff4f612dc869 100644
--- a/dbaccess/qa/extras/dialog-save.cxx
+++ b/dbaccess/qa/extras/dialog-save.cxx
@@ -92,8 +92,7 @@ void DialogSaveTest::test()
 // All our uno::References are (should?) be invalid now -> let them go 
out of scope
 }
 {
-uno::Sequence args(1);
-args[0] <<= aFileName;
+uno::Sequence args{ uno::Any(aFileName) };
 Reference 
xHNA(getMultiServiceFactory()->createInstanceWithArguments("com.sun.star.packages.Package",
 args), UNO_QUERY_THROW);
 Reference< beans::XPropertySet > 
xPS(xHNA->getByHierarchicalName("Dialogs/Standard/Dialog1.xml"), 
UNO_QUERY_THROW);
 sal_Int64 nSize = 0;
diff --git a/dbaccess/qa/extras/empty-stdlib-save.cxx 
b/dbaccess/qa/extras/empty-stdlib-save.cxx
index 9339d3c4307e..2ffbccaa6131 100644
--- a/dbaccess/qa/extras/empty-stdlib-save.cxx
+++ b/dbaccess/qa/extras/empty-stdlib-save.cxx
@@ -106,8 +106,7 @@ void DialogSaveTest::test()
 // All our uno::References are (should?) be invalid now -> let them go 
out of scope
 }
 {
-uno::Sequence args(1);
-args[0] <<= aFileName;
+uno::Sequence args{ uno::Any(aFileName) };
 Reference 
xHNA(getMultiServiceFactory()->createInstanceWithArguments("com.sun.star.packages.Package",
 args), UNO_QUERY_THROW);
 CPPUNIT_ASSERT(!xHNA->hasByHierarchicalName("Basic/Standard"));
 CPPUNIT_ASSERT(!xHNA->hasByHierarchicalName("Dialogs/Standard"));
diff --git a/dbaccess/qa/extras/nolib-save.cxx 
b/dbaccess/qa/extras/nolib-save.cxx
index f441b608b31e..f64e0fbece10 100644
--- a/dbaccess/qa/extras/nolib-save.cxx
+++ b/dbaccess/qa/extras/nolib-save.cxx
@@ -96,8 +96,7 @@ void DialogSaveTest::test()
 // All our uno::References are (should?) be invalid now -> let them go 
out of scope
 }
 {
-

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2020-06-30 Thread Stephan Bergmann (via logerrit)

 dbaccess/qa/unit/tdf119625.cxx |5 ++---
 dbaccess/qa/unit/tdf126268.cxx |2 +-
 dbaccess/source/core/dataaccess/databasedocument.cxx   |2 +-
 dbaccess/source/core/recovery/dbdocrecovery.cxx|4 ++--
 dbaccess/source/core/recovery/storagetextstream.cxx|2 +-
 dbaccess/source/core/recovery/subcomponentrecovery.cxx |4 ++--
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx  |2 +-
 dbaccess/source/ui/querydesign/QueryDesignView.cxx |4 ++--
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx  |2 +-
 9 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 4dfa47b25c82899028f439394ce63843ea60f5dc
Author: Stephan Bergmann 
AuthorDate: Tue Jun 30 23:04:07 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jul 1 07:08:29 2020 +0200

Upcoming improved loplugin:staticanonymous -> redundantstatic: dbaccess

Change-Id: I49932a9d89d2933bebd313d3f1f64af84f0e52cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97552
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index 5486a476f166..5d0ec008ff7a 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -52,9 +52,8 @@ struct expect_t
the level we are testing, this test will have to allow for or set
the destination timezone.
  */
-static const expect_t expect[]
-= { { 0, 15, 10, 10 }, { 1, 23, 30, 30 }, { 2, 5, 0, 0 },  { 3, 4, 30, 0 },
-{ 4, 3, 15, 10 },  { 5, 5, 0, 0 },{ 6, 3, 22, 22 } };
+const expect_t expect[] = { { 0, 15, 10, 10 }, { 1, 23, 30, 30 }, { 2, 5, 0, 0 
},  { 3, 4, 30, 0 },
+{ 4, 3, 15, 10 },  { 5, 5, 0, 0 },{ 6, 3, 22, 
22 } };
 
 void Tdf119625Test::testTime()
 {
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index 426edee37f0c..90039af825de 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -44,7 +44,7 @@ struct expect_t
 };
 }
 
-static const expect_t expect[] = {
+const expect_t expect[] = {
 { 1, "0.00" },   { 2, "25.00" },  { 3, "26.00" }, { 4, "30.4" },  { 5, 
"45.8" },
 { 6, "-25.00" }, { 7, "-26.00" }, { 8, "-30.4" }, { 9, "-45.8" },
 };
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 6811ae332e84..4eac4796982b 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -316,7 +316,7 @@ namespace
 }
 }
 
-static const char sPictures[] = "Pictures";
+const char sPictures[] = "Pictures";
 
 // base documents seem to have a different behaviour to other documents, the
 // root storage contents at least seem to be re-used over different saves, 
thus if there is a
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx 
b/dbaccess/source/core/recovery/dbdocrecovery.cxx
index 280789ff8a84..ab5947d91261 100644
--- a/dbaccess/source/core/recovery/dbdocrecovery.cxx
+++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx
@@ -86,9 +86,9 @@ namespace dbaccess
 return true;
 }
 
-static const char sRecoveryDataSubStorageName[] = "recovery";
+const char sRecoveryDataSubStorageName[] = "recovery";
 
-static const char sObjectMapStreamName[] = "storage-component-map.ini";
+const char sObjectMapStreamName[] = "storage-component-map.ini";
 
 void lcl_writeObjectMap_throw( const Reference & 
i_rContext, const Reference< XStorage >& i_rStorage,
 const MapStringToCompDesc& i_mapStorageToCompDesc )
diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx 
b/dbaccess/source/core/recovery/storagetextstream.cxx
index 142615f005c2..6ea4ef005320 100644
--- a/dbaccess/source/core/recovery/storagetextstream.cxx
+++ b/dbaccess/source/core/recovery/storagetextstream.cxx
@@ -36,7 +36,7 @@ namespace dbaccess
 Reference< XTextOutputStream2 >  xTextOutput;
 };
 
-static const char sLineFeed[] = "\n";
+const char sLineFeed[] = "\n";
 
 // StorageTextOutputStream
 StorageTextOutputStream::StorageTextOutputStream(   const 
Reference& i_rContext,
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx 
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index 55f3f98a250e..ab16ee9e2c04 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -160,8 +160,8 @@ namespace dbaccess
 return xCommandProcessor;
 }
 
-static const char sSettingsStreamName[] = "settings.xml";
-static const char sCurrentQueryDesignName[] = 
"ooo:current-query-design";
+const char sSettingsStreamName[] = "settings.xml";
+const char sCurrentQueryDesignName[] = "ooo:current-query-design";
 }
 
 namespace {
diff --git

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2020-06-03 Thread Stephan Bergmann (via logerrit)

 dbaccess/qa/extras/hsql_schema_import.cxx   |   66 +---
 dbaccess/qa/extras/macros-test.cxx  |3 
 dbaccess/qa/unit/hsql_binary_import.cxx |6 -
 dbaccess/qa/unit/tdf119625.cxx  |7 -
 dbaccess/qa/unit/tdf126268.cxx  |4 
 dbaccess/source/ui/app/AppController.cxx|5 -
 dbaccess/source/ui/dlg/ConnectionHelper.cxx |   12 --
 dbaccess/source/ui/misc/WCopyTable.cxx  |3 
 dbaccess/source/ui/misc/WTypeSelect.cxx |3 
 dbaccess/source/ui/querydesign/querycontainerwindow.cxx |3 
 dbaccess/source/ui/tabledesign/TableController.cxx  |3 
 dbaccess/source/ui/uno/ColumnPeer.cxx   |3 
 12 files changed, 43 insertions(+), 75 deletions(-)

New commits:
commit 868b0763ac47f765cb48c277897274a595b831d0
Author: Stephan Bergmann 
AuthorDate: Wed Jun 3 09:20:59 2020 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jun 3 11:40:43 2020 +0200

Upcoming loplugin:elidestringvar: dbaccess

Change-Id: I5dc074a250ee169812f3ffd0cc4e598972ab87dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95396
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/dbaccess/qa/extras/hsql_schema_import.cxx 
b/dbaccess/qa/extras/hsql_schema_import.cxx
index 89ee74ce03aa..6d714ae9a8ae 100644
--- a/dbaccess/qa/extras/hsql_schema_import.cxx
+++ b/dbaccess/qa/extras/hsql_schema_import.cxx
@@ -61,10 +61,8 @@ public:
 
 void HsqlSchemaImportTest::testIntegerPrimaryKeyNotNull()
 {
-const OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT 
NULL PRIMARY KEY)" };
-
 FbCreateStmtParser aCreateParser;
-aCreateParser.parse(sql);
+aCreateParser.parse("CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT 
NULL PRIMARY KEY)");
 
 CPPUNIT_ASSERT_EQUAL(OUString{ "\"myTable\"" }, 
aCreateParser.getTableName());
 const auto& columns = aCreateParser.getColumnDef();
@@ -79,13 +77,10 @@ void HsqlSchemaImportTest::testIntegerPrimaryKeyNotNull()
 
 void HsqlSchemaImportTest::testVarcharWithParam()
 {
-const OUString sql{
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
-"VARCHAR(50))"
-};
-
 FbCreateStmtParser aCreateParser;
-aCreateParser.parse(sql);
+aCreateParser.parse(
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
+"VARCHAR(50))");
 
 const auto& columns = aCreateParser.getColumnDef();
 CPPUNIT_ASSERT_EQUAL(2_z, columns.size());
@@ -104,13 +99,10 @@ void HsqlSchemaImportTest::testVarcharWithParam()
  **/
 void HsqlSchemaImportTest::testVarcharWithoutParam()
 {
-const OUString sql{
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
-"VARCHAR)"
-};
-
 FbCreateStmtParser aCreateParser;
-aCreateParser.parse(sql);
+aCreateParser.parse(
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
+"VARCHAR)");
 
 const auto& columns = aCreateParser.getColumnDef();
 CPPUNIT_ASSERT_EQUAL(2_z, columns.size());
@@ -122,13 +114,10 @@ void HsqlSchemaImportTest::testVarcharWithoutParam()
 
 void HsqlSchemaImportTest::testNumericWithTwoParam()
 {
-const OUString sql{
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"Betrag\" "
-"NUMERIC(8,2))"
-};
-
 FbCreateStmtParser aCreateParser;
-aCreateParser.parse(sql);
+aCreateParser.parse(
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"Betrag\" "
+"NUMERIC(8,2))");
 
 const auto& columns = aCreateParser.getColumnDef();
 CPPUNIT_ASSERT_EQUAL(2_z, columns.size());
@@ -146,13 +135,10 @@ void HsqlSchemaImportTest::testNumericWithTwoParam()
 
 void HsqlSchemaImportTest::testIntegerAutoincremental()
 {
-const OUString sql{
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY 
GENERATED "
-"BY DEFAULT AS IDENTITY(START WITH 0), \"myText\" VARCHAR(50))"
-};
-
 FbCreateStmtParser aCreateParser;
-aCreateParser.parse(sql);
+aCreateParser.parse(
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY 
GENERATED "
+"BY DEFAULT AS IDENTITY(START WITH 0), \"myText\" VARCHAR(50))");
 
 const auto& columns = aCreateParser.getColumnDef();
 const auto column = columns.at(0);
@@ -169,13 +155,10 @@ void HsqlSchemaImportTest::testIntegerAutoincremental()
  */
 void HsqlSchemaImportTest::testTimestampWithParam()
 {
-const OUString sql{
-"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL PRIMARY KEY, 
\"myText\" "
-"TIMESTAMP(0))"
-};
-
 FbCreateStmtParser aCreateParser;
-aCreateParser.parse(sql);
+aCreateParser.parse(
+"CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2020-04-06 Thread Noel Grandin (via logerrit)

 dbaccess/qa/unit/hsql_binary_import.cxx |1 -
 dbaccess/qa/unit/tdf119625.cxx  |1 -
 dbaccess/qa/unit/tdf126268.cxx  |1 -
 dbaccess/source/core/api/CacheSet.cxx   |3 ---
 dbaccess/source/core/api/KeySet.cxx |6 --
 dbaccess/source/core/misc/DatabaseDataProvider.cxx  |2 --
 dbaccess/source/filter/xml/xmlfilter.cxx|1 -
 dbaccess/source/ui/app/AppDetailPageHelper.cxx  |1 -
 dbaccess/source/ui/app/AppIconControl.cxx   |2 +-
 dbaccess/source/ui/browser/unodatbr.cxx |   10 +-
 dbaccess/source/ui/dlg/queryorder.cxx   |2 --
 dbaccess/source/ui/querydesign/QueryTableView.cxx   |1 -
 dbaccess/source/ui/querydesign/TableConnectionData.cxx  |1 -
 dbaccess/source/ui/querydesign/querycontainerwindow.cxx |3 ++-
 14 files changed, 4 insertions(+), 31 deletions(-)

New commits:
commit 1a26e950ab844f566701cecf32ca812e2e28a8cd
Author: Noel Grandin 
AuthorDate: Sun Apr 5 21:33:59 2020 +0200
Commit: Noel Grandin 
CommitDate: Mon Apr 6 10:24:58 2020 +0200

loplugin:unusedvariableplus in dbaccess

Change-Id: Id2c2416443b2c9d6d516513ee543542e9681f69a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91728
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx 
b/dbaccess/qa/unit/hsql_binary_import.cxx
index 604c2e0e0560..fbf12f929019 100644
--- a/dbaccess/qa/unit/hsql_binary_import.cxx
+++ b/dbaccess/qa/unit/hsql_binary_import.cxx
@@ -32,7 +32,6 @@ public:
 void HsqlBinaryImportTest::setUp()
 {
 DBTestBase::setUp();
-SvtMiscOptions aMiscOptions;
 osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ 
"1" }.pData);
 }
 
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index 339c2cf163a2..8431c5426e90 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -33,7 +33,6 @@ public:
 void Tdf119625Test::setUp()
 {
 DBTestBase::setUp();
-SvtMiscOptions aMiscOptions;
 osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ 
"1" }.pData);
 }
 
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index 2f24cbbda813..b0719936f588 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -32,7 +32,6 @@ public:
 void Tdf126268Test::setUp()
 {
 DBTestBase::setUp();
-SvtMiscOptions aMiscOptions;
 osl_setEnvironment(OUString{ "DBACCESS_HSQL_MIGRATION" }.pData, OUString{ 
"1" }.pData);
 }
 
diff --git a/dbaccess/source/core/api/CacheSet.cxx 
b/dbaccess/source/core/api/CacheSet.cxx
index a1c5430ac343..b8877358e604 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -317,9 +317,6 @@ void OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow 
,const connectivity::OSQ
 OUStringBuffer aSql("DELETE FROM " + m_aComposedTableName + " WHERE ");
 
 // use keys and indexes for exact positioning
-// first the keys
-const Reference xPrimaryKeyColumns = 
getPrimaryKeyColumns_throw(xSet);
-// second the indexes
 Reference xIndexSup(_xTable,UNO_QUERY);
 Reference xIndexes;
 if(xIndexSup.is())
diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index f7a3c4ed7847..d50d9e850080 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -451,10 +451,6 @@ void OKeySet::updateRow(const ORowSetRow& _rInsertRow 
,const ORowSetRow& _rOrigi
 OUString sParam(" = ?");
 
 // use keys and indexes for exact positioning
-// first the keys
-Reference xKeyColumns = getKeyColumns();
-
-// second the indexes
 Reference xIndexSup(_xTable,UNO_QUERY);
 Reference xIndexes;
 if ( xIndexSup.is() )
@@ -843,8 +839,6 @@ void OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const 
connectivity::OSQLTa
 static const char aAnd[] = " AND ";
 
 // use keys and indexes for exact positioning
-Reference xKeyColumns = getKeyColumns();
-// second the indexes
 Reference xIndexSup(_xTable,UNO_QUERY);
 Reference xIndexes;
 if ( xIndexSup.is() )
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx 
b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 9c423950daba..b5179e57b32f 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -79,8 +79,6 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< 
uno::XComponentContex
 
 void SAL_CALL DatabaseDataProvider::disposing()
 {
-lang::EventObject aEvt(static_cast(this));
-
 m_aParameterManager.dispose();   // (to free any references it may have to 
me)
 m_aFilterManager.dispose();  // (dito)
 
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2019-08-29 Thread Julien Nabet (via logerrit)

 dbaccess/qa/unit/hsql_binary_import.cxx|6 ++
 dbaccess/qa/unit/tdf119625.cxx |7 +++
 dbaccess/qa/unit/tdf126268.cxx |7 +++
 dbaccess/source/core/dataaccess/datasource.cxx |5 +
 dbaccess/source/core/misc/dsntypes.cxx |7 ++-
 5 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit 2252aba08121566e834dc530f31339e15bd94dec
Author: Julien Nabet 
AuthorDate: Wed Aug 28 22:13:13 2019 +0200
Commit: Julien Nabet 
CommitDate: Thu Aug 29 20:54:47 2019 +0200

tdf#127180: Propose migration + Firebird by default only in experimental

See:

http://document-foundation-mail-archive.969070.n3.nabble.com/About-putting-back-Firebird-experimental-td4265392.html#a4265519

Change-Id: I651baa78d345ce56e8d38d56aba096d04a225c5c
Reviewed-on: https://gerrit.libreoffice.org/78240
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/dbaccess/qa/unit/hsql_binary_import.cxx 
b/dbaccess/qa/unit/hsql_binary_import.cxx
index 2c1c332629cb..5b0249a9497f 100644
--- a/dbaccess/qa/unit/hsql_binary_import.cxx
+++ b/dbaccess/qa/unit/hsql_binary_import.cxx
@@ -45,6 +45,10 @@ void HsqlBinaryImportTest::setUp()
 
 void HsqlBinaryImportTest::testBinaryImport()
 {
+SvtMiscOptions aMiscOptions;
+bool oldValue = aMiscOptions.IsExperimentalMode();
+
+aMiscOptions.SetExperimentalMode(true);
 // the migration requires the file to be writable
 utl::TempFile const temp(createTempCopy("hsqldb_migration_test.odb"));
 uno::Reference const xDocument = 
getDocumentForUrl(temp.GetURL());
@@ -87,6 +91,8 @@ void HsqlBinaryImportTest::testBinaryImport()
 CPPUNIT_ASSERT_EQUAL(sal_Int16{ 1998 }, date.Year);
 
 closeDocument(uno::Reference(xDocument, uno::UNO_QUERY));
+if (!oldValue)
+aMiscOptions.SetExperimentalMode(false);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(HsqlBinaryImportTest);
diff --git a/dbaccess/qa/unit/tdf119625.cxx b/dbaccess/qa/unit/tdf119625.cxx
index d38e85bb75a3..e1bb46b087f7 100644
--- a/dbaccess/qa/unit/tdf119625.cxx
+++ b/dbaccess/qa/unit/tdf119625.cxx
@@ -63,6 +63,11 @@ static const expect_t expect[]
 
 void Tdf119625Test::testTime()
 {
+SvtMiscOptions aMiscOptions;
+bool oldValue = aMiscOptions.IsExperimentalMode();
+
+aMiscOptions.SetExperimentalMode(true);
+
 // the migration requires the file to be writable
 utl::TempFile const temp(createTempCopy("tdf119625.odb"));
 uno::Reference const xDocument = 
getDocumentForUrl(temp.GetURL());
@@ -106,6 +111,8 @@ void Tdf119625Test::testTime()
 CPPUNIT_ASSERT(!xRes->next());
 
 closeDocument(uno::Reference(xDocument, uno::UNO_QUERY));
+if (!oldValue)
+aMiscOptions.SetExperimentalMode(false);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Tdf119625Test);
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index ffbe6361a231..9d41b95809aa 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -56,6 +56,11 @@ static const expect_t expect[] = {
 
 void Tdf126268Test::testNumbers()
 {
+SvtMiscOptions aMiscOptions;
+bool oldValue = aMiscOptions.IsExperimentalMode();
+
+aMiscOptions.SetExperimentalMode(true);
+
 // the migration requires the file to be writable
 utl::TempFile const temp(createTempCopy("tdf126268.odb"));
 uno::Reference const xDocument = 
getDocumentForUrl(temp.GetURL());
@@ -80,6 +85,8 @@ void Tdf126268Test::testNumbers()
 CPPUNIT_ASSERT(!xRes->next());
 
 closeDocument(uno::Reference(xDocument, uno::UNO_QUERY));
+if (!oldValue)
+aMiscOptions.SetExperimentalMode(false);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Tdf126268Test);
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx 
b/dbaccess/source/core/dataaccess/datasource.cxx
index e01583da6266..edad6f160f7d 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -63,6 +63,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -615,6 +616,10 @@ Reference< XConnection > 
ODatabaseSource::buildLowLevelConnection(const OUString
 //ignore when we don't have a model. E.g. Mailmerge, data sources, 
fields...
 bIgnoreMigration = true;
 }
+SvtMiscOptions aMiscOptions;
+
+if (!aMiscOptions.IsExperimentalMode())
+bIgnoreMigration = true;
 
 if(!bIgnoreMigration && m_pImpl->m_sConnectURL == "sdbc:embedded:hsqldb")
 {
diff --git a/dbaccess/source/core/misc/dsntypes.cxx 
b/dbaccess/source/core/misc/dsntypes.cxx
index 7332ccffa196..86aedb385245 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -286,7 +287,11 @@ bool ODsnTypeCollection::isEmbeddedDatabase( const 
OUString& _sURL )
 
 OUString ODsnTypeCollection::getEmbeddedDatabase()
 {
-return

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2019-07-19 Thread Noel Grandin (via logerrit)

 dbaccess/qa/extras/rowsetclones.cxx   |2 +-
 dbaccess/source/core/api/KeySet.cxx   |2 +-
 dbaccess/source/core/api/tablecontainer.cxx   |2 +-
 dbaccess/source/core/dataaccess/databasedocument.cxx  |3 +--
 dbaccess/source/core/dataaccess/documentcontainer.cxx |2 +-
 dbaccess/source/core/dataaccess/documentdefinition.cxx|   14 +-
 dbaccess/source/core/dataaccess/documenteventexecutor.cxx |2 +-
 dbaccess/source/ext/macromigration/docinteraction.cxx |2 +-
 dbaccess/source/filter/xml/dbloader2.cxx  |2 +-
 dbaccess/source/ui/app/AppController.cxx  |6 +++---
 dbaccess/source/ui/app/AppControllerDnD.cxx   |2 +-
 dbaccess/source/ui/app/AppView.cxx|4 ++--
 dbaccess/source/ui/browser/brwctrlr.cxx   |6 +++---
 dbaccess/source/ui/browser/brwview.cxx|4 ++--
 dbaccess/source/ui/browser/dataview.cxx   |2 +-
 dbaccess/source/ui/browser/genericcontroller.cxx  |2 +-
 dbaccess/source/ui/browser/sbagrid.cxx|   12 ++--
 dbaccess/source/ui/browser/unodatbr.cxx   |7 +++
 dbaccess/source/ui/dlg/ConnectionHelper.cxx   |4 ++--
 dbaccess/source/ui/dlg/DbAdminImpl.cxx|2 +-
 dbaccess/source/ui/misc/UITools.cxx   |2 +-
 dbaccess/source/ui/misc/WCopyTable.cxx|2 +-
 dbaccess/source/ui/misc/datasourceconnector.cxx   |8 +++-
 dbaccess/source/ui/querydesign/querycontroller.cxx|2 +-
 dbaccess/source/ui/tabledesign/TableController.cxx|2 +-
 dbaccess/source/ui/uno/copytablewizard.cxx|2 +-
 26 files changed, 46 insertions(+), 54 deletions(-)

New commits:
commit 1003f9f14d83eac9c08a219fa7d8140550de02c7
Author: Noel Grandin 
AuthorDate: Fri Jul 19 09:52:48 2019 +0200
Commit: Noel Grandin 
CommitDate: Fri Jul 19 11:53:24 2019 +0200

loplugin:referencecasting in dbaccess

Change-Id: If44176f85f460afca92cfa77b3cc1f7107a41690
Reviewed-on: https://gerrit.libreoffice.org/75938
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/dbaccess/qa/extras/rowsetclones.cxx 
b/dbaccess/qa/extras/rowsetclones.cxx
index 433bf328864b..aabb80acc0fa 100644
--- a/dbaccess/qa/extras/rowsetclones.cxx
+++ b/dbaccess/qa/extras/rowsetclones.cxx
@@ -82,7 +82,7 @@ void RowSetClones::test()
 rowSetProperties->setPropertyValue("ActiveConnection", Any(xConnection));
 
 xRowSet->execute();
-uno::Reference< XResultSet > xResultSet(xRowSet, UNO_QUERY);
+uno::Reference< XResultSet > xResultSet = xRowSet;
 CPPUNIT_ASSERT(xResultSet.is());
 // always starts at BeforeFirst position
 CPPUNIT_ASSERT(xResultSet->isBeforeFirst());
diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 80771e48b76f..137f1e3b4104 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -291,7 +291,7 @@ void OKeySet::construct(const Reference< XResultSet>& 
_xDriverSet, const OUStrin
 Reference 
xAnalyzer(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY);
 xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery());
 Reference xTabSup(xAnalyzer,uno::UNO_QUERY);
-Reference xSelectTables(xTabSup->getTables(),uno::UNO_QUERY);
+Reference xSelectTables = xTabSup->getTables();
 const Sequence< OUString> aSeq = xSelectTables->getElementNames();
 if ( aSeq.getLength() > 1 ) // special handling for join
 {
diff --git a/dbaccess/source/core/api/tablecontainer.cxx 
b/dbaccess/source/core/api/tablecontainer.cxx
index 01336a5e3327..f0adf088281f 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -147,7 +147,7 @@ void lcl_createDefintionObject(const OUString& _rName
 else
 {
 // set as folder
-_xTableDefinition.set( TableDefinition::createWithName( 
::comphelper::getProcessComponentContext(), _rName ), UNO_QUERY);
+_xTableDefinition = TableDefinition::createWithName( 
::comphelper::getProcessComponentContext(), _rName );
 
_xTableDefinitions->insertByName(_rName,makeAny(_xTableDefinition));
 }
 Reference 
xColumnsSupplier(_xTableDefinition,UNO_QUERY);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 24db02fc6be0..b0904f969b58 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -1598,9 +1598,8 @@ void ODatabaseDocument::WriteThroughComponent( const 
Reference< XOutputStream >&
 xSaxWriter->setOutputStream( xOutputStream );
 
 // prepare arguments (prepend doc

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2019-07-12 Thread Xisco Fauli (via logerrit)

 dbaccess/qa/unit/data/tdf126268.odb  |binary
 dbaccess/qa/unit/tdf126268.cxx   |6 --
 dbaccess/source/filter/hsqldb/rowinputbinary.cxx |   20 +++-
 3 files changed, 23 insertions(+), 3 deletions(-)

New commits:
commit 25277bcb727994072239c9c2549c271fdd62150e
Author: Xisco Fauli 
AuthorDate: Fri Jul 12 12:59:22 2019 +0200
Commit: Xisco Faulí 
CommitDate: Fri Jul 12 19:17:41 2019 +0200

tdf#126268: Add support for negative decimal

basically reintroduce the code deleted in
2e26ef34bf1a2e5d1293e45cf3b1415d9514b056
and check at the right place the sign values

Change-Id: Idf613a3a087b428d1f85abe9b43342fb67538a63
Reviewed-on: https://gerrit.libreoffice.org/75488
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/dbaccess/qa/unit/data/tdf126268.odb 
b/dbaccess/qa/unit/data/tdf126268.odb
index ffd00c140791..434a4238ba3b 100644
Binary files a/dbaccess/qa/unit/data/tdf126268.odb and 
b/dbaccess/qa/unit/data/tdf126268.odb differ
diff --git a/dbaccess/qa/unit/tdf126268.cxx b/dbaccess/qa/unit/tdf126268.cxx
index 967d5e671ff0..ffbe6361a231 100644
--- a/dbaccess/qa/unit/tdf126268.cxx
+++ b/dbaccess/qa/unit/tdf126268.cxx
@@ -49,8 +49,10 @@ struct expect_t
 OUString number;
 };
 
-static const expect_t expect[]
-= { { 1, "0.00" }, { 2, "25.00" }, { 3, "26.00" }, { 4, "30.4" }, { 5, 
"45.8" } };
+static const expect_t expect[] = {
+{ 1, "0.00" },   { 2, "25.00" },  { 3, "26.00" }, { 4, "30.4" },  { 5, 
"45.8" },
+{ 6, "-25.00" }, { 7, "-26.00" }, { 8, "-30.4" }, { 9, "-45.8" },
+};
 
 void Tdf126268Test::testNumbers()
 {
diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx 
b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
index a12ab0513abf..b75c8574dccf 100644
--- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
+++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx
@@ -89,9 +89,27 @@ OUString lcl_double_dabble(const std::vector& 
bytes)
 OUString lcl_makeStringFromBigint(const std::vector& bytes)
 {
 std::vector aBytes{ bytes };
+OUStringBuffer sRet;
 
+// two's complement
+if ((bytes[0] & 0x80) != 0)
+{
+sRet.append("-");
+for (auto& byte : aBytes)
+byte = ~byte;
+// add 1 to byte array
+// FIXME e.g. 1 valid ?
+for (size_t i = aBytes.size() - 1; i != 0; --i)
+{
+aBytes[i] += 1;
+if (aBytes[i] != 0)
+break;
+}
+}
 // convert binary to BCD
-return lcl_double_dabble(aBytes);
+OUString sNum = lcl_double_dabble(aBytes);
+sRet.append(sNum);
+return sRet.makeStringAndClear();
 }
 
 OUString lcl_putDot(const OUString& sNum, sal_Int32 nScale)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2018-07-06 Thread Tamas Bunth

 dbaccess/qa/extras/hsql_schema_import.cxx  |   18 ++
 dbaccess/source/filter/hsqldb/createparser.cxx |7 +--
 2 files changed, 23 insertions(+), 2 deletions(-)

New commits:
commit a91fe8558b4c8aa163069ebdb117d58239da74f2
Author: Tamas Bunth 
Date:   Tue Jun 26 13:15:07 2018 +0200

dbahsql: Look for properties only after name

Additional properties in SQL string like "DEFAULT" or "NOT NULL" should
be searched only after column name, because what if a column name is
"myEvilNOT NULLColumn"

Change-Id: I21f0755ba14c7267243df044db4d16963387
Reviewed-on: https://gerrit.libreoffice.org/56462
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git a/dbaccess/qa/extras/hsql_schema_import.cxx 
b/dbaccess/qa/extras/hsql_schema_import.cxx
index 892be33d15e7..dd75eb2dc38c 100644
--- a/dbaccess/qa/extras/hsql_schema_import.cxx
+++ b/dbaccess/qa/extras/hsql_schema_import.cxx
@@ -42,6 +42,7 @@ public:
 void testIntegerAutoincremental();
 void testTimestampWithParam();
 void testDefaultValueNow();
+void testEvilNullColumnName();
 // TODO testForeign, testDecomposer
 
 CPPUNIT_TEST_SUITE(HsqlSchemaImportTest);
@@ -53,6 +54,7 @@ public:
 CPPUNIT_TEST(testIntegerAutoincremental);
 CPPUNIT_TEST(testTimestampWithParam);
 CPPUNIT_TEST(testDefaultValueNow);
+CPPUNIT_TEST(testEvilNullColumnName);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -197,6 +199,22 @@ void HsqlSchemaImportTest::testDefaultValueNow()
 CPPUNIT_ASSERT(fbSql.indexOf("\'NOW\'") > 0); // composed 'NOW'
 }
 
+void HsqlSchemaImportTest::testEvilNullColumnName()
+{
+OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY, "
+  "\"myEvilNOT NULLName\" "
+  "VARCHAR(20))" };
+
+FbCreateStmtParser aCreateParser;
+aCreateParser.parse(sql);
+
+const auto& columns = aCreateParser.getColumnDef();
+CPPUNIT_ASSERT_EQUAL(2_z, columns.size());
+const ColumnDefinition* colVarchar = lcl_findByType(columns, 
css::sdbc::DataType::VARCHAR);
+CPPUNIT_ASSERT(colVarchar != nullptr);
+CPPUNIT_ASSERT(colVarchar->isNullable());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(HsqlSchemaImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/dbaccess/source/filter/hsqldb/createparser.cxx 
b/dbaccess/source/filter/hsqldb/createparser.cxx
index 2344ceb075fe..32abe25a8521 100644
--- a/dbaccess/source/filter/hsqldb/createparser.cxx
+++ b/dbaccess/source/filter/hsqldb/createparser.cxx
@@ -301,10 +301,13 @@ void CreateStmtParser::parseColumnPart(const OUString& 
sColumnPart)
 if (isPrimaryKey)
 m_PrimaryKeys.push_back(rColumnName);
 
+const OUString sColumnWithoutName = 
sColumn.copy(sColumn.indexOf(typeParts.typeName));
+
 ColumnDefinition aColDef(rColumnName, 
lcl_getDataTypeFromHsql(typeParts.typeName),
  typeParts.params, isPrimaryKey,
- lcl_getAutoIncrementDefault(sColumn), 
lcl_isNullable(sColumn),
- bCaseInsensitive, 
lcl_getDefaultValue(sColumn));
+ 
lcl_getAutoIncrementDefault(sColumnWithoutName),
+ lcl_isNullable(sColumnWithoutName), 
bCaseInsensitive,
+ lcl_getDefaultValue(sColumnWithoutName));
 
 m_aColumns.push_back(aColDef);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2018-07-06 Thread Tamas Bunth

 dbaccess/qa/extras/hsql_schema_import.cxx|   23 +++
 dbaccess/source/filter/hsqldb/columndef.cxx  |4 +++-
 dbaccess/source/filter/hsqldb/columndef.hxx  |4 +++-
 dbaccess/source/filter/hsqldb/createparser.cxx   |   18 +-
 dbaccess/source/filter/hsqldb/fbcreateparser.cxx |   10 ++
 5 files changed, 56 insertions(+), 3 deletions(-)

New commits:
commit 8f3d6e67b08ed1bce9bc989e5e3df92c4d9d95d3
Author: Tamas Bunth 
Date:   Tue Jun 26 12:27:57 2018 +0200

tdf#117867 dbahsql: Migrate default values

Default Value "NOW" is a special case, because Firebird likes it with
single quotes. In contrast, HSQLDB uses the keyword without quotes.

Add unit test for parsing default value "NOW"

Change-Id: I34886f8ae53e98addb52bf5e85030a03721d6a45
Reviewed-on: https://gerrit.libreoffice.org/56454
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git a/dbaccess/qa/extras/hsql_schema_import.cxx 
b/dbaccess/qa/extras/hsql_schema_import.cxx
index a04e3697ecfb..892be33d15e7 100644
--- a/dbaccess/qa/extras/hsql_schema_import.cxx
+++ b/dbaccess/qa/extras/hsql_schema_import.cxx
@@ -41,6 +41,7 @@ public:
 void testNumericWithTwoParam();
 void testIntegerAutoincremental();
 void testTimestampWithParam();
+void testDefaultValueNow();
 // TODO testForeign, testDecomposer
 
 CPPUNIT_TEST_SUITE(HsqlSchemaImportTest);
@@ -51,6 +52,7 @@ public:
 CPPUNIT_TEST(testNumericWithTwoParam);
 CPPUNIT_TEST(testIntegerAutoincremental);
 CPPUNIT_TEST(testTimestampWithParam);
+CPPUNIT_TEST(testDefaultValueNow);
 
 CPPUNIT_TEST_SUITE_END();
 };
@@ -174,6 +176,27 @@ void HsqlSchemaImportTest::testTimestampWithParam()
 CPPUNIT_ASSERT(fbSql.indexOf("0") < 0); //does not contain
 }
 
+/**
+ * Special case:
+ * HSQLDB uses keyword NOW without quotes. Firebird uses single quotes 'NOW'
+ */
+void HsqlSchemaImportTest::testDefaultValueNow()
+{
+OUString sql{ "CREATE CACHED TABLE \"myTable\"(\"id\" INTEGER NOT NULL 
PRIMARY KEY, \"myDate\" "
+  "TIMESTAMP DEFAULT NOW)" };
+
+FbCreateStmtParser aCreateParser;
+aCreateParser.parse(sql);
+
+const auto& columns = aCreateParser.getColumnDef();
+const ColumnDefinition* colTimeStamp = lcl_findByType(columns, 
css::sdbc::DataType::TIMESTAMP);
+
+CPPUNIT_ASSERT(colTimeStamp != nullptr);
+CPPUNIT_ASSERT_EQUAL(OUString{ "NOW" }, colTimeStamp->getDefault()); // 
parsed NOW
+OUString fbSql = aCreateParser.compose();
+CPPUNIT_ASSERT(fbSql.indexOf("\'NOW\'") > 0); // composed 'NOW'
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(HsqlSchemaImportTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/dbaccess/source/filter/hsqldb/columndef.cxx 
b/dbaccess/source/filter/hsqldb/columndef.cxx
index 6e36ee1b8718..dd71e81f28b3 100644
--- a/dbaccess/source/filter/hsqldb/columndef.cxx
+++ b/dbaccess/source/filter/hsqldb/columndef.cxx
@@ -27,7 +27,8 @@ using namespace css::sdbc;
 
 ColumnDefinition::ColumnDefinition(const OUString& sName, sal_Int32 eType,
const std::vector aParams, bool 
bPrimary,
-   sal_Int32 nAutoIncr, bool bNullable, bool 
bCaseInsensitive)
+   sal_Int32 nAutoIncr, bool bNullable, bool 
bCaseInsensitive,
+   const OUString& sDefault)
 : m_sName(sName)
 , m_eType(eType)
 , m_aParams(aParams)
@@ -35,6 +36,7 @@ ColumnDefinition::ColumnDefinition(const OUString& sName, 
sal_Int32 eType,
 , m_nAutoIncrement(nAutoIncr)
 , m_bNullable(bNullable)
 , m_bCaseInsensitive(bCaseInsensitive)
+, m_sDefaultValue(sDefault)
 {
 }
 }
diff --git a/dbaccess/source/filter/hsqldb/columndef.hxx 
b/dbaccess/source/filter/hsqldb/columndef.hxx
index b356d3906b37..fd23ed313abb 100644
--- a/dbaccess/source/filter/hsqldb/columndef.hxx
+++ b/dbaccess/source/filter/hsqldb/columndef.hxx
@@ -26,11 +26,12 @@ private:
 sal_Int32 m_nAutoIncrement;
 bool m_bNullable;
 bool m_bCaseInsensitive;
+OUString m_sDefaultValue;
 
 public:
 ColumnDefinition(const OUString& sName, sal_Int32 eType, const 
std::vector aParams,
  bool bPrimary = false, sal_Int32 nAutoIncr = -1, bool 
bNullable = true,
- bool bCaseInsensitive = false);
+ bool bCaseInsensitive = false, const OUString& sDefault = 
OUString{});
 
 OUString const& getName() const { return m_sName; }
 sal_Int32 getDataType() const { return m_eType; }
@@ -40,6 +41,7 @@ public:
 bool isCaseInsensitive() const { return m_bCaseInsensitive; }
 sal_Int32 getStartValue() const { return m_nAutoIncrement; }
 const std::vector& getParams() const { return m_aParams; }
+OUString const& getDefault() const { return m_sDefaultValue; }
 };
 }
 
diff --git a/dbaccess/source/filter/hsqldb/createparser.cxx 
b/dbaccess/source/filter/hsqldb/createparser.cxx
index

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source desktop/source

2016-04-01 Thread Wastack

 dbaccess/qa/unit/data/hsqldb_empty.odb.lck|binary
 dbaccess/source/core/api/resultset.cxx|2 +-
 dbaccess/source/core/dataaccess/ModelImpl.cxx |2 +-
 dbaccess/source/core/dataaccess/databasedocument.cxx  |8 
 dbaccess/source/core/dataaccess/documenteventexecutor.cxx |2 +-
 dbaccess/source/core/recovery/dbdocrecovery.cxx   |   14 +++---
 dbaccess/source/core/recovery/subcomponentrecovery.cxx|8 
 dbaccess/source/ext/macromigration/migrationengine.cxx|   12 ++--
 dbaccess/source/ext/macromigration/migrationlog.cxx   |2 +-
 dbaccess/source/ui/app/AppDetailPageHelper.cxx|2 +-
 dbaccess/source/ui/dlg/sqlmessage.cxx |2 +-
 dbaccess/source/ui/misc/UITools.cxx   |2 +-
 dbaccess/source/ui/misc/imageprovider.cxx |4 ++--
 desktop/source/app/dispatchwatcher.cxx|2 +-
 desktop/source/deployment/misc/dp_misc.cxx|2 +-
 15 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 9e596250a6e968c5d1e2fb0de582ae242e02acf9
Author: Wastack 
Date:   Thu Mar 31 08:40:23 2016 +0200

tdf#97966  Drop 'static' keywords

Including no keywords from extern "C" blocks

Change-Id: Icff7c0308843d6a7608be24d7fcf11fa079c7b72
Reviewed-on: https://gerrit.libreoffice.org/23672
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/dbaccess/qa/unit/data/hsqldb_empty.odb.lck 
b/dbaccess/qa/unit/data/hsqldb_empty.odb.lck
new file mode 100644
index 000..d64ce94
Binary files /dev/null and b/dbaccess/qa/unit/data/hsqldb_empty.odb.lck differ
diff --git a/dbaccess/source/core/api/resultset.cxx 
b/dbaccess/source/core/api/resultset.cxx
index e69cf2b..f268810 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -295,7 +295,7 @@ sal_Int32 OResultSet::findColumn(const OUString& 
columnName) throw( SQLException
 
 namespace
 {
-static Reference< XDatabaseMetaData > 
lcl_getDBMetaDataFromStatement_nothrow( const Reference< XInterface >& 
_rxStatement )
+Reference< XDatabaseMetaData > lcl_getDBMetaDataFromStatement_nothrow( 
const Reference< XInterface >& _rxStatement )
 {
 Reference< XDatabaseMetaData > xDBMetaData;
 try
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 318ed94..9df76e5 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1193,7 +1193,7 @@ namespace
 
 namespace
 {
-static void lcl_rebaseScriptStorage_throw( const Reference< 
XStorageBasedLibraryContainer >& _rxContainer,
+void lcl_rebaseScriptStorage_throw( const Reference< 
XStorageBasedLibraryContainer >& _rxContainer,
 const Reference< XStorage >& _rxNewRootStorage )
 {
 if ( _rxContainer.is() )
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index dc1f629..2922e8e 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -285,7 +285,7 @@ namespace
 return _rArguments.getOrDefault( "StatusIndicator", xStatusIndicator );
 }
 
-static void lcl_triggerStatusIndicator_throw( const 
::comphelper::NamedValueCollection& _rArguments, DocumentGuard& _rGuard, const 
bool _bStart )
+void lcl_triggerStatusIndicator_throw( const 
::comphelper::NamedValueCollection& _rArguments, DocumentGuard& _rGuard, const 
bool _bStart )
 {
 Reference< XStatusIndicator > xStatusIndicator( 
lcl_extractStatusIndicator( _rArguments ) );
 if ( !xStatusIndicator.is() )
@@ -307,7 +307,7 @@ namespace
 // note that |reset| can throw a DisposedException
 }
 
-static void lcl_extractStatusIndicator( const 
::comphelper::NamedValueCollection& _rArguments, Sequence< Any >& _rCallArgs )
+void lcl_extractStatusIndicator( const ::comphelper::NamedValueCollection& 
_rArguments, Sequence< Any >& _rCallArgs )
 {
 Reference< XStatusIndicator > xStatusIndicator( 
lcl_extractStatusIndicator( _rArguments ) );
 if ( !xStatusIndicator.is() )
@@ -318,7 +318,7 @@ namespace
 _rCallArgs[ nLength ] <<= xStatusIndicator;
 }
 
-static void lcl_extractAndStartStatusIndicator( const 
::comphelper::NamedValueCollection& _rArguments, Reference< XStatusIndicator >& 
_rxStatusIndicator,
+void lcl_extractAndStartStatusIndicator( const 
::comphelper::NamedValueCollection& _rArguments, Reference< XStatusIndicator >& 
_rxStatusIndicator,
 Sequence< Any >& _rCallArgs )
 {
 _rxStatusIndicator = lcl_extractStatusIndicator( _rArguments );
@@ -339,7 +339,7 @@ namespace
 }
 }
 
-static

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source include/toolkit toolkit/source vbahelper/source writerfilter/source xmloff/source

2014-12-08 Thread Noel Grandin

 dbaccess/qa/unit/dbtest_base.cxx  |2 
 dbaccess/source/ui/misc/indexcollection.cxx   |   14 +--
 include/toolkit/helper/servicenames.hxx   |1 
 toolkit/source/controls/grid/defaultgriddatamodel.cxx |4 -
 toolkit/source/controls/tree/treedatamodel.cxx|   10 +-
 toolkit/source/helper/servicenames.cxx|1 
 vbahelper/source/vbahelper/vbaglobalbase.cxx  |7 -
 writerfilter/source/rtftok/rtfsdrimport.cxx   |8 +-
 xmloff/source/forms/elementexport.cxx |   72 +-
 xmloff/source/forms/elementimport.cxx |   16 ++--
 xmloff/source/forms/layerexport.cxx   |2 
 11 files changed, 64 insertions(+), 73 deletions(-)

New commits:
commit 2979ff295c9fafdb92cb56cd1f5ddb0a6b56cf20
Author: Noel Grandin n...@peralex.com
Date:   Fri Dec 5 16:28:32 2014 +0200

fdo#38835 strip out OUString globals

Change-Id: I1a435214af102461e02217f7d95248dac14e5f1a

diff --git a/dbaccess/qa/unit/dbtest_base.cxx b/dbaccess/qa/unit/dbtest_base.cxx
index 1f226c1..d3b07f8 100644
--- a/dbaccess/qa/unit/dbtest_base.cxx
+++ b/dbaccess/qa/unit/dbtest_base.cxx
@@ -25,8 +25,6 @@ using namespace ::com::sun::star::uno;
 class DBTestBase
 : public UnoApiTest
 {
-protected:
-static const OUString our_sFilePath;
 public:
 DBTestBase() : UnoApiTest(dbaccess/qa/unit/data) {};
 
diff --git a/dbaccess/source/ui/misc/indexcollection.cxx 
b/dbaccess/source/ui/misc/indexcollection.cxx
index 7557d6cc..5049e2a 100644
--- a/dbaccess/source/ui/misc/indexcollection.cxx
+++ b/dbaccess/source/ui/misc/indexcollection.cxx
@@ -150,9 +150,9 @@ namespace dbaui
 }
 
 // set the properties
-static const OUString s_sUniquePropertyName = IsUnique;
-static const OUString s_sSortPropertyName = IsAscending;
-static const OUString s_sNamePropertyName = Name;
+static const char s_sUniquePropertyName[] = IsUnique;
+static const char s_sSortPropertyName[] = IsAscending;
+static const char s_sNamePropertyName[] = Name;
 // the index' own props
 xIndexDescriptor-setPropertyValue(s_sUniquePropertyName, 
css::uno::makeAny(_rPos-bUnique));
 xIndexDescriptor-setPropertyValue(s_sNamePropertyName, 
makeAny(_rPos-sName));
@@ -252,10 +252,10 @@ namespace dbaui
 
 void OIndexCollection::implFillIndexInfo(OIndex _rIndex, Reference 
XPropertySet  _rxDescriptor)
 {
-static const OUString s_sPrimaryIndexPropertyName = 
IsPrimaryKeyIndex;
-static const OUString s_sUniquePropertyName = IsUnique;
-static const OUString s_sSortPropertyName = IsAscending;
-static const OUString s_sCatalogPropertyName = Catalog;
+static const char s_sPrimaryIndexPropertyName[] = IsPrimaryKeyIndex;
+static const char s_sUniquePropertyName[] = IsUnique;
+static const char s_sSortPropertyName[] = IsAscending;
+static const char s_sCatalogPropertyName[] = Catalog;
 
 _rIndex.bPrimaryKey = 
::cppu::any2bool(_rxDescriptor-getPropertyValue(s_sPrimaryIndexPropertyName));
 _rIndex.bUnique = 
::cppu::any2bool(_rxDescriptor-getPropertyValue(s_sUniquePropertyName));
diff --git a/include/toolkit/helper/servicenames.hxx 
b/include/toolkit/helper/servicenames.hxx
index b007a87..cc81567 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -87,7 +87,6 @@ extern const sal_Char szServiceName_UnoSpinButtonControl[], 
szServiceName_UnoSpi
 
 extern const sal_Char szServiceName_TreeControl[];
 extern const sal_Char szServiceName_TreeControlModel[];
-extern const sal_Char szServiceName_MutableTreeDataModel[];
 
 extern const sal_Char szServiceName_GridControl[];
 extern const sal_Char szServiceName_GridControlModel[];
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx 
b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 883d3e4..aa830e4 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -495,8 +495,8 @@ private:
 
 Sequence OUString  SAL_CALL 
DefaultGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException, 
std::exception)
 {
-static const OUString 
aServiceName(com.sun.star.awt.grid.DefaultGridDataModel);
-static const Sequence OUString  aSeq( aServiceName, 1 );
+Sequence OUString  aSeq( 1 );
+aSeq[0] = com.sun.star.awt.grid.DefaultGridDataModel;
 return aSeq;
 }
 
diff --git a/toolkit/source/controls/tree/treedatamodel.cxx 
b/toolkit/source/controls/tree/treedatamodel.cxx
index ee1468f..3f50b3d 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.cxx
@@ -258,9 +258,8 @@ sal_Bool SAL_CALL MutableTreeDataModel::supportsService( 
const OUString Service
 
 Sequence OUString

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source sfx2/source sw/inc sw/source

2014-09-17 Thread Julien Nabet

 dbaccess/qa/complex/dbaccess/RowSet.java   |2 +-
 dbaccess/source/core/api/CacheSet.cxx  |2 +-
 dbaccess/source/core/api/KeySet.cxx|   10 +-
 dbaccess/source/core/api/OptimisticSet.cxx |2 +-
 sfx2/source/view/viewsh.cxx|4 ++--
 sw/inc/anchoreddrawobject.hxx  |2 +-
 sw/source/core/text/txtfly.cxx |2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit a762204a5df46ef68c5b0be4427fc99e32c4c36d
Author: Julien Nabet serval2...@yahoo.fr
Date:   Wed Sep 17 21:14:52 2014 +0200

Typos

Change-Id: Icf850c4b7b146a82a5638a3cd88ad02f3171aff3

diff --git a/dbaccess/qa/complex/dbaccess/RowSet.java 
b/dbaccess/qa/complex/dbaccess/RowSet.java
index c9bb39a..66749fb 100644
--- a/dbaccess/qa/complex/dbaccess/RowSet.java
+++ b/dbaccess/qa/complex/dbaccess/RowSet.java
@@ -200,7 +200,7 @@ public class RowSet extends TestCase
 System.out.println(testing testRowSet);
 createTestCase(true);
 
-// sequential postioning
+// sequential positioning
 m_resultSet.beforeFirst();
 testSequentialPositining(m_resultSet, m_row);
 
diff --git a/dbaccess/source/core/api/CacheSet.cxx 
b/dbaccess/source/core/api/CacheSet.cxx
index 65c5e83..de9d943 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -282,7 +282,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow 
_rInsertRow ,const ORowSetR
 fillTableName(xSet);
 
 OUStringBuffer aSql(UPDATE  + m_aComposedTableName +  SET );
-// list all cloumns that should be set
+// list all columns that should be set
 
 OUStringBuffer aCondition;
 ::std::list sal_Int32 aOrgValues;
diff --git a/dbaccess/source/core/api/KeySet.cxx 
b/dbaccess/source/core/api/KeySet.cxx
index 2c75718..96e01ab 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -562,14 +562,14 @@ void SAL_CALL OKeySet::updateRow(const ORowSetRow 
_rInsertRow ,const ORowSetRow
 fillTableName(xSet);
 
 OUStringBuffer aSql = UPDATE  + m_aComposedTableName +  SET ;
-// list all cloumns that should be set
+// list all columns that should be set
 static OUString aPara( = ?,);
 OUString aQuote  = getIdentifierQuoteString();
 static OUString aAnd( AND );
 OUString sIsNull( IS NULL);
 OUString sParam( = ?);
 
-// use keys and indexes for exact postioning
+// use keys and indexes for exact positioning
 // first the keys
 ReferenceXNameAccess xKeyColumns = getKeyColumns();
 
@@ -972,11 +972,11 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow 
_rDeleteRow,const connectivit
 
 OUStringBuffer aSql(DELETE FROM  + m_aComposedTableName +  WHERE );
 
-// list all cloumns that should be set
+// list all columns that should be set
 OUString aQuote  = getIdentifierQuoteString();
 static OUString aAnd( AND );
 
-// use keys and indexes for excat postioning
+// use keys and indexes for exact positioning
 ReferenceXNameAccess xKeyColumns = getKeyColumns();
 // second the indexes
 ReferenceXIndexesSupplier xIndexSup(_xTable,UNO_QUERY);
@@ -1082,7 +1082,7 @@ void SAL_CALL OKeySet::moveToCurrentRow(  ) 
throw(SQLException, RuntimeException
 
 ReferenceXNameAccess OKeySet::getKeyColumns() const
 {
-// use keys and indexes for exact postioning
+// use keys and indexes for exact positioning
 // first the keys
 
 ReferenceXIndexAccess xKeys = m_xTableKeys;
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx 
b/dbaccess/source/core/api/OptimisticSet.cxx
index 44e7807..aece21b 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -182,7 +182,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow 
_rInsertRow ,const ORow
 {
 if ( m_aJoinedKeyColumns.empty() )
 throw SQLException();
-// list all cloumns that should be set
+// list all columns that should be set
 static OUString s_sPara( = ?);
 OUString aQuote  = getIdentifierQuoteString();
 
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 9b40bb4..fd07e1a 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -1052,7 +1052,7 @@ void SfxViewShell::OuterResizePixel
 here. The mainuse is to change the size of the Vis-Area.
 
 If the Border is changed due to the new calculation then this has to be set
-by SfxViewShell::SetBorderPixel(const SvBorder). The Postioning of Tools
+by SfxViewShell::SetBorderPixel(const SvBorder). The Positioning of 
Tools
 is only allowed after the calling of 'SetBorderPixel'.
 
 [Example]
@@ -1101,7 +1101,7 @@ void SfxViewShell::InnerResizePixel
 
 If the Border is changed due to the new calculation then is has to be set
 by SfxViewShell::SetBorderPixel(const SvBorder).
-The Postioning of Tools is only allowed after the calling of
+The

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

2013-08-19 Thread Jelle van der Waa

 dbaccess/qa/extras/macros-test.cxx |6 -
 dbaccess/source/core/recovery/subcomponentrecovery.cxx |5 
 dbaccess/source/ext/macromigration/migrationengine.cxx |   19 ++---
 dbaccess/source/ext/macromigration/migrationlog.cxx|   14 +++-
 dbaccess/source/sdbtools/connection/objectnames.cxx|6 -
 dbaccess/source/ui/misc/WCopyTable.cxx |3 --
 6 files changed, 11 insertions(+), 42 deletions(-)

New commits:
commit 9a1aca007fd06f3f8223ee02a79e44099d778b51
Author: Jelle van der Waa je...@vdwaa.nl
Date:   Sat Aug 17 22:14:22 2013 +0200

fdo#57950: Remove some chained appends in dbaccess

Change-Id: If93b4a11ac15ede2b08ef42bb2fa4670f0d4cd24
Reviewed-on: https://gerrit.libreoffice.org/5481
Reviewed-by: Andrzej J.R. Hunt andr...@ahunt.org
Tested-by: Andrzej J.R. Hunt andr...@ahunt.org

diff --git a/dbaccess/qa/extras/macros-test.cxx 
b/dbaccess/qa/extras/macros-test.cxx
index cc0a437..bcff534 100644
--- a/dbaccess/qa/extras/macros-test.cxx
+++ b/dbaccess/qa/extras/macros-test.cxx
@@ -51,11 +51,7 @@ private:
 
 void DBAccessTest::createFileURL(const OUString aFileBase, const OUString 
aFileExtension, OUString rFilePath)
 {
-OUString aSep(/);
-OUStringBuffer aBuffer( getSrcRootURL() );
-aBuffer.append(m_aBaseString);
-aBuffer.append(aSep).append(aFileBase).append(aFileExtension);
-rFilePath = aBuffer.makeStringAndClear();
+rFilePath = getSrcRootURL() + m_aBaseString + / + aFileBase + 
aFileExtension;
 }
 
 DBAccessTest::DBAccessTest()
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx 
b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
index af11780..0981787 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx
@@ -218,10 +218,7 @@ namespace dbaccess
 private:
 OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken )
 {
-OUStringBuffer aQualifiedName( m_aNamespace );
-aQualifiedName.append( sal_Unicode( ':' ) );
-aQualifiedName.append( ::xmloff::token::GetXMLToken( i_eToken ) );
-return aQualifiedName.makeStringAndClear();
+return m_aNamespace + : + ::xmloff::token::GetXMLToken( i_eToken 
);
 }
 
 private:
diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx 
b/dbaccess/source/ext/macromigration/migrationengine.cxx
index c0ec435..8d0b5f1 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.cxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.cxx
@@ -1253,12 +1253,7 @@ namespace dbmm
 }
 sBaseName = aReplacement.makeStringAndClear();
 
-OUStringBuffer aNewLibNameAttempt;
-aNewLibNameAttempt.append( sPrefix );
-aNewLibNameAttempt.append( sBaseName );
-aNewLibNameAttempt.appendAscii( _ );
-aNewLibNameAttempt.append( _rSourceLibName );
-OUString sTargetName( aNewLibNameAttempt.makeStringAndClear() 
);
+OUString sTargetName( sPrefix + sBaseName + _ + 
_rSourceLibName );
 if ( !_rxTargetContainer-hasByName( sTargetName ) )
 return sTargetName;
 }
@@ -1267,12 +1262,7 @@ namespace dbmm
 // (The latter is valid, since there can be multiple sub documents 
with the same base name,
 // in different levels in the hierarchy.)
 // In this case, just use the umambiguous sub document number.
-OUStringBuffer aNewLibName;
-aNewLibName.append( sPrefix );
-aNewLibName.append( OUString::valueOf( sal_Int64( 
_rDocument.nNumber ) ) );
-aNewLibName.appendAscii( _ );
-aNewLibName.append( _rSourceLibName );
-return aNewLibName.makeStringAndClear();
+return sPrefix + OUString::valueOf( sal_Int64( _rDocument.nNumber 
) ) + _ + _rSourceLibName;
 }
 }
 
@@ -1680,10 +1670,7 @@ namespace dbmm
 OSL_ENSURE( sLibrary != sNewLibName,
 MigrationEngine_Impl::impl_adjustScriptLibrary_nothrow: a 
library which has not been migrated? );
 
-OUStringBuffer aNewLocation;
-aNewLocation.append( sNewLibName );
-aNewLocation.append( sScriptName.copy( nLibModuleSeparator ) );
-xUri-setName( aNewLocation.makeStringAndClear() );
+xUri-setName( sNewLibName + sScriptName.copy( nLibModuleSeparator 
) );
 
 // update the new script URL
 _inout_rScriptCode = xUri-getUriReference();
diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx 
b/dbaccess/source/ext/macromigration/migrationlog.cxx
index cee6065..f4c1ac9 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.cxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.cxx
@@ -430,11 +430,8 @@ namespace dbmm

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source desktop/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source include/toolkit toolkit/source vbahelper/source writerfilter/source xmloff/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source sfx2/source sw/inc sw/source

[Libreoffice-commits] core.git: dbaccess/qa dbaccess/source

15 matches

Site Navigation

Mail list logo

Footer information