strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolves: i122145 Multiselection with mix of DrawObjects and OLE...

Browse source 
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
(cherry picked from commit 3c33a28233dfbb0db44553f13511107976f18363)
This commit is contained in:
Armin Le Grand 2013-05-15 16:20:13 +00:00 committed by Caolán McNamara
parent 3cc0f7b992
commit 82f418d2d9
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
View file

@ -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">

4
svx/source/sidebar/SelectionAnalyzer.cxx
View file

@ -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: