[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - 2 commits - chart2/source connectivity/source

[Justin Luth (via logerrit)]

 chart2/source/controller/sidebar/ChartLinePanel.cxx |    5 +----
 connectivity/source/drivers/mysqlc/mysqlc_table.cxx |    9 ++++++++-
 connectivity/source/drivers/mysqlc/mysqlc_table.hxx |    4 ++++
 3 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 92cae42e5d8e5565cda975bf4be543fa9dfee352
Author:     Justin Luth <jl...@mail.com>
AuthorDate: Sat May 20 11:38:16 2023 -0400
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu May 25 11:53:16 2023 +0200

    tdf#138279 Revert "On double click on chart select the chart backgroud"
    
    This reverts 7.1 commit 6a915073f8400fd34274cf311994bbc9bf498ab6.
    
    The change was simply wrong. There is NOTHING about this context
    that indicates that a double-click is happening.
    
    So whatever this patch was trying to do,
    it simply was made in a completely wrong way.
    
    So best to just revert, and put the onus back on the interested
    parties to redesign a fix for their double-click issue.
    
    Change-Id: Ia209c0552839d6cce1b348432789f0f861ac5703
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152023
    Reviewed-by: Justin Luth <jl...@mail.com>
    Tested-by: Jenkins
    (cherry picked from commit 73a82b425b4dc02ef4ad3946b71c067a6411045c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152217
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx 
b/chart2/source/controller/sidebar/ChartLinePanel.cxx
index d9da9a2985ef..f9c0e6795eed 100644
--- a/chart2/source/controller/sidebar/ChartLinePanel.cxx
+++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx
@@ -55,10 +55,7 @@ OUString getCID(const rtl::Reference<::chart::ChartModel>& 
xModel)
 
     css::uno::Any aAny = xSelectionSupplier->getSelection();
     if (!aAny.hasValue())
-    {
-        xSelectionSupplier->select(css::uno::Any(OUString("CID/Page=")));
-        aAny = xSelectionSupplier->getSelection();
-    }
+        return OUString();
 
     OUString aCID;
     aAny >>= aCID;
commit a8dd0dd684cf76570f7906793d2450357152e756
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed May 24 22:15:26 2023 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu May 25 11:53:06 2023 +0200

    tdf#155443: MySQL/MariaDB direct connect: pb to change fieldname in table
    
    Copy and simplify "getAlterTableColumnPart" from Mysql JDBC part which seems
    to do the right job with table name.
    
    Change-Id: I94d20b002a60f2ce1ea4d7e4de8040a9cbf04994
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152247
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
    Tested-by: Jenkins
    (cherry picked from commit 7f950e018f708815258e7a50e6383167fdc75866)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152215
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_table.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_table.cxx
index 13d7480998c3..aa2bd528e93e 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_table.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_table.cxx
@@ -135,7 +135,7 @@ void SAL_CALL 
connectivity::mysqlc::Table::alterColumnByName(
     {
         OUString sNewColName;
         rDescriptor->getPropertyValue("Name") >>= sNewColName;
-        OUString sSql("ALTER TABLE `" + getName() + "` RENAME COLUMN `" + 
rColName + "` TO `"
+        OUString sSql(getAlterTableColumnPart() + " RENAME COLUMN `" + 
rColName + "` TO `"
                       + sNewColName + "`");
 
         getConnection()->createStatement()->execute(sSql);
@@ -155,6 +155,13 @@ void SAL_CALL 
connectivity::mysqlc::Table::alterColumnByIndex(
                       descriptor);
 }
 
+OUString connectivity::mysqlc::Table::getAlterTableColumnPart() const
+{
+    return "ALTER TABLE "
+           + ::dbtools::composeTableName(getMetaData(), m_CatalogName, 
m_SchemaName, m_Name, true,
+                                         
::dbtools::EComposeRule::InTableDefinitions);
+}
+
 OUString connectivity::mysqlc::Table::getRenameStart() const { return "RENAME 
TABLE "; }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */
diff --git a/connectivity/source/drivers/mysqlc/mysqlc_table.hxx 
b/connectivity/source/drivers/mysqlc/mysqlc_table.hxx
index f17a326878f9..7487f1bc7b34 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_table.hxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_table.hxx
@@ -58,6 +58,10 @@ public:
 
     virtual void SAL_CALL alterColumnByIndex(
         sal_Int32 index, const css::uno::Reference<css::beans::XPropertySet>& 
descriptor) override;
+
+    /** returns the ALTER TABLE XXX statement
+    */
+    OUString getAlterTableColumnPart() const;
 };
 
 } // namespace connectivity::mysqlc