diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-29 12:40:47 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-29 15:08:43 +0200 |
commit | 34180700b2686c97cdce0b52ca9578a41a153035 (patch) | |
tree | 073f3753e4483f30efa3c7c769f23971e6a046d5 /vcl/source | |
parent | e710170d906fcb248a5e4ff5a3a90cbf0e20003d (diff) |
loplugin:removeunusedmethods, remove unused stuff
Change-Id: I35456b2a3ad2a84a1d045f09cdfb29e4c19b8350
Diffstat (limited to 'vcl/source')
-rw-r--r-- | vcl/source/edit/textdat2.hxx | 1 | ||||
-rw-r--r-- | vcl/source/filter/FilterConfigCache.cxx | 5 | ||||
-rw-r--r-- | vcl/source/filter/FilterConfigCache.hxx | 1 | ||||
-rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 5 | ||||
-rw-r--r-- | vcl/source/filter/sgvmain.cxx | 6 | ||||
-rw-r--r-- | vcl/source/filter/sgvmain.hxx | 2 | ||||
-rw-r--r-- | vcl/source/gdi/dibtools.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/gdimtf.cxx | 41 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 30 | ||||
-rw-r--r-- | vcl/source/gdi/sallayout.cxx | 32 |
10 files changed, 0 insertions, 131 deletions
diff --git a/vcl/source/edit/textdat2.hxx b/vcl/source/edit/textdat2.hxx index f7d4fcea0ab2..4ae76d289256 100644 --- a/vcl/source/edit/textdat2.hxx +++ b/vcl/source/edit/textdat2.hxx @@ -72,7 +72,6 @@ public: sal_uInt8& GetKind() { return nKind; } void SetRightToLeft(bool b) { bRightToLeft = b; } bool IsRightToLeft() const { return bRightToLeft; } - bool HasValidSize() const { return nWidth != (-1); } }; class TETextPortionList : public std::vector<TETextPortion*> diff --git a/vcl/source/filter/FilterConfigCache.cxx b/vcl/source/filter/FilterConfigCache.cxx index 14fdbaa8dfa1..f0bfbabdc783 100644 --- a/vcl/source/filter/FilterConfigCache.cxx +++ b/vcl/source/filter/FilterConfigCache.cxx @@ -435,11 +435,6 @@ bool FilterConfigCache::IsImportInternalFilter( sal_uInt16 nFormat ) return (nFormat < aImport.size()) && aImport[ nFormat ].bIsInternalFilter; } -bool FilterConfigCache::IsImportPixelFormat( sal_uInt16 nFormat ) -{ - return (nFormat < aImport.size()) && aImport[ nFormat ].bIsPixelFormat; -} - OUString FilterConfigCache::GetExportFilterName( sal_uInt16 nFormat ) { if( nFormat < aExport.size() ) diff --git a/vcl/source/filter/FilterConfigCache.hxx b/vcl/source/filter/FilterConfigCache.hxx index c288132a4ce2..f568c515b4f5 100644 --- a/vcl/source/filter/FilterConfigCache.hxx +++ b/vcl/source/filter/FilterConfigCache.hxx @@ -99,7 +99,6 @@ public: OUString GetImportFilterTypeName( sal_uInt16 nFormat ); bool IsImportInternalFilter( sal_uInt16 nFormat ); - bool IsImportPixelFormat( sal_uInt16 nFormat ); sal_uInt16 GetExportFormatCount() const { return sal::static_int_cast< sal_uInt16 >(aExport.size()); }; diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 84cdfcac5ac8..12a929454c37 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -1205,11 +1205,6 @@ OUString GraphicFilter::GetImportWildcard( sal_uInt16 nFormat, sal_Int32 nEntry return pConfig->GetImportWildcard( nFormat, nEntry ); } -bool GraphicFilter::IsImportPixelFormat( sal_uInt16 nFormat ) -{ - return pConfig->IsImportPixelFormat( nFormat ); -} - sal_uInt16 GraphicFilter::GetExportFormatCount() { return pConfig->GetExportFormatCount(); diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 189f66a920b6..45f69feec00a 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -134,12 +134,6 @@ sal_uInt16 MulDiv(sal_uInt16 a, sal_uInt16 Mul, sal_uInt16 Div) // SgfFilterSDrw -SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd) -{ - rIStream.Read(&rDtHd.Reserved[0], DtHdSize); - return rIStream; -} - void DtHdOverSeek(SvStream& rInp) { sal_uLong FPos=rInp.Tell(); diff --git a/vcl/source/filter/sgvmain.hxx b/vcl/source/filter/sgvmain.hxx index 77c4981bef38..6223d45923fa 100644 --- a/vcl/source/filter/sgvmain.hxx +++ b/vcl/source/filter/sgvmain.hxx @@ -42,7 +42,6 @@ struct PointType { class DtHdType { public: sal_uInt8 Reserved[256]; - friend SvStream& ReadDtHdType(SvStream& rIStream, DtHdType& rDtHd); friend void DtHdOverSeek(SvStream& rInp); }; @@ -157,7 +156,6 @@ public: } virtual ~ObjkType() {} friend SvStream& ReadObjkType(SvStream& rIStream, ObjkType& rObjk); - friend bool ObjOverSeek(SvStream& rInp, ObjkType& rObjk); virtual void Draw(OutputDevice& rOut); }; diff --git a/vcl/source/gdi/dibtools.cxx b/vcl/source/gdi/dibtools.cxx index 401074373cda..f4bb3c849244 100644 --- a/vcl/source/gdi/dibtools.cxx +++ b/vcl/source/gdi/dibtools.cxx @@ -1706,12 +1706,4 @@ bool WriteDIBBitmapEx( return false; } -bool WriteDIBV5( - const Bitmap& rSource, - const Bitmap& rSourceAlpha, - SvStream& rOStm) -{ - return ImplWriteDIB(rSource, &rSourceAlpha, rOStm, false, true); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index 4cd5334971be..bbdb4ebd2d07 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -2954,45 +2954,4 @@ void GDIMetaFile::UseCanvas( bool _bUseCanvas ) bUseCanvas = _bUseCanvas; } -MetaCommentAction* makePluggableRendererAction( const OUString& rRendererServiceName, - const OUString& rGraphicServiceName, - const void* _pData, - sal_uInt32 nDataSize ) -{ - const sal_uInt8* pData=static_cast<sal_uInt8 const *>(_pData); - - // FIXME: Data gets copied twice, unfortunately - OString aRendererServiceName( - rRendererServiceName.getStr(), - rRendererServiceName.getLength(), - RTL_TEXTENCODING_ASCII_US); - OString aGraphicServiceName( - rGraphicServiceName.getStr(), - rGraphicServiceName.getLength(), - RTL_TEXTENCODING_ASCII_US); - - std::vector<sal_uInt8> aMem( - aRendererServiceName.getLength()+ - aGraphicServiceName.getLength()+2+nDataSize); - sal_uInt8* pMem=&aMem[0]; - - std::copy(aRendererServiceName.getStr(), - aRendererServiceName.getStr()+aRendererServiceName.getLength()+1, - pMem); - pMem+=aRendererServiceName.getLength()+1; - std::copy(aGraphicServiceName.getStr(), - aGraphicServiceName.getStr()+aGraphicServiceName.getLength()+1, - pMem); - pMem+=aGraphicServiceName.getLength()+1; - - std::copy(pData,pData+nDataSize, - pMem); - - return new MetaCommentAction( - "DELEGATE_PLUGGABLE_RENDERER", - 0, - &aMem[0], - aMem.size()); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 88c4a6297d95..02c190c21426 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -387,36 +387,6 @@ bool QueueInfo::operator==( const QueueInfo& rInfo ) const mnJobs == rInfo.mnJobs; } -SvStream& WriteQueueInfo( SvStream& rOStream, const QueueInfo& rInfo ) -{ - VersionCompat aCompat( rOStream, StreamMode::WRITE, 1 ); - - write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maPrinterName, RTL_TEXTENCODING_UTF8); - write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maDriver, RTL_TEXTENCODING_UTF8); - write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maLocation, RTL_TEXTENCODING_UTF8); - write_uInt16_lenPrefixed_uInt8s_FromOUString(rOStream, rInfo.maComment, RTL_TEXTENCODING_UTF8); - rOStream.WriteUInt32( static_cast<sal_uInt32>(rInfo.mnStatus) ); - rOStream.WriteUInt32( rInfo.mnJobs ); - - return rOStream; -} - -SvStream& ReadQueueInfo( SvStream& rIStream, QueueInfo& rInfo ) -{ - VersionCompat aCompat( rIStream, StreamMode::READ ); - - rInfo.maPrinterName = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maDriver = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maLocation = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - rInfo.maComment = read_uInt16_lenPrefixed_uInt8s_ToOUString(rIStream, RTL_TEXTENCODING_UTF8); - sal_uInt32 nTmp; - rIStream.ReadUInt32( nTmp ); - rInfo.mnStatus = static_cast<PrintQueueFlags>(nTmp); - rIStream.ReadUInt32( rInfo.mnJobs ); - - return rIStream; -} - SalPrinterQueueInfo::SalPrinterQueueInfo() { mnStatus = PrintQueueFlags::NONE; diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 04cbdd2e7c30..0154aaafedee 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -153,38 +153,6 @@ std::ostream &operator <<(std::ostream& s, ImplLayoutArgs &rArgs) return s; } -// TODO: ask the glyph directly, for now we need this method because of #i99367# -// true if a codepoint doesn't influence the logical text width -bool IsDiacritic( sal_UCS4 nChar ) -{ - // shortcut obvious non-diacritics - if( nChar < 0x0300 ) - return false; - if( nChar >= 0x2100 ) - return false; - - // TODO: #i105058# use icu uchar.h's character classification instead of the handcrafted table - struct DiaRange { sal_UCS4 mnMin, mnEnd;}; - static const DiaRange aRanges[] = { - {0x0300, 0x0370}, - {0x0590, 0x05BE}, {0x05BF, 0x05C0}, {0x05C1, 0x05C3}, {0x05C4, 0x05C6}, {0x05C7, 0x05C8}, - {0x0610, 0x061B}, {0x064B, 0x0660}, {0x0670, 0x0671}, {0x06D6, 0x06DD}, {0x06DF, 0x06E5}, {0x06E7, 0x06E9}, {0x06EA,0x06EF}, - {0x0730, 0x074D}, {0x07A6, 0x07B1}, {0x07EB, 0x07F4}, - {0x1DC0, 0x1E00}, - {0x205F, 0x2070}, {0x20D0, 0x2100}, - {0xFB1E, 0xFB1F} - }; - - // TODO: almost anything is faster than an O(n) search - static const int nCount = SAL_N_ELEMENTS(aRanges); - const DiaRange* pRange = &aRanges[0]; - for( int i = nCount; --i >= 0; ++pRange ) - if( (pRange->mnMin <= nChar) && (nChar < pRange->mnEnd) ) - return true; - - return false; -} - int GetVerticalFlags( sal_UCS4 nChar ) { if( (nChar >= 0x1100 && nChar <= 0x11f9) // Hangul Jamo |