summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/inc/app.hrc1
-rw-r--r--sd/inc/sdcommands.h1
-rw-r--r--sd/sdi/_drvwsh.sdi2
-rw-r--r--sd/sdi/sdraw.sdi27
-rw-r--r--sd/source/ui/app/menuids_tmpl.src9
-rw-r--r--sd/source/ui/app/popup2_tmpl.src2
-rw-r--r--sd/source/ui/view/drviews2.cxx2
-rw-r--r--sd/source/ui/view/drviewsj.cxx4
-rw-r--r--svx/inc/globlmn_tmpl.hrc5
-rw-r--r--svx/inc/svx/svxids.hrc3
-rw-r--r--svx/sdi/svx.sdi24
-rw-r--r--sw/inc/cmdid.h3
-rw-r--r--sw/inc/swcommands.h1
-rw-r--r--sw/sdi/_grfsh.sdi2
-rw-r--r--sw/sdi/swriter.sdi24
-rw-r--r--sw/source/ui/app/mn.src12
-rw-r--r--sw/source/ui/docvw/docvw.hrc2
-rw-r--r--sw/source/ui/shells/grfsh.cxx7
18 files changed, 43 insertions, 88 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
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index e85bd91398f8..8ab7e4bfeb91 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -262,6 +262,11 @@
Command = ".uno:ExternalEdit" ; \
Text [ en-US ] = "Edit with External Tool..." ; \
+#define ITEM_SAVE_GRAPHIC \
+ Identifier = SID_SAVE_GRAPHIC ; \
+ Command = ".uno:SaveGraphic" ; \
+ Text [ en-US ] = "Save Graphic..." ; \
+
#define ITEM_VIEW_ATTR_ZOOM \
Identifier = SID_ATTR_ZOOM ; \
Command = ".uno:Zoom" ; \
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index db8753e36761..eef88b6c43bd 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -957,9 +957,10 @@
#define SID_INSERT_FORM_HSCROLL (SID_SVX_START+1112)
#define SID_EXTERNAL_EDIT (SID_SVX_START+1113)
#define SID_ATTR_PAGE_SHARED_FIRST (SID_SVX_START+1114)
+#define SID_SAVE_GRAPHIC (SID_SVX_START+1115)
// IMPORTANT NOTE: adjust SID_SVX_FIRSTFREE, when adding new slot id
-#define SID_SVX_FIRSTFREE (SID_EXTERNAL_EDIT + 1)
+#define SID_SVX_FIRSTFREE (SID_SAVE_GRAPHIC + 1)
// --------------------------------------------------------------------------
// Overflow check for slot IDs
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 8b168c8eabde..5344e1764b91 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5972,6 +5972,30 @@ SfxVoidItem ExternalEdit SID_EXTERNAL_EDIT
GroupId = GID_GRAPHIC;
]
+SfxVoidItem SaveGraphic SID_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 = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_MODIFY;
+]
+
//--------------------------------------------------------------------------
SfxBoolItem Init3D SID_3D_INIT
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;
generated by cgit (git 2.34.1) at 2024-07-16 10:06:16 +0000