diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-11-14 09:27:04 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-14 10:11:33 +0000 |
commit | 690ce9f1b95c0bb2e8401771c376d3052009c9af (patch) | |
tree | 514eaf197e0f7a5c665c4a847505d924dbf05201 | |
parent | fb0b27491dbb0186ac20574b47c904b4c44eac83 (diff) |
callcatcher: more binfilter freed up methods
Change-Id: Iea3716e5c7a21f083f36ce4b8d43ae9fc85227f7
-rw-r--r-- | Makefile.top | 1 | ||||
-rw-r--r-- | desktop/source/deployment/gui/descedit.cxx | 15 | ||||
-rw-r--r-- | desktop/source/deployment/gui/descedit.hxx | 1 | ||||
-rw-r--r-- | sot/inc/sot/stg.hxx | 7 | ||||
-rw-r--r-- | sot/inc/sot/storage.hxx | 1 | ||||
-rw-r--r-- | sot/source/sdstor/storage.cxx | 14 | ||||
-rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 98 | ||||
-rw-r--r-- | tools/inc/tools/inetmime.hxx | 8 | ||||
-rw-r--r-- | tools/source/inet/inetmime.cxx | 60 | ||||
-rwxr-xr-x | unusedcode.easy | 6 |
10 files changed, 6 insertions, 205 deletions
diff --git a/Makefile.top b/Makefile.top index 82ce7f84dc68..af7d91d99125 100644 --- a/Makefile.top +++ b/Makefile.top @@ -531,6 +531,7 @@ findunusedcode: | grep -v ^libwps_tools_win:: \ | grep -v ^lucene:: \ | grep -v ^Matrix3d:: \ + | grep -v ^RelatedMultipart:: \ | grep -v ^salhelper:: \ | grep -v ^VSDInternalStream:: \ | grep -v ^WP1 \ diff --git a/desktop/source/deployment/gui/descedit.cxx b/desktop/source/deployment/gui/descedit.cxx index 6e7511699d95..904adf350b38 100644 --- a/desktop/source/deployment/gui/descedit.cxx +++ b/desktop/source/deployment/gui/descedit.cxx @@ -55,21 +55,6 @@ void DescriptionEdit::Init() // ----------------------------------------------------------------------- -void DescriptionEdit::UpdateScrollBar() -{ - if ( m_bIsVerticalScrollBarHidden ) - { - ScrollBar* pVScrBar = GetVScrollBar(); - if ( pVScrBar && pVScrBar->GetVisibleSize() < pVScrBar->GetRangeMax() ) - { - pVScrBar->Show(); - m_bIsVerticalScrollBarHidden = false; - } - } -} - -// ----------------------------------------------------------------------- - void DescriptionEdit::Clear() { SetText( String() ); diff --git a/desktop/source/deployment/gui/descedit.hxx b/desktop/source/deployment/gui/descedit.hxx index 7c8eb3e20a25..a7a7b0cf2cbb 100644 --- a/desktop/source/deployment/gui/descedit.hxx +++ b/desktop/source/deployment/gui/descedit.hxx @@ -33,7 +33,6 @@ namespace dp_gui bool m_bIsVerticalScrollBarHidden; void Init(); - void UpdateScrollBar(); public: DescriptionEdit( Window* pParent, const ResId& rResId ); diff --git a/sot/inc/sot/stg.hxx b/sot/inc/sot/stg.hxx index 183ffaa8856f..711dce29cc77 100644 --- a/sot/inc/sot/stg.hxx +++ b/sot/inc/sot/stg.hxx @@ -267,11 +267,8 @@ public: const SvStream* GetSvStream() const; virtual sal_Bool Equals( const BaseStorageStream& rStream ) const; sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); - sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); SvStream* GetModifySvStream(); - - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetXInputStream() const; }; namespace ucbhelper @@ -355,20 +352,16 @@ public: virtual const SvStream* GetSvStream() const; virtual sal_Bool Equals( const BaseStorage& rStream ) const; sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); - sal_Bool GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ); sal_Bool GetProperty( const String& rEleName, const String& rName, ::com::sun::star::uno::Any& rValue ); -//#if _SOLAR__PRIVATE UCBStorageElement_Impl* FindElement_Impl( const String& rName ) const; sal_Bool CopyStorageElement_Impl( UCBStorageElement_Impl& rElement, BaseStorage* pDest, const String& rNew ) const; BaseStorage* OpenStorage_Impl( const String & rEleName, StreamMode, sal_Bool bDirect, sal_Bool bForceUCBStorage ); -//#endif }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx index abe1d831fa08..2f92517270c0 100644 --- a/sot/inc/sot/storage.hxx +++ b/sot/inc/sot/storage.hxx @@ -197,7 +197,6 @@ public: virtual sal_Bool MoveTo( const String & rEleName, SotStorage * pDest, const String & rNewName ); - sal_Bool SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ); sal_Bool IsOLEStorage() const; static sal_Bool IsOLEStorage( const String & rFileName ); static sal_Bool IsOLEStorage( SvStream* pStream ); diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx index 5fd1efa0b8b0..dbfeefc36424 100644 --- a/sot/source/sdstor/storage.cxx +++ b/sot/source/sdstor/storage.cxx @@ -1047,20 +1047,6 @@ sal_Bool SotStorage::Validate() return sal_True; } -sal_Bool SotStorage::SetProperty( const String& rName, const ::com::sun::star::uno::Any& rValue ) -{ - UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg ); - if ( pStg ) - { - return pStg->SetProperty( rName, rValue ); - } - else - { - DBG_WARNING("W1:Not implemented!"); - return sal_False; - } -} - sal_Bool SotStorage::IsOLEStorage() const { UCBStorage* pStg = PTR_CAST( UCBStorage, m_pOwnStg ); diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index c3158c5f3daf..c0a0021fe024 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -453,9 +453,6 @@ public: sal_uLong CopySourceToTemporary(); // same as ReadSourceWriteToTemporary() // but the writing is done at the end of temporary // pointer position is not changed - Reference<XInputStream> GetXInputStream(); // return XInputStream, after that - // this class is close to be unusable - // since it can not read and write using SvStream::SetError; void SetError( sal_uInt32 nError ); void PrepareCachedForReopen( StreamMode nMode ); @@ -710,62 +707,6 @@ UCBStorageStream_Impl::~UCBStorageStream_Impl() } -Reference<XInputStream> UCBStorageStream_Impl::GetXInputStream() -{ - Reference< XInputStream > aResult; - - if( m_pAntiImpl && m_nRepresentMode != nonset ) - { - OSL_FAIL( "Misuse of the XInputstream!" ); - SetError( ERRCODE_IO_ACCESSDENIED ); - } - else - { - if( m_bModified ) - { - // use wrapper around temporary stream - if( Init() ) - { - CopySourceToTemporary(); - - // owner transfer of stream to wrapper - aResult = new ::utl::OInputStreamWrapper( m_pStream, sal_True ); - m_pStream->Seek(0); - - if( aResult.is() ) - { - // temporary stream can not be used here any more - // and can not be opened untill wrapper is closed - // stream is deleted by wrapper after use - m_pStream = NULL; - m_nRepresentMode = xinputstream; - } - } - } - else - { - Free(); - - // open a new instance of XInputStream - try - { - aResult = m_pContent->openStream(); - } - catch (const Exception&) - { - // usually means that stream could not be opened - } - - if( aResult.is() ) - m_nRepresentMode = xinputstream; - else - SetError( ERRCODE_IO_ACCESSDENIED ); - } - } - - return aResult; -} - sal_Bool UCBStorageStream_Impl::Init() { if( m_nRepresentMode == xinputstream ) @@ -1420,11 +1361,6 @@ SvStream* UCBStorageStream::GetModifySvStream() return (SvStream*)pImp; } -Reference< XInputStream > UCBStorageStream::GetXInputStream() const -{ - return pImp->GetXInputStream(); -} - sal_Bool UCBStorageStream::Equals( const BaseStorageStream& rStream ) const { // ??? @@ -1508,23 +1444,6 @@ sal_Bool UCBStorageStream::SetProperty( const String& rName, const ::com::sun::s return sal_False; } -sal_Bool UCBStorageStream::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ) -{ - try - { - if ( pImp->m_pContent ) - { - rValue = pImp->m_pContent->getPropertyValue( rName ); - return sal_True; - } - } - catch (const Exception&) - { - } - - return sal_False; -} - sal_uLong UCBStorageStream::GetSize() const { return pImp->GetSize(); @@ -3361,21 +3280,4 @@ sal_Bool UCBStorage::SetProperty( const String& rName, const ::com::sun::star::u return sal_False; } -sal_Bool UCBStorage::GetProperty( const String& rName, ::com::sun::star::uno::Any& rValue ) -{ - try - { - if ( pImp->GetContent() ) - { - rValue = pImp->m_pContent->getPropertyValue( rName ); - return sal_True; - } - } - catch (const Exception&) - { - } - - return sal_False; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx index 2e0e483fde2e..296a08e50a9a 100644 --- a/tools/inc/tools/inetmime.hxx +++ b/tools/inc/tools/inetmime.hxx @@ -420,11 +420,6 @@ public: static const sal_Unicode * skipComment(const sal_Unicode * pBegin, const sal_Unicode * pEnd); - static const sal_Char * skipLinearWhiteSpaceComment(const sal_Char * - pBegin, - const sal_Char * - pEnd); - static const sal_Unicode * skipLinearWhiteSpaceComment(const sal_Unicode * pBegin, const sal_Unicode * @@ -438,9 +433,6 @@ public: static const sal_Unicode * skipQuotedString(const sal_Unicode * pBegin, const sal_Unicode * pEnd); - static bool scanUnsigned(const sal_Char *& rBegin, const sal_Char * pEnd, - bool bLeadingZeroes, sal_uInt32 & rValue); - static bool scanUnsigned(const sal_Unicode *& rBegin, const sal_Unicode * pEnd, bool bLeadingZeroes, sal_uInt32 & rValue); diff --git a/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx index 2def17c82266..834583e01c67 100644 --- a/tools/source/inet/inetmime.cxx +++ b/tools/source/inet/inetmime.cxx @@ -575,44 +575,6 @@ const sal_Unicode * INetMIME::skipComment(const sal_Unicode * pBegin, } // static -const sal_Char * INetMIME::skipLinearWhiteSpaceComment(const sal_Char * - pBegin, - const sal_Char * pEnd) -{ - DBG_ASSERT(pBegin && pBegin <= pEnd, - "INetMIME::skipLinearWhiteSpaceComment(): Bad sequence"); - - while (pBegin != pEnd) - switch (*pBegin) - { - case '\t': - case ' ': - ++pBegin; - break; - - case 0x0D: // CR - if (startsWithLineFolding(pBegin, pEnd)) - pBegin += 3; - else - return pBegin; - break; - - case '(': - { - const sal_Char * p = skipComment(pBegin, pEnd); - if (p == pBegin) - return pBegin; - pBegin = p; - break; - } - - default: - return pBegin; - } - return pBegin; -} - -// static const sal_Unicode * INetMIME::skipLinearWhiteSpaceComment(const sal_Unicode * pBegin, const sal_Unicode * @@ -708,28 +670,6 @@ const sal_Unicode * INetMIME::skipQuotedString(const sal_Unicode * pBegin, } // static -bool INetMIME::scanUnsigned(const sal_Char *& rBegin, const sal_Char * pEnd, - bool bLeadingZeroes, sal_uInt32 & rValue) -{ - sal_uInt64 nTheValue = 0; - const sal_Char * p = rBegin; - for ( ; p != pEnd; ++p) - { - int nWeight = getWeight(*p); - if (nWeight < 0) - break; - nTheValue = 10 * nTheValue + nWeight; - if (nTheValue > std::numeric_limits< sal_uInt32 >::max()) - return false; - } - if (nTheValue == 0 && (p == rBegin || (!bLeadingZeroes && p - rBegin != 1))) - return false; - rBegin = p; - rValue = sal_uInt32(nTheValue); - return true; -} - -// static bool INetMIME::scanUnsigned(const sal_Unicode *& rBegin, const sal_Unicode * pEnd, bool bLeadingZeroes, sal_uInt32 & rValue) diff --git a/unusedcode.easy b/unusedcode.easy index cd2ce8cebfe5..55a29aebe09c 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -4,7 +4,6 @@ GraphicObject::SwapIn(SvStream*) LiblantagDataRef::presetDataPath(rtl::OUString const&) Line::GetLength() const Line::Intersection(Rectangle const&, Line&) const -RelatedMultipart::getIds() SanExtensionImpl::setCertExtn(unsigned char*, unsigned int, unsigned char*, unsigned int, unsigned char) ScFiltersTest::testColorScaleODS() ScFiltersTest::testColorScaleXLSX() @@ -70,6 +69,11 @@ svgio::svgreader::SvgStyleAttributes::setFillRule(bool const*) svgio::svgreader::pathTextBreakupHelper::getLength(rtl::OUString const&) const test::BootstrapFixtureBase::getPathFromWorkdir(char const*) test::BootstrapFixtureBase::getURLFromWorkdir(char const*) +unicode::isAlphaDigit(unsigned short) +unicode::isDigit(unsigned short) +unicode::isLower(unsigned short) +unicode::isPrint(unsigned short) +unicode::isUpper(unsigned short) writerfilter::analyzerIds() writerfilter::createAnalyzer() writerfilter::createStreamHandler() |