[Libreoffice-commits] core.git: Branch 'aoo/trunk' - svtools/source

[Armin Le Grand]

 svtools/source/misc/transfer.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 65dd87d8f010a9c9d1b277f9b1839378b549d06f
Author: Armin Le Grand <alg at apache.org>
Date:   Wed May 29 16:15:37 2013 +0000

    i122388 Corrected old fix to mentioned bounds

diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 0742701..62cab33 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -1867,9 +1867,15 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapE
             {
                 const Size aSize(OutputDevice::LogicToLogic(rBmpEx.GetPrefSize(), aMapMode, MAP_100TH_MM));
 
-                if((aSize.Width() > 5000) || (aSize.Height() > 5000))
+                // #122388# This wrongly corrects in the given case; changing from 5000 100th mm to
+                // the described 50 cm (which is 50000 100th mm)
+                if((aSize.Width() > 50000) || (aSize.Height() > 50000))
                 {
                     rBmpEx.SetPrefMapMode(MAP_PIXEL);
+
+                    // #122388# also adapt size by applying the mew MapMode
+                    const Size aNewSize(OutputDevice::LogicToLogic(aSize, MAP_100TH_MM, MAP_PIXEL));
+                    rBmpEx.SetPrefSize(aNewSize);
                 }
             }
         }