summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Le Grand <alg@apache.org>2013-05-15 16:20:13 +0000
committerArmin Le Grand <alg@apache.org>2013-05-15 16:20:13 +0000
commit8a2531d3d98ad3afb2b233be2d5dd7b67febeba6 (patch)
tree820ffe4934c7a313c502f82d99794da4924d7779
parent710925d1d93a8ccf36957fa2f4d98d7dedb4cb9f (diff)
i122145 Two changes: 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
Notes
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu6
-rw-r--r--svx/source/sidebar/SelectionAnalyzer.cxx4
2 files changed, 10 insertions, 0 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 5e3ddbea1231..927747c99d3c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -345,10 +345,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">
@@ -376,11 +379,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 52e1b9fb55b4..3039fec85742 100644
--- a/svx/source/sidebar/SelectionAnalyzer.cxx
+++ b/svx/source/sidebar/SelectionAnalyzer.cxx
@@ -454,6 +454,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: