diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-03-09 09:41:08 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-03-13 08:10:15 +0100 |
| commit | 1a7444ed69a68696b05feb3f3618b6704a140ba6 (patch) | |
| tree | f598a4a6ada225691de143689ba3ff3425961c40 /sw | |
| parent | b0259d3e857bef53b27c3f61ecc448c3f96aad07 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/cmdid.h | 1 | ||||
| -rw-r--r-- | sw/sdi/_basesh.sdi | 2 | ||||
| -rw-r--r-- | sw/sdi/swriter.sdi | 17 | ||||
| -rw-r--r-- | sw/source/uibase/shells/basesh.cxx | 6 |
4 files changed, 4 insertions, 22 deletions
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 |