diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-03 10:49:42 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-03 13:30:49 +0100 |
commit | 03b9b942e73d3578e6469a390235e7837f16c9f7 (patch) | |
tree | 432dded0805a1d1701a83a25c8cdc97f3a5efd3e | |
parent | d6530ee225a1132fba5e9ce1819ecd6e8c8ef2c9 (diff) |
callcatcher: remove unused methods
-rw-r--r-- | binfilter/bf_basic/source/basmgr/basmgr.cxx | 78 | ||||
-rw-r--r-- | binfilter/bf_svtools/source/numbers/svt_zformat.cxx | 12 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/inc/laycache.hxx | 2 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 24 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 4 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 6 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 46 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx | 16 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/tox/sw_tox.cxx | 13 | ||||
-rw-r--r-- | binfilter/inc/bf_basic/basmgr.hxx | 1 | ||||
-rw-r--r-- | binfilter/inc/bf_svtools/zformat.hxx | 2 |
11 files changed, 0 insertions, 204 deletions
diff --git a/binfilter/bf_basic/source/basmgr/basmgr.cxx b/binfilter/bf_basic/source/basmgr/basmgr.cxx index a3e63721b..8a26d612d 100644 --- a/binfilter/bf_basic/source/basmgr/basmgr.cxx +++ b/binfilter/bf_basic/source/basmgr/basmgr.cxx @@ -462,7 +462,6 @@ public: void SetRelStorageName( const String& rN ) { aRelStorageName = rN; } const String& GetRelStorageName() const { return aRelStorageName; } - void CalcRelStorageName( const String& rMgrStorageName ); StarBASICRef GetLib() const { @@ -656,20 +655,6 @@ BasicLibInfo* BasicLibInfo::Create( SotStorageStream& rSStream ) return pInfo; } -void BasicLibInfo::CalcRelStorageName( const String& rMgrStorageName ) -{ - if ( rMgrStorageName.Len() ) - { - INetURLObject aAbsURLObj( rMgrStorageName ); - aAbsURLObj.removeSegment(); - String aPath = aAbsURLObj.GetMainURL( INetURLObject::NO_DECODE ); - UniString aRelURL = INetURLObject::GetRelURL( aPath, GetStorageName() ); - SetRelStorageName( aRelURL ); - } - else - SetRelStorageName( String() ); -} - BasicManager::BasicManager( SotStorage& rStorage, const String& rBaseURL, StarBASIC* pParentFromStdLib, String* pLibPath ) { DBG_CTOR( BasicManager, 0 ); @@ -1169,69 +1154,6 @@ BasicLibInfo* BasicManager::CreateLibInfo() return pInf; } -BOOL BasicManager::ImpStoreLibary( StarBASIC* pLib, SotStorage& rStorage ) const -{ - DBG_CHKTHIS( BasicManager, 0 ); - DBG_ASSERT( pLib, "pLib = 0 (ImpStorageLibary)" ); - - SotStorageRef xBasicStorage = rStorage.OpenSotStorage - ( BasicStreamName, STREAM_STD_READWRITE, FALSE ); - - String aStorName( rStorage.GetName() ); - DBG_ASSERT( aStorName.Len(), "No Storage Name!" ); - if ( !xBasicStorage.Is() || xBasicStorage->GetError() ) - { - StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_MGRSAVE, aStorName, ERRCODE_BUTTON_OK ); - ((BasicManager*)this)->pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_OPENLIBSTORAGE, pLib->GetName() ) ); - } - else - { - // In dem Basic-Storage liegt jede Lib in einem Stream... - SotStorageStreamRef xBasicStream = xBasicStorage->OpenSotStream( pLib->GetName(), STREAM_STD_READWRITE ); - if ( !xBasicStream.Is() || xBasicStream->GetError() ) - { - StringErrorInfo* pErrInf = new StringErrorInfo( ERRCODE_BASMGR_LIBSAVE, pLib->GetName(), ERRCODE_BUTTON_OK ); - ((BasicManager*)this)->pErrorMgr->InsertError( BasicError( *pErrInf, BASERR_REASON_OPENLIBSTREAM, pLib->GetName() ) ); - } - else - { - BasicLibInfo* pLibInfo = FindLibInfo( pLib ); - DBG_ASSERT( pLibInfo, "ImpStoreLibary: LibInfo?!" ); - - xBasicStream->SetSize( 0 ); - xBasicStream->SetBufferSize( 1024 ); - - // SBX_DONTSTORE, damit Child-Basics nicht gespeichert werden - SetFlagToAllLibs( SBX_DONTSTORE, TRUE ); - // Aber das hier will ich jetzt speichern: - pLib->ResetFlag( SBX_DONTSTORE ); - if ( pLibInfo->HasPassword() ) - xBasicStream->SetCryptMaskKey(szCryptingKey); - BOOL bDone = pLib->Store( *xBasicStream ); - xBasicStream->SetBufferSize( 0 ); - if ( bDone ) - { - // Diese Informationen immer verschluesseln... - xBasicStream->SetBufferSize( 1024 ); - xBasicStream->SetCryptMaskKey(szCryptingKey); - *xBasicStream << static_cast<sal_uInt32>(PASSWORD_MARKER); - String aTmpPassword = pLibInfo->GetPassword(); - xBasicStream->WriteByteString( aTmpPassword, RTL_TEXTENCODING_MS_1252 ); - xBasicStream->SetBufferSize( 0 ); - } - // Vorsichtshalber alle Dont't Store lassen... - pLib->SetFlag( SBX_DONTSTORE ); - pLib->SetModified( FALSE ); - if( !xBasicStorage->Commit() ) - bDone = FALSE; - xBasicStream->SetCryptMaskKey(rtl::OString()); - DBG_ASSERT( bDone, "Warum geht Basic::Store() nicht ?" ); - return bDone; - } - } - return FALSE; -} - BOOL BasicManager::ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly ) const { DBG_CHKTHIS( BasicManager, 0 ); diff --git a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx index fe73f1ae2..bae404d1e 100644 --- a/binfilter/bf_svtools/source/numbers/svt_zformat.cxx +++ b/binfilter/bf_svtools/source/numbers/svt_zformat.cxx @@ -281,18 +281,6 @@ void ImpSvNumFor::Load(SvStream& rStream, ImpSvNumberformatScan& rSc, pColor = rSc.GetColor(sColorName); } - -BOOL ImpSvNumFor::HasNewCurrency() const -{ - for ( USHORT j=0; j<nAnzStrings; j++ ) - { - if ( aI.nTypeArray[j] == NF_SYMBOLTYPE_CURRENCY ) - return TRUE; - } - return FALSE; -} - - BOOL ImpSvNumFor::GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const { diff --git a/binfilter/bf_sw/source/core/inc/laycache.hxx b/binfilter/bf_sw/source/core/inc/laycache.hxx index d1bbf4d0d..5eaa785f8 100644 --- a/binfilter/bf_sw/source/core/inc/laycache.hxx +++ b/binfilter/bf_sw/source/core/inc/laycache.hxx @@ -54,8 +54,6 @@ public: SwLayoutCache() : pImpl( NULL ), nLockCount( 0 ) {} ~SwLayoutCache(); - void Read( SvStream &rStream ); - void ClearImpl(); sal_Bool IsLocked() const { return nLockCount > 0; } USHORT& GetLockCount() { return nLockCount; } diff --git a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx index 8bc37ec13..dbfc80230 100644 --- a/binfilter/bf_sw/source/core/layout/sw_laycache.cxx +++ b/binfilter/bf_sw/source/core/layout/sw_laycache.cxx @@ -63,30 +63,6 @@ namespace binfilter { /*N*/ SV_IMPL_PTRARR( SwPageFlyCache, SwFlyCachePtr ) -/* - * Reading and writing of the layout cache. - * The layout cache is not necessary, but it improves - * the performance and reduces the text flow during - * the formatting. - * The layout cache contains the index of the paragraphs/tables - * at the top of every page, so it's possible to create - * the right count of pages and to distribute the document content - * to this pages before the formatting starts. - */ - -/*N*/ void SwLayoutCache::Read( SvStream &rStream ) -/*N*/ { -/*N*/ if( !pImpl ) -/*N*/ { -/*N*/ pImpl = new SwLayCacheImpl; -/*N*/ if( !pImpl->Read( rStream ) ) -/*N*/ { -/*?*/ delete pImpl; -/*?*/ pImpl = 0; -/*N*/ } -/*N*/ } -/*N*/ } - //----------------------------------------------------------------------------- /*N*/ void SwLayCacheImpl::Insert( USHORT nType, ULONG nIndex, xub_StrLen nOffset ) diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx index d93ea2be0..a02f76abd 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx +++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx @@ -519,8 +519,6 @@ public: void CloseValuePos32( UINT32 ); // UINT32-Wert an Position eintragen ULONG BytesLeft(); // wie viele Bytes hat der Record noch? void CheckIoError( SvStream*); // korrekten E/A-Fehlercode setzen - static ByteString ConvertStringNoDbDelim( const String& rStr, - rtl_TextEncoding eSource ); static String ConvertStringNoDbDelim( const ByteString& rStr, rtl_TextEncoding eSource ); static ByteString ConvertStringNoDelim( const String& rStr, @@ -685,7 +683,6 @@ public: void OutNodeNum( const SwNodeNum& ); // O: Absatz-Numerierung void InEndNoteInfo( SwEndNoteInfo &rENInf ); // I: globale Endnoten-Info - void OutEndNoteInfo( const SwEndNoteInfo &rENInf ); // O: globale Endnoten-Info void InEndNoteInfo(); // I: globale Endnoten-Info void InFtnInfo(); // I: globale Fussnoten-Info void InFtnInfo40(); // I: globale Fussn.-Info 3.1/4.0 @@ -694,7 +691,6 @@ public: // SW3PAGE.CXX void InPageFtnInfo( SwPageFtnInfo& ); // I: Fussnoten-Info - void OutPageFtnInfo( const SwPageFtnInfo& rFtn ); void InPageDescs(); // I: alle Seitenvorlagen SwPageDesc* InPageDesc( USHORT& ); // I: Seitenvorlage void ConnectPageDescAttrs(); // I: PageDesc-Referenzen aufloesen diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx index 69417d8c6..a012b0eed 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx @@ -1644,12 +1644,6 @@ void Sw3StringPool::LoadOld( SvStream& r ) /*N*/ nExpFFVersion = 0; // um ungesetzte Version zu erkennen! /*N*/ } -/*N*/ ByteString Sw3IoImp::ConvertStringNoDbDelim( const String& rStr, -/*N*/ rtl_TextEncoding eSource ) -/*N*/ { -/*N*/ return ConvertStringNoDelim( rStr, DB_DELIM, '\xff', eSource ); -/*N*/ } -/*N*/ /*N*/ String Sw3IoImp::ConvertStringNoDbDelim( const ByteString& rStr, /*N*/ rtl_TextEncoding eSource ) /*N*/ { diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx index 52d459505..0d046ff37 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx @@ -1123,52 +1123,6 @@ void lcl_sw3io__copyNumRule( const SwNumRule& rSrc, SwNumRule& rDst ) /*N*/ rENInf.SetSuffix( sSuffix ); /*N*/ } - -// globale Fussnoten-Info ausgeben - -/*N*/ void Sw3IoImp::OutEndNoteInfo( const SwEndNoteInfo &rENInf ) -/*N*/ { -/*N*/ SwTxtFmtColl* pColl = rENInf.GetFtnTxtColl(); -/*N*/ USHORT nCollIdx = pColl ? aStringPool.Add( pColl->GetName(), -/*N*/ pColl->GetPoolFmtId() ) -/*N*/ : IDX_NO_VALUE; -/*N*/ -/*N*/ const SwPageDesc *pDesc = (const SwPageDesc *)rENInf.GetPageDescDep() -/*N*/ ->GetRegisteredIn(); -/*N*/ USHORT nPageIdx = pDesc ? aStringPool.Find( pDesc->GetName(), -/*N*/ pDesc->GetPoolFmtId() ) -/*N*/ : IDX_NO_VALUE; -/*N*/ -/*N*/ const SwCharFmt *pCharFmt = (const SwCharFmt *)rENInf.GetCharFmtDep() -/*N*/ ->GetRegisteredIn(); -/*N*/ USHORT nChrIdx = pCharFmt ? aStringPool.Find( pCharFmt->GetName(), -/*N*/ pCharFmt->GetPoolFmtId() ) -/*N*/ : IDX_NO_VALUE; -/*N*/ -/*N*/ BYTE nFlags = 0x09; // 9 bytes of data -/*N*/ pCharFmt = (const SwCharFmt *)rENInf.GetAnchorCharFmtDep()->GetRegisteredIn(); -/*N*/ USHORT nAnchorChrIdx = pCharFmt ? aStringPool.Find( pCharFmt->GetName(), -/*N*/ pCharFmt->GetPoolFmtId() ) -/*N*/ : IDX_NO_VALUE; -/*N*/ if( IDX_NO_VALUE != nAnchorChrIdx && nAnchorChrIdx != -/*N*/ ( rENInf.IsEndNoteInfo() ? RES_POOLCHR_FOOTNOTE_ANCHOR -/*N*/ : RES_POOLCHR_ENDNOTE_ANCHOR )) -/*N*/ nFlags += 0x12; -/*N*/ -/*N*/ *pStrm << nFlags -/*N*/ << (BYTE) rENInf.aFmt.GetNumberingType() -/*N*/ << (UINT16) nPageIdx -/*N*/ << (UINT16) nCollIdx -/*N*/ << (UINT16) rENInf.nFtnOffset -/*N*/ << (UINT16) nChrIdx; -/*N*/ -/*N*/ if( 0x10 & nFlags ) -/*N*/ *pStrm << (UINT16) nAnchorChrIdx; -/*N*/ -/*N*/ OutString( *pStrm, rENInf.GetPrefix() ); -/*N*/ OutString( *pStrm, rENInf.GetSuffix() ); -/*N*/ } - /*N*/ void Sw3IoImp::InEndNoteInfo() /*N*/ { /*N*/ OpenRec( SWG_ENDNOTEINFO ); diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx index fbf0da0f1..3cf1d8b76 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx @@ -88,22 +88,6 @@ namespace binfilter { /*N*/ Error(); /*N*/ } -// Fussnoten-Info ausgeben - -/*N*/ void Sw3IoImp::OutPageFtnInfo( const SwPageFtnInfo& rFtn ) -/*N*/ { -/*N*/ OpenRec( SWG_PAGEFOOTINFO ); -/*N*/ *pStrm << (INT32) rFtn.GetHeight() -/*N*/ << (INT32) rFtn.GetTopDist() -/*N*/ << (INT32) rFtn.GetBottomDist() -/*N*/ << (INT16) rFtn.GetAdj() -/*N*/ << (INT32) rFtn.GetWidth().GetNumerator() -/*N*/ << (INT32) rFtn.GetWidth().GetDenominator() -/*N*/ << (INT16) rFtn.GetLineWidth() -/*N*/ << rFtn.GetLineColor(); -/*N*/ CloseRec( SWG_PAGEFOOTINFO ); -/*N*/ } - /*N*/ void Sw3IoImp::InPageDescs() /*N*/ { /*N*/ if( Peek() != SWG_STRINGPOOL ) diff --git a/binfilter/bf_sw/source/core/tox/sw_tox.cxx b/binfilter/bf_sw/source/core/tox/sw_tox.cxx index 8d3e3c317..3e67e9afc 100644 --- a/binfilter/bf_sw/source/core/tox/sw_tox.cxx +++ b/binfilter/bf_sw/source/core/tox/sw_tox.cxx @@ -415,19 +415,6 @@ String lcl_GetAuthPattern(USHORT nTypeId) /*N*/ return nRet; /*N*/ } -/*N*/ String lcl_GetPattern( const String& rPattern, const sal_Char* pToken ) -/*N*/ { -/*N*/ String sRet; -/*N*/ String aSearch; aSearch.AssignAscii( pToken ); -/*N*/ aSearch.Erase( aSearch.Len() - 1, 1 ); -/*N*/ -/*N*/ xub_StrLen nEnd, nFound = rPattern.Search( aSearch ); -/*N*/ if( STRING_NOTFOUND != nFound && -/*N*/ STRING_NOTFOUND != ( nEnd = rPattern.Search( '>', nFound )) ) -/*N*/ sRet = rPattern.Copy( nFound, nEnd - nFound + 1 ); -/*N*/ return sRet; -/*N*/ } - void SwForm::SetFirstTabPos( USHORT n ) //{ nFirstTabPos = n; } { // the tab stop token looks like: <T ,,1234,0,.> <T> <T ,,1234> diff --git a/binfilter/inc/bf_basic/basmgr.hxx b/binfilter/inc/bf_basic/basmgr.hxx index a3bd2b1b7..cf9b4824a 100644 --- a/binfilter/inc/bf_basic/basmgr.hxx +++ b/binfilter/inc/bf_basic/basmgr.hxx @@ -152,7 +152,6 @@ private: void Init(); protected: - BOOL ImpStoreLibary( StarBASIC* pLib, SotStorage& rStorage ) const; BOOL ImpLoadLibary( BasicLibInfo* pLibInfo ) const; BOOL ImpLoadLibary( BasicLibInfo* pLibInfo, SotStorage* pCurStorage, BOOL bInfosOnly = FALSE ) const; void ImpCreateStdLib( StarBASIC* pParentFromStdLib ); diff --git a/binfilter/inc/bf_svtools/zformat.hxx b/binfilter/inc/bf_svtools/zformat.hxx index f10511882..74759ccae 100644 --- a/binfilter/inc/bf_svtools/zformat.hxx +++ b/binfilter/inc/bf_svtools/zformat.hxx @@ -153,8 +153,6 @@ public: { pColor = pCol; sColorName = rName; } const String& GetColorName() const { return sColorName; } - // new SYMBOLTYPE_CURRENCY in subformat? - BOOL HasNewCurrency() const; BOOL GetNewCurrencySymbol( String& rSymbol, String& rExtension ) const; void SaveNewCurrencyMap( SvStream& rStream ) const; void LoadNewCurrencyMap( SvStream& rStream ); |