[Libreoffice-commits] core.git: Branch 'feature/sidebar' - officecfg/registry svx/source

[Armin Le Grand]

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |    6 ++++++
 svx/source/sidebar/SelectionAnalyzer.cxx                     |    4 ++++
 2 files changed, 10 insertions(+)

New commits:
commit 3c33a28233dfbb0db44553f13511107976f18363
Author: Armin Le Grand <alg at apache.org>
Date:   Wed May 15 16:20:13 2013 +0000

    Resolves: i122145 Multiselection with mix of DrawObjects and OLE...
    
    will allow LineStyle and FillStyle panel, single selection of OLE offers these,
    too, but in default closed state
    
    (cherry picked from commit 8a2531d3d98ad3afb2b233be2d5dd7b67febeba6)
    
    Change-Id: Iba8f99afb4324d33be0469e3b0835f08fe142b0a

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index b0c669e..a92643a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -317,10 +317,13 @@
         <prop oor:name="ContextList">
           <value oor:separator=";">
             Calc,           Draw,       visible ;
+            Calc,           OLE,        hidden  ;
             DrawImpress,    3DObject,   visible ;
             DrawImpress,    Draw,       visible ;
             DrawImpress,    TextObject, hidden  ;
+            DrawImpress,    OLE,        hidden  ;
             WriterVariants, Draw,       visible ;
+            WriterVariants, OLE,        hidden, .uno:FrameDialog ;
           </value>
         </prop>
         <prop oor:name="ImplementationURL" oor:type="xs:string">
@@ -348,11 +351,14 @@
           <value oor:separator=";">
             Calc,           Draw,       visible ;
             Calc,           Graphic,    visible ;
+            Calc,           OLE,        hidden  ;
             DrawImpress,    3DObject,   visible ;
             DrawImpress,    Draw,       visible ;
             DrawImpress,    Graphic,    visible ;
             DrawImpress,    TextObject, hidden  ;
+            DrawImpress,    OLE,        hidden  ;
             WriterVariants, Draw,       visible ;
+            WriterVariants, OLE,        hidden, .uno:FrameDialog ;
           </value>
         </prop>
         <prop oor:name="ImplementationURL" oor:type="xs:string">
diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx
index 384f5f6..5924c6f 100644
--- a/svx/source/sidebar/SelectionAnalyzer.cxx
+++ b/svx/source/sidebar/SelectionAnalyzer.cxx
@@ -449,6 +449,10 @@ bool SelectionAnalyzer::IsShapeType (const sal_uInt16 nType)
         case OBJ_POLY:
         case OBJ_FREELINE:
         case OBJ_FREEFILL:
+
+        // #122145# adding OBJ_OLE2 since these also allow line/fill style and may
+        // be multiselected/grouped with normal draw objects, e.g. math OLE objects
+        case OBJ_OLE2:
             return true;
 
         default: