Change ANKER to ANCHOR (fdo#42455)

11 files changed, 76 insertions, 76 deletions

diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 83a31becaf64..5f4968aa6c8c 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -504,7 +504,7 @@ void ExtraIdle::Timeout()
         }
         case 7:
         {
-            new StatementSlot( 20384 ); // FN_TOOL_ANKER_CHAR aus SW?
+            new StatementSlot( 20384 ); // FN_TOOL_ANCHOR_CHAR from SW?
             return;
         }
     }
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 94d9692bbd21..33c287bec513 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -352,16 +352,16 @@ included in c-context files, so c++ style stuff will cause problems.
 #define FN_TOOL_GROUP           (FN_INSERT + 47)    /* Group objects */
 #define FN_TOOL_UNGROUP         (FN_INSERT + 48)    /* Remove Grouping */
 
-#define FN_TOOL_ANKER           (FN_INSERT + 49)    /* Draw Anchor for object */
-#define FN_TOOL_ANKER_PAGE      (FN_INSERT + 50)    /* anchor Draw object to page */
-#define FN_TOOL_ANKER_PARAGRAPH (FN_INSERT + 51)    /* anchor Draw object to paragraph */
+#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 */
 
 #define FN_MAILMERGE_WIZARD     (FN_INSERT + 64)    /* mail merge wizard */
 #define FN_QRY_OPEN_TABLE       (FN_INSERT + 65)    /* open database (Basic) */
-#define FN_TOOL_ANKER_FRAME     (FN_INSERT + 66)    /* anchor Draw-Object to frame*/
+#define FN_TOOL_ANCHOR_FRAME    (FN_INSERT + 66)    /* anchor Draw-Object to frame*/
 #define FN_QRY_MERGE            (FN_INSERT + 67)    /* insert record (serial letter) */
-#define FN_MAILMERGE_CHILDWINDOW (FN_INSERT + 68)    /* back-to-mail-merge-wizard child window*/
+#define FN_MAILMERGE_CHILDWINDOW (FN_INSERT + 68)   /* back-to-mail-merge-wizard child window*/
 #define FN_INSERT_SMA           (FN_INSERT + 69)    /* insert StarMath  */
 
 #define FN_QRY_GET_COLUMN_NAME  (FN_INSERT + 70)    /* number of columns (Basic) */
@@ -376,7 +376,7 @@ included in c-context files, so c++ style stuff will cause problems.
 #define FN_QRY_DELETE_RECORD    (FN_INSERT + 79)    /* delete record */
 #define FN_QRY_GET_PHYS_RECORD_ID (FN_INSERT + 80)  /* get physical (absolute) record number (Basic) */
 
-#define FN_TOOL_ANKER_CHAR       (FN_INSERT + 84)   /* anchor Draw object to charater */
+#define FN_TOOL_ANCHOR_CHAR     (FN_INSERT + 84)    /* anchor Draw object to charater */
 
 #define FN_QRY_INSERT           (FN_INSERT + 86)    /* insert record selection in to text */
 #define FN_QRY_MERGE_FIELD      (FN_INSERT + 87)    /* insert record selection into fields */
@@ -410,7 +410,7 @@ included in c-context files, so c++ style stuff will cause problems.
 #define FN_SBA_BRW_MERGE        (FN_INSERT2 + 9)    /* serial letter print */
 #define FN_JAVAEDIT             (FN_INSERT2 + 10)   /* edit script field */
 #define FN_INSERT_HRULER        (FN_INSERT2 + 11)   /* insert horizontal ruler */
-#define FN_TOOL_ANKER_AT_CHAR   (FN_INSERT2 + 12)   /* anchor object to character*/
+#define FN_TOOL_ANCHOR_AT_CHAR  (FN_INSERT2 + 12)   /* anchor object to character*/
 
 #define FN_INSERT_PAGEHEADER    (FN_INSERT2 + 13)   /* insert default header */
 #define FN_INSERT_PAGEFOOTER    (FN_INSERT2 + 14)   /* insert default footer */
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 514c40c35bdb..411ec5c76621 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -311,11 +311,11 @@
 #define CMD_FN_ABSTRACT_STARIMPRESS                 ".uno:SendAbstractToStarImpress"
 #define CMD_FN_OUTLINE_TO_CLIPBOARD                 ".uno:SendOutlineToClipboard"
 #define CMD_FN_OUTLINE_TO_IMPRESS                   ".uno:SendOutlineToStarImpress"
-#define CMD_FN_TOOL_ANKER_AT_CHAR                   ".uno:SetAnchorAtChar"
-#define CMD_FN_TOOL_ANKER_CHAR                      ".uno:SetAnchorToChar"
-#define CMD_FN_TOOL_ANKER_FRAME                     ".uno:SetAnchorToFrame"
-#define CMD_FN_TOOL_ANKER_PAGE                      ".uno:SetAnchorToPage"
-#define CMD_FN_TOOL_ANKER_PARAGRAPH                 ".uno:SetAnchorToPara"
+#define CMD_FN_TOOL_ANCHOR_AT_CHAR                  ".uno:SetAnchorAtChar"
+#define CMD_FN_TOOL_ANCHOR_CHAR                     ".uno:SetAnchorToChar"
+#define CMD_FN_TOOL_ANCHOR_FRAME                    ".uno:SetAnchorToFrame"
+#define CMD_FN_TOOL_ANCHOR_PAGE                     ".uno:SetAnchorToPage"
+#define CMD_FN_TOOL_ANCHOR_PARAGRAPH                ".uno:SetAnchorToPara"
 #define CMD_FN_TABLE_SET_COL_WIDTH                  ".uno:SetColumnWidth"
 #define CMD_FN_SET_EXT_MODE                         ".uno:SetExtSelection"
 #define CMD_FN_SET_ADD_MODE                         ".uno:SetMultiSelection"
@@ -357,7 +357,7 @@
 #define CMD_FN_DRAWTEXT_ATTR_DLG                    ".uno:TextAttributes"
 #define CMD_FN_DRAW_WRAP_DLG                        ".uno:TextWrap"
 #define CMD_FN_THESAURUS_DLG                        ".uno:ThesaurusDialog"
-#define CMD_FN_TOOL_ANKER                           ".uno:ToggleAnchorType"
+#define CMD_FN_TOOL_ANCHOR                          ".uno:ToggleAnchorType"
 #define CMD_FN_TOOL_HIERARCHIE                      ".uno:ToggleObjectLayer"
 #define CMD_FN_UNDERLINE_DOUBLE                     ".uno:UnderlineDouble"
 #define CMD_FN_FRAME_UNCHAIN                        ".uno:UnhainFrames"
diff --git a/sw/sdi/_basesh.sdi b/sw/sdi/_basesh.sdi
index c4c4952dc8f6..91e224f988d3 100644
--- a/sw/sdi/_basesh.sdi
+++ b/sw/sdi/_basesh.sdi
@@ -389,35 +389,35 @@ interface BaseTextSelection
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 // Methode fuer Rahmen und Objekte
-    FN_TOOL_ANKER
+    FN_TOOL_ANCHOR
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    FN_TOOL_ANKER_PARAGRAPH
+    FN_TOOL_ANCHOR_PARAGRAPH
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    FN_TOOL_ANKER_CHAR
+    FN_TOOL_ANCHOR_CHAR
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    FN_TOOL_ANKER_AT_CHAR
+    FN_TOOL_ANCHOR_AT_CHAR
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
-    FN_TOOL_ANKER_FRAME
+    FN_TOOL_ANCHOR_FRAME
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
diff --git a/sw/sdi/basesh.sdi b/sw/sdi/basesh.sdi
index 230d977b0cfc..edf86539847c 100644
--- a/sw/sdi/basesh.sdi
+++ b/sw/sdi/basesh.sdi
@@ -33,7 +33,7 @@ interface TextSelection : BaseTextSelection
     // hier sollen die Slots eingefuegt werden, die vom StarWriter/WEB
     // nicht unterstuetzt werden
 
-    FN_TOOL_ANKER_PAGE
+    FN_TOOL_ANCHOR_PAGE
     [
         ExecMethod = Execute ;
         StateMethod = GetState ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 36c45e495cc4..d7cb8b3b3bbb 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7249,7 +7249,7 @@ SfxVoidItem SendOutlineToStarImpress FN_OUTLINE_TO_IMPRESS
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem SetAnchorAtChar FN_TOOL_ANKER_AT_CHAR
+SfxVoidItem SetAnchorAtChar FN_TOOL_ANCHOR_AT_CHAR
 ()
 [
     /* flags: */
@@ -7277,7 +7277,7 @@ SfxVoidItem SetAnchorAtChar FN_TOOL_ANKER_AT_CHAR
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem SetAnchorToChar FN_TOOL_ANKER_CHAR
+SfxVoidItem SetAnchorToChar FN_TOOL_ANCHOR_CHAR
 ()
 [
     /* flags: */
@@ -7305,7 +7305,7 @@ SfxVoidItem SetAnchorToChar FN_TOOL_ANKER_CHAR
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem SetAnchorToFrame FN_TOOL_ANKER_FRAME
+SfxVoidItem SetAnchorToFrame FN_TOOL_ANCHOR_FRAME
 ()
 [
     /* flags: */
@@ -7333,7 +7333,7 @@ SfxVoidItem SetAnchorToFrame FN_TOOL_ANKER_FRAME
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem SetAnchorToPage FN_TOOL_ANKER_PAGE
+SfxVoidItem SetAnchorToPage FN_TOOL_ANCHOR_PAGE
 ()
 [
     /* flags: */
@@ -7361,7 +7361,7 @@ SfxVoidItem SetAnchorToPage FN_TOOL_ANKER_PAGE
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem SetAnchorToPara FN_TOOL_ANKER_PARAGRAPH
+SfxVoidItem SetAnchorToPara FN_TOOL_ANCHOR_PARAGRAPH
 ()
 [
     /* flags: */
@@ -8419,7 +8419,7 @@ SfxVoidItem TextWrap FN_DRAW_WRAP_DLG
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem ToggleAnchorType FN_TOOL_ANKER
+SfxVoidItem ToggleAnchorType FN_TOOL_ANCHOR
 ()
 [
     /* flags: */
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 9a1b842cb829..edcaa8e7b925 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1004,16 +1004,16 @@ String MN_DRAW_POPUPMENU
     MenuItem\
     {\
         RadioCheck = TRUE ; \
-        Identifier = FN_TOOL_ANKER_FRAME ; \
-        HelpId = CMD_FN_TOOL_ANKER_FRAME ; \
+        Identifier = FN_TOOL_ANCHOR_FRAME ; \
+        HelpId = CMD_FN_TOOL_ANCHOR_FRAME ; \
         Text [ en-US ] = "To ~Frame" ; \
     };
 
 #define MN_ANCHOR \
     MenuItem\
     {\
-        Identifier = FN_TOOL_ANKER ; \
-        HelpId = CMD_FN_TOOL_ANKER ; \
+        Identifier = FN_TOOL_ANCHOR ; \
+        HelpId = CMD_FN_TOOL_ANCHOR ; \
         Command = ".uno:AnchorMenu" ; \
         Text [ en-US ] = "An~chor" ; \
         SubMenu = Menu\
@@ -1023,29 +1023,29 @@ String MN_DRAW_POPUPMENU
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
-                    Identifier = FN_TOOL_ANKER_PAGE ; \
-                    HelpId = CMD_FN_TOOL_ANKER_PAGE ; \
+                    Identifier = FN_TOOL_ANCHOR_PAGE ; \
+                    HelpId = CMD_FN_TOOL_ANCHOR_PAGE ; \
                     Text [ en-US ] = "To P~age" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
-                    Identifier = FN_TOOL_ANKER_PARAGRAPH ; \
-                    HelpId = CMD_FN_TOOL_ANKER_PARAGRAPH ; \
+                    Identifier = FN_TOOL_ANCHOR_PARAGRAPH ; \
+                    HelpId = CMD_FN_TOOL_ANCHOR_PARAGRAPH ; \
                     Text [ en-US ] = "To ~Paragraph" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
-                    Identifier = FN_TOOL_ANKER_AT_CHAR ; \
-                    HelpId = CMD_FN_TOOL_ANKER_AT_CHAR ; \
+                    Identifier = FN_TOOL_ANCHOR_AT_CHAR ; \
+                    HelpId = CMD_FN_TOOL_ANCHOR_AT_CHAR ; \
                     Text [ en-US ] = "To ~Character" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
-                    Identifier = FN_TOOL_ANKER_CHAR ; \
-                    HelpId = CMD_FN_TOOL_ANKER_CHAR ; \
+                    Identifier = FN_TOOL_ANCHOR_CHAR ; \
+                    HelpId = CMD_FN_TOOL_ANCHOR_CHAR ; \
                     Text [ en-US ] = "As C~haracter" ; \
                 };\
                 MN_AT_FRAME\
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index e1bdf64e8797..556a0db034f2 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -323,7 +323,7 @@ void SwDLL::RegisterControls()
     SwModule* pMod = SW_MOD();
     SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod );
     SvxTbxCtlAlign::RegisterControl(SID_OBJECT_ALIGN, pMod );
-    SwTbxAnchor::RegisterControl(FN_TOOL_ANKER, pMod );
+    SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod );
     SwTbxInsertCtrl::RegisterControl(FN_INSERT_CTRL, pMod );
     SwTbxInsertCtrl::RegisterControl(FN_INSERT_OBJ_CTRL, pMod );
     SwTbxAutoTextCtrl::RegisterControl(FN_INSERT_FIELD_CTRL, pMod );
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx
index a32d1f12c593..548ab3f4c579 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/ui/ribbar/tbxanchr.cxx
@@ -121,14 +121,14 @@ void  SwTbxAnchor::Click()
         return;
     }
     SwWrtShell* pWrtShell = pActiveView->GetWrtShellPtr();
-    aPopMenu.EnableItem( FN_TOOL_ANKER_FRAME, 0 != pWrtShell->IsFlyInFly() );
+    aPopMenu.EnableItem( FN_TOOL_ANCHOR_FRAME, 0 != pWrtShell->IsFlyInFly() );
 
     Rectangle aRect(GetToolBox().GetItemRect(GetId()));
     sal_uInt16 nHtmlMode = ::GetHtmlMode((SwDocShell*)SfxObjectShell::Current());
     sal_Bool bHtmlModeNoAnchor = ( nHtmlMode & HTMLMODE_ON) && 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS);
 
     if (bHtmlModeNoAnchor || pWrtShell->IsInHeaderFooter())
-        aPopMenu.RemoveItem(aPopMenu.GetItemPos(FN_TOOL_ANKER_PAGE));
+        aPopMenu.RemoveItem(aPopMenu.GetItemPos(FN_TOOL_ANCHOR_PAGE));
 
     if (nActAnchorId)
         aPopMenu.CheckItem(nActAnchorId);
diff --git a/sw/source/ui/ribbar/tbxanchr.src b/sw/source/ui/ribbar/tbxanchr.src
index 41067b18fb08..8f15dc8dfc59 100644
--- a/sw/source/ui/ribbar/tbxanchr.src
+++ b/sw/source/ui/ribbar/tbxanchr.src
@@ -35,35 +35,35 @@ Menu MN_ANCHOR_POPUP
         {
             _MenuItemFlags = MIB_RADIOCHECK ;
             RadioCheck = TRUE ;
-            Identifier = FN_TOOL_ANKER_PAGE ;
+            Identifier = FN_TOOL_ANCHOR_PAGE ;
             Text [ en-US ] = "To Page" ;
         };
         MenuItem
         {
             _MenuItemFlags = MIB_RADIOCHECK ;
             RadioCheck = TRUE ;
-            Identifier = FN_TOOL_ANKER_PARAGRAPH ;
+            Identifier = FN_TOOL_ANCHOR_PARAGRAPH ;
             Text [ en-US ] = "To Paragraph" ;
         };
         MenuItem
         {
             _MenuItemFlags = MIB_RADIOCHECK ;
             RadioCheck = TRUE ;
-            Identifier = FN_TOOL_ANKER_AT_CHAR ;
+            Identifier = FN_TOOL_ANCHOR_AT_CHAR ;
             Text [ en-US ] = "To Character" ;
         };
         MenuItem
         {
             _MenuItemFlags = MIB_RADIOCHECK ;
             RadioCheck = TRUE ;
-            Identifier = FN_TOOL_ANKER_CHAR ;
+            Identifier = FN_TOOL_ANCHOR_CHAR ;
             Text [ en-US ] = "As Character" ;
         };
         MenuItem
         {
             _MenuItemFlags = MIB_RADIOCHECK ;
             RadioCheck = TRUE ;
-            Identifier = FN_TOOL_ANKER_FRAME ;
+            Identifier = FN_TOOL_ANCHOR_FRAME ;
             Text [ en-US ] = "To Frame" ;
         };
     };
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index ce79ff39d9df..0235915e5a9d 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -1004,21 +1004,21 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             rSh.CallChgLnk();
         }
         break;
-        case FN_TOOL_ANKER:
+        case FN_TOOL_ANCHOR:
             break;
-        case FN_TOOL_ANKER_PAGE:
-        case FN_TOOL_ANKER_PARAGRAPH:
-        case FN_TOOL_ANKER_CHAR:
-        case FN_TOOL_ANKER_AT_CHAR:
-        case FN_TOOL_ANKER_FRAME:
+        case FN_TOOL_ANCHOR_PAGE:
+        case FN_TOOL_ANCHOR_PARAGRAPH:
+        case FN_TOOL_ANCHOR_CHAR:
+        case FN_TOOL_ANCHOR_AT_CHAR:
+        case FN_TOOL_ANCHOR_FRAME:
         {
-            RndStdIds eSet = nSlot == FN_TOOL_ANKER_PAGE
+            RndStdIds eSet = nSlot == FN_TOOL_ANCHOR_PAGE
                                 ? FLY_AT_PAGE
-                                : nSlot == FN_TOOL_ANKER_PARAGRAPH
+                                : nSlot == FN_TOOL_ANCHOR_PARAGRAPH
                                     ? FLY_AT_PARA
-                                    : nSlot == FN_TOOL_ANKER_FRAME
+                                    : nSlot == FN_TOOL_ANCHOR_FRAME
                                         ? FLY_AT_FLY
-                                        : nSlot == FN_TOOL_ANKER_CHAR
+                                        : nSlot == FN_TOOL_ANCHOR_CHAR
                                             ? FLY_AS_CHAR
                                             : FLY_AT_CHAR;
             rSh.StartUndo();
@@ -1105,7 +1105,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
             }
             rSh.EndUndo();
 
-            GetView().GetViewFrame()->GetBindings().Invalidate( FN_TOOL_ANKER );
+            GetView().GetViewFrame()->GetBindings().Invalidate( FN_TOOL_ANCHOR );
         }
         break;
 
