vcl/headless/svpbmp.cxx | 2 +-
vcl/inc/headless/svpbmp.hxx | 2 +-
vcl/inc/qt5/QtBitmap.hxx | 2 +-
vcl/inc/quartz/salbmp.h | 2 +-
vcl/inc/salbmp.hxx | 2 +-
vcl/inc/skia/salbmp.hxx | 2 +-
vcl/inc/win/salbmp.h | 2 +-
vcl/qt5/QtBitmap.cxx | 4 ++--
vcl/quartz/salbmp.cxx | 8 ++------
vcl/skia/salbmp.cxx | 8 ++------
vcl/source/bitmap/bitmap.cxx | 2 +-
vcl/win/gdi/gdiimpl.cxx | 2 +-
vcl/win/gdi/salbmp.cxx | 4 ++--
13 files changed, 17 insertions(+), 25 deletions(-)
New commits:
commit 32080b4cd789f98be14f644f1a8b2bb3b5a72f2b
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Sep 2 08:09:24 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Sep 2 20:15:28 2025 +0200
pass SalGraphics by ref to SalBimap::Create
since it is never nullptr, which flushes out some unused code
Change-Id: I70c7cbc7c3f79e42448fb986c74ef099fdc5d02b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190509
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 314269c1a01e..74bc4eea895b 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -185,7 +185,7 @@ bool SvpSalBitmap::Create(const SalBitmap& rBmp)
}
bool SvpSalBitmap::Create( const SalBitmap& /*rSalBmp*/,
- SalGraphics* /*pGraphics*/ )
+ SalGraphics& /*rGraphics*/ )
{
return false;
}
diff --git a/vcl/inc/headless/svpbmp.hxx b/vcl/inc/headless/svpbmp.hxx
index b650626bf0e1..fb15f6c0d56f 100644
--- a/vcl/inc/headless/svpbmp.hxx
+++ b/vcl/inc/headless/svpbmp.hxx
@@ -43,7 +43,7 @@ public:
const BitmapPalette& rPalette) override;
SAL_DLLPRIVATE virtual bool Create( const SalBitmap& rSalBmp )
override;
SAL_DLLPRIVATE virtual bool Create( const SalBitmap& rSalBmp,
- SalGraphics* pGraphics ) override;
+ SalGraphics& rGraphics ) override;
SAL_DLLPRIVATE virtual bool Create(const SalBitmap& rSalBmp,
vcl::PixelFormat eNewPixelFormat) override;
SAL_DLLPRIVATE virtual bool Create( const css::uno::Reference<
css::rendering::XBitmapCanvas >& rBitmapCanvas,
diff --git a/vcl/inc/qt5/QtBitmap.hxx b/vcl/inc/qt5/QtBitmap.hxx
index 6e6c82ba8fc9..1d2fc86299bc 100644
--- a/vcl/inc/qt5/QtBitmap.hxx
+++ b/vcl/inc/qt5/QtBitmap.hxx
@@ -39,7 +39,7 @@ public:
virtual bool Create(const Size& rSize, vcl::PixelFormat ePixelFormat,
const BitmapPalette& rPal) override;
virtual bool Create(const SalBitmap& rSalBmp) override;
- virtual bool Create(const SalBitmap& rSalBmp, SalGraphics* pGraphics)
override;
+ virtual bool Create(const SalBitmap& rSalBmp, SalGraphics& rGraphics)
override;
virtual bool Create(const SalBitmap& rSalBmp, vcl::PixelFormat
eNewPixelFormat) override;
virtual bool Create(const
css::uno::Reference<css::rendering::XBitmapCanvas>& rBitmapCanvas,
Size& rSize) override;
diff --git a/vcl/inc/quartz/salbmp.h b/vcl/inc/quartz/salbmp.h
index 7ada1f6829f1..a8e3c07fd6ad 100644
--- a/vcl/inc/quartz/salbmp.h
+++ b/vcl/inc/quartz/salbmp.h
@@ -58,7 +58,7 @@ public:
// SalBitmap methods
bool Create( const Size& rSize, vcl::PixelFormat ePixelFormat,
const BitmapPalette& rPal ) override;
bool Create( const SalBitmap& rSalBmp ) override;
- bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics )
override;
+ bool Create( const SalBitmap& rSalBmp, SalGraphics& rGraphics )
override;
bool Create( const SalBitmap& rSalBmp, vcl::PixelFormat
eNewPixelFormat) override;
virtual bool Create( const css::uno::Reference<
css::rendering::XBitmapCanvas >& rBitmapCanvas,
Size& rSize ) override;
diff --git a/vcl/inc/salbmp.hxx b/vcl/inc/salbmp.hxx
index 441f630da167..02a7442fbede 100644
--- a/vcl/inc/salbmp.hxx
+++ b/vcl/inc/salbmp.hxx
@@ -64,7 +64,7 @@ public:
const BitmapPalette& rPal ) = 0;
virtual bool Create( const SalBitmap& rSalBmp ) = 0;
virtual bool Create( const SalBitmap& rSalBmp,
- SalGraphics* pGraphics ) = 0;
+ SalGraphics& rGraphics ) = 0;
virtual bool Create( const SalBitmap& rSalBmp,
vcl::PixelFormat eNewPixelFormat) = 0;
virtual bool Create( const css::uno::Reference<
css::rendering::XBitmapCanvas >& rBitmapCanvas,
diff --git a/vcl/inc/skia/salbmp.hxx b/vcl/inc/skia/salbmp.hxx
index 0212705c0e3e..e4ec340aad31 100644
--- a/vcl/inc/skia/salbmp.hxx
+++ b/vcl/inc/skia/salbmp.hxx
@@ -39,7 +39,7 @@ public:
virtual bool Create(const Size& rSize, vcl::PixelFormat ePixelFormat,
const BitmapPalette& rPal) override;
virtual bool Create(const SalBitmap& rSalBmp) override;
- virtual bool Create(const SalBitmap& rSalBmp, SalGraphics* pGraphics)
override;
+ virtual bool Create(const SalBitmap& rSalBmp, SalGraphics& rGraphics)
override;
virtual bool Create(const SalBitmap& rSalBmp, vcl::PixelFormat
eNewPixelFormat) override;
virtual bool Create(const
css::uno::Reference<css::rendering::XBitmapCanvas>& rBitmapCanvas,
Size& rSize) override;
diff --git a/vcl/inc/win/salbmp.h b/vcl/inc/win/salbmp.h
index 4ad38ecbec15..800525f993fb 100644
--- a/vcl/inc/win/salbmp.h
+++ b/vcl/inc/win/salbmp.h
@@ -73,7 +73,7 @@ public:
bool Create( HBITMAP hBitmap );
virtual bool Create( const Size& rSize, vcl::PixelFormat
ePixelFormat, const BitmapPalette& rPal ) override;
virtual bool Create( const SalBitmap& rSalBmpImpl )
override;
- virtual bool Create( const SalBitmap& rSalBmpImpl,
SalGraphics* pGraphics ) override;
+ virtual bool Create( const SalBitmap& rSalBmpImpl,
SalGraphics& rGraphics ) override;
virtual bool Create( const SalBitmap& rSalBmpImpl,
vcl::PixelFormat eNewPixelFormat ) override;
virtual bool Create( const css::uno::Reference<
css::rendering::XBitmapCanvas >& rBitmapCanvas,
Size& rSize ) override;
diff --git a/vcl/qt5/QtBitmap.cxx b/vcl/qt5/QtBitmap.cxx
index 643208b23c5d..04f98bb268e9 100644
--- a/vcl/qt5/QtBitmap.cxx
+++ b/vcl/qt5/QtBitmap.cxx
@@ -63,10 +63,10 @@ bool QtBitmap::Create(const SalBitmap& rSalBmp)
return true;
}
-bool QtBitmap::Create(const SalBitmap& rSalBmp, SalGraphics* pSalGraphics)
+bool QtBitmap::Create(const SalBitmap& rSalBmp, SalGraphics& rSalGraphics)
{
const QtBitmap* pBitmap = static_cast<const QtBitmap*>(&rSalBmp);
- QtGraphics* pGraphics = static_cast<QtGraphics*>(pSalGraphics);
+ QtGraphics* pGraphics = static_cast<QtGraphics*>(&rSalGraphics);
QImage* pImage = pGraphics->getQImage();
m_pImage.reset(new
QImage(pBitmap->m_pImage->convertToFormat(pImage->format())));
return true;
diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx
index e65de0090e4d..b71dae40005a 100644
--- a/vcl/quartz/salbmp.cxx
+++ b/vcl/quartz/salbmp.cxx
@@ -77,13 +77,9 @@ bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp )
return Create( rSalBmp, ePixelFormat);
}
-bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics
)
+bool QuartzSalBitmap::Create( const SalBitmap& rSalBmp, SalGraphics& rGraphics
)
{
- vcl::PixelFormat ePixelFormat = vcl::PixelFormat::INVALID;
- if (pGraphics)
- ePixelFormat = vcl::bitDepthToPixelFormat(pGraphics->GetBitCount());
- else
- ePixelFormat = vcl::bitDepthToPixelFormat(rSalBmp.GetBitCount());
+ vcl::PixelFormat ePixelFormat =
vcl::bitDepthToPixelFormat(rGraphics.GetBitCount());
return Create( rSalBmp, ePixelFormat);
}
diff --git a/vcl/skia/salbmp.cxx b/vcl/skia/salbmp.cxx
index 16cfb2b1c994..2cffab77cfb4 100644
--- a/vcl/skia/salbmp.cxx
+++ b/vcl/skia/salbmp.cxx
@@ -143,13 +143,9 @@ bool SkiaSalBitmap::Create(const SalBitmap& rSalBmp)
return Create(rSalBmp, vcl::bitDepthToPixelFormat(rSalBmp.GetBitCount()));
}
-bool SkiaSalBitmap::Create(const SalBitmap& rSalBmp, SalGraphics* pGraphics)
+bool SkiaSalBitmap::Create(const SalBitmap& rSalBmp, SalGraphics& rGraphics)
{
- auto ePixelFormat = vcl::PixelFormat::INVALID;
- if (pGraphics)
- ePixelFormat = vcl::bitDepthToPixelFormat(pGraphics->GetBitCount());
- else
- ePixelFormat = vcl::bitDepthToPixelFormat(rSalBmp.GetBitCount());
+ vcl::PixelFormat ePixelFormat =
vcl::bitDepthToPixelFormat(rGraphics.GetBitCount());
return Create(rSalBmp, ePixelFormat);
}
diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx
index 4bf24b5cea8a..ba1c1df4d14a 100644
--- a/vcl/source/bitmap/bitmap.cxx
+++ b/vcl/source/bitmap/bitmap.cxx
@@ -932,7 +932,7 @@ Bitmap Bitmap::CreateDisplayBitmap( OutputDevice* pDisplay
) const
if( mxSalBmp && pDispGraphics )
{
std::shared_ptr<SalBitmap>
xImpDispBmp(ImplGetSVData()->mpDefInst->CreateSalBitmap());
- if (xImpDispBmp->Create(*mxSalBmp, pDispGraphics))
+ if (xImpDispBmp->Create(*mxSalBmp, *pDispGraphics))
aDispBmp.ImplSetSalBitmap(xImpDispBmp);
}
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 7f6484bf9cda..f5c3525d8e9f 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -636,7 +636,7 @@ void WinSalGraphicsImpl::drawMask(const SalTwoRect& rPosAry,
{
WinSalBitmap aTmp;
- if( aTmp.Create( rSalBitmap, &mrParent ) )
+ if( aTmp.Create( rSalBitmap, mrParent ) )
ImplDrawBitmap( hDC, aPosAry, aTmp, false, 0x00B8074AUL ); //
raster operation PSDPxax
}
else
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index b3d7ea40fa08..f76e96beb7bf 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -500,7 +500,7 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBitmap )
return false;
}
-bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics* pSGraphics )
+bool WinSalBitmap::Create( const SalBitmap& rSSalBmp, SalGraphics& rSGraphics )
{
assert(!mpDIB && "already created");
assert(!mhDDB && "already created");
@@ -514,7 +514,7 @@ bool WinSalBitmap::Create( const SalBitmap& rSSalBmp,
SalGraphics* pSGraphics )
return false;
bool bRet = false;
- WinSalGraphics* pGraphics = static_cast<WinSalGraphics*>(pSGraphics);
+ WinSalGraphics* pGraphics = static_cast<WinSalGraphics*>(&rSGraphics);
HDC hDC = pGraphics->getHDC();
BITMAP aDDBInfo;
