diff options
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; } |