diff options
| -rw-r--r-- | include/sfx2/sidebar/EnumContext.hxx | 1 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 3 | ||||
| -rw-r--r-- | sfx2/source/sidebar/EnumContext.cxx | 1 | ||||
| -rw-r--r-- | svx/source/sidebar/SelectionAnalyzer.cxx | 24 |
4 files changed, 19 insertions, 10 deletions
diff --git a/include/sfx2/sidebar/EnumContext.hxx b/include/sfx2/sidebar/EnumContext.hxx index 3fc5fda50f22..3fd2670e4109 100644 --- a/include/sfx2/sidebar/EnumContext.hxx +++ b/include/sfx2/sidebar/EnumContext.hxx @@ -68,6 +68,7 @@ public: Context_Cell, Context_Chart, Context_Draw, + Context_DrawLine, Context_DrawPage, Context_DrawText, Context_EditCell, diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu index 504bf3b58f3e..653d826a2ccb 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu @@ -384,14 +384,17 @@ <prop oor:name="ContextList"> <value oor:separator=";"> Calc, Draw, visible ; + Calc, DrawLine, visible ; Calc, Graphic, visible ; Calc, OLE, hidden ; DrawImpress, 3DObject, visible ; DrawImpress, Draw, visible ; + DrawImpress, DrawLine, visible ; DrawImpress, Graphic, visible ; DrawImpress, TextObject, hidden ; DrawImpress, OLE, hidden ; WriterVariants, Draw, visible ; + WriterVariants, DrawLine, visible ; </value> </prop> <prop oor:name="ImplementationURL" oor:type="xs:string"> diff --git a/sfx2/source/sidebar/EnumContext.cxx b/sfx2/source/sidebar/EnumContext.cxx index 9f8a63077f18..4f9b75b50ebb 100644 --- a/sfx2/source/sidebar/EnumContext.cxx +++ b/sfx2/source/sidebar/EnumContext.cxx @@ -178,6 +178,7 @@ void EnumContext::ProvideContextContainers() AddContext(Chart); AddContext(Chart); AddContext(Draw); + AddContext(DrawLine); AddContext(DrawPage); AddContext(DrawText); AddContext(EditCell); diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx index 91611c2d7aa2..e21eea03d943 100644 --- a/svx/source/sidebar/SelectionAnalyzer.cxx +++ b/svx/source/sidebar/SelectionAnalyzer.cxx @@ -209,11 +209,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt case OBJ_OUTLINETEXT: case OBJ_TEXT: case OBJ_TEXTEXT: - case OBJ_PATHLINE: - case OBJ_PLIN: - case OBJ_FREELINE: - case OBJ_EDGE: - case OBJ_LINE: case OBJ_MEASURE: case OBJ_RECT: case OBJ_CIRC: @@ -227,6 +222,13 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt case OBJ_GRUP: return EnumContext::Context_Draw; + case OBJ_PLIN: + case OBJ_PATHLINE: + case OBJ_FREELINE: + case OBJ_LINE: + case OBJ_EDGE: + return EnumContext::Context_DrawLine; + case OBJ_GRAF: return EnumContext::Context_Graphic; @@ -252,11 +254,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( switch (nObjectId) { case OBJ_CAPTION: - case OBJ_PATHLINE: - case OBJ_PLIN: - case OBJ_FREELINE: - case OBJ_EDGE: - case OBJ_LINE: case OBJ_MEASURE: case OBJ_RECT: case OBJ_CIRC: @@ -270,6 +267,13 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( case OBJ_GRUP: return EnumContext::Context_Draw; + case OBJ_EDGE: + case OBJ_PATHLINE: + case OBJ_FREELINE: + case OBJ_PLIN: + case OBJ_LINE: + return EnumContext::Context_DrawLine; + case OBJ_TITLETEXT: case OBJ_OUTLINETEXT: case OBJ_TEXT: |