Kaydet (Commit) 7bb74f1a authored tarafından Rishabh Kumar's avatar Rishabh Kumar Kaydeden (comit) Katarina Behrens

tdf#84381: Improved sidebar selection analyser for Calc and Draw/Impress

Disables the area tab when a line is selected

Change-Id: Ib02a68fb548a7cc10f9af7e0d1b6191119f18915
Reviewed-on: https://gerrit.libreoffice.org/16165Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 594ef250
...@@ -68,6 +68,7 @@ public: ...@@ -68,6 +68,7 @@ public:
Context_Cell, Context_Cell,
Context_Chart, Context_Chart,
Context_Draw, Context_Draw,
Context_DrawLine,
Context_DrawPage, Context_DrawPage,
Context_DrawText, Context_DrawText,
Context_EditCell, Context_EditCell,
......
...@@ -384,14 +384,17 @@ ...@@ -384,14 +384,17 @@
<prop oor:name="ContextList"> <prop oor:name="ContextList">
<value oor:separator=";"> <value oor:separator=";">
Calc, Draw, visible ; Calc, Draw, visible ;
Calc, DrawLine, visible ;
Calc, Graphic, visible ; Calc, Graphic, visible ;
Calc, OLE, hidden ; Calc, OLE, hidden ;
DrawImpress, 3DObject, visible ; DrawImpress, 3DObject, visible ;
DrawImpress, Draw, visible ; DrawImpress, Draw, visible ;
DrawImpress, DrawLine, visible ;
DrawImpress, Graphic, visible ; DrawImpress, Graphic, visible ;
DrawImpress, TextObject, hidden ; DrawImpress, TextObject, hidden ;
DrawImpress, OLE, hidden ; DrawImpress, OLE, hidden ;
WriterVariants, Draw, visible ; WriterVariants, Draw, visible ;
WriterVariants, DrawLine, visible ;
</value> </value>
</prop> </prop>
<prop oor:name="ImplementationURL" oor:type="xs:string"> <prop oor:name="ImplementationURL" oor:type="xs:string">
......
...@@ -178,6 +178,7 @@ void EnumContext::ProvideContextContainers() ...@@ -178,6 +178,7 @@ void EnumContext::ProvideContextContainers()
AddContext(Chart); AddContext(Chart);
AddContext(Chart); AddContext(Chart);
AddContext(Draw); AddContext(Draw);
AddContext(DrawLine);
AddContext(DrawPage); AddContext(DrawPage);
AddContext(DrawText); AddContext(DrawText);
AddContext(EditCell); AddContext(EditCell);
......
...@@ -209,11 +209,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt ...@@ -209,11 +209,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt
case OBJ_OUTLINETEXT: case OBJ_OUTLINETEXT:
case OBJ_TEXT: case OBJ_TEXT:
case OBJ_TEXTEXT: case OBJ_TEXTEXT:
case OBJ_PATHLINE:
case OBJ_PLIN:
case OBJ_FREELINE:
case OBJ_EDGE:
case OBJ_LINE:
case OBJ_MEASURE: case OBJ_MEASURE:
case OBJ_RECT: case OBJ_RECT:
case OBJ_CIRC: case OBJ_CIRC:
...@@ -227,6 +222,13 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt ...@@ -227,6 +222,13 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SC (const sal_uInt
case OBJ_GRUP: case OBJ_GRUP:
return EnumContext::Context_Draw; 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: case OBJ_GRAF:
return EnumContext::Context_Graphic; return EnumContext::Context_Graphic;
...@@ -252,11 +254,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( ...@@ -252,11 +254,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD (
switch (nObjectId) switch (nObjectId)
{ {
case OBJ_CAPTION: case OBJ_CAPTION:
case OBJ_PATHLINE:
case OBJ_PLIN:
case OBJ_FREELINE:
case OBJ_EDGE:
case OBJ_LINE:
case OBJ_MEASURE: case OBJ_MEASURE:
case OBJ_RECT: case OBJ_RECT:
case OBJ_CIRC: case OBJ_CIRC:
...@@ -270,6 +267,13 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD ( ...@@ -270,6 +267,13 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD (
case OBJ_GRUP: case OBJ_GRUP:
return EnumContext::Context_Draw; 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_TITLETEXT:
case OBJ_OUTLINETEXT: case OBJ_OUTLINETEXT:
case OBJ_TEXT: case OBJ_TEXT:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment