diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-10 14:12:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-13 09:37:13 +0200 |
commit | 593515e529d75f08f4d3766dac78b1792aea4be4 (patch) | |
tree | a82b7d8b52106727304b092273e3b8cc7c9175d0 /editeng | |
parent | ee094bd46f55118993c72af719dc046476f9f311 (diff) |
loplugin:staticmethods
Change-Id: I332d3b3158b46cf130540c6e1479dd01cb457d03
Diffstat (limited to 'editeng')
-rw-r--r-- | editeng/source/editeng/editdoc.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editdoc.hxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 8 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit3.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit4.cxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit5.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/flditem.cxx | 2 | ||||
-rw-r--r-- | editeng/source/items/justifyitem.cxx | 6 | ||||
-rw-r--r-- | editeng/source/lookuptree/Trie.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/splwrap.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/unolingu.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outleeng.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outlin2.cxx | 2 | ||||
-rw-r--r-- | editeng/source/outliner/outliner.cxx | 2 | ||||
-rw-r--r-- | editeng/source/uno/unoipset.cxx | 4 | ||||
-rw-r--r-- | editeng/source/uno/unotext.cxx | 6 |
18 files changed, 29 insertions, 29 deletions
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx index fa956cc1519e..90594d0fb0a8 100644 --- a/editeng/source/editeng/editdoc.cxx +++ b/editeng/source/editeng/editdoc.cxx @@ -2223,7 +2223,7 @@ OUString EditDoc::GetParaAsString( sal_Int32 nNode ) const OUString EditDoc::GetParaAsString( const ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nEndPos, - bool bResolveFields) const + bool bResolveFields) { return pNode->GetExpandedText(nStartPos, nEndPos, bResolveFields); } diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index da5841b7894b..5d120972a13a 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -798,7 +798,7 @@ public: sal_uLong GetTextLen() const; OUString GetParaAsString( sal_Int32 nNode ) const; - OUString GetParaAsString(const ContentNode* pNode, sal_Int32 nStartPos = 0, sal_Int32 nEndPos = -1, bool bResolveFields = true) const; + static OUString GetParaAsString(const ContentNode* pNode, sal_Int32 nStartPos = 0, sal_Int32 nEndPos = -1, bool bResolveFields = true); EditPaM GetStartPaM() const; EditPaM GetEndPaM() const; @@ -813,7 +813,7 @@ public: void InsertAttribInSelection( ContentNode* pNode, sal_Int32 nStart, sal_Int32 nEnd, const SfxPoolItem& rPoolItem ); bool RemoveAttribs( ContentNode* pNode, sal_Int32 nStart, sal_Int32 nEnd, sal_uInt16 nWhich = 0 ); bool RemoveAttribs( ContentNode* pNode, sal_Int32 nStart, sal_Int32 nEnd, EditCharAttrib*& rpStarting, EditCharAttrib*& rpEnding, sal_uInt16 nWhich = 0 ); - void FindAttribs( ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nEndPos, SfxItemSet& rCurSet ); + static void FindAttribs( ContentNode* pNode, sal_Int32 nStartPos, sal_Int32 nEndPos, SfxItemSet& rCurSet ); sal_Int32 GetPos(const ContentNode* pNode) const; const ContentNode* GetObject(sal_Int32 nPos) const; diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 21bdec0715e9..eec5cb9771ea 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2139,7 +2139,7 @@ void EditEngine::SetAllMisspellRanges( const std::vector<editeng::MisspellRanges void EditEngine::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { - pImpEditEngine->SetForbiddenCharsTable( xForbiddenChars ); + ImpEditEngine::SetForbiddenCharsTable( xForbiddenChars ); } void EditEngine::SetDefaultLanguage( LanguageType eLang ) diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 321bfbf63092..92e7f274302b 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -592,8 +592,8 @@ private: EditPaM CursorRight( const EditPaM& rPaM, sal_uInt16 nCharacterIteratorMode = ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL ); EditPaM CursorStartOfLine( const EditPaM& rPaM ); EditPaM CursorEndOfLine( const EditPaM& rPaM ); - EditPaM CursorStartOfParagraph( const EditPaM& rPaM ); - EditPaM CursorEndOfParagraph( const EditPaM& rPaM ); + static EditPaM CursorStartOfParagraph( const EditPaM& rPaM ); + static EditPaM CursorEndOfParagraph( const EditPaM& rPaM ); EditPaM CursorStartOfDoc(); EditPaM CursorEndOfDoc(); EditPaM WordLeft( const EditPaM& rPaM, sal_Int16 nWordType = ::com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ); @@ -619,7 +619,7 @@ private: void ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32 nPara, sal_Int32 nIndex ); LanguageType ImplCalcDigitLang(LanguageType eCurLang) const; void ImplInitDigitMode(OutputDevice* pOutDev, LanguageType eLang); - OUString convertDigits(const OUString &rString, sal_Int32 nStt, sal_Int32 nLen, LanguageType eDigitLang) const; + static OUString convertDigits(const OUString &rString, sal_Int32 nStt, sal_Int32 nLen, LanguageType eDigitLang); EditPaM ReadText( SvStream& rInput, EditSelection aSel ); EditPaM ReadRTF( SvStream& rInput, EditSelection aSel ); @@ -1011,7 +1011,7 @@ public: bool IsAddExtLeading() const { return bAddExtLeading; } rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable( bool bGetInternal = true ) const; - void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); + static void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ); /** sets a link that is called at the beginning of a drag operation at an edit view */ void SetBeginDropHdl( const Link& rLink ) { maBeginDropHdl = rLink; } diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index bb964c193105..7fc5c43c0a65 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -294,7 +294,7 @@ OUString ImpEditEngine::GetSelected( const EditSelection& rSel, const LineEnd eE const sal_Int32 nStartPos = nNode==nStartNode ? aSel.Min().GetIndex() : 0; const sal_Int32 nEndPos = nNode==nEndNode ? aSel.Max().GetIndex() : pNode->Len(); // can also be == nStart! - aText += aEditDoc.GetParaAsString( pNode, nStartPos, nEndPos ); + aText += EditDoc::GetParaAsString( pNode, nStartPos, nEndPos ); if ( nNode < nEndNode ) aText += aSep; } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 972c99701a5e..5157b8b95708 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3505,7 +3505,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev, Rectangle aClipRect, Point aSt { const SvxFieldData* pFieldData = pFieldItem->GetField(); if( pFieldData ) - pMtf->AddAction( pFieldData->createEndComment() ); + pMtf->AddAction( SvxFieldData::createEndComment() ); } } @@ -4291,7 +4291,7 @@ LanguageType ImpEditEngine::ImplCalcDigitLang(LanguageType eCurLang) const return eLang; } -OUString ImpEditEngine::convertDigits(const OUString &rString, sal_Int32 nStt, sal_Int32 nLen, LanguageType eDigitLang) const +OUString ImpEditEngine::convertDigits(const OUString &rString, sal_Int32 nStt, sal_Int32 nLen, LanguageType eDigitLang) { OUStringBuffer aBuf(rString); for (sal_Int32 nIdx = nStt, nEnd = nStt + nLen; nIdx < nEnd; ++nIdx) diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 6bcd3a9088a1..37d0b2080cc4 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -254,7 +254,7 @@ sal_uInt32 ImpEditEngine::WriteText( SvStream& rOutput, EditSelection aSel ) if ( nNode == nEndNode ) // can also be == nStart! nEndPos = aSel.Max().GetIndex(); } - OUString aTmpStr = aEditDoc.GetParaAsString( pNode, nStartPos, nEndPos ); + OUString aTmpStr = EditDoc::GetParaAsString( pNode, nStartPos, nEndPos ); rOutput.WriteByteStringLine( aTmpStr, rOutput.GetStreamCharSet() ); } @@ -665,7 +665,7 @@ sal_uInt32 ImpEditEngine::WriteRTF( SvStream& rOutput, EditSelection aSel ) if ( n == nEndPortion ) nE = nEndPos; - OUString aRTFStr = aEditDoc.GetParaAsString( pNode, nS, nE); + OUString aRTFStr = EditDoc::GetParaAsString( pNode, nS, nE); RTFOutFuncs::Out_String( rOutput, aRTFStr, eDestEnc ); rOutput.WriteChar( '}' ); } diff --git a/editeng/source/editeng/impedit5.cxx b/editeng/source/editeng/impedit5.cxx index 698346dc338e..1b019a770d50 100644 --- a/editeng/source/editeng/impedit5.cxx +++ b/editeng/source/editeng/impedit5.cxx @@ -328,7 +328,7 @@ SfxItemSet ImpEditEngine::GetAttribs( EditSelection aSel, EditEngineAttribs nOnl // 2) Examine Style and paragraph attributes only when OFF ... // First the very hard formatting ... - aEditDoc.FindAttribs( pNode, nStartPos, nEndPos, aCurSet ); + EditDoc::FindAttribs( pNode, nStartPos, nEndPos, aCurSet ); if( nOnlyHardAttrib != EditEngineAttribs_OnlyHard ) { diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 8297a406c6c9..8a643fa335f2 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -271,7 +271,7 @@ MetaAction* SvxFieldData::createBeginComment() const return new MetaCommentAction( "FIELD_SEQ_BEGIN" ); } -MetaAction* SvxFieldData::createEndComment() const +MetaAction* SvxFieldData::createEndComment() { return new MetaCommentAction( "FIELD_SEQ_END" ); } diff --git a/editeng/source/items/justifyitem.cxx b/editeng/source/items/justifyitem.cxx index 7871c87bc217..c8806bd61760 100644 --- a/editeng/source/items/justifyitem.cxx +++ b/editeng/source/items/justifyitem.cxx @@ -158,7 +158,7 @@ bool SvxHorJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } -OUString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) const +OUString SvxHorJustifyItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_HOR_JUSTIFY_REPEAT, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_HORJUST_STANDARD + nVal); @@ -294,7 +294,7 @@ bool SvxVerJustifyItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) } -OUString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) const +OUString SvxVerJustifyItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_VERJUST_STANDARD + nVal); @@ -376,7 +376,7 @@ bool SvxJustifyMethodItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId } -OUString SvxJustifyMethodItem::GetValueText( sal_uInt16 nVal ) const +OUString SvxJustifyMethodItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_VER_JUSTIFY_BOTTOM, "enum overflow!" ); return EE_RESSTR(RID_SVXITEMS_JUSTMETHOD_AUTO + nVal); diff --git a/editeng/source/lookuptree/Trie.cxx b/editeng/source/lookuptree/Trie.cxx index 7565513d0ee3..43e84b86080c 100644 --- a/editeng/source/lookuptree/Trie.cxx +++ b/editeng/source/lookuptree/Trie.cxx @@ -34,7 +34,7 @@ struct TrieNode TrieNode* traversePath(const OUString& sPath); void addNewChild(TrieNode* pChild); void collectSuggestions(const OUString& sPath, std::vector<OUString>& rSuggestionList); - void collectSuggestionsForCurrentNode(TrieNode* pCurrent, const OUString& sPath, vector<OUString>& rSuggestionList); + static void collectSuggestionsForCurrentNode(TrieNode* pCurrent, const OUString& sPath, vector<OUString>& rSuggestionList); }; TrieNode::TrieNode(sal_Unicode aCharacter) : diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx index 69b2baca1fc4..69d2fc2d555a 100644 --- a/editeng/source/misc/splwrap.cxx +++ b/editeng/source/misc/splwrap.cxx @@ -432,7 +432,7 @@ bool SvxSpellWrapper::SpellNext( ) -Reference< XDictionary > SvxSpellWrapper::GetAllRightDic() const +Reference< XDictionary > SvxSpellWrapper::GetAllRightDic() { Reference< XDictionary > xDic; diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx index d3a10720fada..9208677eba2b 100644 --- a/editeng/source/misc/unolingu.cxx +++ b/editeng/source/misc/unolingu.cxx @@ -433,7 +433,7 @@ class LinguMgrExitLstnr : public cppu::WeakImplHelper1<XEventListener> { uno::Reference< XDesktop2 > xDesktop; - void AtExit(); + static void AtExit(); public: LinguMgrExitLstnr(); diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx index ad3c1a6e40f1..ea0af4fb794f 100644 --- a/editeng/source/outliner/outleeng.cxx +++ b/editeng/source/outliner/outleeng.cxx @@ -94,7 +94,7 @@ void OutlinerEditEng::ParagraphConnected( sal_Int32 /*nLeftParagraph*/, sal_Int3 if( pOwner && pOwner->IsUndoEnabled() && !const_cast<EditEngine&>(pOwner->GetEditEngine()).IsInUndo() ) { Paragraph* pPara = pOwner->GetParagraph( nRightParagraph ); - if( pPara && pOwner->HasParaFlag( pPara, ParaFlag::ISPAGE ) ) + if( pPara && Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) ) { pOwner->InsertUndo( new OutlinerUndoChangeParaFlags( pOwner, nRightParagraph, ParaFlag::ISPAGE, ParaFlag::NONE ) ); } diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 8dd6ef1456f3..9f3defc4d765 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -401,7 +401,7 @@ Reference< XSpellChecker1 > Outliner::GetSpeller() void Outliner::SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> xForbiddenChars ) { - pEditEngine->SetForbiddenCharsTable( xForbiddenChars ); + EditEngine::SetForbiddenCharsTable( xForbiddenChars ); } void Outliner::SetHyphenator( Reference< XHyphenator >& xHyph ) diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index e0b05e199a16..f1069ccdda91 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -2078,7 +2078,7 @@ void Outliner::SetParaFlag( Paragraph* pPara, ParaFlag nFlag ) } } -bool Outliner::HasParaFlag( const Paragraph* pPara, ParaFlag nFlag ) const +bool Outliner::HasParaFlag( const Paragraph* pPara, ParaFlag nFlag ) { return pPara && pPara->HasFlag( nFlag ); } diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index 402f9da359ec..fbece038b66a 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -95,7 +95,7 @@ bool SvxUnoCheckForPositiveValue( const uno::Any& rVal ) -uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) const +uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) { uno::Any aVal; if(!pMap || !pMap->nWID) @@ -141,7 +141,7 @@ uno::Any SvxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry* } -void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) const +void SvxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) { if(!pMap || !pMap->nWID) return; diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx index db0bfceb222f..390b19f8d178 100644 --- a/editeng/source/uno/unotext.cxx +++ b/editeng/source/uno/unotext.cxx @@ -496,7 +496,7 @@ void SvxUnoTextRangeBase::setPropertyValue( const SfxItemPropertySimpleEntry* pM // For parts of composite items with multiple properties (eg background) // must be taken from the document before the old item. rNewSet.Put(rOldSet.Get(pMap->nWID)); // Old Item in new Set - mpPropSet->setPropertyValue(pMap, rValue, rNewSet, false ); + SvxItemPropertySet::setPropertyValue(pMap, rValue, rNewSet, false ); } } @@ -679,7 +679,7 @@ void SvxUnoTextRangeBase::getPropertyValue( const SfxItemPropertySimpleEntry* pM default: if(!GetPropertyValueHelper( *const_cast<SfxItemSet*>(&rSet), pMap, rAny, &maSelection, GetEditSource() )) - rAny = mpPropSet->getPropertyValue(pMap, rSet, true, false ); + rAny = SvxItemPropertySet::getPropertyValue(pMap, rSet, true, false ); } } @@ -1299,7 +1299,7 @@ uno::Any SAL_CALL SvxUnoTextRangeBase::getPropertyDefault( const OUString& aProp { SfxItemSet aSet( *pPool, pMap->nWID, pMap->nWID); aSet.Put(pPool->GetDefaultItem(pMap->nWID)); - return mpPropSet->getPropertyValue(pMap, aSet, true, false ); + return SvxItemPropertySet::getPropertyValue(pMap, aSet, true, false ); } } } |