rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix optimal zoom

Browse Source
This commit is contained in:
Caolán McNamara 2011-02-10 12:51:07 +00:00
parent 1b16007a72
commit 7031388d8c
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0001-Resolves-fdo-33750-i94623-use-optimal-border-width-w.patch Normal file
View File

@ -0,0 +1,34 @@
From 773d856c8ef2bf65aec25289cb0186d81d76f5f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 10 Feb 2011 12:46:34 +0000
Subject: [PATCH] Resolves: fdo#33750 #i94623# use optimal border width when zooming to optimal
---
sw/source/ui/uiview/viewmdi.cxx | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx
index 3310b83..28af9ca 100644
--- a/sw/source/ui/uiview/viewmdi.cxx
+++ b/sw/source/ui/uiview/viewmdi.cxx
@@ -123,15 +123,9 @@ void SwView::_SetZoom( const Size &rEditSize, SvxZoomType eZoomType,
if( SVX_ZOOM_OPTIMAL == eZoomType )
{
- if (pPostItMgr->HasNotes() && pPostItMgr->ShowNotes())
- {
- lLeftMargin = long(rLRSpace.GetLeft()) + aPageRect.Left() + nLeftOfst;
- }
- else
- {
+ if (!pPostItMgr->HasNotes() || !pPostItMgr->ShowNotes())
aPageSize.Width() -= ( rLRSpace.GetLeft() + rLRSpace.GetRight() + nLeftOfst * 2 );
- lLeftMargin = long(rLRSpace.GetLeft()) + aPageRect.Left() + nLeftOfst;
- }
+ lLeftMargin = long(rLRSpace.GetLeft()) + DOCUMENTBORDER + nLeftOfst;
nFac = aWindowSize.Width() * 100 / aPageSize.Width();
}
else if(SVX_ZOOM_WHOLEPAGE == eZoomType || SVX_ZOOM_PAGEWIDTH == eZoomType )
--
1.7.4

2
libreoffice.spec
View File

@ -114,6 +114,7 @@ Patch26: 0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch
Patch27: 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
Patch28: 0001-Resolves-rhbz-670020-crash-in-slidesorting.patch
Patch29: 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch
Patch30: 0001-Resolves-fdo-33750-i94623-use-optimal-border-width-w.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir}
@ -746,6 +747,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch27 -p1 -b .rhbz673819-crash-on-changing-position-of-d.patch
%patch28 -p1 -b .rhbz670020-crash-in-slidesorting.patch
%patch29 -p1 -b .rhbz676539-handle-missing-pWindows-from-xW.patch
%patch30 -p1 -b .fdo33750-i94623-use-optimal-border-width-w.patch
touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip