diff options
| author | Armin Le Grand <alg@apache.org> | 2013-05-29 16:15:37 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-17 16:14:15 +0100 |
| commit | 20e1181461adaae3289a5ef943ec5c4b75cc1570 (patch) | |
| tree | b7e0717455ac4da7cd9d5c5112e50228d44f23a5 /svtools | |
| parent | e2c63c14f0bdea6ba360b2549dced1492b626b67 (diff) | |
Resolves: #i122388# Corrected old fix to mentioned bounds
(cherry picked from commit 65dd87d8f010a9c9d1b277f9b1839378b549d06f)
Change-Id: I01318b3f96b23196f54335782ef9c946bf2b1ef9
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 8407e1926d9b..0f9c540935ba 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -1777,9 +1777,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)) + // #i122388# 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); + + // #i122388# also adapt size by applying the mew MapMode + const Size aNewSize(OutputDevice::LogicToLogic(aSize, MAP_100TH_MM, MAP_PIXEL)); + rBmpEx.SetPrefSize(aNewSize); } } } |