diff options
Diffstat (limited to 'vcl/source/gdi')
| -rw-r--r-- | vcl/source/gdi/print.cxx | 9 | ||||
| -rw-r--r-- | vcl/source/gdi/virdev.cxx | 16 |
2 files changed, 13 insertions, 12 deletions
diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 36edd1bbcdde..2c9a58dec73d 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -461,7 +461,6 @@ OUString Printer::GetDefaultPrinterName() void Printer::ImplInitData() { mbDevOutput = false; - meOutDevType = OUTDEV_PRINTER; mbDefPrinter = false; mnError = ERRCODE_NONE; mnPageQueueSize = 0; @@ -854,6 +853,7 @@ long Printer::GetGradientStepCount( long nMinRect ) } Printer::Printer() + : OutputDevice(OUTDEV_PRINTER) { ImplInitData(); SalPrinterQueueInfo* pInfo = ImplGetQueueInfo( GetDefaultPrinterName(), nullptr ); @@ -867,8 +867,9 @@ Printer::Printer() ImplInitDisplay(); } -Printer::Printer( const JobSetup& rJobSetup ) : - maJobSetup( rJobSetup ) +Printer::Printer( const JobSetup& rJobSetup ) + : OutputDevice(OUTDEV_PRINTER) + , maJobSetup(rJobSetup) { ImplInitData(); const ImplJobSetup& rConstData = rJobSetup.ImplGetConstData(); @@ -888,6 +889,7 @@ Printer::Printer( const JobSetup& rJobSetup ) : } Printer::Printer( const QueueInfo& rQueueInfo ) + : OutputDevice(OUTDEV_PRINTER) { ImplInitData(); SalPrinterQueueInfo* pInfo = ImplGetQueueInfo( rQueueInfo.GetPrinterName(), @@ -899,6 +901,7 @@ Printer::Printer( const QueueInfo& rQueueInfo ) } Printer::Printer( const OUString& rPrinterName ) + : OutputDevice(OUTDEV_PRINTER) { ImplInitData(); SalPrinterQueueInfo* pInfo = ImplGetQueueInfo( rPrinterName, nullptr ); diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx index e0dc6ee1c201..425b2d153a4e 100644 --- a/vcl/source/gdi/virdev.cxx +++ b/vcl/source/gdi/virdev.cxx @@ -112,6 +112,9 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, { SAL_INFO( "vcl.virdev", "ImplInitVirDev(" << nDX << "," << nDY << "," << static_cast<int>(eFormat) << ")" ); + meRefDevMode = RefDevMode::NONE; + mbForceZeroExtleadBug = false; + bool bErase = nDX > 0 && nDY > 0; if ( nDX < 1 ) @@ -166,7 +169,6 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, else if ( pOutDev->GetOutDevType() == OUTDEV_VIRDEV ) mbScreenComp = static_cast<const VirtualDevice*>(pOutDev)->mbScreenComp; - meOutDevType = OUTDEV_VIRDEV; mbDevOutput = true; mxFontCollection = pSVData->maGDIData.mxScreenFontList; mxFontCache = pSVData->maGDIData.mxScreenFontCache; @@ -199,8 +201,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev, } VirtualDevice::VirtualDevice(DeviceFormat eFormat) -: meRefDevMode( RefDevMode::NONE ), - mbForceZeroExtleadBug( false ) + : OutputDevice(OUTDEV_VIRDEV) { SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" ); @@ -208,8 +209,7 @@ VirtualDevice::VirtualDevice(DeviceFormat eFormat) } VirtualDevice::VirtualDevice(const OutputDevice& rCompDev, DeviceFormat eFormat) - : meRefDevMode( RefDevMode::NONE ), - mbForceZeroExtleadBug( false ) + : OutputDevice(OUTDEV_VIRDEV) { SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" ); @@ -217,8 +217,7 @@ VirtualDevice::VirtualDevice(const OutputDevice& rCompDev, DeviceFormat eFormat) } VirtualDevice::VirtualDevice(const OutputDevice& rCompDev, DeviceFormat eFormat, DeviceFormat eAlphaFormat) - : meRefDevMode( RefDevMode::NONE ) - , mbForceZeroExtleadBug( false ) + : OutputDevice(OUTDEV_VIRDEV) { SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << ", " << static_cast<int>(eAlphaFormat) << " )" ); @@ -231,8 +230,7 @@ VirtualDevice::VirtualDevice(const OutputDevice& rCompDev, DeviceFormat eFormat, VirtualDevice::VirtualDevice(const SystemGraphicsData *pData, const Size &rSize, DeviceFormat eFormat) -: meRefDevMode( RefDevMode::NONE ), - mbForceZeroExtleadBug( false ) + : OutputDevice(OUTDEV_VIRDEV) { SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" ); |