summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-06-28 04:16:51 +0200
committerAndras Timar <andras.timar@collabora.com>2017-07-06 15:34:31 +0200
commitf79c4146930bd20deb0a2e399d31c1f1275fbfee (patch)
tree3aa50c2da36be5c0a46de23b32fefdea09082dd5 /sc
parent5345f96f0dc36cd1dc7e918be837f068be47ec0c (diff)
always import page scaling, tdf#65848
Change-Id: If5bad2336443280dd33d750b1b2749a06f2b5101 Reviewed-on: https://gerrit.libreoffice.org/39334 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit fef72f9623bac7f9aa50b4f2606e6ec6282cfe1f) Reviewed-on: https://gerrit.libreoffice.org/39340 Reviewed-by: Eike Rathke <erack@redhat.com> (cherry picked from commit ae56c9862222718871b6bf098162c2b8b4c44b82)
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/oox/pagesettings.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx
index 5af216a589d4..a34aca50b88b 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 );
}