[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 3 commits - dbaccess/source sc/source sw/source

[Vasily Melenchuk (via logerrit)]

 dbaccess/source/ui/dlg/ConnectionPage.cxx |    1 +
 sc/source/core/opencl/formulagroupcl.cxx  |    4 ++--
 sw/source/core/unocore/unodraw.cxx        |   11 ++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 240a7c9cd6e064bbb5d9501c392e6a6897b703d4
Author:     Vasily Melenchuk <vasily.melenchuk at cib.de>
AuthorDate: Tue May 5 15:47:44 2020 +0300
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 18 20:44:33 2020 +0200

    tdf#128665: sw: set unique name for shape format
    
    Set name even if received shape name is empty. This is required
    to have unique style name for undo/redo correct work.
    
    Change-Id: I26cc8ec7ec831286c7afa8e17b94e6c0a270cf20
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93479
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94373
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index b205802231df..698b05b5ac96 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -712,7 +712,16 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape)
     if (pFormat)
     {
         if (pFormat->GetName().isEmpty())
-            pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false);
+        {
+            if (pSvxShape->GetSdrObject()->GetName().isEmpty())
+            {
+                pFormat->SetName(pDoc->GetUniqueShapeName(), false);
+            }
+            else
+            {
+                pFormat->SetName(pSvxShape->GetSdrObject()->GetName(), false);
+            }
+        }
         pShape->SetFrameFormat(pFormat);
     }
     pShape->m_bDescriptor = false;
commit 5d617bfd96e8dd983e0fd962c5c323d9e8faf539
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Dec 6 16:59:34 2019 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 18 20:44:24 2020 +0200

    loplugin:implicitboolconversion
    
    ...in non-dependent templated code that Clang trunk now apparently processes
    more aggressively, presumably since <https://github.com/llvm/llvm-project/
    commit/878a24ee244a24c39d1c57e9af2e88c621f7cce9> "Reapply 'Fix crash on switch
    conditions of non-integer types in templates'"
    
    Change-Id: I561d046c736b4e9574565c01daf0f59e7d5ec414
    Reviewed-on: https://gerrit.libreoffice.org/84656
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93696
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 27f3d2674ab7..f126311d5bf3 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -1204,9 +1204,9 @@ public:
 
     size_t GetWindowSize() const { return mpDVR->GetRefRowSize(); }
 
-    size_t GetStartFixed() const { return bIsStartFixed; }
+    bool GetStartFixed() const { return bIsStartFixed; }
 
-    size_t GetEndFixed() const { return bIsEndFixed; }
+    bool GetEndFixed() const { return bIsEndFixed; }
 
 protected:
     bool bIsStartFixed, bIsEndFixed;
commit 3b6ad03de7b4c29891216c6be6dbb9e0f7442be1
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sat May 16 19:39:29 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 18 20:44:14 2020 +0200

    tdf#97416: fix Database password properties in ODB file not re-settable via UI
    
    Just call save_state() of the checkbox
    
    Change-Id: I3fa434b080efdcd284fba8e2f73d8e4846870576
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94363
    Tested-by: Jenkins
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94374

diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 2fec1cee16b6..e763e3097c2d 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -238,6 +238,7 @@ namespace dbaui
             m_xUserName->save_value();
             m_xConnectionURL->save_value();
             m_xJavaDriver->save_value();
+            m_xPasswordRequired->save_state();
         }
     }