[Libreoffice-commits] core.git: vcl/headless vcl/inc
Stephan Bergmann
sbergman at redhat.com
Mon Nov 23 06:38:54 PST 2015
vcl/headless/svpbmp.cxx | 2 +-
vcl/headless/svpvd.cxx | 2 +-
vcl/inc/headless/svpinst.hxx | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 254ca2513c85701e92b4e27023bf26cbc76133e9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Nov 23 15:38:16 2015 +0100
loplugin:staticmethods
Change-Id: Ia22b7f53a85e55fd33762adceba9a1b1827d6f34
diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 722b4dd..884a80c 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -45,7 +45,7 @@ bool SvpSalBitmap::Create( const Size& rSize,
SvpSalInstance* pInst = SvpSalInstance::s_pDefaultInstance;
assert( pInst );
- basebmp::Format nFormat = pInst->getBaseBmpFormatForBitCount( nBitCount );
+ basebmp::Format nFormat = SvpSalInstance::getBaseBmpFormatForBitCount( nBitCount );
B2IVector aSize( rSize.Width(), rSize.Height() );
if( aSize.getX() == 0 )
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 3cc8b5f..8b4d3c5 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -67,7 +67,7 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY,
{
SvpSalInstance* pInst = SvpSalInstance::s_pDefaultInstance;
assert( pInst );
- basebmp::Format nFormat = pInst->getBaseBmpFormatForDeviceFormat(m_eFormat);
+ basebmp::Format nFormat = SvpSalInstance::getBaseBmpFormatForDeviceFormat(m_eFormat);
sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(nFormat, aDevSize.getX());
if (m_eFormat == DeviceFormat::BITMASK)
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index cf30aae..779a65f 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -167,8 +167,8 @@ public:
virtual GenPspGraphics *CreatePrintGraphics() override;
- ::basebmp::Format getBaseBmpFormatForBitCount(sal_uInt16);
- ::basebmp::Format getBaseBmpFormatForDeviceFormat(DeviceFormat);
+ static ::basebmp::Format getBaseBmpFormatForBitCount(sal_uInt16);
+ static ::basebmp::Format getBaseBmpFormatForDeviceFormat(DeviceFormat);
};
#endif // INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
More information about the Libreoffice-commits
mailing list