vcl/inc/quartz/salvd.h | 2 +-
vcl/quartz/salvd.cxx | 11 +++++------
2 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 222ff8ce8e20f3afcef3acb21d5eb7ebfa388138
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Tue Feb 4 13:06:50 2025 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Tue Feb 4 14:59:39 2025 +0100
Avoid -Werror,-Wunused-parameter
>
/Volumes/lode/lode/jenkins/workspace/lo_tb_master_mac/vcl/quartz/salvd.cxx:120:22:
error: unused parameter 'pGraphic' [-Werror,-Wunused-parameter]
> AquaSalGraphics* pGraphic, tools::Long &nDX, tools::Long &nDY,
> ^
(<https://ci.libreoffice.org/job/lo_tb_master_mac/52565/>) since
a46c265051af9b383c928914087d1e91025c2d2f "split CreateVirtualDevice into two
methods". (The argument to
> mpGraphics = new AquaSalGraphics( /*pGraphic*/ );
had been commented out ever since the code got introduced in
f0faedb959edd27d6b5b96ec77fd54f7172d52dd "INTEGRATION: CWS aquabmpfix01
(1.22.12); FILE MERGED".)
Change-Id: I476bba0fe65005bbd8f95e7185639e0a6629affd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181101
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index 941ffe9df3ca..db953d1ec295 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -53,7 +53,7 @@ private:
public:
AquaSalVirtualDevice( AquaSalGraphics* pGraphic, tools::Long nDX,
tools::Long nDY, DeviceFormat eFormat );
- AquaSalVirtualDevice( AquaSalGraphics* pGraphic, tools::Long &nDX,
tools::Long &nDY, DeviceFormat eFormat, const SystemGraphicsData& rData );
+ AquaSalVirtualDevice( tools::Long &nDX, tools::Long &nDY, DeviceFormat
eFormat, const SystemGraphicsData& rData );
virtual ~AquaSalVirtualDevice() override;
virtual SalGraphics* AcquireGraphics() override;
diff --git a/vcl/quartz/salvd.cxx b/vcl/quartz/salvd.cxx
index 69f18473fb91..66bccc3524b8 100644
--- a/vcl/quartz/salvd.cxx
+++ b/vcl/quartz/salvd.cxx
@@ -54,7 +54,7 @@ std::unique_ptr<SalVirtualDevice>
AquaSalInstance::CreateVirtualDevice( SalGraph
#endif
}
-std::unique_ptr<SalVirtualDevice> AquaSalInstance::CreateVirtualDevice(
SalGraphics& rGraphics,
+std::unique_ptr<SalVirtualDevice> AquaSalInstance::CreateVirtualDevice(
SalGraphics&,
tools::Long &nDX,
tools::Long &nDY,
DeviceFormat eFormat,
const
SystemGraphicsData& rData )
@@ -63,10 +63,10 @@ std::unique_ptr<SalVirtualDevice>
AquaSalInstance::CreateVirtualDevice( SalGraph
SalData::ensureThreadAutoreleasePool();
#ifdef IOS
- return std::unique_ptr<SalVirtualDevice>(new AquaSalVirtualDevice(
static_cast< AquaSalGraphics* >(&rGraphics),
+ return std::unique_ptr<SalVirtualDevice>(new AquaSalVirtualDevice(
nDX, nDY, eFormat, rData ));
#else
- return std::unique_ptr<SalVirtualDevice>(new AquaSalVirtualDevice(
static_cast< AquaSalGraphics* >(&rGraphics),
+ return std::unique_ptr<SalVirtualDevice>(new AquaSalVirtualDevice(
nDX, nDY, eFormat, rData ));
#endif
}
@@ -117,7 +117,7 @@ AquaSalVirtualDevice::AquaSalVirtualDevice(
}
AquaSalVirtualDevice::AquaSalVirtualDevice(
- AquaSalGraphics* pGraphic, tools::Long &nDX, tools::Long &nDY,
+ tools::Long &nDX, tools::Long &nDY,
DeviceFormat eFormat, const SystemGraphicsData& rData )
: mbGraphicsUsed( false )
, mnBitmapDepth( 0 )
@@ -128,14 +128,13 @@ AquaSalVirtualDevice::AquaSalVirtualDevice(
<< " size=(" << nDX << "x" << nDY << ") bitcount=" <<
static_cast<int>(eFormat) <<
" rData=" << &rData << " context=" << rData.rCGContext );
- assert(pGraphic);
assert(rData.rCGContext);
// Create virtual device based on existing SystemGraphicsData
// We ignore nDx and nDY, as the desired size comes from the
SystemGraphicsData.
// the mxContext is from pData (what "mxContext"? there is no such field
anywhere in vcl;)
mbForeignContext = true;
- mpGraphics = new AquaSalGraphics( /*pGraphic*/ );
+ mpGraphics = new AquaSalGraphics();
if (nDX == 0)
{
nDX = 1;
