[Libreoffice-commits] core.git: sw/sdi sw/source

[Jennifer Liebel]

 sw/sdi/_grfsh.sdi                 |   12 ++++++++++++
 sw/source/ui/app/mn.src           |    1 +
 sw/source/uibase/shells/grfsh.cxx |    3 +--
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 24077ffc063990f9de11c6819432219a59d809f8
Author: Jennifer Liebel <jliebel94 at gmail.com>
Date:   Tue Sep 2 12:40:20 2014 +0000

    fdo#82496: Change picture option by rightclicking
    
    Change-Id: I31fb1a1f89030610a9d11b9236e8cde22dbc0ca5
    Reviewed-on: https://gerrit.libreoffice.org/11332
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 15c00cc..2eb2ab2 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -62,6 +62,13 @@ interface BaseTextGraphic
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
 
+    SID_CHANGE_PICTURE
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetAttrState ;
+        DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+    ]
+
     SID_EXTERNAL_EDIT
     [
         ExecMethod = Execute ;
@@ -224,6 +231,11 @@ interface BaseTextGraphic
         StateMethod = GetAttrState ;
         DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
     ]
+    SID_CHANGE_PICTURE
+    [
+        ExecMethod = FuTemporary ;
+        StateMethod = GetMenuState ;
+    ]
     SID_GRFFILTER_SOLARIZE  // status(final|play|rec)
     [
         ExecMethod = ExecAttr ;
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index f62c8da..79b797d 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1239,6 +1239,7 @@ Menu MN_GRF_POPUPMENU
         MN_FRM_CAPTION_ITEM
         SEPARATOR;
         MenuItem { ITEM_SAVE_GRAPHIC };
+        MenuItem { ITEM_CHANGE_PICTURE };
         MenuItem { ITEM_COMPRESS_GRAPHIC };
         MenuItem { ITEM_EXTERNAL_EDIT };
 
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index d5ecec5..0e13b38 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -178,7 +178,6 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             }
         }
         break;
-
         case SID_EXTERNAL_EDIT:
         {
             // When the graphic is selected to be opened via some external tool
@@ -191,7 +190,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
             }
         }
         break;
-
+        case SID_CHANGE_PICTURE:
         case SID_INSERT_GRAPHIC:
         {
             // #i123922# implement slot independent from the two below to