|
 |
ebc4bd |
From caa08b214542fdf1bed3912b9c4fac36e5d87eb2 Mon Sep 17 00:00:00 2001
|
|
 |
ebc4bd |
From: Jennifer Liebel <jliebel94@gmail.com>
|
|
 |
ebc4bd |
Date: Tue, 2 Sep 2014 12:40:20 +0000
|
|
 |
ebc4bd |
Subject: [PATCH] fdo#82496: Change picture option by rightclicking
|
|
 |
ebc4bd |
|
|
 |
ebc4bd |
Change-Id: I31fb1a1f89030610a9d11b9236e8cde22dbc0ca5
|
|
 |
ebc4bd |
---
|
|
 |
ebc4bd |
sw/sdi/_grfsh.sdi | 12 ++++++++++++
|
|
 |
ebc4bd |
sw/source/ui/app/mn.src | 1 +
|
|
 |
ebc4bd |
sw/source/uibase/shells/grfsh.cxx | 3 +--
|
|
 |
ebc4bd |
3 files changed, 14 insertions(+), 2 deletions(-)
|
|
 |
ebc4bd |
|
|
 |
ebc4bd |
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
|
|
 |
ebc4bd |
index 15c00cc..2eb2ab2 100644
|
|
 |
ebc4bd |
--- a/sw/sdi/_grfsh.sdi
|
|
 |
ebc4bd |
+++ b/sw/sdi/_grfsh.sdi
|
|
 |
ebc4bd |
@@ -62,6 +62,13 @@ interface BaseTextGraphic
|
|
 |
ebc4bd |
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
|
|
 |
ebc4bd |
]
|
|
 |
ebc4bd |
|
|
 |
ebc4bd |
+ SID_CHANGE_PICTURE
|
|
 |
ebc4bd |
+ [
|
|
 |
ebc4bd |
+ ExecMethod = Execute ;
|
|
 |
ebc4bd |
+ StateMethod = GetAttrState ;
|
|
 |
ebc4bd |
+ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
|
|
 |
ebc4bd |
+ ]
|
|
 |
ebc4bd |
+
|
|
 |
ebc4bd |
SID_EXTERNAL_EDIT
|
|
 |
ebc4bd |
[
|
|
 |
ebc4bd |
ExecMethod = Execute ;
|
|
 |
ebc4bd |
@@ -224,6 +231,11 @@ interface BaseTextGraphic
|
|
 |
ebc4bd |
StateMethod = GetAttrState ;
|
|
 |
ebc4bd |
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
|
|
 |
ebc4bd |
]
|
|
 |
ebc4bd |
+ SID_CHANGE_PICTURE
|
|
 |
ebc4bd |
+ [
|
|
 |
ebc4bd |
+ ExecMethod = FuTemporary ;
|
|
 |
ebc4bd |
+ StateMethod = GetMenuState ;
|
|
 |
ebc4bd |
+ ]
|
|
 |
ebc4bd |
SID_GRFFILTER_SOLARIZE // status(final|play|rec)
|
|
 |
ebc4bd |
[
|
|
 |
ebc4bd |
ExecMethod = ExecAttr ;
|
|
 |
ebc4bd |
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
|
|
 |
ebc4bd |
index f62c8da..79b797d 100644
|
|
 |
ebc4bd |
--- a/sw/source/ui/app/mn.src
|
|
 |
ebc4bd |
+++ b/sw/source/ui/app/mn.src
|
|
 |
ebc4bd |
@@ -1239,6 +1239,7 @@ Menu MN_GRF_POPUPMENU
|
|
 |
ebc4bd |
MN_FRM_CAPTION_ITEM
|
|
 |
ebc4bd |
SEPARATOR;
|
|
 |
ebc4bd |
MenuItem { ITEM_SAVE_GRAPHIC };
|
|
 |
ebc4bd |
+ MenuItem { ITEM_CHANGE_PICTURE };
|
|
 |
ebc4bd |
MenuItem { ITEM_COMPRESS_GRAPHIC };
|
|
 |
ebc4bd |
MenuItem { ITEM_EXTERNAL_EDIT };
|
|
 |
ebc4bd |
|
|
 |
ebc4bd |
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
|
|
 |
ebc4bd |
index d5ecec5..0e13b38 100644
|
|
 |
ebc4bd |
--- a/sw/source/core/uibase/shells/grfsh.cxx
|
|
 |
ebc4bd |
+++ b/sw/source/core/uibase/shells/grfsh.cxx
|
|
 |
ebc4bd |
@@ -178,7 +178,6 @@ void SwGrfShell::Execute(SfxRequest &rReq)
|
|
 |
ebc4bd |
}
|
|
 |
ebc4bd |
}
|
|
 |
ebc4bd |
break;
|
|
 |
ebc4bd |
-
|
|
 |
ebc4bd |
case SID_EXTERNAL_EDIT:
|
|
 |
ebc4bd |
{
|
|
 |
ebc4bd |
// When the graphic is selected to be opened via some external tool
|
|
 |
ebc4bd |
@@ -191,7 +190,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
|
|
 |
ebc4bd |
}
|
|
 |
ebc4bd |
}
|
|
 |
ebc4bd |
break;
|
|
 |
ebc4bd |
-
|
|
 |
ebc4bd |
+ case SID_CHANGE_PICTURE:
|
|
 |
ebc4bd |
case SID_INSERT_GRAPHIC:
|
|
 |
ebc4bd |
{
|
|
 |
ebc4bd |
// #i123922# implement slot independent from the two below to
|
|
 |
ebc4bd |
--
|
|
 |
ebc4bd |
1.9.3
|
|
 |
ebc4bd |
|