[Libreoffice-commits] core.git: 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 86ffa73ed04900a33160cb6b28a8898fe139396d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jan 7 10:07:27 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jan 7 14:14:42 2020 +0100

    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>

diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index c19061877cef..e114d7b8e9b3 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -103,6 +103,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 d8dd5fb17498..344d8a02961b 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -193,8 +193,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 890203b82802..ae583af16f4b 100644
--- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx
@@ -909,6 +909,12 @@ void LinePropertyPanelBase::disableArrowHead()
     ActivateControls();
 }
 
+void LinePropertyPanelBase::enableArrowHead()
+{
+    mbArrowSupported = true;
+    ActivateControls();
+}
+
 }} // end of namespace svx::sidebar
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */