From 864c7e109ba2e66a31840e5e22e061aa2c7ae4c0 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Jun 02 2016 16:30:27 +0000 Subject: Resolves: tdf#96411 Add slide layout changing to impress menus --- diff --git a/0001-tdf-96411-Add-slide-layout-changing-to-impress-menu-.patch b/0001-tdf-96411-Add-slide-layout-changing-to-impress-menu-.patch new file mode 100644 index 0000000..f0af2b9 --- /dev/null +++ b/0001-tdf-96411-Add-slide-layout-changing-to-impress-menu-.patch @@ -0,0 +1,147 @@ +From cf52d2ab891e1f84ec191cae596699c0d97d31a9 Mon Sep 17 00:00:00 2001 +From: Yousuf Philips +Date: Fri, 18 Dec 2015 23:29:34 +0400 +Subject: [PATCH] tdf#96411 Add slide layout changing to impress menu bar + +Change-Id: I49ec715b6a5b6733a2440e901c5f7947857f6273 +Reviewed-on: https://gerrit.libreoffice.org/20803 +Reviewed-by: Yousuf Philips +Tested-by: Yousuf Philips +(cherry picked from commit 235a10d49eb1b7becbac32965633447b97a684bc) +--- + .../openoffice/Office/UI/DrawImpressCommands.xcu | 85 ++++++++++++++++++++++ + sd/uiconfig/simpress/menubar/menubar.xml | 22 ++++++ + 2 files changed, 107 insertions(+) + +diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +index bdb9d8a..162c1ae 100644 +--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu ++++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +@@ -2030,6 +2030,91 @@ + 1 + + ++ ++ ++ Blank ++ ++ ++ ++ ++ Title ++ ++ ++ ++ ++ Title, Text ++ ++ ++ ++ ++ Title, Content ++ ++ ++ ++ ++ Centered Text ++ ++ ++ ++ ++ Title, 2 Content ++ ++ ++ ++ ++ Title, Content and 2 Content on Right ++ ++ ++ ++ ++ Title, 2 Content on Left and Content ++ ++ ++ ++ ++ Title, Content above Content ++ ++ ++ ++ ++ Title, 2 Content above Content ++ ++ ++ ++ ++ Title, 4 Content ++ ++ ++ ++ ++ Title, 6 Content ++ ++ ++ ++ ++ Title, Content (Vertical) ++ ++ ++ ++ ++ Title, Content over Content (Vertical) ++ ++ ++ ++ ++ Title, Vertical Content ++ ++ ++ ++ ++ Title, 2 Vertical Content ++ ++ ++ ++ ++ Slide Layout ++ ++ + + + +diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml +index b2ce36f..f0db5ed 100644 +--- a/sd/uiconfig/simpress/menubar/menubar.xml ++++ b/sd/uiconfig/simpress/menubar/menubar.xml +@@ -536,6 +536,28 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +-- +2.7.3 + diff --git a/libreoffice.spec b/libreoffice.spec index 6e4b78b..e47b540 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -58,7 +58,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 7%{?libo_prerelease}%{?dist} +Release: 8%{?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 and CC0 URL: http://www.libreoffice.org/ @@ -2276,6 +2276,9 @@ done %endif %changelog +* Thu Jun 02 2016 Caolán McNamara - 1:5.1.3.2-8-UNBUILT +- Resolves: tdf#96411 Add slide layout changing to impress menus + * Tue May 31 2016 Caolán McNamara - 1:5.1.3.2-7 - misc gtk3 native menu fixes - fix missing gtk2 non-native menubar