[libreoffice/f20] Resolves: fdo#82496 Change picture by right clicking in writer

[Caolán McNamara]

commit c92307277179558e61cbee0f2d2ef497d92da3f9
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 9 10:12:39 2014 +0100

    Resolves: fdo#82496 Change picture by right clicking in writer

 ...96-Change-picture-option-by-rightclicking.patch |   78 ++++++++++++++++++++
 libreoffice.spec                                   |    6 +-
 2 files changed, 83 insertions(+), 1 deletions(-)
---
diff --git a/0001-fdo-82496-Change-picture-option-by-rightclicking.patch b/0001-fdo-82496-Change-picture-option-by-rightclicking.patch
new file mode 100644
index 0000000..e63f4a4
--- /dev/null
+++ b/0001-fdo-82496-Change-picture-option-by-rightclicking.patch
@@ -0,0 +1,78 @@
+From caa08b214542fdf1bed3912b9c4fac36e5d87eb2 Mon Sep 17 00:00:00 2001
+From: Jennifer Liebel <jliebel94 at gmail.com>
+Date: Tue, 2 Sep 2014 12:40:20 +0000
+Subject: [PATCH] fdo#82496: Change picture option by rightclicking
+
+Change-Id: I31fb1a1f89030610a9d11b9236e8cde22dbc0ca5
+---
+ 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(-)
+
+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
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index a217e53..1003517 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -36,7 +36,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.3
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        2%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -311,6 +311,7 @@ Patch56: 0001-fix-KDE4-detection-on-aarch64.patch
 Patch57: 0001-drop-useless-test-for-ant-apache-regexp.patch
 Patch58: 0001-No-fstack-protect-strong-for-gcc3_linux_aarch64-cpp2.patch
 Patch59: 0001-set-up-java-on-aarch64.patch
+Patch60: 0001-fdo-82496-Change-picture-option-by-rightclicking.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2252,6 +2253,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Sep 09 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.6.3-2
+- Resolves: fdo#82496 Change picture by right clicking in writer
+
 * Thu Aug 28 2014 David Tardon <dtardon at redhat.com> - 1:4.2.6.3-1
 - new bugfix release
 - fix build on ppc64