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

[Armin Le Grand]

 helpcontent2                |    2 +-
 vcl/source/gdi/impgraph.cxx |   15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 62c2022ba73b165072e0bf01f7f368f0ecda9aad
Author: Armin Le Grand <alg at apache.org>
Date:   Wed Jan 22 20:25:16 2014 +0000

    Resolves: #i123983# Corrected Graphic Metafile fallback creator
    
    (cherry picked from commit b5797deea72476fbcec4315f1f18249fd39bbaea)
    
    Change-Id: I4d09592cd9e4b86445d048fb875e7bc13b03801d

diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index 4b87d6f..5fe1572 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.cxx
@@ -630,22 +630,21 @@ const GDIMetaFile& ImpGraphic::ImplGetGDIMetaFile() const
             pThat->maEx = maSvgData->getReplacement();
         }
 
-        VirtualDevice aVirDev;
-        const Size aSizePixel(maEx.GetSizePixel());
-
-        pThat->maMetaFile.Record(&aVirDev);
-
+        // #123983# directly create a metafile with the same PrefSize and PrefMapMode
+        // the bitmap has, this will be an always correct metafile
         if(maEx.IsTransparent())
         {
-            aVirDev.DrawBitmapEx(Point(), maEx);
+            pThat->maMetaFile.AddAction(new MetaBmpExScaleAction(Point(), maEx.GetPrefSize(), maEx));
         }
         else
         {
-            aVirDev.DrawBitmap(Point(), maEx.GetBitmap());
+            pThat->maMetaFile.AddAction(new MetaBmpScaleAction(Point(), maEx.GetPrefSize(), maEx.GetBitmap()));
         }
 
         pThat->maMetaFile.Stop();
-        pThat->maMetaFile.SetPrefSize(aSizePixel);
+        pThat->maMetaFile.WindStart();
+        pThat->maMetaFile.SetPrefSize(maEx.GetPrefSize());
+        pThat->maMetaFile.SetPrefMapMode(maEx.GetPrefMapMode());
     }
 
     return maMetaFile;
commit 235723e5eb2983361ec81d6898947cc8bccab224
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jan 23 11:29:22 2014 +0000

    Updated core
    Project: help  ffb2ed136796922df0b2aa60787ddd2ace3e71ec

diff --git a/helpcontent2 b/helpcontent2
index 23bdde9..ffb2ed1 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 23bdde918a84d61f7162980ee9356363c3393202
+Subproject commit ffb2ed136796922df0b2aa60787ddd2ace3e71ec