[Libreoffice-commits] core.git: vcl/headless

Stephan Bergmann sbergman at redhat.com
Mon Nov 23 07:57:38 PST 2015


 vcl/headless/svpbmp.cxx |    2 --
 vcl/headless/svpvd.cxx  |    2 --
 2 files changed, 4 deletions(-)

New commits:
commit 9ca49c1b95bad0055ffc9185249cec0a27376dbc
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 23 16:56:09 2015 +0100

    pInst no longer needed
    
    ...since 254ca2513c85701e92b4e27023bf26cbc76133e9 "loplugin:staticmethods"
    
    Change-Id: I7d051a9add4e5176c1dac0b281cd09939da3f3a2

diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx
index 884a80c..685463c 100644
--- a/vcl/headless/svpbmp.cxx
+++ b/vcl/headless/svpbmp.cxx
@@ -43,8 +43,6 @@ bool SvpSalBitmap::Create( const Size& rSize,
 {
     SAL_INFO( "vcl.headless", "SvpSalBitmap::Create(" << rSize.Width() << "," << rSize.Height() << "," << nBitCount << ")" );
 
-    SvpSalInstance* pInst = SvpSalInstance::s_pDefaultInstance;
-    assert( pInst );
     basebmp::Format nFormat = SvpSalInstance::getBaseBmpFormatForBitCount( nBitCount );
 
     B2IVector aSize( rSize.Width(), rSize.Height() );
diff --git a/vcl/headless/svpvd.cxx b/vcl/headless/svpvd.cxx
index 8b4d3c5..026da6b 100644
--- a/vcl/headless/svpvd.cxx
+++ b/vcl/headless/svpvd.cxx
@@ -65,8 +65,6 @@ bool SvpSalVirtualDevice::SetSizeUsingBuffer( long nNewDX, long nNewDY,
         aDevSize.setY( 1 );
     if( ! m_aDevice.get() || m_aDevice->getSize() != aDevSize )
     {
-        SvpSalInstance* pInst = SvpSalInstance::s_pDefaultInstance;
-        assert( pInst );
         basebmp::Format nFormat = SvpSalInstance::getBaseBmpFormatForDeviceFormat(m_eFormat);
         sal_Int32 nStride = basebmp::getBitmapDeviceStrideForWidth(nFormat, aDevSize.getX());
 


More information about the Libreoffice-commits mailing list