[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sc/source

[Markus Mohrhard]

 sc/source/filter/oox/pagesettings.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7b1abc47af7a64ab8d3204cb85f173f0023da3ff
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Wed Jun 28 04:16:51 2017 +0200

    always import page scaling, tdf#65848
    
    Change-Id: If5bad2336443280dd33d750b1b2749a06f2b5101
    Reviewed-on: https://gerrit.libreoffice.org/39334
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit fef72f9623bac7f9aa50b4f2606e6ec6282cfe1f)
    Reviewed-on: https://gerrit.libreoffice.org/39339
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index beeea7b352e5..fe5ff212e341 100644
--- a/sc/source/filter/oox/pagesettings.cxx
+++ b/sc/source/filter/oox/pagesettings.cxx
@@ -911,7 +911,7 @@ void PageSettingsConverter::writePageSettingsProperties(
     else
     {
         // scale may be 0 which indicates uninitialized
-        sal_Int16 nScale = (rModel.mbValidSettings && (rModel.mnScale > 0)) ? getLimitedValue< sal_Int16, sal_Int32 >( rModel.mnScale, 10, 400 ) : 100;
+        sal_Int16 nScale = (rModel.mnScale > 0) ? getLimitedValue< sal_Int16, sal_Int32 >( rModel.mnScale, 10, 400 ) : 100;
         rPropSet.setProperty( PROP_PageScale, nScale );
     }