[libreoffice] Resolves: fdo#80911 don't swap notes page width height
Caolán McNamara
caolanm at fedoraproject.org
Wed Sep 17 14:26:04 UTC 2014
commit ea1e04fdb50eb18e6cd5ddee9628017faca1d4b1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Sep 17 15:07:47 2014 +0100
Resolves: fdo#80911 don't swap notes page width height
...o-80911-don-t-swap-notes-page-width-heigh.patch | 69 ++++++++++++++++++++
libreoffice.spec | 6 ++-
2 files changed, 74 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-fdo-80911-don-t-swap-notes-page-width-heigh.patch b/0001-Resolves-fdo-80911-don-t-swap-notes-page-width-heigh.patch
new file mode 100644
index 0000000..57e6fbc
--- /dev/null
+++ b/0001-Resolves-fdo-80911-don-t-swap-notes-page-width-heigh.patch
@@ -0,0 +1,69 @@
+From 572f3640bc343edf389e63a92b832046f361a0dc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Wed, 17 Sep 2014 14:32:03 +0100
+Subject: [PATCH] Resolves: fdo#80911 don't swap notes page width/height
+
+Change-Id: I9826f69d03de85ea8d2b2c025121599877798852
+(cherry picked from commit cca120ad92ecab741ca9683f3cf76d9e4fc81729)
+---
+ sd/source/ui/view/DocumentRenderer.cxx | 28 +++++++++++++++-------------
+ 1 file changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
+index 7080e9d..1bfb039 100644
+--- a/sd/source/ui/view/DocumentRenderer.cxx
++++ b/sd/source/ui/view/DocumentRenderer.cxx
+@@ -1410,6 +1410,7 @@ private:
+ {
+ SdDrawDocument* pDocument = mrBase.GetMainViewShell()->GetDoc();
+ rInfo.meOrientation = ORIENTATION_PORTRAIT;
++ bool bDoDodgyHeightWidthFit = !mpOptions->IsDraw() && !mpOptions->IsNotes();
+
+ if( ! mpOptions->IsBooklet())
+ {
+@@ -1418,9 +1419,9 @@ private:
+ else if (rInfo.maPageSize.Width() < rInfo.maPageSize.Height())
+ rInfo.meOrientation = ORIENTATION_LANDSCAPE;
+
+- // Draw should abide by specified paper size
++ // Draw and Notes should abide by their specified paper size
+ Size aPaperSize;
+- if (mpOptions->IsDraw())
++ if (!bDoDodgyHeightWidthFit)
+ {
+ aPaperSize.setWidth(rInfo.maPageSize.Width());
+ aPaperSize.setHeight(rInfo.maPageSize.Height());
+@@ -1431,18 +1432,19 @@ private:
+ aPaperSize.setHeight(rInfo.mpPrinter->GetPaperSize().Height());
+ }
+
+- if( (rInfo.meOrientation == ORIENTATION_LANDSCAPE &&
+- (aPaperSize.Width() < aPaperSize.Height()))
+- ||
+- (rInfo.meOrientation == ORIENTATION_PORTRAIT &&
+- (aPaperSize.Width() > aPaperSize.Height()))
+- )
+- {
+- maPrintSize = awt::Size(aPaperSize.Height(), aPaperSize.Width());
+- }
+- else
++ maPrintSize = awt::Size(aPaperSize.Width(), aPaperSize.Height());
++
++ if (bDoDodgyHeightWidthFit)
+ {
+- maPrintSize = awt::Size(aPaperSize.Width(), aPaperSize.Height());
++ if( (rInfo.meOrientation == ORIENTATION_LANDSCAPE &&
++ (aPaperSize.Width() < aPaperSize.Height()))
++ ||
++ (rInfo.meOrientation == ORIENTATION_PORTRAIT &&
++ (aPaperSize.Width() > aPaperSize.Height()))
++ )
++ {
++ maPrintSize = awt::Size(aPaperSize.Height(), aPaperSize.Width());
++ }
+ }
+
+ return true;
+--
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 3013133..6d39551 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -46,7 +46,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice
Epoch: 1
Version: %{libo_version}.1
-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/
@@ -318,6 +318,7 @@ Patch26: 0001-No-fstack-protect-strong-for-gcc3_linux_aarch64-cpp2.patch
Patch27: 0001-fdo-82496-Change-picture-option-by-rightclicking.patch
Patch28: 0001-create-a-master-document-template-type.patch
Patch29: 0001-fdo-80650-src-transl.-merge-must-be-case-sensitive.patch
+Patch30: 0001-Resolves-fdo-80911-don-t-swap-notes-page-width-heigh.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/libreoffice
@@ -2294,6 +2295,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%endif
%changelog
+* Wed Sep 17 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.3.2.1-2
+- Resolves: fdo#80911 don't swap notes page width height
+
* Fri Sep 12 2014 David Tardon <dtardon at redhat.com> - 1:4.3.2.1-1
- update to 4.3.2 rc1
More information about the scm-commits
mailing list