diff options
author | Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> | 2014-04-15 14:34:50 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-05-08 19:54:02 +0000 |
commit | 3d2a17fd2e9cde29f12268ddfccc3f5b51455722 (patch) | |
tree | dbf614d39e922a822b92d1a6f87dd300ef29c2c1 /xmloff | |
parent | loplugin:saloverride (diff) | |
download | core-3d2a17fd2e9cde29f12268ddfccc3f5b51455722.tar.gz core-3d2a17fd2e9cde29f12268ddfccc3f5b51455722.zip |
fdo#77451 Detect AOO 4.x for SvXMLImport::needFixPositionAfterZ
Old versions of OOo and AOO need a fix for Z paths. But AOO 4.0 did not
fix it neither.
Change-Id: I29af75035c7c059b69fcdc3a1ce27b617a30dbd1
Reviewed-on: https://gerrit.libreoffice.org/9012
Tested-by: Michael Stahl <mstahl@redhat.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'xmloff')
-rw-r--r-- | xmloff/source/draw/ximpshap.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index a3fd8bb5a974..97040ea3ec9d 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -1848,10 +1848,12 @@ bool SvXMLImport::needFixPositionAfterZ() const bool bWrongPositionAfterZ( false ); sal_Int32 nUPD( 0 ); sal_Int32 nBuildId( 0 ); - if ( getBuildIds( nUPD, nBuildId ) && - ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD == 300 ) || - ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD == 340 ) || - ( nUPD == 350 && nBuildId < 202 ) ) ) + if ( getBuildIds( nUPD, nBuildId ) && // test OOo and old versions of LibO and AOO + ( ( ( nUPD == 641 ) || ( nUPD == 645 ) || ( nUPD == 680 ) || ( nUPD == 300 ) || + ( nUPD == 310 ) || ( nUPD == 320 ) || ( nUPD == 330 ) || ( nUPD == 340 ) || + ( nUPD == 350 && nBuildId < 202 ) ) + || ( getGeneratorVersion() >= SvXMLImport::AOO_40x // test if AOO 4.x + && getGeneratorVersion() < SvXMLImport::AOO_4x ) ) ) { bWrongPositionAfterZ = true; } |