Kaydet (Commit) 9f33b802 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky

FN_TOOL_ANCHOR cleanup

Drop unused execute method, and fix state method
to match actual use.

Change-Id: I93b86bbe10b48bf7fca7d9068446a698d7dd9036
üst 097bec4b
...@@ -401,7 +401,6 @@ interface BaseTextSelection ...@@ -401,7 +401,6 @@ interface BaseTextSelection
// Methode fuer Rahmen und Objekte // Methode fuer Rahmen und Objekte
FN_TOOL_ANCHOR FN_TOOL_ANCHOR
[ [
ExecMethod = Execute ;
StateMethod = GetState ; StateMethod = GetState ;
DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
] ]
......
...@@ -6036,8 +6036,6 @@ SfxVoidItem AnchorMenu FN_TOOL_ANCHOR ...@@ -6036,8 +6036,6 @@ SfxVoidItem AnchorMenu FN_TOOL_ANCHOR
RecordAbsolute = FALSE, RecordAbsolute = FALSE,
RecordPerSet; RecordPerSet;
SlotType = SfxUInt16Item
AccelConfig = TRUE, AccelConfig = TRUE,
MenuConfig = TRUE, MenuConfig = TRUE,
ToolBoxConfig = TRUE, ToolBoxConfig = TRUE,
......
...@@ -1043,8 +1043,6 @@ void SwBaseShell::Execute(SfxRequest &rReq) ...@@ -1043,8 +1043,6 @@ void SwBaseShell::Execute(SfxRequest &rReq)
rSh.CallChgLnk(); rSh.CallChgLnk();
} }
break; break;
case FN_TOOL_ANCHOR:
break;
case FN_TOOL_ANCHOR_PAGE: case FN_TOOL_ANCHOR_PAGE:
case FN_TOOL_ANCHOR_PARAGRAPH: case FN_TOOL_ANCHOR_PARAGRAPH:
case FN_TOOL_ANCHOR_CHAR: case FN_TOOL_ANCHOR_CHAR:
...@@ -1634,39 +1632,11 @@ void SwBaseShell::GetState( SfxItemSet &rSet ) ...@@ -1634,39 +1632,11 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
(eSet == RndStdIds::FLY_AT_CHAR)) (eSet == RndStdIds::FLY_AT_CHAR))
|| ((nWhich == FN_TOOL_ANCHOR_CHAR) && || ((nWhich == FN_TOOL_ANCHOR_CHAR) &&
(eSet == RndStdIds::FLY_AS_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) if( nWhich == FN_TOOL_ANCHOR_FRAME && !rSh.IsFlyInFly() )
{ rSet.DisableItem(nWhich);
case RndStdIds::FLY_AT_PAGE: else if(nWhich != FN_TOOL_ANCHOR)
nSlotId = FN_TOOL_ANCHOR_PAGE; rSet.Put(SfxBoolItem(nWhich, bSet));
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));
}
} }
else else
rSet.DisableItem( nWhich ); rSet.DisableItem( nWhich );
......
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