include/svx/svxids.hrc | 3 ++- sc/sdi/drawsh.sdi | 1 + sc/source/ui/drawfunc/drawsh2.cxx | 2 ++ sc/source/ui/drawfunc/drawsh5.cxx | 2 -- sc/uiconfig/scalc/toolbar/drawobjectbar.xml | 2 +- sc/uiconfig/scalc/toolbar/formdesign.xml | 2 +- sc/uiconfig/scalc/toolbar/graphicobjectbar.xml | 2 +- svx/sdi/svx.sdi | 17 +++++++++++++++++ sw/inc/cmdid.h | 1 - sw/sdi/_basesh.sdi | 2 +- sw/sdi/swriter.sdi | 17 ----------------- sw/source/uibase/shells/basesh.cxx | 6 +++--- 12 files changed, 29 insertions(+), 28 deletions(-)
New commits: commit 1a7444ed69a68696b05feb3f3618b6704a140ba6 Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> Date: Fri Mar 9 09:41:08 2018 +0100 tdf#114552 Convert anchor toggle to anchor menu Since we now have three, not two anchor types. Change-Id: I9654de574a9d546d2191093cba9c192fac3cd3d7 Reviewed-on: https://gerrit.libreoffice.org/50987 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonas...@gmail.com> Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@cib.de> diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index 248a37638775..e568f24e535b 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -962,9 +962,10 @@ class SfxStringItem; #define SID_BMPMASK_COLOR ( SID_SVX_START + 1169 ) #define SID_PARAGRAPH_SIGN_CLASSIFY_DLG ( SID_SVX_START + 1170 ) #define SID_CLASSIFICATION_DIALOG ( SID_SVX_START + 1171 ) +#define SID_ANCHOR_MENU ( SID_SVX_START + 1172 ) // IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id -#define SID_SVX_FIRSTFREE ( SID_CLASSIFICATION_DIALOG + 1 ) +#define SID_SVX_FIRSTFREE ( SID_ANCHOR_MENU + 1 ) // Overflow check for slot IDs #if SID_SVX_FIRSTFREE > SID_SVX_END diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index 038489e3e065..23e76a146e67 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -158,6 +158,7 @@ interface TableDraw SID_MIRROR_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_FLIP_HORIZONTAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_FLIP_VERTICAL [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] + SID_ANCHOR_MENU [ StateMethod = GetDrawFuncState; Export = FALSE; ] SID_ANCHOR_PAGE [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] SID_ANCHOR_TOGGLE [ ExecMethod = ExecDrawFunc; StateMethod = GetDrawFuncState; Export = FALSE; ] SID_ANCHOR_CELL [ ExecMethod = ExecDrawFunc; StateMethod = GetState; Export = FALSE; ] diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 83d5d51ade9c..a1cc5388a2ea 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -244,6 +244,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // disable functions rSet.DisableItem( SID_COPY ); // Notes always default to Page anchor. rSet.DisableItem( SID_ANCHOR_TOGGLE ); + rSet.DisableItem( SID_ANCHOR_MENU ); } } @@ -273,6 +274,7 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // disable functions rSet.DisableItem( SID_COPY ); // other rSet.DisableItem( SID_ANCHOR_TOGGLE ); + rSet.DisableItem( SID_ANCHOR_MENU ); rSet.DisableItem( SID_ORIGINALSIZE ); rSet.DisableItem( SID_FITCELLSIZE ); rSet.DisableItem( SID_ATTR_TRANSFORM ); diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 971f1aa73782..cd4d38ae5b7f 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -368,8 +368,6 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) rBindings.Invalidate( SID_ANCHOR_CELL_RESIZE ); break; - // TODO: This toggle should probably be converted to a dropdown, - // since we now have three states, not two. case SID_ANCHOR_TOGGLE: { switch( pView->GetAnchorType() ) diff --git a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml index 04122cd81849..4d55efe27314 100644 --- a/sc/uiconfig/scalc/toolbar/drawobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/drawobjectbar.xml @@ -32,7 +32,7 @@ <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:FillStyle"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/> + <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:ToggleObjectRotateMode"/> <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/> diff --git a/sc/uiconfig/scalc/toolbar/formdesign.xml b/sc/uiconfig/scalc/toolbar/formdesign.xml index ed70f63eb9ec..5804f06448c4 100644 --- a/sc/uiconfig/scalc/toolbar/formdesign.xml +++ b/sc/uiconfig/scalc/toolbar/formdesign.xml @@ -30,7 +30,7 @@ <toolbar:toolbaritem xlink:href=".uno:AddField"/> <toolbar:toolbaritem xlink:href=".uno:AutoControlFocus"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/> + <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BringToFront" toolbar:visible="false"/> <toolbar:toolbaritem xlink:href=".uno:SendToBack" toolbar:visible="false"/> diff --git a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml index e63f9946da90..ddc508fad1a9 100644 --- a/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/graphicobjectbar.xml @@ -35,7 +35,7 @@ <toolbar:toolbaritem xlink:href=".uno:Crop"/> <toolbar:toolbaritem xlink:href=".uno:FillShadow"/> <toolbar:toolbarseparator/> - <toolbar:toolbaritem xlink:href=".uno:ToggleAnchorType"/> + <toolbar:toolbaritem xlink:href=".uno:AnchorMenu"/> <toolbar:toolbaritem xlink:href=".uno:ObjectAlign"/> <toolbar:toolbarseparator/> <toolbar:toolbaritem xlink:href=".uno:BringToFront"/> diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index eed15720caa9..e0eb906b5e8e 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -11927,3 +11927,20 @@ SfxVoidItem HangingIndent SID_HANGING_INDENT ToolBoxConfig = TRUE, GroupId = SfxGroupId::Format; ] + +SfxVoidItem AnchorMenu SID_ANCHOR_MENU +() +[ + AutoUpdate = FALSE, + FastCall = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + + AccelConfig = TRUE, + MenuConfig = TRUE, + ToolBoxConfig = TRUE, + GroupId = SfxGroupId::Format; +] \ No newline at end of file diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 16de50113705..c561ec7f4837 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -212,7 +212,6 @@ #define FN_INSERT_FRAME_INTERACT_NOCOL (FN_INSERT + 36) /*insert interactive non column frame*/ #define FN_INSERT_SIGNATURELINE (FN_INSERT + 37) /*insert signature line*/ -#define FN_TOOL_ANCHOR (FN_INSERT + 49) /* Draw Anchor for object */ #define FN_TOOL_ANCHOR_PAGE (FN_INSERT + 50) /* anchor Draw object to page */ #define FN_TOOL_ANCHOR_PARAGRAPH (FN_INSERT + 51) /* anchor Draw object to paragraph */ #define FN_TOOL_HIERARCHIE (FN_INSERT + 52) /* change hierarchy */ diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi index 23f4d0e5dfdf..bb66c461644b 100644 --- a/sw/sdi/_basesh.sdi +++ b/sw/sdi/_basesh.sdi @@ -416,7 +416,7 @@ interface BaseTextSelection DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] // Method for frames and objects - FN_TOOL_ANCHOR + SID_ANCHOR_MENU [ StateMethod = GetState ; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 00fa29d6abfc..85047fbf39fc 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -5962,23 +5962,6 @@ SfxVoidItem TextWrap FN_DRAW_WRAP_DLG GroupId = SfxGroupId::Format; ] -SfxVoidItem AnchorMenu FN_TOOL_ANCHOR -() -[ - AutoUpdate = FALSE, - FastCall = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - - AccelConfig = TRUE, - MenuConfig = TRUE, - ToolBoxConfig = TRUE, - GroupId = SfxGroupId::Format; -] - SfxVoidItem ToggleObjectLayer FN_TOOL_HIERARCHIE () [ diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 05ff06eda599..017e65c3fd70 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -1149,7 +1149,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) } rSh.EndUndo(); - GetView().GetViewFrame()->GetBindings().Invalidate( FN_TOOL_ANCHOR ); + GetView().GetViewFrame()->GetBindings().Invalidate( SID_ANCHOR_MENU ); } break; @@ -1617,7 +1617,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) } break; - case FN_TOOL_ANCHOR: + case SID_ANCHOR_MENU: case FN_TOOL_ANCHOR_PAGE: case FN_TOOL_ANCHOR_PARAGRAPH: case FN_TOOL_ANCHOR_CHAR: @@ -1649,7 +1649,7 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) if( nWhich == FN_TOOL_ANCHOR_FRAME && !rSh.IsFlyInFly() ) rSet.DisableItem(nWhich); - else if(nWhich != FN_TOOL_ANCHOR) + else if(nWhich != SID_ANCHOR_MENU) rSet.Put(SfxBoolItem(nWhich, bSet)); } else _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits