[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - include/svx svx/source

[Caolán McNamara (via logerrit)]

 include/svx/sidebar/LinePropertyPanelBase.hxx     |    1 +
 svx/source/sidebar/line/LinePropertyPanel.cxx     |    4 +++-
 svx/source/sidebar/line/LinePropertyPanelBase.cxx |    6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 2b8e09b12cdcc2254b86f80ec3b0691c7548e1f2
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 7 10:07:27 2020 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun May 10 21:45:05 2020 +0200

    arrow in sidebar not getting reenabled on changing context
    
    possibly since...
    
    commit 5b77d17c4f1ca734babf962b45c1aa07bdca14e9
    Date:   Sat Jan 4 18:09:20 2020 +0000
    
        sidebar: allow panels to lurk around instead of being disposed.
    
    Change-Id: I4d3085a1bd0ceb5f04dba3e49c801df05b795061
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86332
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93866
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 6d10cca666a0..2def46e3b524 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -108,6 +108,7 @@ protected:
 
     void setMapUnit(MapUnit eMapUnit);
 
+    void enableArrowHead();
     void disableArrowHead();
 
 protected:
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 1ea655b733a6..14fa40d06d15 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -195,8 +195,10 @@ void LinePropertyPanel::HandleContextChange(
             break;
     }
 
-    if(!bShowArrows)
+    if (!bShowArrows)
         disableArrowHead();
+    else
+        enableArrowHead();
 }
 
 void LinePropertyPanel::setLineStyle(const XLineStyleItem& rItem)
diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
index 824ee8126095..75a703949610 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -910,6 +910,12 @@ void LinePropertyPanelBase::disableArrowHead()
     ActivateControls();
 }
 
+void LinePropertyPanelBase::enableArrowHead()
+{
+    mbArrowSupported = true;
+    ActivateControls();
+}
+
 }} // end of namespace svx::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */