Combine popup menu entries and IDs (SID_SAVE_GRAPHIC)

Change-Id: I9d0e4f31d073ad416934358c6507dc6564754758

7 files changed, 7 insertions, 44 deletions

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 97ebfc51cd6b..80349f5f6ed3 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -668,8 +668,7 @@ included in c-context files, so c++ style stuff will cause problems.
 #define FN_FORMAT_APPLY_DEFAULT             (FN_FORMAT2 + 157)
 #define FN_FORMAT_APPLY_TEXTBODY            (FN_FORMAT2 + 158)
 #define FN_REMOVE_DIRECT_CHAR_FORMATS       (FN_FORMAT2 + 159)
-
-#define FN_SAVE_GRAPHIC                     (FN_FORMAT2 + 160)
+//free (160)
 
 /*--------------------------------------------------------------------
     Region: Extras
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 69e546c06de6..85a94eb87c49 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -47,7 +47,6 @@
 #define CMD_FN_EDIT_FOOTNOTE                        ".uno:EditFootnote"
 #define CMD_FN_FORMAT_FRAME_DLG                     ".uno:FrameDialog"
 #define CMD_FN_FORMAT_GRAFIC_DLG                    ".uno:GraphicDialog"
-#define CMD_FN_SAVE_GRAPHIC                         ".uno:SaveGraphic"
 #define CMD_FN_NUM_BULLET_UP                        ".uno:IncrementLevel"
 #define CMD_FN_EDIT_IDX_ENTRY_DLG                   ".uno:IndexEntryDialog"
 #define CMD_FN_INSERT_FLD_AUTHOR                    ".uno:InsertAuthorField"
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 42d9666a7105..678cf285da5c 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -52,7 +52,7 @@ interface BaseTextGraphic
     ]
 
 
-    FN_SAVE_GRAPHIC // status(final|play)
+    SID_SAVE_GRAPHIC
     [
         ExecMethod = Execute ;
         StateMethod = GetAttrState ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 7e9680e58f80..28e023395870 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3437,30 +3437,6 @@ SfxVoidItem GraphicDialog FN_FORMAT_GRAFIC_DLG
     ToolBoxConfig = TRUE,
     GroupId = GID_GRAPHIC;
 ]
-//--------------------------------------------------------------------------
-SfxVoidItem SaveGraphic FN_SAVE_GRAPHIC
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = TRUE,
-    MenuConfig = TRUE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = TRUE,
-    GroupId = GID_GRAPHIC;
-]
 
 //--------------------------------------------------------------------------
 SfxVoidItem Grow FN_GROW_FONT_SIZE
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 8b312910a3c0..837fb1f279f8 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1280,18 +1280,10 @@ Menu MN_GRF_POPUPMENU
             HelpId = CMD_FN_FORMAT_GRAFIC_DLG ;
             Text [ en-US ] = "~Picture..." ;
         };
-        MenuItem
-        {
-            Identifier = FN_SAVE_GRAPHIC;
-            HelpId = CMD_FN_SAVE_GRAPHIC;
-            Text [ en-US ] = "Save Graphics..." ;
-        };
         MN_FRM_CAPTION_ITEM
         SEPARATOR;
-        MenuItem
-        {
-           ITEM_EXTERNAL_EDIT
-        };
+        MenuItem { ITEM_SAVE_GRAPHIC };
+        MenuItem { ITEM_EXTERNAL_EDIT };
         SEPARATOR;
         MenuItem
         {
diff --git a/sw/source/ui/docvw/docvw.hrc b/sw/source/ui/docvw/docvw.hrc
index f137d2ae11ed..7792db6569e7 100644
--- a/sw/source/ui/docvw/docvw.hrc
+++ b/sw/source/ui/docvw/docvw.hrc
@@ -25,7 +25,7 @@
 #define MN_READONLY_OPENURL             (RC_DOCVW_BEGIN + 2)
 #define MN_READONLY_OPENURLNEW          (RC_DOCVW_BEGIN + 3)
 #define MN_READONLY_EDITDOC             (RC_DOCVW_BEGIN + 4)
-    // FREE, formerly known as MN_READONLY_BROWSE_STOP
+// free (5)
 #define MN_READONLY_BROWSE_BACKWARD     (RC_DOCVW_BEGIN + 6)
 #define MN_READONLY_BROWSE_FORWARD      (RC_DOCVW_BEGIN + 7)
 #define MN_READONLY_SELECTION_MODE      (RC_DOCVW_BEGIN + 8)
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index 06caa0632edc..984568c9469b 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -113,7 +113,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             GetView().ExecuteScan( rReq );
             break;
         }
-        case FN_SAVE_GRAPHIC:
+        case SID_SAVE_GRAPHIC:
         {
             const Graphic *pGraphic;
             if(0 != (pGraphic = rSh.GetGraphic()))
@@ -554,14 +554,11 @@ void SwGrfShell::GetAttrState(SfxItemSet &rSet)
             if( bParentCntProt || !bIsGrfCntnt )
                 bDisable = sal_True;
             break;
-        case FN_SAVE_GRAPHIC:
+        case SID_SAVE_GRAPHIC:
             if( rSh.GetGraphicType() == GRAPHIC_NONE )
                 bDisable = sal_True;
         break;
         case SID_EXTERNAL_EDIT:
-            /*
-             * If the Graphic is None type it should be externally editable
-             */
             if( rSh.GetGraphicType() == GRAPHIC_NONE )
                 bDisable = sal_True;
         break;