Combine popup menu entries and IDs (SID_SAVE_GRAPHIC)

Change-Id: I9d0e4f31d073ad416934358c6507dc6564754758

8 files changed, 5 insertions, 43 deletions

diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 67636c9ba9f7..71aabc1de750 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -372,7 +372,6 @@
 #define SID_NOTES_MASTERPAGE                (SID_SD_START+350)
 #define SID_TITLE_MASTERPAGE                (SID_SD_START+351)
 #define SID_INSERTPAGE_QUICK                (SID_SD_START+352)
-#define SID_SAVEGRAPHIC                     (SID_SD_START+353)
 // free
 #define SID_INSERT_FLD_DATE_VAR             (SID_SD_START+357)
 #define SID_INSERT_FLD_DATE_FIX             (SID_SD_START+358)
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index cee596eb8123..02839d1700a9 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -89,7 +89,6 @@
 #define CMD_SID_NOTESMODE                           ".uno:NotesMode"
 #define CMD_SID_POSITION                            ".uno:ObjectPosition"
 #define CMD_SID_ORIGINAL_SIZE                       ".uno:OriginalSize"
-#define CMD_SID_SAVEGRAPHIC                         ".uno:SaveGraphic"
 #define CMD_SID_OUTLINEMODE                         ".uno:OutlineMode"
 #define CMD_SID_OUTLINE_TEXT_AUTOFIT                ".uno.OutlineTextAutofit"
 #define CMD_SID_PAGESETUP                           ".uno:PageSetup"
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index 018e7d01f7bc..7cb4c10ed0c9 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -70,7 +70,7 @@ interface DrawView
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
     ]
-    SID_SAVEGRAPHIC
+    SID_SAVE_GRAPHIC
     [
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 4b6ddae0d53b..03208aaa2f43 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -4729,31 +4729,6 @@ SfxVoidItem OriginalSize SID_ORIGINAL_SIZE
 ]
 
 //--------------------------------------------------------------------------
-SfxVoidItem SaveGraphic SID_SAVEGRAPHIC
-()
-[
-    /* flags: */
-    AutoUpdate = FALSE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_MODIFY;
-]
-
-//--------------------------------------------------------------------------
 SfxBoolItem OutlineMode SID_OUTLINEMODE
 
 [
@@ -7210,5 +7185,3 @@ SfxVoidItem TaskPaneShowPanel SID_SHOW_TOOL_PANEL (
     ToolBoxConfig = FALSE,
     GroupId = GID_VIEW;
 ]
-
-
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 604e952b8294..5bd16635cac9 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -846,14 +846,6 @@
         Text [ en-US ] = "~Original Size" ; \
     };
 
-#define MN_SAVEGRAPHIC\
-    MenuItem\
-    {\
-        Identifier = SID_SAVEGRAPHIC ; \
-        HelpId = CMD_SID_SAVEGRAPHIC ; \
-        Text [ en-US ] = "Save as Picture..." ; \
-    };
-
 #define MN_CROP\
     MenuItem\
     {\
@@ -1197,4 +1189,3 @@
         HelpId = CMD_SID_STYLE_EDIT ; \
         Text [ en-US ] = "Edit Style..." ; \
     };
-
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index a1ded7cff714..abf411542ee3 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -658,7 +658,7 @@
         SEPARATOR
         MN_STYLEDT
         SEPARATOR
-        MN_SAVEGRAPHIC
+        MenuItem { ITEM_SAVE_GRAPHIC };
     };
 };
 
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index c9f49e6e554e..a33b12bec00a 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -931,7 +931,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
         }
         break;
 
-        case SID_SAVEGRAPHIC:
+        case SID_SAVE_GRAPHIC:
         {
             const SdrMarkList& rMarkList = mpDrawView->GetMarkedObjectList();
             if( rMarkList.GetMarkCount() == 1 )
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 10be9e115df2..d6f2055e4ac5 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -118,7 +118,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_BEHIND_OBJ ) ||
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_REVERSE_ORDER ) ||
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_ORIGINAL_SIZE ) ||
-             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SAVEGRAPHIC ) ||
+            SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_SAVE_GRAPHIC ) ||
             SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_TEXTATTR_DLG ) )
         {
             const SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
@@ -139,7 +139,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
 
             if ( !( pObj->ISA( SdrGrafObj ) ) )
             {
-                rSet.DisableItem(SID_SAVEGRAPHIC);
+                rSet.DisableItem(SID_SAVE_GRAPHIC);
             }
 
             // Wenn es sich um kein Gruppenobjekt oder 3D-Objekt handelt