From 644487a1152c7586a7f20c7f372572a71d8494d5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 7 Oct 2015 16:28:27 +0200 Subject: loplugin:unusedmethods Change-Id: I161cd52606c11b6008f5d8b1d8ee391692f91861 Reviewed-on: https://gerrit.libreoffice.org/19231 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/source/bitmap/BitmapFilterStackBlur.cxx | 9 --- vcl/source/filter/FilterConfigCache.cxx | 18 ----- vcl/source/filter/FilterConfigCache.hxx | 2 - vcl/source/filter/graphicfilter.cxx | 24 +------ vcl/source/gdi/bmpacc.cxx | 108 ---------------------------- vcl/source/gdi/cvtgrf.cxx | 3 +- 6 files changed, 3 insertions(+), 161 deletions(-) (limited to 'vcl/source') diff --git a/vcl/source/bitmap/BitmapFilterStackBlur.cxx b/vcl/source/bitmap/BitmapFilterStackBlur.cxx index 4358f2b90fb7..6782a94ca87b 100644 --- a/vcl/source/bitmap/BitmapFilterStackBlur.cxx +++ b/vcl/source/bitmap/BitmapFilterStackBlur.cxx @@ -578,13 +578,4 @@ bool BitmapFilterStackBlur::filter(Bitmap& rBitmap) return true; } -bool BitmapFilterStackBlur::filter(BitmapEx& rBitmapEx) -{ - Bitmap aBitmap = rBitmapEx.GetBitmap(); - filter(aBitmap); - rBitmapEx = BitmapEx(aBitmap); - - return true; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index f0bfbabdc783..8df7bfb7edab 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -346,17 +346,6 @@ sal_uInt16 FilterConfigCache::GetImportFormatNumberForExtension( const OUString& return GRFILTER_FORMAT_NOTFOUND; } -sal_uInt16 FilterConfigCache::GetImportFormatNumberForMediaType( const OUString& rMediaType ) -{ - CacheVector::const_iterator aIter, aEnd; - for (aIter = aImport.begin(), aEnd = aImport.end(); aIter != aEnd; ++aIter) - { - if ( aIter->sMediaType.equalsIgnoreAsciiCase( rMediaType ) ) - return sal::static_int_cast< sal_uInt16 >(aIter - aImport.begin()); - } - return GRFILTER_FORMAT_NOTFOUND; -} - sal_uInt16 FilterConfigCache::GetImportFormatNumberForShortName( const OUString& rShortName ) { CacheVector::const_iterator aEnd; @@ -515,13 +504,6 @@ OUString FilterConfigCache::GetExportFormatExtension( sal_uInt16 nFormat, sal_In return OUString(""); } -OUString FilterConfigCache::GetExportFilterTypeName( sal_uInt16 nFormat ) -{ - if( nFormat < aExport.size() ) - return aExport[ nFormat ].sFilterType; - return OUString(""); -} - OUString FilterConfigCache::GetExportInternalFilterName( sal_uInt16 nFormat ) { if( nFormat < aExport.size() ) diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx index f568c515b4f5..a5bfb641ff2b 100644 --- a/vcl/source/filter/FilterConfigCache.hxx +++ b/vcl/source/filter/FilterConfigCache.hxx @@ -85,7 +85,6 @@ public: sal_uInt16 GetImportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aImport.size()); }; sal_uInt16 GetImportFormatNumber( const OUString& rFormatName ); - sal_uInt16 GetImportFormatNumberForMediaType( const OUString& rMediaType ); sal_uInt16 GetImportFormatNumberForShortName( const OUString& rShortName ); sal_uInt16 GetImportFormatNumberForTypeName( const OUString& rType ); sal_uInt16 GetImportFormatNumberForExtension( const OUString& rExt ); @@ -112,7 +111,6 @@ public: OUString GetExportFormatMediaType( sal_uInt16 nFormat ); OUString GetExportFormatShortName( sal_uInt16 nFormat ); OUString GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ); - OUString GetExportFilterTypeName( sal_uInt16 nFormat ); OUString GetExportInternalFilterName( sal_uInt16 nFormat ); bool IsExportInternalFilter( sal_uInt16 nFormat ); diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 73807d4e9306..7b763996890c 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1155,11 +1155,6 @@ sal_uInt16 GraphicFilter::GetImportFormatNumber( const OUString& rFormatName ) return pConfig->GetImportFormatNumber( rFormatName ); } -sal_uInt16 GraphicFilter::GetImportFormatNumberForMediaType( const OUString& rMediaType ) -{ - return pConfig->GetImportFormatNumberForMediaType( rMediaType ); -} - sal_uInt16 GraphicFilter::GetImportFormatNumberForShortName( const OUString& rShortName ) { return pConfig->GetImportFormatNumberForShortName( rShortName ); @@ -1180,22 +1175,18 @@ OUString GraphicFilter::GetImportFormatTypeName( sal_uInt16 nFormat ) return pConfig->GetImportFilterTypeName( nFormat ); } +#ifdef WNT OUString GraphicFilter::GetImportFormatMediaType( sal_uInt16 nFormat ) { return pConfig->GetImportFormatMediaType( nFormat ); } +#endif OUString GraphicFilter::GetImportFormatShortName( sal_uInt16 nFormat ) { return pConfig->GetImportFormatShortName( nFormat ); } -OUString GraphicFilter::GetImportOSFileType( sal_uInt16 ) -{ - OUString aOSFileType; - return aOSFileType; -} - OUString GraphicFilter::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ) { return pConfig->GetImportWildcard( nFormat, nEntry ); @@ -1236,11 +1227,6 @@ OUString GraphicFilter::GetExportFormatName( sal_uInt16 nFormat ) return pConfig->GetExportFormatName( nFormat ); } -OUString GraphicFilter::GetExportFormatTypeName( sal_uInt16 nFormat ) -{ - return pConfig->GetExportFilterTypeName( nFormat ); -} - OUString GraphicFilter::GetExportFormatMediaType( sal_uInt16 nFormat ) { return pConfig->GetExportFormatMediaType( nFormat ); @@ -1251,12 +1237,6 @@ OUString GraphicFilter::GetExportFormatShortName( sal_uInt16 nFormat ) return pConfig->GetExportFormatShortName( nFormat ); } -OUString GraphicFilter::GetExportOSFileType( sal_uInt16 ) -{ - OUString aOSFileType; - return aOSFileType; -} - OUString GraphicFilter::GetExportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry ) { return pConfig->GetExportWildcard( nFormat, nEntry ); diff --git a/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx index 9917203f565a..87bc60f1be46 100644 --- a/vcl/source/gdi/bmpacc.cxx +++ b/vcl/source/gdi/bmpacc.cxx @@ -286,114 +286,6 @@ bool BitmapReadAccess::ImplSetAccessPointers( sal_uLong nFormat ) return bRet; } -void BitmapReadAccess::ImplZeroInitUnusedBits() -{ - const sal_uInt32 nWidth = Width(), nHeight = Height(), nScanSize = GetScanlineSize(); - - if( nWidth && nHeight && nScanSize && GetBuffer() ) - { - sal_uInt32 nBits; - bool bMsb; - - const sal_uLong nScanlineFormat = GetScanlineFormat(); - switch( nScanlineFormat ) - { - case( BMP_FORMAT_1BIT_MSB_PAL ): - nBits = 1; - bMsb = true; - break; - - case( BMP_FORMAT_1BIT_LSB_PAL ): - nBits = 1; - bMsb = false; - break; - - case( BMP_FORMAT_4BIT_MSN_PAL ): - nBits = 4; - bMsb = true; - break; - - case( BMP_FORMAT_4BIT_LSN_PAL ): - nBits = 4; - bMsb = false; - break; - - case( BMP_FORMAT_8BIT_PAL ): - case( BMP_FORMAT_8BIT_TC_MASK ): - bMsb = true; - nBits = 8; - break; - - case( BMP_FORMAT_16BIT_TC_MSB_MASK ): - case( BMP_FORMAT_16BIT_TC_LSB_MASK ): - bMsb = true; - nBits = 16; - break; - - case( BMP_FORMAT_24BIT_TC_BGR ): - case( BMP_FORMAT_24BIT_TC_RGB ): - case( BMP_FORMAT_24BIT_TC_MASK ): - bMsb = true; - nBits = 24; - break; - - case( BMP_FORMAT_32BIT_TC_ABGR ): - case( BMP_FORMAT_32BIT_TC_ARGB ): - case( BMP_FORMAT_32BIT_TC_BGRA ): - case( BMP_FORMAT_32BIT_TC_RGBA ): - case( BMP_FORMAT_32BIT_TC_MASK ): - bMsb = true; - nBits = 32; - break; - - default: - { - OSL_FAIL( "BitmapWriteAccess::ZeroInitUnusedBits: Unsupported pixel format"); - nBits = 0; - bMsb = true; - } - break; - } - - nBits *= nWidth; - if( nScanSize % 4 || !bMsb ) - { - DBG_ASSERT( 8*nScanSize >= nBits, - "BitmapWriteAccess::ZeroInitUnusedBits: span size smaller than width?!"); - const sal_uInt32 nLeftOverBits = 8*sizeof(sal_uInt8)*nScanSize - nBits; - if( nLeftOverBits != 0 ) // else there is really nothing to do - { - const sal_uInt32 nBytes = (nLeftOverBits + 7U) >> 3U; - sal_uInt8 nMask; - - if( bMsb ) - nMask = static_cast(0xffU << (nLeftOverBits & 3UL)); - else - nMask = static_cast(0xffU >> (nLeftOverBits & 3UL)); - - sal_uInt8* pLastBytes = reinterpret_cast(GetBuffer()) + ( nScanSize - nBytes ); - for( sal_uInt32 i = 0; i < nHeight; i++, pLastBytes += nScanSize ) - { - *pLastBytes &= nMask; - for( sal_uInt32 j = 1; j < nBytes; j++ ) - pLastBytes[j] = 0; - } - } - } - else if( nBits & 0x1f ) - { - sal_uInt32 nMask = 0xffffffff << ( ( nScanSize << 3 ) - nBits ); - sal_uInt8* pLast4Bytes = reinterpret_cast(GetBuffer()) + ( nScanSize - 4 ); - -#ifdef OSL_LITENDIAN - nMask = OSL_SWAPDWORD( nMask ); -#endif - for( sal_uInt32 i = 0; i < nHeight; i++, pLast4Bytes += nScanSize ) - *reinterpret_cast(pLast4Bytes) &= nMask; - } - } -} - BitmapColor BitmapReadAccess::GetInterpolatedColorWithFallback( double fY, double fX, const BitmapColor& rFallback ) const { // ask directly doubles >= 0.0 here to avoid rounded values of 0 at small negative diff --git a/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx index 3d13c82d07e6..d803813ac919 100644 --- a/vcl/source/gdi/cvtgrf.cxx +++ b/vcl/source/gdi/cvtgrf.cxx @@ -24,8 +24,7 @@ #include // Callback -GraphicConverter::GraphicConverter() : - mpConvertData( NULL ) +GraphicConverter::GraphicConverter() { } -- cgit