diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-01-24 11:08:48 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-01-24 16:53:56 +0000 |
commit | 17ecf0036d44657b954de6c8f7efd536ab5c4809 (patch) | |
tree | 313962191e32e2ab611e3e25b8237b6ad76a329b /vcl | |
parent | use read_lenPrefixed_uInt16s_ToOUString instead of hand-rolled loops (diff) | |
download | core-17ecf0036d44657b954de6c8f7efd536ab5c4809.tar.gz core-17ecf0036d44657b954de6c8f7efd536ab5c4809.zip |
callcatcher: update list, remove newly unused methods
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/inc/vcl/field.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/vcl/image.hxx | 1 | ||||
-rw-r--r-- | vcl/inc/vcl/longcurr.hxx | 2 | ||||
-rw-r--r-- | vcl/source/control/field.cxx | 21 | ||||
-rw-r--r-- | vcl/source/control/field2.cxx | 28 | ||||
-rw-r--r-- | vcl/source/control/longcurr.cxx | 35 | ||||
-rw-r--r-- | vcl/source/gdi/image.cxx | 11 |
7 files changed, 0 insertions, 102 deletions
diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index 311346ed6383..970c81d917dd 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -120,7 +120,6 @@ private: protected: PatternFormatter(); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplSetMask(const rtl::OString& rEditMask, const XubString& rLiteralMask); SAL_DLLPRIVATE sal_Bool ImplIsSameMask() const { return mbSameMask; } @@ -608,9 +607,6 @@ public: class VCL_DLLPUBLIC CurrencyField : public SpinField, public CurrencyFormatter { -protected: - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - public: CurrencyField( Window* pParent, WinBits nWinStyle ); diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index c76338a8ada0..cef4efa56a4d 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -162,7 +162,6 @@ private: const Color* pMaskColor ) const; SAL_DLLPRIVATE void ImplInit( sal_uInt16 nItems, const Size &rSize ); SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const ::rtl::OUString& rImageName ) const; - SAL_DLLPRIVATE void ImplMakeUnique(); }; #endif // _SV_IMAGE_HXX diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx index 60c4d9ff949f..1981000bc894 100644 --- a/vcl/inc/vcl/longcurr.hxx +++ b/vcl/inc/vcl/longcurr.hxx @@ -57,8 +57,6 @@ protected: sal_Bool mbThousandSep; LongCurrencyFormatter(); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - public: ~LongCurrencyFormatter(); diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx index 51c4ee2dbe26..823a70a8a696 100644 --- a/vcl/source/control/field.cxx +++ b/vcl/source/control/field.cxx @@ -2217,27 +2217,6 @@ CurrencyField::CurrencyField( Window* pParent, WinBits nWinStyle ) : // ----------------------------------------------------------------------- -void CurrencyField::ImplLoadRes( const ResId& rResId ) -{ - SpinField::ImplLoadRes( rResId ); - CurrencyFormatter::ImplLoadRes( ResId( (RSHEADER_TYPE *)GetClassRes(), *rResId.GetResMgr() ) ); - - sal_uLong nMask = ReadLongRes(); - - if ( CURRENCYFIELD_FIRST & nMask ) - mnFirst = ReadLongRes(); - - if ( CURRENCYFIELD_LAST & nMask ) - mnLast = ReadLongRes(); - - if ( CURRENCYFIELD_SPINSIZE & nMask ) - mnSpinSize = ReadLongRes(); - - Reformat(); -} - -// ----------------------------------------------------------------------- - CurrencyField::~CurrencyField() { } diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 93c36ef8f00a..e625a1f5641c 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -824,34 +824,6 @@ PatternFormatter::PatternFormatter() // ----------------------------------------------------------------------- -void PatternFormatter::ImplLoadRes( const ResId& rResId ) -{ - rtl::OString aEditMask; - XubString aLiteralMask; - ResMgr* pMgr = rResId.GetResMgr(); - if( pMgr ) - { - sal_uLong nMask = pMgr->ReadLong(); - - if ( PATTERNFORMATTER_STRICTFORMAT & nMask ) - SetStrictFormat( (sal_Bool)pMgr->ReadShort() ); - - if ( PATTERNFORMATTER_EDITMASK & nMask ) - { - aEditMask = rtl::OUStringToOString(pMgr->ReadString(), - RTL_TEXTENCODING_ASCII_US); - } - - if ( PATTERNFORMATTER_LITTERALMASK & nMask ) - aLiteralMask = pMgr->ReadString(); - - if ( (PATTERNFORMATTER_EDITMASK | PATTERNFORMATTER_LITTERALMASK) & nMask ) - ImplSetMask( aEditMask, aLiteralMask ); - } -} - -// ----------------------------------------------------------------------- - PatternFormatter::~PatternFormatter() { } diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index 6407f480f913..8f4eb0166298 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -344,41 +344,6 @@ LongCurrencyFormatter::LongCurrencyFormatter() // ----------------------------------------------------------------------- -void LongCurrencyFormatter::ImplLoadRes( const ResId& rResId ) -{ - ImpInit(); - - ResMgr* pMgr = rResId.GetResMgr(); - if( pMgr ) - { - sal_uLong nMask = pMgr->ReadLong(); - - if ( NUMERICFORMATTER_MIN & nMask ) - mnMin = pMgr->ReadLong(); - - if ( NUMERICFORMATTER_MAX & nMask ) - mnMax = pMgr->ReadLong(); - - if ( NUMERICFORMATTER_STRICTFORMAT & nMask ) - SetStrictFormat( (sal_Bool)pMgr->ReadShort() ); - - if ( NUMERICFORMATTER_DECIMALDIGITS & nMask ) - SetDecimalDigits( pMgr->ReadShort() ); - - if ( NUMERICFORMATTER_VALUE & nMask ) - { - mnFieldValue = pMgr->ReadLong(); - if ( mnFieldValue > mnMax ) - mnFieldValue = mnMax; - else if ( mnFieldValue < mnMin ) - mnFieldValue = mnMin; - mnLastValue = mnFieldValue; - } - } -} - -// ----------------------------------------------------------------------- - LongCurrencyFormatter::~LongCurrencyFormatter() { } diff --git a/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx index ce63d9dbf595..7860745ca187 100644 --- a/vcl/source/gdi/image.cxx +++ b/vcl/source/gdi/image.cxx @@ -470,17 +470,6 @@ void ImageAryData::Load(const rtl::OUString &rPrefix) } // ----------------------------------------------------------------------- - -void ImageList::ImplMakeUnique() -{ - if( mpImplData && mpImplData->mnRefCount > 1 ) - { - --mpImplData->mnRefCount; - mpImplData = new ImplImageList( *mpImplData ) ; - } -} - -// ----------------------------------------------------------------------- // Rather a performance hazard: BitmapEx ImageList::GetAsHorizontalStrip() const { |