diff options
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 6 | ||||
-rw-r--r-- | svx/source/sidebar/SelectionAnalyzer.cxx | 4 |
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 b0c669e35441..a92643a6c4fc 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 384f5f6bf033..5924c6f94060 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: |