[Libreoffice-commits] core.git: sw/source

Douglas Mencken dougmencken at gmail.com
Mon Mar 21 18:25:51 UTC 2016


 sw/source/core/view/pagepreviewlayout.cxx |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 439f2b8d1d6b594493a4a78249c35e7387b318d4
Author: Douglas Mencken <dougmencken at gmail.com>
Date:   Mon Mar 21 03:07:25 2016 -0400

    clarify confusing code style
    
    Change-Id: Id05b1a361dcc3e63d5c26b48dded0914c1dbefb4
    Reviewed-on: https://gerrit.libreoffice.org/23390
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index 1fcc3a2..f19bd3d 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -221,16 +221,16 @@ bool SwPagePreviewLayout::Init( const sal_uInt16 _nCols,
         Fraction aYScale( aWinSize.Height(), mnPreviewLayoutHeight );
         if( aXScale < aYScale )
             aYScale = aXScale;
-        {
-            // adjust scaling for Drawing layer.
-            aYScale *= Fraction( 1000, 1 );
-            long nNewNuminator = aYScale.operator long();
-            if( nNewNuminator < 1 )
-                nNewNuminator = 1;
-            aYScale = Fraction( nNewNuminator, 1000 );
-            // propagate scaling as zoom percentage to view options for font cache
-            _ApplyNewZoomAtViewShell( static_cast<sal_uInt8>(nNewNuminator/10) );
-        }
+
+        // adjust scaling for Drawing layer.
+        aYScale *= Fraction( 1000, 1 );
+        long nNewNuminator = aYScale.operator long();
+        if( nNewNuminator < 1 )
+            nNewNuminator = 1;
+        aYScale = Fraction( nNewNuminator, 1000 );
+        // propagate scaling as zoom percentage to view options for font cache
+        _ApplyNewZoomAtViewShell( static_cast<sal_uInt8>(nNewNuminator/10) );
+
         aMapMode.SetScaleY( aYScale );
         aMapMode.SetScaleX( aYScale );
         // set created mapping mode with calculated scaling at output device.


More information about the Libreoffice-commits mailing list