You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/05/15 18:20:13 UTC
svn commit: r1482937 - in /openoffice/trunk/main:
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
svx/source/sidebar/SelectionAnalyzer.cxx
Author: alg
Date: Wed May 15 16:20:13 2013
New Revision: 1482937
URL: http://svn.apache.org/r1482937
Log:
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
Modified:
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx
Modified: openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu?rev=1482937&r1=1482936&r2=1482937&view=diff
==============================================================================
--- openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu (original)
+++ openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu Wed May 15 16:20:13 2013
@@ -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">
Modified: openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx?rev=1482937&r1=1482936&r2=1482937&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/SelectionAnalyzer.cxx Wed May 15 16:20:13 2013
@@ -454,6 +454,10 @@ bool SelectionAnalyzer::IsShapeType (con
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: