From 3d2a17fd2e9cde29f12268ddfccc3f5b51455722 Mon Sep 17 00:00:00 2001 From: Laurent Balland-Poirier Date: Tue, 15 Apr 2014 14:34:50 +0200 Subject: 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 Reviewed-by: Michael Stahl --- xmloff/source/draw/ximpshap.cxx | 10 ++++++---- 1 file 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; } -- cgit v1.2.3