Resolves: fdo#82496 Change picture option with right click in writer

10 years ago · 89f6a94680
parent 51e536d736
commit 89f6a94680
2 changed files with 83 additions and 1 deletions
--- a/0001-fdo-82496-Change-picture-option-by-rightclicking.patch
+++ 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@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
+
--- a/libreoffice.spec
+++ b/libreoffice.spec
@ -46,7 +46,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        3%{?libo_prerelease}%{?dist}
+Release:        4%{?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/
@ -319,6 +319,7 @@ Patch27: 0002-Linux-AArch64-port.patch
 Patch28: 0001-fix-KDE4-detection-on-aarch64.patch
 Patch29: 0001-drop-useless-test-for-ant-apache-regexp.patch
 Patch30: 0001-No-fstack-protect-strong-for-gcc3_linux_aarch64-cpp2.patch
+Patch31: 0001-fdo-82496-Change-picture-option-by-rightclicking.patch

 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@ -2298,6 +2299,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif

 %changelog
+* Tue Sep 09 2014 Caolán McNamara <caolanm@redhat.com> - 1:4.3.1.2-4
+- Resolves: fdo#82496 Change picture option with right click in writer
+
 * Fri Sep 05 2014 David Tardon <dtardon@redhat.com> - 1:4.3.1.2-3
 - build for aarch64