diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-08-03 22:24:34 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-04 09:35:53 +0100 |
commit | 3846455f87478cc391f3c8da424286e5afb33618 (patch) | |
tree | 495469baff2b44615d439d61f7e15fb26135ed52 | |
parent | eb88ad05c3fdecd6bee4a127eeccc2645af8b6ac (diff) |
callcatcher: remove unused methods
-rw-r--r-- | binfilter/bf_forms/source/misc/forms_services.cxx | 17 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 41 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 76 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/fields/sw_dbfld.cxx | 25 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx | 12 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/sw3io/sw3imp.hxx | 2 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 11 | ||||
-rw-r--r-- | binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx | 12 | ||||
-rw-r--r-- | binfilter/inc/bf_sw/crsrsh.hxx | 90 | ||||
-rw-r--r-- | binfilter/inc/bf_sw/dbfld.hxx | 1 | ||||
-rw-r--r-- | binfilter/inc/bf_sw/doc.hxx | 3 |
11 files changed, 1 insertions, 289 deletions
diff --git a/binfilter/bf_forms/source/misc/forms_services.cxx b/binfilter/bf_forms/source/misc/forms_services.cxx index 78cae8125..4369a9012 100644 --- a/binfilter/bf_forms/source/misc/forms_services.cxx +++ b/binfilter/bf_forms/source/misc/forms_services.cxx @@ -440,23 +440,6 @@ void ensureClassInfos() REGISTER_CLASS1(ImageProducer, SRV_AWT_IMAGEPRODUCER); } -//--------------------------------------------------------------------------------------- -void registerServiceProvider(const ::rtl::OUString& _rServiceImplName, const Sequence< ::rtl::OUString >& _rServices, starregistry::XRegistryKey* _pKey) -{ - ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" )); - sMainKeyName += _rServiceImplName; - sMainKeyName += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )); - Reference<starregistry::XRegistryKey> xNewKey = _pKey->createKey(sMainKeyName); - OSL_ENSURE(xNewKey.is(), "forms::registerProvider : could not create a registry key !"); - if (!xNewKey.is()) - return; - - const ::rtl::OUString* pSupportedServices = _rServices.getConstArray(); - for (sal_Int32 i=0; i<_rServices.getLength(); ++i, ++pSupportedServices) - xNewKey->createKey(*pSupportedServices); -} - -//======================================================================================= extern "C" { diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx index 9bfa18016..48bb6f136 100644 --- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx +++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx @@ -774,11 +774,6 @@ using namespace ::com::sun::star::util; #if defined(DBG_UTIL) || defined(WIN) -/*N*/ SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const -/*N*/ { -/*N*/ return (SwCursor*)GetCrsr( bMakeTblCrsr ); -/*N*/ } - // gebe den Stack Cursor zurueck /*N*/ SwPaM * SwCrsrShell::GetStkCrsr() const { return pCrsrStk; } @@ -794,43 +789,7 @@ using namespace ::com::sun::star::util; /*N*/ return IsTableMode() || pCurCrsr->HasMark() || /*N*/ pCurCrsr->GetNext() != pCurCrsr; /*N*/ } -// returns if multiple cursors are available -/*N*/ bool SwCrsrShell::IsMultiSelection() const -/*N*/ { -/*N*/ return pCurCrsr->GetNext() != pCurCrsr; -/*N*/ } - -// pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen -/*N*/ const SwTableNode* SwCrsrShell::IsCrsrInTbl( BOOL bIsPtInTbl ) const -/*N*/ { -/*N*/ return pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode(); -/*N*/ } - - -/*?*/ bool SwCrsrShell::IsCrsrPtAtEnd() const -/*?*/ { -/*?*/ return pCurCrsr->End() == pCurCrsr->GetPoint(); -/*?*/ } - -/*?*/ void SwCrsrShell::UnSetVisCrsr() -/*?*/ { -/*?*/ pVisCrsr->Hide(); -/*?*/ pVisCrsr->SetDragCrsr( FALSE ); -/*?*/ } - - -/*?*/ bool SwCrsrShell::IsSelOnePara() const -/*?*/ { -/*?*/ return pCurCrsr == pCurCrsr->GetNext() && -/*?*/ pCurCrsr->GetPoint()->nNode == -/*?*/ pCurCrsr->GetMark()->nNode; -/*?*/ } - -/*?*/ SwMoveFnCollection* SwCrsrShell::MakeFindRange(USHORT, USHORT, SwPaM*) const -/*?*/ { -/*?*/ DBG_BF_ASSERT(0, "STRIP"); return NULL; -/*?*/ } #endif /** diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx index cbbf818b3..5d9411eea 100644 --- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx +++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx @@ -1150,82 +1150,6 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos, /*N*/ sRet += String::CreateFromInt32(rData.nCommandType); /*N*/ return sRet; /*N*/ } -/*N*/ void SwDoc::GetAllUsedDB( SvStringsDtor& rDBNameList, -/*N*/ const SvStringsDtor* pAllDBNames ) -/*N*/ { -/*N*/ USHORT n; -/*N*/ SvStringsDtor aUsedDBNames; -/*N*/ SvStringsDtor aAllDBNames; -/*N*/ -/*N*/ if( !pAllDBNames ) -/*N*/ { -/*N*/ GetAllDBNames( aAllDBNames ); -/*N*/ pAllDBNames = &aAllDBNames; -/*N*/ } -/*N*/ -/*N*/ SwSectionFmts& rArr = GetSections(); -/*N*/ for( n = rArr.Count(); n; ) -/*N*/ { -/*N*/ SwSection* pSect = rArr[ --n ]->GetSection(); -/*N*/ -/*N*/ if( pSect ) -/*N*/ { -/*N*/ String aCond( pSect->GetCondition() ); -/*N*/ AddUsedDBToList( rDBNameList, FindUsedDBs( *pAllDBNames, -/*N*/ aCond, aUsedDBNames ) ); -/*N*/ aUsedDBNames.DeleteAndDestroy( 0, aUsedDBNames.Count() ); -/*N*/ } -/*N*/ } -/*N*/ -/*N*/ const SfxPoolItem* pItem; -/*N*/ USHORT nMaxItems = GetAttrPool().GetItemCount( RES_TXTATR_FIELD ); -/*N*/ for( n = 0; n < nMaxItems; ++n ) -/*N*/ { -/*N*/ if( 0 == (pItem = GetAttrPool().GetItem( RES_TXTATR_FIELD, n ) )) -/*N*/ continue; -/*N*/ -/*N*/ const SwFmtFld* pFmtFld = (SwFmtFld*)pItem; -/*N*/ const SwTxtFld* pTxtFld = pFmtFld->GetTxtFld(); -/*N*/ if( !pTxtFld || !pTxtFld->GetTxtNode().GetNodes().IsDocNodes() ) -/*N*/ continue; -/*N*/ -/*N*/ const SwField* pFld = pFmtFld->GetFld(); -/*N*/ switch( pFld->GetTyp()->Which() ) -/*N*/ { -/*N*/ case RES_DBFLD: -/*N*/ AddUsedDBToList( rDBNameList, -/*N*/ lcl_DBDataToString(((SwDBField*)pFld)->GetDBData() )); -/*N*/ break; -/*N*/ -/*N*/ case RES_DBSETNUMBERFLD: -/*N*/ case RES_DBNAMEFLD: -/*N*/ AddUsedDBToList( rDBNameList, -/*N*/ lcl_DBDataToString(((SwDBNameInfField*)pFld)->GetRealDBData() )); -/*N*/ break; -/*N*/ -/*N*/ case RES_DBNUMSETFLD: -/*N*/ case RES_DBNEXTSETFLD: -/*N*/ AddUsedDBToList( rDBNameList, -/*N*/ lcl_DBDataToString(((SwDBNameInfField*)pFld)->GetRealDBData() )); -/*N*/ // kein break // JP: ist das so richtig ?? -/*N*/ -/*N*/ case RES_HIDDENTXTFLD: -/*N*/ case RES_HIDDENPARAFLD: -/*N*/ AddUsedDBToList(rDBNameList, FindUsedDBs( *pAllDBNames, -/*N*/ pFld->GetPar1(), aUsedDBNames )); -/*N*/ aUsedDBNames.DeleteAndDestroy( 0, aUsedDBNames.Count() ); -/*N*/ break; -/*N*/ -/*N*/ case RES_SETEXPFLD: -/*N*/ case RES_GETEXPFLD: -/*N*/ case RES_TABLEFLD: -/*N*/ AddUsedDBToList(rDBNameList, FindUsedDBs( *pAllDBNames, -/*N*/ pFld->GetFormula(), aUsedDBNames )); -/*N*/ aUsedDBNames.DeleteAndDestroy( 0, aUsedDBNames.Count() ); -/*N*/ break; -/*N*/ } -/*N*/ } -/*N*/ } /*-------------------------------------------------------------------- Beschreibung: diff --git a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx index b1917f29e..75b7033bb 100644 --- a/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx +++ b/binfilter/bf_sw/source/core/fields/sw_dbfld.cxx @@ -244,31 +244,6 @@ SwDBFieldType::SwDBFieldType(SwDoc* pDocPtr, const String& rNam, const SwDBData& /*N*/ SetExpansion( rExpansion ); /*N*/ } -//------------------------------------------------------------------------------ - -/*N*/ String SwDBField::GetOldContent() -/*N*/ { -/*N*/ String sOldExpand = Expand(); -/*N*/ String sNewExpand = sOldExpand; -/*N*/ BOOL bOldInit = bInitialized; -/*N*/ -/*N*/ bInitialized = FALSE; -/*N*/ InitContent(); -/*N*/ bInitialized = bOldInit; -/*N*/ -/*N*/ if( ::binfilter::GetAppCmpStrIgnore().isEqual( sNewExpand, Expand() ) ) -/*N*/ { -/*N*/ sNewExpand = '<'; -/*N*/ sNewExpand += ((SwDBFieldType *)GetTyp())->GetColumnName(); -/*N*/ sNewExpand += '>'; -/*N*/ } -/*N*/ SetExpansion( sOldExpand ); -/*N*/ -/*N*/ return sNewExpand; -/*N*/ } - -//------------------------------------------------------------------------------ - /*N*/ String SwDBField::Expand() const /*N*/ { /*N*/ String sRet; diff --git a/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx b/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx index 4617e034c..ad468601d 100644 --- a/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx +++ b/binfilter/bf_sw/source/core/frmedt/sw_fetab.cxx @@ -54,20 +54,8 @@ namespace binfilter { //siehe auch swtable.cxx #define COLFUZZY 20L - /*N*/ SwTabCols *pLastCols = 0; - - -/*N*/ inline const SwCursor& GetShellCursor( const SwCrsrShell& rShell ) -/*N*/ { -/*N*/ const SwShellCrsr *pCrsr = rShell.GetTableCrsr(); -/*N*/ if( !pCrsr ) -/*N*/ pCrsr = (SwShellCrsr*)*rShell.GetSwCrsr( FALSE ); -/*N*/ return *pCrsr; -/*N*/ } - - /*N*/ void ClearFEShellTabCols() /*N*/ { /*N*/ DELETEZ( pLastCols ); diff --git a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx index a02f76abd..7b065f7c9 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx +++ b/binfilter/bf_sw/source/core/sw3io/sw3imp.hxx @@ -260,14 +260,12 @@ class Sw3StringPool BOOL bFixed; void Setup( SwDoc& rDoc, const SwFmt& rFmt, USHORT=0 ); - void SetupTxtCollByName( SwDoc& rDoc, const String& rCollName ); void RemoveExtension( SwFmt& ); public: Sw3StringPool(); USHORT Count() { return aPool.Count(); } void Clear(); - void SetupRedlines( SwDoc& ); void RemoveExtensions( SwDoc& ); static void RemoveExtension( String& ); USHORT Add( const String&, USHORT nPoolId /*= 0*/, BOOL bDontSearch=FALSE ); diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx index a012b0eed..9958ecb44 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx @@ -1427,17 +1427,6 @@ const int RES_POOLCOLL_HTML_DT_40 = 0x3007; /*N*/ } /*N*/ } -/*N*/ void Sw3StringPool::SetupTxtCollByName( SwDoc& rDoc, const String& rName ) -/*N*/ { -/*N*/ if( !rName.Len() ) -/*N*/ return; -/*N*/ -/*N*/ const SwTxtFmtColl *pColl = rDoc.FindTxtFmtCollByName( rName ); -/*N*/ sal_uInt16 nPoolId = pColl ? pColl->GetPoolFmtId() -/*N*/ : SwStyleNameMapper::GetPoolIdFromUIName( rName, GET_POOLID_TXTCOLL ); -/*N*/ Add( rName, nPoolId ); -/*N*/ } - /*N*/ sal_uInt16 Sw3StringPool::Add( const String& r, sal_uInt16 n, sal_Bool bDontSearch ) /*N*/ { /*N*/ sal_uInt16 i = bDontSearch ? aPool.Count() : 0; diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx index f74ea6396..125dd6140 100644 --- a/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx +++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx @@ -54,18 +54,6 @@ namespace binfilter { // lokaler Record in SWG_REDLINE #define SWG_REDLINEDATA_LCL 'D' -/*N*/ void Sw3StringPool::SetupRedlines( SwDoc& rDoc ) -/*N*/ { -/*N*/ const SwRedlineTbl& rRedlines = rDoc.GetRedlineTbl(); -/*N*/ for( USHORT i=0; i<rRedlines.Count(); i++ ) -/*N*/ { -/*?*/ const SwRedline *pRedline = rRedlines[i]; - for( USHORT j=0; j<pRedline->GetStackCount(); j++ ) - Add( pRedline->GetAuthorString(j), USHRT_MAX ); -/*N*/ } -/*N*/ } - - // REDLINE: // BYTE Flags // 0x10 - visisble Flags diff --git a/binfilter/inc/bf_sw/crsrsh.hxx b/binfilter/inc/bf_sw/crsrsh.hxx index 2cffbe63c..f691a7b00 100644 --- a/binfilter/inc/bf_sw/crsrsh.hxx +++ b/binfilter/inc/bf_sw/crsrsh.hxx @@ -240,11 +240,7 @@ private: typedef bool (SwCursor:: *FNCrsr)(); - protected: - - CRSR_INLINE SwMoveFnCollection* MakeFindRange( USHORT, USHORT, SwPaM* ) const; - /* * Compare-Methode for the StackCursor and the current Cursor. * The Methods return -1, 0, 1 for lower, equal, greater. The enum @@ -277,7 +273,6 @@ public: // TableCursor in normale Cursor verwandeln, Tablemode aufheben SwPaM* GetCrsr( bool bMakeTblCrsr = TRUE ) const; - CRSR_INLINE SwCursor* GetSwCrsr( bool bMakeTblCrsr = TRUE ) const; // nur den akt. Cursor returnen SwShellCrsr* _GetCrsr() { return pCurCrsr; } const SwShellCrsr* _GetCrsr() const { return pCurCrsr; } @@ -399,12 +394,6 @@ public: // Abfrage, ob ueberhaupt eine Selektion existiert, sprich der akt. Cursor // aufgespannt oder nicht der einzigste ist. CRSR_INLINE bool IsSelection() const; - // returns if multiple cursors are available - CRSR_INLINE bool IsMultiSelection() const; - - // Abfrage, ob ein kompletter Absatz selektiert wurde - // Abfrage, ob die Selektion in einem Absatz ist - CRSR_INLINE bool IsSelOnePara() const; //Sollte fuer das Clipboard der WaitPtr geschaltet werden. @@ -424,20 +413,8 @@ public: // ergibt sich aus seiner aktuellen Position im Layout !! void UpdateCrsrPos(); - // returne den am akt. Cursor selektierten Text. Dieser wird mit - // Felder etc. aufgefuellt!! - // gebe nur den Text ab der akt. Cursor Position zurueck (bis zum NodeEnde) - // retrurne die Anzahl der selektierten Zeichen. - // Falls keine Selektion vorliegt entscheided nType was selektiert wird - // bIntrnlChar besagt ob interne Zeichen erhalten bleiben (TRUE) oder - // ob sie expandiert werden (z.B Felder/...) - - // pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen - CRSR_INLINE const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const; - CRSR_INLINE bool IsCrsrPtAtEnd() const; - CRSR_INLINE const SwPaM* GetTblCrs() const; - CRSR_INLINE SwPaM* GetTblCrs(); + CRSR_INLINE SwPaM* GetTblCrs(); // select a table row, column or box (based on the current cursor) @@ -459,32 +436,6 @@ public: const SwShellTableCrsr* GetTableCrsr() const { return pTblCrsr; } SwShellTableCrsr* GetTableCrsr() { return pTblCrsr; } - - // springe in den Header/Footer des angegebenen oder akt. PageDesc - // is point of cursor in header/footer. pbInHeader return TRUE if it is - // in a headerframe otherwise in a footerframe - - // springe zum naechsten Verzeichnis [mit dem Namen] - // springe zum vorherigen Verzeichnis [mit dem Namen] - // springe zum naechsten (vorherigen) Verzeichniseintrag - // Zur naechsten/ vorherigen Verzeichnismarke dieses Typs traveln - - // springe zum naechsten (vorherigen) Tabellenformel - // optional auch nur zu kaputten Formeln springen - // jump to the next / previous hyperlink - inside text and also - // on graphics - - // springe zu dieser Refmark - - // hole vom Start/Ende der akt. Selection das nte Zeichen - // erweiter die akt. Selection am Anfang/Ende um n Zeichen - // setze nur den sichtbaren Cursor an die angegebene Dokument-Pos. - // returnt FALSE: wenn der ob der SPoint vom Layout korrigiert wurde. - // (wird zum Anzeigen von Drag&Drop/Copy-Cursor benoetigt) - CRSR_INLINE void UnSetVisCrsr(); - - // Char Travelling - Methoden (in crstrvl1.cxx) - // Abfrage vom CrsrTravelling Status CrsrMoveState GetMoveState() const { return eMvState; } @@ -569,46 +520,13 @@ public: #if !defined(DBG_UTIL) && !defined(WIN) -inline SwMoveFnCollection* SwCrsrShell::MakeFindRange( - USHORT /*nStt*/, USHORT /*nEnd*/, SwPaM* /*pPam*/ ) const -{ - DBG_BF_ASSERT(0, "STRIP"); return NULL; -} - -inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const -{ - return (SwCursor*)GetCrsr( bMakeTblCrsr ); -} - inline SwPaM* SwCrsrShell::GetStkCrsr() const { return pCrsrStk; } - - /*N*/ inline bool SwCrsrShell::IsSelection() const /*N*/ { /*N*/ return IsTableMode() || pCurCrsr->HasMark() || /*N*/ pCurCrsr->GetNext() != pCurCrsr; /*N*/ } -inline bool SwCrsrShell::IsMultiSelection() const -{ - return pCurCrsr->GetNext() != pCurCrsr; -} - -inline bool SwCrsrShell::IsSelOnePara() const -{ - return pCurCrsr == pCurCrsr->GetNext() && - pCurCrsr->GetPoint()->nNode == pCurCrsr->GetMark()->nNode; -} - -inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( BOOL bIsPtInTbl ) const -{ - return pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode(); -} - -inline bool SwCrsrShell::IsCrsrPtAtEnd() const -{ - return pCurCrsr->End() == pCurCrsr->GetPoint(); -} inline const SwPaM* SwCrsrShell::GetTblCrs() const { @@ -620,12 +538,6 @@ inline SwPaM* SwCrsrShell::GetTblCrs() return pTblCrsr; } -inline void SwCrsrShell::UnSetVisCrsr() -{ - pVisCrsr->Hide(); - pVisCrsr->SetDragCrsr( FALSE ); -} - #endif diff --git a/binfilter/inc/bf_sw/dbfld.hxx b/binfilter/inc/bf_sw/dbfld.hxx index a73e7a19b..097e41358 100644 --- a/binfilter/inc/bf_sw/dbfld.hxx +++ b/binfilter/inc/bf_sw/dbfld.hxx @@ -104,7 +104,6 @@ public: void ChangeExpansion( const SwFrm*, const SwTxtFld* ); void InitContent(); void InitContent(const String& rExpansion); - String GetOldContent(); inline void ChgBodyTxtFlag( BOOL bIsInBody ); inline BOOL IsInBodyTxt() const; diff --git a/binfilter/inc/bf_sw/doc.hxx b/binfilter/inc/bf_sw/doc.hxx index d6fc7238d..aecadc4da 100644 --- a/binfilter/inc/bf_sw/doc.hxx +++ b/binfilter/inc/bf_sw/doc.hxx @@ -776,9 +776,6 @@ public: void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { pNewDBMgr = pNewMgr; } SwNewDBMgr* GetNewDBMgr() const { return pNewDBMgr; } void SetInitDBFields(sal_Bool b); - // Von Feldern verwendete Datenbanken herausfinden - void GetAllUsedDB( SvStringsDtor& rDBNameList, - const SvStringsDtor* pAllDBNames = 0 ); void ChgDBData( const SwDBData& rNewData ); SwDBData GetDBData(); |