[Libreoffice-commits] core.git: filter/source

[László Németh]

 filter/source/msfilter/escherex.cxx |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

New commits:
commit 4188a037fbaf3618df26e1661a4586483036f055
Author: László Németh <nemeth at numbertext.org>
Date:   Mon Jun 18 17:29:11 2018 +0200

    filter clean-up: remove duplicate of checking EMF magic header
    
    Change-Id: I63fd380be974c1d15beef0d2cfec42350119ae2f
    Reviewed-on: https://gerrit.libreoffice.org/56050
    Tested-by: Jenkins
    Reviewed-by: László Németh <nemeth at numbertext.org>

diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index c0da5ae84b81..ab41d5188a32 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -4185,22 +4185,18 @@ sal_uInt32 EscherGraphicProvider::GetBlibID( SvStream& rPicOutStrm, GraphicObjec
 
                     case GfxLinkType::NativeWmf :
                     {
-                        if ( pGraphicAry && ( p_EscherBlibEntry->mnSize > 0x2c ) )
+                        if ( aGraphicLink.IsEMF() )
                         {
-                            if ( ( pGraphicAry[ 0x28 ] == 0x20 ) && ( pGraphicAry[ 0x29 ] == 0x45 )     // check the magic
-                                && ( pGraphicAry[ 0x2a ] == 0x4d ) && ( pGraphicAry[ 0x2b ] == 0x46 ) ) // number ( emf detection )
-                            {
-                                p_EscherBlibEntry->meBlibType = EMF;
-                            }
-                            else
-                            {
-                                p_EscherBlibEntry->meBlibType = WMF;
-                                if ( ( pGraphicAry[ 0 ] == 0xd7 ) && ( pGraphicAry[ 1 ] == 0xcd )
-                                    && ( pGraphicAry[ 2 ] == 0xc6 ) && ( pGraphicAry[ 3 ] == 0x9a ) )
-                                {   // we have to get rid of the metafileheader
-                                    pGraphicAry += 22;
-                                    p_EscherBlibEntry->mnSize -= 22;
-                                }
+                            p_EscherBlibEntry->meBlibType = EMF;
+                        }
+                        else if ( pGraphicAry && ( p_EscherBlibEntry->mnSize > 0x2c ) )
+                        {
+                            p_EscherBlibEntry->meBlibType = WMF;
+                            if ( ( pGraphicAry[ 0 ] == 0xd7 ) && ( pGraphicAry[ 1 ] == 0xcd )
+                                && ( pGraphicAry[ 2 ] == 0xc6 ) && ( pGraphicAry[ 3 ] == 0x9a ) )
+                            {   // we have to get rid of the metafileheader
+                                pGraphicAry += 22;
+                                p_EscherBlibEntry->mnSize -= 22;
                             }
                         }
                     }