[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - dbaccess/source sw/source

[Michael Weghorn (via logerrit)]

 dbaccess/source/filter/hsqldb/parseschema.cxx |   20 ++++++++++++++++++--
 sw/source/ui/dbui/mmresultdialogs.cxx         |    2 --
 2 files changed, 18 insertions(+), 4 deletions(-)

New commits:
commit 8694e39a6dc2c36025f5db191d9fbeacd7cfd01d
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Fri Jul 19 08:27:57 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 5 10:51:50 2019 +0200

    Mail merge: Preselect proper printer
    
    The proper printer has already been set
    a few lines above depending on the value of
    'bMergePrinterExists', so it shouldn't be
    unconditionally overwritten here with a
    potentially invalid printer (using the same
    statement as already used 7 lines above for
    the 'else' case).
    
    This e.g. makes sure that the default printer
    is selected when no printer has been set, e.g.
    just after running Mail Merge Wizard on a new
    Writer doc, in which case no printer was selected
    previously.
    
    Change-Id: I922b8234be9c80536b6b0a9ba0dd19bdc39246e8
    Reviewed-on: https://gerrit.libreoffice.org/75932
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit 3bc1f99d3a792cdba037bcc757e8611d7e187b73)
    Reviewed-on: https://gerrit.libreoffice.org/75967
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 8d4733df5ca12e92dbf5d5ac525fd4d8bf9307dd)
    Reviewed-on: https://gerrit.libreoffice.org/76938
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index a103d4001023..b7b55baca56c 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -345,8 +345,6 @@ void SwMMResultPrintDialog::FillInPrinterSettings()
     sal_Int32 count = xConfigItem->GetMergedDocumentCount();
     m_xToNF->set_value(count);
     m_xToNF->set_max(count);
-
-    m_xPrinterLB->set_active_text(xConfigItem->GetSelectedPrinter());
 }
 
 void SwMMResultEmailDialog::FillInEmailSettings()
commit f877a8625ce4eb5004024d4fdf0cc3d5075050d4
Author:     Tamas Bunth <tamas.bunth at collabora.co.uk>
AuthorDate: Tue Jul 16 21:44:38 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Aug 5 10:51:38 2019 +0200

    tdf#123020 dbahsql: Support string delimiter
    
    Support multi-word table names while migrating HSQLDB data.
    
    Change-Id: I5129f995ea90a3fdbcbcb844774cf074f3ffddb2
    Reviewed-on: https://gerrit.libreoffice.org/75734
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit b5890bf269214a47833bc9514b80650455e77ef6)
    Reviewed-on: https://gerrit.libreoffice.org/75820
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit 47d6c43c19aa6ea05f0f65db58e5cdcf1c603660)
    Reviewed-on: https://gerrit.libreoffice.org/75853
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit ed9acbe6057f535bca8d4ce98aa0eda7be34e15b)
    Reviewed-on: https://gerrit.libreoffice.org/76937
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/dbaccess/source/filter/hsqldb/parseschema.cxx b/dbaccess/source/filter/hsqldb/parseschema.cxx
index e04998c80f28..f8e17d90b312 100644
--- a/dbaccess/source/filter/hsqldb/parseschema.cxx
+++ b/dbaccess/source/filter/hsqldb/parseschema.cxx
@@ -28,6 +28,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <sal/log.hxx>
+#include <connectivity/dbexception.hxx>
 
 namespace
 {
@@ -74,8 +75,17 @@ public:
 
     OUString getTableName() const
     {
-        // SET TABLE <tableName>
-        return string::split(m_sql, u' ')[2];
+        // SET TABLE <tableName> or SET TABLE "<multi word table name>"
+        OUString sName = string::split(m_sql, u' ')[2];
+        if (sName.indexOf('"') >= 0)
+        {
+            // Table name with string delimiter
+            OUStringBuffer sMultiName("\"");
+            sMultiName.append(string::split(m_sql, u'"')[1]);
+            sMultiName.append("\"");
+            sName = sMultiName.makeStringAndClear();
+        }
+        return sName;
     }
 };
 
@@ -169,6 +179,12 @@ void SchemaParser::parseSchema()
 
 ColumnTypeVector SchemaParser::getTableColumnTypes(const OUString& sTableName) const
 {
+    if (m_ColumnTypes.count(sTableName) < 1)
+    {
+        constexpr char NOT_EXIST[] = "Internal error while getting column information of table";
+        SAL_WARN("dbaccess", NOT_EXIST << ". Table name is: " << sTableName);
+        dbtools::throwGenericSQLException(NOT_EXIST, ::comphelper::getProcessComponentContext());
+    }
     return m_ColumnTypes.at(sTableName);
 }