Kaydet (Commit) 3d2a17fd authored tarafından Laurent Balland-Poirier's avatar Laurent Balland-Poirier Kaydeden (comit) Michael Stahl

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/9012Tested-by: 's avatarMichael Stahl <mstahl@redhat.com>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 18e4e155
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment