diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-17 13:03:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-23 14:25:59 +0000 |
| commit | c43a3a58677b467274ce6c21d7db1a6c0cc65cb4 (patch) | |
| tree | 3bb61dc498bd5ff72df4be4e0003ab284b0cc655 /svx | |
| parent | b0f5416d7ee7c988d316df7ffa0318fa6514e4de (diff) | |
establish that Virtual Devices either match Physical Device depth or ...
are 1 or (rarely) 8 bit and lock that down.
Change-Id: I3d946ebef34ffb71c5adea7aa420af50e9584e05
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/dialcontrol.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 9fa46c5fc375..5deea9502202 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -166,7 +166,7 @@ void CalculateHorizontalScalingFactor( const SdrObject* pCustomShape, aFont.SetOrientation( 0 ); // initializing virtual device - ScopedVclPtrInstance< VirtualDevice > pVirDev( 1 ); + ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::BITMASK); pVirDev->SetMapMode( MAP_100TH_MM ); pVirDev->SetFont( aFont ); @@ -260,7 +260,7 @@ void GetTextAreaOutline( const FWData& rFWData, const SdrObject* pCustomShape, F aFont.SetWeight( rWeightItem.GetWeight() ); // initializing virtual device - ScopedVclPtrInstance< VirtualDevice > pVirDev( 1 ); + ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::BITMASK); pVirDev->SetMapMode( MAP_100TH_MM ); pVirDev->SetFont( aFont ); pVirDev->EnableRTL(); diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 18f6a5c002b7..c93c0ace9e81 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -35,7 +35,7 @@ namespace svx { const long DIAL_OUTER_WIDTH = 8; DialControlBmp::DialControlBmp(vcl::Window& rParent) : - VirtualDevice(rParent, 0, 0), + VirtualDevice(rParent, DeviceFormat::FULLCOLOR, DeviceFormat::FULLCOLOR), mbEnabled(true), mrParent(rParent), mnCenterX(0), |