@@ -1560,12 +1560,12 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
             }
             break;
 
-            case FN_TOOL_ANKER:
-            case FN_TOOL_ANKER_PAGE:
-            case FN_TOOL_ANKER_PARAGRAPH:
-            case FN_TOOL_ANKER_CHAR:
-            case FN_TOOL_ANKER_AT_CHAR:
-            case FN_TOOL_ANKER_FRAME:
+            case FN_TOOL_ANCHOR:
+            case FN_TOOL_ANCHOR_PAGE:
+            case FN_TOOL_ANCHOR_PARAGRAPH:
+            case FN_TOOL_ANCHOR_CHAR:
+            case FN_TOOL_ANCHOR_AT_CHAR:
+            case FN_TOOL_ANCHOR_FRAME:
             {
                 sal_Bool bObj = 0 != rSh.IsObjSelected();
                 sal_Bool bParentCntProt = rSh.IsSelObjProtected( FLYPROTECT_CONTENT|FLYPROTECT_PARENT ) != 0;
@@ -1579,22 +1579,22 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                         rSh.GetFlyFrmAttr(aSet);
                     RndStdIds eSet = ((SwFmtAnchor&)aSet.Get(RES_ANCHOR)).GetAnchorId();
                     const sal_Bool bSet =
-                           ((nWhich == FN_TOOL_ANKER_PAGE) &&
+                           ((nWhich == FN_TOOL_ANCHOR_PAGE) &&
                             (eSet == FLY_AT_PAGE))
-                        || ((nWhich == FN_TOOL_ANKER_PARAGRAPH) &&
+                        || ((nWhich == FN_TOOL_ANCHOR_PARAGRAPH) &&
                             (eSet == FLY_AT_PARA))
-                        || ((nWhich == FN_TOOL_ANKER_FRAME) &&
+                        || ((nWhich == FN_TOOL_ANCHOR_FRAME) &&
                             (eSet == FLY_AT_FLY))
-                        || ((nWhich == FN_TOOL_ANKER_AT_CHAR) &&
+                        || ((nWhich == FN_TOOL_ANCHOR_AT_CHAR) &&
                             (eSet == FLY_AT_CHAR))
-                        || ((nWhich == FN_TOOL_ANKER_CHAR) &&
+                        || ((nWhich == FN_TOOL_ANCHOR_CHAR) &&
                             (eSet == FLY_AS_CHAR));
-                    if(nWhich != FN_TOOL_ANKER)
+                    if(nWhich != FN_TOOL_ANCHOR)
                     {
                         sal_uInt16 nHtmlMode = ::GetHtmlMode(GetView().GetDocShell());
-                        if( ( nWhich == FN_TOOL_ANKER_PAGE &&
+                        if( ( nWhich == FN_TOOL_ANCHOR_PAGE &&
                               ((HTMLMODE_ON & nHtmlMode) && (0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS)))) ||
-                            ( nWhich == FN_TOOL_ANKER_FRAME && !rSh.IsFlyInFly() ) )
+                            ( nWhich == FN_TOOL_ANCHOR_FRAME && !rSh.IsFlyInFly() ) )
                             rSet.DisableItem(nWhich);
                         else
                             rSet.Put(SfxBoolItem(nWhich, bSet));
@@ -1606,19 +1606,19 @@ void SwBaseShell::GetState( SfxItemSet &rSet )
                         switch (eSet)
                         {
                             case FLY_AT_PAGE:
-                                nSlotId = FN_TOOL_ANKER_PAGE;
+                                nSlotId = FN_TOOL_ANCHOR_PAGE;
                             break;
                             case FLY_AT_PARA:
-                                nSlotId = FN_TOOL_ANKER_PARAGRAPH;
+                                nSlotId = FN_TOOL_ANCHOR_PARAGRAPH;
                             break;
                             case FLY_AS_CHAR:
-                                nSlotId = FN_TOOL_ANKER_CHAR;
+                                nSlotId = FN_TOOL_ANCHOR_CHAR;
                             break;
                             case FLY_AT_CHAR:
-                                nSlotId = FN_TOOL_ANKER_AT_CHAR;
+                                nSlotId = FN_TOOL_ANCHOR_AT_CHAR;
                             break;
                             case FLY_AT_FLY:
-                                nSlotId = FN_TOOL_ANKER_FRAME;
+                                nSlotId = FN_TOOL_ANCHOR_FRAME;
                             break;
                             default:
                                 ;