[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - officecfg/registry svx/source

[Rishabh]

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |    3 ++-
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx          |    2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit c39e78c7680457c1e276569409b6a2c279758496
Author: Rishabh <kris.kr296 at yahoo.in>
Date:   Sun Jan 24 03:58:08 2016 +0530

    Make Position and Size sidebar tab visible when a line is selected
    
    Regression bug introduced by - https://gerrit.libreoffice.org/#/c/16165/ and removal of obsolete writer code.
    
    Change-Id: I8ab2e0c04b5c90fafdb43f34899053df7bd7fb4e
    Reviewed-on: https://gerrit.libreoffice.org/21739
    Reviewed-by: Jochen Nitschke <j.nitschke+logerrit at ok.de>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 8fb5502b25f0ca0e97e3eb07b68d89d21ee3d0ec)
    Reviewed-on: https://gerrit.libreoffice.org/21851
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 92071f8..6982bb0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -451,7 +451,6 @@
             DrawImpress,    TextObject, hidden  ;
             DrawImpress,    OLE,        hidden  ;
             WriterVariants, Draw,       visible ;
-            WriterVariants, DrawLine,   visible ;
           </value>
         </prop>
         <prop oor:name="ImplementationURL" oor:type="xs:string">
@@ -505,6 +504,7 @@
           <value oor:separator=";">
             Calc,           Chart,       visible                       ;
             Calc,           Draw,        hidden                        ;
+            Calc,           DrawLine,    visible                       ;
             Calc,           Form,        visible                       ;
             Calc,           Graphic,     hidden                        ;
             Calc,           Media,       visible                       ;
@@ -512,6 +512,7 @@
             Calc,           OLE,         visible                       ;
             DrawImpress,    3DObject,    visible                       ;
             DrawImpress,    Draw,        hidden                        ;
+            DrawImpress,    DrawLine,    visible                       ;
             DrawImpress,    Form,        visible                       ;
             DrawImpress,    Graphic,     hidden                        ;
             DrawImpress,    Media,       visible                       ;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 89effbb..bc3d30e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -285,8 +285,10 @@ void PosSizePropertyPanel::HandleContextChange(
             break;
 
         case CombinedEnumContext(Application_Calc, Context_Draw):
+        case CombinedEnumContext(Application_Calc, Context_DrawLine):
         case CombinedEnumContext(Application_Calc, Context_Graphic):
         case CombinedEnumContext(Application_DrawImpress, Context_Draw):
+        case CombinedEnumContext(Application_DrawImpress, Context_DrawLine):
         case CombinedEnumContext(Application_DrawImpress, Context_TextObject):
         case CombinedEnumContext(Application_DrawImpress, Context_Graphic):
             bShowPosition = true;