[Libreoffice-commits] core.git: 2 commits - sc/source vcl/source

[Tor Lillqvist]

 sc/source/ui/view/viewfun5.cxx   |    3 +++
 vcl/source/filter/wmf/enhwmf.cxx |    3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 55112988e67d627dc807fd30478c1c3f952c75f2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Feb 20 13:46:21 2014 +0200

    Combine two subsequent SAL_INFO calls into one
    
    Change-Id: Iec931ddb77ce09df72ee9ce321e443e6f5a785f1

diff --git a/vcl/source/filter/wmf/enhwmf.cxx b/vcl/source/filter/wmf/enhwmf.cxx
index b83a5cf..e2292a0 100644
--- a/vcl/source/filter/wmf/enhwmf.cxx
+++ b/vcl/source/filter/wmf/enhwmf.cxx
@@ -497,8 +497,7 @@ sal_Bool EnhWMFReader::ReadEnhWMF()
 
             pWMF->ReadUInt32( length );
 
-            SAL_INFO("vcl.emf", "\tGDI comment");
-            SAL_INFO("vcl.emf", "\t\tlength: " << length);
+            SAL_INFO("vcl.emf", "\tGDI comment, length: " << length);
 
             if( pWMF->good() && length >= 4 ) {
                 sal_uInt32 id;
commit debbddf12bd266102d93e417934ca98365db9987
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Feb 20 13:37:04 2014 +0200

    Re-introduce code to try to get GDI metafile replacement image
    
    The code was commented out in 2009 (with any rationale lost from
    version history) and then cleaned away in 2011. Re-introduce the bit
    that tries FORMAT_GDIMETAFILE. Seems to work, knock on wood.
    
    Change-Id: Ie0cfdde98afb127233ac928e899165209f439a6c

diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index ef4777f..9a7910b 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -181,6 +181,9 @@ bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId,
                     Graphic aGraphic;
                     sal_uLong nGrFormat = 0;
 
+                    if (aDataHelper.GetGraphic( FORMAT_GDIMETAFILE, aGraphic ) )
+                        nGrFormat = SOT_FORMAT_GDIMETAFILE;
+
                     // insert replacement image ( if there is one ) into the object helper
                     if ( nGrFormat )
                     {