[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - 2 commits - include/tools sw/source tools/source

[Miklos Vajna (via logerrit)]

 include/tools/debug.hxx                        |    6 +++---
 sw/source/uibase/sidebar/WrapPropertyPanel.cxx |    8 ++++++++
 tools/source/debug/debug.cxx                   |    4 ----
 3 files changed, 11 insertions(+), 7 deletions(-)

New commits:
commit af0678cc00aff2e2d375bc34dc77b27e9a27cf6a
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Dec 18 10:46:43 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Apr 30 12:05:59 2020 +0200

    tools: define DbgTestSolarMutex() unconditionally
    
    See the discussion at <https://gerrit.libreoffice.org/#/c/58170/>, and
    this came up on IRC today again.
    
    The above change broke the invariant that you can mix product and debug
    (but not dbgutil) builds. Restore this, without mandating dbgutil for
    the solar mutex assert code, which is useful for plain debug builds as
    well.
    
    (cherry picked from commit fc761cb2cc343c0c0f3ca8a908a547603a029e36)
    
    Conflicts:
            tools/source/debug/debug.cxx
    
    Change-Id: I1f8bdb114b129fc4f39f186ba917e35e346a16b5

diff --git a/include/tools/debug.hxx b/include/tools/debug.hxx
index b66a9b2866ef..c72da4d06887 100644
--- a/include/tools/debug.hxx
+++ b/include/tools/debug.hxx
@@ -34,14 +34,14 @@
     standard assert.
 */
 
-#ifndef NDEBUG
-// we want the solar mutex checking to be enabled in the assert-enabled builds that the QA people use
-
 typedef void (*DbgTestSolarMutexProc)();
 
 TOOLS_DLLPUBLIC void DbgSetTestSolarMutex( DbgTestSolarMutexProc pParam );
 TOOLS_DLLPUBLIC void DbgTestSolarMutex();
 
+#ifndef NDEBUG
+// we want the solar mutex checking to be enabled in the assert-enabled builds that the QA people use
+
 #define DBG_TESTSOLARMUTEX()   \
 do                             \
 {                              \
diff --git a/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index de4a14015044..fb2b0513c938 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.cxx
@@ -61,8 +61,6 @@
 #include <cxxabi.h>
 #endif
 
-#ifndef NDEBUG
-
 struct DebugData
 {
     DbgTestSolarMutexProc   pDbgTestSolarMutex;
@@ -93,8 +91,6 @@ void DbgTestSolarMutex()
         aDebugData.pDbgTestSolarMutex();
 }
 
-#endif
-
 static void exceptionToStringImpl(OStringBuffer& sMessage, const css::uno::Any & caught)
 {
     auto toOString = [](OUString const & s) {
commit fdb48192a1234482631f243a4b9ea77af52364ef
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Dec 18 22:34:06 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Apr 30 12:03:38 2020 +0200

    sw lok: disable Edit Contour button in image sidebar
    
    This can be enabled when the underlying dialog is OK under LOK.
    
    Change-Id: Id74d20de55e77842d707e345b2193ca9113594e8
    Reviewed-on: https://gerrit.libreoffice.org/85435
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
    Tested-by: Jenkins
    (cherry picked from commit 803c3a7824883ccf7d0841aabff591c014d20195)

diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
index e596d8d8dc72..b9d01096a1f7 100644
--- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx
@@ -36,6 +36,7 @@
 #include <hintids.hxx>
 #include <uitool.hxx>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <comphelper/lok.hxx>
 
 const char UNO_WRAPOFF[] = ".uno:WrapOff";
 const char UNO_WRAPLEFT[] = ".uno:WrapLeft";
@@ -148,6 +149,13 @@ void WrapPropertyPanel::Initialize()
 
     Link<Button*,void> EditContourLink = LINK(this, WrapPropertyPanel, EditContourHdl);
     mpEditContour->SetClickHdl(EditContourLink);
+
+    if (comphelper::LibreOfficeKit::isActive())
+    {
+        // Disable Edit Contour button for LOK purposes.
+        mpEditContour->Hide();
+    }
+
     Link<Button*, void> EnableContourLink = LINK(this,WrapPropertyPanel, EnableContourHdl);
     mpEnableContour->SetClickHdl(EnableContourLink);
     mpSpacingLB->SetSelectHdl(LINK(this, WrapPropertyPanel, SpacingLBHdl));