svn commit: r1487531 - /openoffice/trunk/main/svtools/source/misc/transfer.cxx

[alg]

Author: alg
Date: Wed May 29 16:15:37 2013
New Revision: 1487531

URL: http://svn.apache.org/r1487531
Log:
i122388 Corrected old fix to mentioned bounds

Modified:
    openoffice/trunk/main/svtools/source/misc/transfer.cxx

Modified: openoffice/trunk/main/svtools/source/misc/transfer.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/misc/transfer.cxx?rev=1487531&r1=1487530&r2=1487531&view=diff
==============================================================================
--- openoffice/trunk/main/svtools/source/misc/transfer.cxx (original)
+++ openoffice/trunk/main/svtools/source/misc/transfer.cxx Wed May 29 16:15:37 
2013
@@ -1867,9 +1867,15 @@ sal_Bool TransferableDataHelper::GetBitm
             {
                 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);
                 }
             }
         }