[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - connectivity/source filter/source sw/source

[Tamas Bunth (via logerrit)]

 connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx |    7 -----
 filter/source/pdf/impdialog.cxx                                |   12 +++++++---
 sw/source/core/view/printdata.cxx                              |    3 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 587c828640c799729b00e1d96c96c161f97293c5
Author:     Tamas Bunth <tamas.bunth at collabora.co.uk>
AuthorDate: Wed Sep 12 17:31:26 2018 +0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Sat Aug 3 14:21:54 2019 +0200

    mysqlc: getTablePrivileges not implemented, so..
    
    it should throw an exception.
    
    Reviewed-on: https://gerrit.libreoffice.org/60460
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 19f8ea668833a4dc90244792cbf91881b0ca9a07)
    
    Change-Id: I32b0b5dde0bcfd8cc59d0814a9f35d43c0f58ae1
    Reviewed-on: https://gerrit.libreoffice.org/76750
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit acafd1ac87cb23a447353b8f0419a25fbe1c4430)
    Reviewed-on: https://gerrit.libreoffice.org/76873
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
index 3bdc27e7744b..f04b8928714b 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_databasemetadata.cxx
@@ -1046,14 +1046,9 @@ Reference<XResultSet> SAL_CALL ODatabaseMetaData::getBestRowIdentifier(const Any
 Reference<XResultSet> SAL_CALL ODatabaseMetaData::getTablePrivileges(
     const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/)
 {
-    Reference<XResultSet> xResultSet(getOwnConnection().getDriver().getFactory()->createInstance(
-                                         "org.openoffice.comp.helper.DatabaseMetaDataResultSet"),
-                                     UNO_QUERY);
-    std::vector<std::vector<Any>> rRows;
     // TODO
     SAL_WARN("connectivity.mysqlc", "method not implemented");
-    lcl_setRows_throw(xResultSet, 12, rRows);
-    return xResultSet;
+    throw SQLException("getTablePrivileges method not implemented", *this, "IM001", 0, Any());
 }
 
 Reference<XResultSet> SAL_CALL ODatabaseMetaData::getCrossReference(
commit 87d5c863109f7991e3f2f3a1eb970c00d5a27bd5
Author:     Daniel Silva <danielfaleirosilva at gmail.com>
AuthorDate: Sat Dec 8 10:15:26 2018 -0200
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Sat Aug 3 14:21:41 2019 +0200

    tdf#54908 Make selection active if there's a selection (Writer)
    
    If the user make a selection in Writer and then opens print dialog or PDF
    export dialog, Print Selection is the default option.
    
    Change-Id: I46ba90cfeabafef1c05dd3e5008ecf55f177a146
    Reviewed-on: https://gerrit.libreoffice.org/64804
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    Tested-by: Jenkins
    (cherry picked from commit f50363c7008c239d302944144beb256de6a55f38)
    Reviewed-on: https://gerrit.libreoffice.org/76879
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 213f2cc2dc02..14738ff2e723 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -503,8 +503,9 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
     mxRbAll->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleAllHdl ) );
     TogglePagesHdl();
 
-    mxRbSelection->set_sensitive( pParent->mbSelectionPresent );
-    if ( pParent->mbSelectionPresent )
+    const bool bSelectionPresent = pParent->mbSelectionPresent;
+    mxRbSelection->set_sensitive( bSelectionPresent );
+    if ( bSelectionPresent )
         mxRbSelection->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleSelectionHdl ) );
     mbIsPresentation = pParent->mbIsPresentation;
     mbIsWriter = pParent->mbIsWriter;
@@ -611,7 +612,12 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
     }
 
     mxCbExportPlaceholders->set_visible(mbIsWriter);
-    if( !mbIsWriter )
+    if( mbIsWriter )
+    {
+        // tdf#54908 Make selection active if there is a selection in Writer's version
+        mxRbSelection->set_active( bSelectionPresent );
+    }
+    else
     {
         mxCbExportPlaceholders->set_active(false);
     }
diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index 44f34d1e2a5f..2e9d9d3a7606 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -301,7 +301,8 @@ SwPrintUIOptions::SwPrintUIOptions(
     aWidgetIds[4] = "rbRangeSelection";
     m_aUIProperties[nIdx++].Value = setChoiceRadiosControlOpt(aWidgetIds, OUString(),
                                                         aHelpIds, aPrintRangeName,
-                                                        aChoices, 0 /* always default to 'All pages' */,
+                                                        aChoices,
+                                                        bHasSelection ? 4 : 0,
                                                         aChoicesDisabled);
 
     // show an Edit dependent on "Pages" selected