[Libreoffice-commits] .: filter/source

Lubos Lunak llunak at kemper.freedesktop.org
Wed Feb 8 08:45:41 PST 2012


 filter/source/msfilter/msdffimp.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 38af1195a9a24af4aaff84e7be318007b82f9b47
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Feb 8 17:38:57 2012 +0100

    do not deserialize into long, use a type of the correct width (fdo#40768)

diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 5871da9..2a91c24 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6672,7 +6672,10 @@ sal_Bool SvxMSDffManager::GetBLIPDirect( SvStream& rBLIPStream, Graphic& rData,
                 rBLIPStream.SeekRel( nSkip + 20 );
 
                 // read in size of metafile in EMUS
-                rBLIPStream >> aMtfSize100.Width() >> aMtfSize100.Height();
+                sal_Int32 width, height;
+                rBLIPStream >> width >> height;
+                aMtfSize100.Width() = width;
+                aMtfSize100.Height() = height;
 
                 // scale to 1/100mm
                 aMtfSize100.Width() /= 360, aMtfSize100.Height() /= 360;


More information about the Libreoffice-commits mailing list