commit 6a1c8a0b53c8ec1c822e60913c1ccdfd2eaa21ce
author Laurent Balland-Poirier <laurent.balland-poirier@laposte.net> Tue Apr 15 14:34:50 2014 +0200
committer Michael Stahl <mstahl@redhat.com> Thu May 08 22:25:46 2014 +0200
tree 9e87c7826db392a5da9c1ed079f16c02a10eb430
parent 23e43dfd8a4b26a9adee87e5274b82a6d1d84a57

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>
(cherry picked from commit 3d2a17fd2e9cde29f12268ddfccc3f5b51455722)
Signed-off-by: Michael Stahl <mstahl@redhat.com>

xmloff/source/draw/ximpshap.cxx

diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index ae94d31..65c3084 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1755,10 +1755,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;
    }