diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-04-28 16:44:30 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-05-01 01:23:50 +0300 |
| commit | 9f33b802a808374b6cd3cbbc3e67c00dd97be270 (patch) | |
| tree | f766693e84e82f9ec23faf25246deaf9ac094199 /sw | |
| parent | 097bec4b78160d688f3afc7e0cd87b21aad51e4e (diff) | |
FN_TOOL_ANCHOR cleanup
Drop unused execute method, and fix state method
to match actual use.
Change-Id: I93b86bbe10b48bf7fca7d9068446a698d7dd9036
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/sdi/_basesh.sdi | 1 | ||||
| -rw-r--r-- | sw/sdi/swriter.sdi | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/basesh.cxx | 38 |
3 files changed, 4 insertions, 37 deletions
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi index c0a4d6c3c594..00cdf2f4de54 100644 --- a/sw/sdi/_basesh.sdi +++ b/sw/sdi/_basesh.sdi @@ -401,7 +401,6 @@ interface BaseTextSelection // Methode fuer Rahmen und Objekte FN_TOOL_ANCHOR [ - ExecMethod = Execute ; StateMethod = GetState ; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index 25a9493ed6e3..3af46d13f5e6 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -6036,8 +6036,6 @@ SfxVoidItem AnchorMenu FN_TOOL_ANCHOR RecordAbsolute = FALSE, RecordPerSet; - SlotType = SfxUInt16Item - AccelConfig = TRUE, MenuConfig = TRUE, ToolBoxConfig = TRUE, diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 2f3db3361dbb..b6f5a493946d 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -1043,8 +1043,6 @@ void SwBaseShell::Execute(SfxRequest &rReq) rSh.CallChgLnk(); } break; - case FN_TOOL_ANCHOR: - break; case FN_TOOL_ANCHOR_PAGE: case FN_TOOL_ANCHOR_PARAGRAPH: case FN_TOOL_ANCHOR_CHAR: @@ -1634,39 +1632,11 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) (eSet == RndStdIds::FLY_AT_CHAR)) || ((nWhich == FN_TOOL_ANCHOR_CHAR) && (eSet == RndStdIds::FLY_AS_CHAR)); - if(nWhich != FN_TOOL_ANCHOR) - { - if( nWhich == FN_TOOL_ANCHOR_FRAME && !rSh.IsFlyInFly() ) - rSet.DisableItem(nWhich); - else - rSet.Put(SfxBoolItem(nWhich, bSet)); - } - else - { - sal_uInt16 nSlotId = 0; - switch (eSet) - { - case RndStdIds::FLY_AT_PAGE: - nSlotId = FN_TOOL_ANCHOR_PAGE; - break; - case RndStdIds::FLY_AT_PARA: - nSlotId = FN_TOOL_ANCHOR_PARAGRAPH; - break; - case RndStdIds::FLY_AS_CHAR: - nSlotId = FN_TOOL_ANCHOR_CHAR; - break; - case RndStdIds::FLY_AT_CHAR: - nSlotId = FN_TOOL_ANCHOR_AT_CHAR; - break; - case RndStdIds::FLY_AT_FLY: - nSlotId = FN_TOOL_ANCHOR_FRAME; - break; - default: - ; - } - rSet.Put(SfxUInt16Item(nWhich, nSlotId)); - } + if( nWhich == FN_TOOL_ANCHOR_FRAME && !rSh.IsFlyInFly() ) + rSet.DisableItem(nWhich); + else if(nWhich != FN_TOOL_ANCHOR) + rSet.Put(SfxBoolItem(nWhich, bSet)); } else rSet.DisableItem( nWhich ); |