summaryrefslogtreecommitdiff
path: root/vcl/source
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source')
-rw-r--r--vcl/source/app/salvtables.cxx6
-rw-r--r--vcl/source/filter/eps/eps.cxx2
-rw-r--r--vcl/source/gdi/gdimtf.cxx2
-rw-r--r--vcl/source/gdi/pdfwriter_impl.cxx2
-rw-r--r--vcl/source/gdi/virdev.cxx21
-rw-r--r--vcl/source/image/ImplImage.cxx2
-rw-r--r--vcl/source/outdev/textline.cxx3
-rw-r--r--vcl/source/outdev/transparent.cxx2
-rw-r--r--vcl/source/window/paint.cxx3
-rw-r--r--vcl/source/window/syswin.cxx2
10 files changed, 20 insertions, 25 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 259192c854cb..43a4b6305395 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -662,8 +662,8 @@ OUString SalInstanceWidget::strip_mnemonic(const OUString& rLabel) const
VclPtr<VirtualDevice> SalInstanceWidget::create_virtual_device() const
{
// create with (annoying) separate alpha layer that LibreOffice itself uses
- return VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(), DeviceFormat::DEFAULT,
- DeviceFormat::DEFAULT);
+ return VclPtr<VirtualDevice>::Create(*Application::GetDefaultDevice(),
+ DeviceFormat::WITH_ALPHA);
}
void SalInstanceWidget::call_attention_to()
@@ -1379,7 +1379,7 @@ void SalInstanceWidget::DoRecursivePaint(vcl::Window* pWindow, const Point& rRen
pWindow->SetMapMode(aMapMode);
}
- VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
+ VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA));
Size aChildSizePixel(pWindow->GetSizePixel());
xOutput->SetOutputSizePixel(aChildSizePixel);
diff --git a/vcl/source/filter/eps/eps.cxx b/vcl/source/filter/eps/eps.cxx
index a6ee4c288e00..c22a109a3ce2 100644
--- a/vcl/source/filter/eps/eps.cxx
+++ b/vcl/source/filter/eps/eps.cxx
@@ -1997,7 +1997,7 @@ void PSWriter::ImplText( const OUString& rUniString, const Point& rPos, KernArra
vcl::Font aNotRotatedFont( maFont );
aNotRotatedFont.SetOrientation( 0_deg10 );
- ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance< VirtualDevice > pVirDev(DeviceFormat::WITHOUT_ALPHA);
pVirDev->SetMapMode( rVDev.GetMapMode() );
pVirDev->SetFont( aNotRotatedFont );
pVirDev->SetTextAlign( eTextAlign );
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 05e4c0fb3a6b..6b1300e589d6 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.cxx
@@ -818,7 +818,7 @@ void GDIMetaFile::ImplAddGradientEx( GDIMetaFile& rMtf,
const Gradient& rGrad )
{
// Generate comment, GradientEx and Gradient actions (within DrawGradient)
- ScopedVclPtrInstance< VirtualDevice > aVDev(rMapDev, DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance< VirtualDevice > aVDev(rMapDev, DeviceFormat::WITHOUT_ALPHA);
aVDev->EnableOutput( false );
GDIMetaFile aGradMtf;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 8be74da9e1c5..e4807abfaae8 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -1198,7 +1198,7 @@ double PDFPage::getHeight() const
PDFWriterImpl::PDFWriterImpl( const PDFWriter::PDFWriterContext& rContext,
const css::uno::Reference< css::beans::XMaterialHolder >& xEnc,
PDFWriter& i_rOuterFace)
- : VirtualDevice(Application::GetDefaultDevice(), DeviceFormat::DEFAULT, DeviceFormat::NONE, OUTDEV_PDF),
+ : VirtualDevice(Application::GetDefaultDevice(), DeviceFormat::WITHOUT_ALPHA, OUTDEV_PDF),
m_aMapMode( MapUnit::MapPoint, Point(), Fraction( 1, pointToPixel(1) ), Fraction( 1, pointToPixel(1) ) ),
m_aWidgetStyleSettings(Application::GetSettings().GetStyleSettings()),
m_nCurrentStructElement( 0 ),
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index d0687faa76b2..4d10f317e93c 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -154,7 +154,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
(void)pOutDev->AcquireGraphics();
pGraphics = pOutDev->mpGraphics;
if ( pGraphics )
- mpVirDev = pSVData->mpDefInst->CreateVirtualDevice(*pGraphics, nDX, nDY, meFormat, pData);
+ mpVirDev = pSVData->mpDefInst->CreateVirtualDevice(*pGraphics, nDX, nDY, meFormatAndAlpha, pData);
else
mpVirDev = nullptr;
if ( !mpVirDev )
@@ -200,14 +200,12 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* pOutDev,
pSVData->maGDIData.mpFirstVirDev = this;
}
-VirtualDevice::VirtualDevice(const OutputDevice* pCompDev, DeviceFormat eFormat,
- DeviceFormat eAlphaFormat, OutDevType eOutDevType)
+VirtualDevice::VirtualDevice(const OutputDevice* pCompDev, DeviceFormat eFormatAndAlpha,
+ OutDevType eOutDevType)
: OutputDevice(eOutDevType)
- , meFormat(eFormat)
- , meAlphaFormat(eAlphaFormat)
+ , meFormatAndAlpha(eFormatAndAlpha)
{
- SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat)
- << ", " << static_cast<int>(eAlphaFormat)
+ SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormatAndAlpha)
<< ", " << static_cast<int>(eOutDevType) << " )" );
ImplInitVirDev(pCompDev ? pCompDev : Application::GetDefaultDevice(), 0, 0);
@@ -216,8 +214,7 @@ VirtualDevice::VirtualDevice(const OutputDevice* pCompDev, DeviceFormat eFormat,
VirtualDevice::VirtualDevice(const SystemGraphicsData& rData, const Size &rSize,
DeviceFormat eFormat)
: OutputDevice(OUTDEV_VIRDEV)
- , meFormat(eFormat)
- , meAlphaFormat(DeviceFormat::NONE)
+ , meFormatAndAlpha(eFormat)
{
SAL_INFO( "vcl.virdev", "VirtualDevice::VirtualDevice( " << static_cast<int>(eFormat) << " )" );
@@ -303,7 +300,7 @@ bool VirtualDevice::InnerImplSetOutputSizePixel( const Size& rNewSize, bool bEra
assert(mpGraphics);
- pNewVirDev = pSVData->mpDefInst->CreateVirtualDevice(*mpGraphics, nNewWidth, nNewHeight, meFormat);
+ pNewVirDev = pSVData->mpDefInst->CreateVirtualDevice(*mpGraphics, nNewWidth, nNewHeight, meFormatAndAlpha);
if ( pNewVirDev )
{
SalGraphics* pGraphics = pNewVirDev->AcquireGraphics();
@@ -359,7 +356,7 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
{
if( InnerImplSetOutputSizePixel(rNewSize, bErase, pBuffer) )
{
- if (meAlphaFormat != DeviceFormat::NONE)
+ if (meFormatAndAlpha != DeviceFormat::WITHOUT_ALPHA)
{
// #110958# Setup alpha bitmap
if(mpAlphaVDev && mpAlphaVDev->GetOutputSizePixel() != rNewSize)
@@ -369,7 +366,7 @@ bool VirtualDevice::ImplSetOutputSizePixel( const Size& rNewSize, bool bErase,
if( !mpAlphaVDev )
{
- mpAlphaVDev = VclPtr<VirtualDevice>::Create(*this, meAlphaFormat);
+ mpAlphaVDev = VclPtr<VirtualDevice>::Create(*this, meFormatAndAlpha);
mpAlphaVDev->InnerImplSetOutputSizePixel(rNewSize, bErase, nullptr);
}
diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx
index 20469d8b4292..a63dd8ccb7ce 100644
--- a/vcl/source/image/ImplImage.cxx
+++ b/vcl/source/image/ImplImage.cxx
@@ -163,7 +163,7 @@ BitmapEx const & ImplImage::getBitmapExForHiDPI(bool bDisabled, SalGraphics* pGr
loadStockAtScale(pGraphics, maBitmapEx);
else // if (mxMetaFile)
{
- ScopedVclPtrInstance<VirtualDevice> aVDev(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance<VirtualDevice> aVDev(DeviceFormat::WITH_ALPHA);
aVDev->SetOutputSizePixel(aTarget);
mxMetaFile->WindStart();
mxMetaFile->Play(*aVDev, Point(), aTarget);
diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx
index 2aebffb4c8b2..7f601075edae 100644
--- a/vcl/source/outdev/textline.cxx
+++ b/vcl/source/outdev/textline.cxx
@@ -1050,8 +1050,7 @@ void OutputDevice::DrawWaveLine(const Point& rStartPos, const Point& rEndPos, to
size_t nWordLength = nEndX - nStartX;
// start with something big to avoid updating it frequently
nWordLength = nWordLength < 1024 ? 1024 : nWordLength;
- ScopedVclPtrInstance< VirtualDevice > pVirtDev( *this, DeviceFormat::DEFAULT,
- DeviceFormat::DEFAULT );
+ ScopedVclPtrInstance< VirtualDevice > pVirtDev( *this, DeviceFormat::WITH_ALPHA );
pVirtDev->SetOutputSizePixel( Size( nWordLength, nWaveHeight * 2 ), false );
pVirtDev->SetLineColor( GetLineColor() );
pVirtDev->SetBackground( Wallpaper( COL_TRANSPARENT ) );
diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx
index d2be9bef6fc9..4a4b6b5a54bb 100644
--- a/vcl/source/outdev/transparent.cxx
+++ b/vcl/source/outdev/transparent.cxx
@@ -597,7 +597,7 @@ void OutputDevice::DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos,
if( !aDstRect.IsEmpty() )
{
// Create transparent buffer
- ScopedVclPtrInstance<VirtualDevice> xVDev(DeviceFormat::DEFAULT, DeviceFormat::DEFAULT);
+ ScopedVclPtrInstance<VirtualDevice> xVDev(DeviceFormat::WITH_ALPHA);
xVDev->mnDPIX = mnDPIX;
xVDev->mnDPIY = mnDPIY;
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index a70f1c0e4004..a98703ca255b 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1521,8 +1521,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP
// paint metafile to VDev
VclPtrInstance<VirtualDevice> pMaskedDevice(*i_pTargetOutDev,
- DeviceFormat::DEFAULT,
- DeviceFormat::DEFAULT);
+ DeviceFormat::WITH_ALPHA);
pMaskedDevice->SetOutputSizePixel( GetOutputSizePixel() );
pMaskedDevice->EnableRTL( IsRTLEnabled() );
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 9439ef62e88c..603cc8aca5fd 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -1124,7 +1124,7 @@ VclPtr<VirtualDevice> SystemWindow::createScreenshot()
Size aSize(GetOutputSizePixel());
- VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::DEFAULT));
+ VclPtr<VirtualDevice> xOutput(VclPtr<VirtualDevice>::Create(DeviceFormat::WITHOUT_ALPHA));
xOutput->SetOutputSizePixel(aSize);
Point aPos;
generated by cgit (git 2.34.1) at 2024-12-25 19:46:49 +0000