From 593515e529d75f08f4d3766dac78b1792aea4be4 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 10 Apr 2015 14:12:10 +0200 Subject: loplugin:staticmethods Change-Id: I332d3b3158b46cf130540c6e1479dd01cb457d03 --- editeng/source/editeng/editdoc.cxx | 2 +- editeng/source/editeng/editdoc.hxx | 4 +-- editeng/source/editeng/editeng.cxx | 2 +- editeng/source/editeng/impedit.hxx | 8 +++--- editeng/source/editeng/impedit2.cxx | 2 +- editeng/source/editeng/impedit3.cxx | 4 +-- editeng/source/editeng/impedit4.cxx | 4 +-- editeng/source/editeng/impedit5.cxx | 2 +- editeng/source/items/flditem.cxx | 2 +- editeng/source/items/justifyitem.cxx | 6 ++-- editeng/source/lookuptree/Trie.cxx | 2 +- editeng/source/misc/splwrap.cxx | 2 +- editeng/source/misc/unolingu.cxx | 2 +- editeng/source/outliner/outleeng.cxx | 2 +- editeng/source/outliner/outlin2.cxx | 2 +- editeng/source/outliner/outliner.cxx | 2 +- editeng/source/uno/unoipset.cxx | 4 +-- editeng/source/uno/unotext.cxx | 6 ++-- filter/source/graphicfilter/itiff/ccidecom.hxx | 4 +-- include/editeng/AccessibleEditableTextPara.hxx | 2 +- include/editeng/acorrcfg.hxx | 4 +-- include/editeng/editeng.hxx | 2 +- include/editeng/flditem.hxx | 2 +- include/editeng/justifyitem.hxx | 6 ++-- include/editeng/outliner.hxx | 6 ++-- include/editeng/splwrap.hxx | 4 +-- include/editeng/svxacorr.hxx | 4 +-- include/editeng/svxrtf.hxx | 2 +- include/editeng/unoedsrc.hxx | 1 - include/editeng/unoipset.hxx | 4 +-- include/editeng/unotext.hxx | 2 +- include/svx/unoshape.hxx | 4 +-- sc/source/core/data/documen9.cxx | 4 +-- sd/source/core/stlsheet.cxx | 6 ++-- sd/source/ui/app/sdmod2.cxx | 2 +- sd/source/ui/func/fuinsfil.cxx | 8 +++--- sd/source/ui/func/fuprobjs.cxx | 4 +-- sd/source/ui/unoidl/unopback.cxx | 6 ++-- sd/source/ui/view/drtxtob.cxx | 8 +++--- sd/source/ui/view/outlnvsh.cxx | 11 ++++---- sd/source/ui/view/outlview.cxx | 38 ++++++++++++++------------ svx/source/svdraw/svdetc.cxx | 2 +- svx/source/svdraw/svdmodel.cxx | 2 +- svx/source/table/cell.cxx | 4 +-- svx/source/unodraw/unoshape.cxx | 14 +++++----- 45 files changed, 107 insertions(+), 107 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 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 GetForbiddenCharsTable( bool bGetInternal = true ) const; - void SetForbiddenCharsTable( rtl::Reference xForbiddenChars ); + static void SetForbiddenCharsTable( rtl::Reference 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& rSuggestionList); - void collectSuggestionsForCurrentNode(TrieNode* pCurrent, const OUString& sPath, vector& rSuggestionList); + static void collectSuggestionsForCurrentNode(TrieNode* pCurrent, const OUString& sPath, vector& 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 { 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(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 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(&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 ); } } } diff --git a/filter/source/graphicfilter/itiff/ccidecom.hxx b/filter/source/graphicfilter/itiff/ccidecom.hxx index 0e57ea80840d..343f5fd84017 100644 --- a/filter/source/graphicfilter/itiff/ccidecom.hxx +++ b/filter/source/graphicfilter/itiff/ccidecom.hxx @@ -72,11 +72,11 @@ private: sal_uInt16 ReadCodeAndDecode(const CCILookUpTableEntry * pLookUp, sal_uInt16 nMaxCodeBits); - void FillBits(sal_uInt8 * pTarget, sal_uInt16 nTargetBits, + static void FillBits(sal_uInt8 * pTarget, sal_uInt16 nTargetBits, sal_uInt16 nBitPos, sal_uInt16 nNumBits, sal_uInt8 nBlackOrWhite); - sal_uInt16 CountBits(const sal_uInt8 * pData, sal_uInt16 nDataSizeBits, + static sal_uInt16 CountBits(const sal_uInt8 * pData, sal_uInt16 nDataSizeBits, sal_uInt16 nBitPos, sal_uInt8 nBlackOrWhite); void Read1DScanlineData(sal_uInt8 * pTarget, sal_uInt16 nTargetBits); diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 337f97a0d8a7..79c32f8078da 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -167,7 +167,7 @@ namespace accessibility virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames (void) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceName - OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getServiceName (void) throw (::com::sun::star::uno::RuntimeException); /** Set the current index in the accessibility parent diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx index b0ecbc1b1be0..1a90fb301e7c 100644 --- a/include/editeng/acorrcfg.hxx +++ b/include/editeng/acorrcfg.hxx @@ -28,7 +28,7 @@ class EDITENG_DLLPUBLIC SvxBaseAutoCorrCfg : public utl::ConfigItem { private: SvxAutoCorrCfg& rParent; - com::sun::star::uno::Sequence GetPropertyNames(); + static com::sun::star::uno::Sequence GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; @@ -45,7 +45,7 @@ class EDITENG_DLLPUBLIC SvxSwAutoCorrCfg : public utl::ConfigItem { private: SvxAutoCorrCfg& rParent; - com::sun::star::uno::Sequence GetPropertyNames(); + static com::sun::star::uno::Sequence GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index 06d73f493c06..d3ed4b69dcb2 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -422,7 +422,7 @@ public: void GetAllMisspellRanges( std::vector& rRanges ) const; void SetAllMisspellRanges( const std::vector& rRanges ); - void SetForbiddenCharsTable( rtl::Reference xForbiddenChars ); + static void SetForbiddenCharsTable( rtl::Reference xForbiddenChars ); void SetDefaultLanguage( LanguageType eLang ); LanguageType GetDefaultLanguage() const; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index 0c41aa8827a6..13f7773ed7ed 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -59,7 +59,7 @@ public: virtual bool operator==( const SvxFieldData& ) const; virtual MetaAction* createBeginComment() const; - MetaAction* createEndComment() const; + static MetaAction* createEndComment(); }; /** diff --git a/include/editeng/justifyitem.hxx b/include/editeng/justifyitem.hxx index 9189171a546b..3ebd449372ac 100644 --- a/include/editeng/justifyitem.hxx +++ b/include/editeng/justifyitem.hxx @@ -45,7 +45,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; + static OUString GetValueText( sal_uInt16 nVal ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; @@ -78,7 +78,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; + static OUString GetValueText( sal_uInt16 nVal ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; @@ -107,7 +107,7 @@ public: virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE; virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; - OUString GetValueText( sal_uInt16 nVal ) const; + static OUString GetValueText( sal_uInt16 nVal ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE; diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index b973e64e1d79..cc00d310e555 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -743,7 +743,7 @@ public: sal_Int16 GetDepth( sal_Int32 nPara ) const; void SetDepth( Paragraph* pParagraph, sal_Int16 nNewDepth ); - bool IsVisible( Paragraph* pPara ) const { return pPara->IsVisible(); } + static bool IsVisible( Paragraph* pPara ) { return pPara->IsVisible(); } void EnableUndo( bool bEnable ); bool IsUndoEnabled() const; @@ -887,7 +887,7 @@ public: bool Collapse( Paragraph* ); void SetParaFlag( Paragraph* pPara, ParaFlag nFlag ); - bool HasParaFlag( const Paragraph* pPara, ParaFlag nFlag ) const; + static bool HasParaFlag( const Paragraph* pPara, ParaFlag nFlag ); // Returns an array containing the widths of the Bullet Indentations // Last value must be -1. Is deleted by the outliner. @@ -936,7 +936,7 @@ public: void SetHyphenator( ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator >& xHyph ); - void SetForbiddenCharsTable( rtl::Reference xForbiddenChars ); + static void SetForbiddenCharsTable( rtl::Reference xForbiddenChars ); // Deprecated void SetDefaultLanguage( LanguageType eLang ); diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx index 18547e96c6ac..6c77e530e1e9 100644 --- a/include/editeng/splwrap.hxx +++ b/include/editeng/splwrap.hxx @@ -125,9 +125,9 @@ protected: virtual bool SpellContinue(); // Check Areas // Result available through GetLast virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ); //Replace word from the replace list - ::com::sun::star::uno::Reference< + static ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XDictionary > - GetAllRightDic() const; + GetAllRightDic(); virtual void SpellEnd(); // Finish area virtual void ScrollArea(); // Set ScrollArea // Replace word diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 98510fc1880a..e1f0ab20f12e 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -176,7 +176,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrectLanguageLists void LoadXMLExceptList_Imp( SvStringsISortDtor*& rpLst, const sal_Char* pStrmName, SotStorageRef& rStg); - void SaveExceptList_Imp( const SvStringsISortDtor& rLst, + static void SaveExceptList_Imp( const SvStringsISortDtor& rLst, const sal_Char* pStrmName, SotStorageRef& rStg, bool bConvert = false); @@ -420,7 +420,7 @@ public: // (used to avoid occasional 'collisions' with (Thai) input-sequence-checking) static bool IsAutoCorrectChar( sal_Unicode cChar ); - bool NeedsHardspaceAutocorr( sal_Unicode cChar ); + static bool NeedsHardspaceAutocorr( sal_Unicode cChar ); CharClass& GetCharClass( LanguageType eLang ) { diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx index cf9732f7c67d..857e18c9edc7 100644 --- a/include/editeng/svxrtf.hxx +++ b/include/editeng/svxrtf.hxx @@ -242,7 +242,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser protected: virtual void InsertPara() = 0; - OUString& DelCharAtEnd( OUString& rStr, const sal_Unicode cDel ); + static OUString& DelCharAtEnd( OUString& rStr, const sal_Unicode cDel ); // is called for each token that is recognized in CallParser virtual void NextToken( int nToken ) SAL_OVERRIDE; diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index 7c94aa2b002b..581093afe00b 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -210,7 +210,6 @@ public: */ virtual EBulletInfo GetBulletInfo( sal_Int32 nPara ) const = 0; - OUString GetNumStr(sal_uInt16) const { return OUString(); } virtual void SetUpdateModeForAcc(bool) {} virtual bool GetUpdateModeForAcc() const { return true; } diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx index ffaa38c4a5fb..e2f2c7e704a4 100644 --- a/include/editeng/unoipset.hxx +++ b/include/editeng/unoipset.hxx @@ -47,8 +47,8 @@ public: ~SvxItemPropertySet(); // Methods, which work directly with the ItemSet - ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ) const; - void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ) const; + static ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet, bool bSearchInParent, bool bDontConvertNegativeValues ); + static void setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const ::com::sun::star::uno::Any& rVal, SfxItemSet& rSet, bool bDontConvertNegativeValues ); // Methods that use Any instead ::com::sun::star::uno::Any getPropertyValue( const SfxItemPropertySimpleEntry* pMap ) const; diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx index 35a65f269074..736d1268e748 100644 --- a/include/editeng/unotext.hxx +++ b/include/editeng/unotext.hxx @@ -264,7 +264,7 @@ protected: ::com::sun::star::beans::PropertyState SAL_CALL _getPropertyState( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL _getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); // returns true if property found or false if unknown property - bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState); + static bool _getOnePropertyStates(const SfxItemSet* pSet, const SfxItemPropertySimpleEntry* pMap, ::com::sun::star::beans::PropertyState& rState); void SAL_CALL _setPropertyToDefault( const OUString& PropertyName, sal_Int32 nPara = -1 ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); void _setPropertyToDefault( SvxTextForwarder* pForwarder, const SfxItemPropertySimpleEntry* pMap, sal_Int32 nPara ) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException ); diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 20f2e22d497a..67fb2e347682 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -86,10 +86,10 @@ class SvxShapeMaster; class SvxItemPropertySet; class SfxItemSet; -void SVX_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, +void SVX_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const com::sun::star::uno::Any& rVal, SfxItemSet& rSet ); -com::sun::star::uno::Any SVX_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ); +com::sun::star::uno::Any SVX_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ); // WARNING: if you update the supported interfaces, diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 639eebb15a17..2ec2a1753679 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -647,7 +647,7 @@ void ScDocument::SetForbiddenCharacters(const rtl::ReferenceSetForbiddenCharsTable( xForbiddenCharacters ); + EditEngine::SetForbiddenCharsTable( xForbiddenCharacters ); if ( pDrawLayer ) pDrawLayer->SetForbiddenCharsTable( xForbiddenCharacters ); } @@ -698,7 +698,7 @@ void ScDocument::SetAsianKerning(bool bNew) void ScDocument::ApplyAsianEditSettings( ScEditEngineDefaulter& rEngine ) { - rEngine.SetForbiddenCharsTable( xForbiddenCharacters ); + EditEngine::SetForbiddenCharsTable( xForbiddenCharacters ); rEngine.SetAsianCompressionMode( GetAsianCompression() ); rEngine.SetKernAsianPunctuation( GetAsianKerning() ); } diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 3a369a10ad37..708147079ec6 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -1039,7 +1039,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con } else if(!SvxUnoTextRangeBase::SetPropertyValueHelper( aSet, pEntry, aValue, aSet )) { - SvxItemPropertySet_setPropertyValue( GetStylePropertySet(), pEntry, aValue, aSet ); + SvxItemPropertySet_setPropertyValue( pEntry, aValue, aSet ); } rStyleSet.Put( aSet ); @@ -1120,7 +1120,7 @@ Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) thro return aAny; // Hole Wert aus ItemSet - aAny = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(),pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( pEntry, aSet ); } if( pEntry->aType != aAny.getValueType() ) @@ -1295,7 +1295,7 @@ Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) t SfxItemPool& rMyPool = GetPool().GetPool(); SfxItemSet aSet( rMyPool, pEntry->nWID, pEntry->nWID); aSet.Put( rMyPool.GetDefaultItem( pEntry->nWID ) ); - aRet = SvxItemPropertySet_getPropertyValue( GetStylePropertySet(), pEntry, aSet ); + aRet = SvxItemPropertySet_getPropertyValue( pEntry, aSet ); } return aRet; } diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index fa5f4a018dda..a5faccb38f89 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -100,7 +100,7 @@ static SdPage* GetCurrentPage( sd::ViewShell* pViewSh, EditFieldInfo* pInfo, boo for( Paragraph* pPara = rOutl.GetParagraph( 0 ); pPara && nPos >= 0; pPara = rOutl.GetParagraph( ++nParaPos ), nPos-- ) { - if( rOutl.HasParaFlag( pPara, ParaFlag::ISPAGE ) ) + if( Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) ) nPgNum++; } diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index d368f96f4894..c47c8ec3c5fe 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -533,7 +533,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) Paragraph* pPara = aSelList.empty() ? NULL : *(aSelList.begin()); // what should we insert? - while (pPara && !rDocliner.HasParaFlag(pPara, ParaFlag::ISPAGE)) + while (pPara && !Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE)) pPara = rDocliner.GetParent(pPara); sal_Int32 nTargetPos = rDocliner.GetAbsPos(pPara) + 1; @@ -544,7 +544,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) while (pPara) { sal_Int32 nPos = rDocliner.GetAbsPos( pPara ); - if ( rDocliner.HasParaFlag( pPara, ParaFlag::ISPAGE ) ) + if ( Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) ) nPage++; pPara = rDocliner.GetParagraph( nPos - 1 ); } @@ -588,7 +588,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) while (pPara) { sal_Int32 nPos = pOutliner->GetAbsPos( pPara ); - if( pOutliner->HasParaFlag( pPara, ParaFlag::ISPAGE ) ) + if( Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) ) nNewPages++; pPara = pOutliner->GetParagraph( ++nPos ); } @@ -625,7 +625,7 @@ void FuInsertFile::InsTextOrRTFinOlMode(SfxMedium* pMedium) rDocliner.SetStyleSheet( nTargetPos, pOutlStyle ); } - if( rDocliner.HasParaFlag( pSourcePara, ParaFlag::ISPAGE ) ) + if( Outliner::HasParaFlag( pSourcePara, ParaFlag::ISPAGE ) ) { nNewPages++; if( pProgress ) diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index 60cdc25c8685..6578b585d643 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -89,7 +89,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) Paragraph* pPara = aSelList.empty() ? NULL : *iter; nDepth = pOutl->GetDepth(pOutl->GetAbsPos( pPara ) ); - bool bPage = pOutl->HasParaFlag( pPara, ParaFlag::ISPAGE ); + bool bPage = ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ); while( iter != aSelList.end() ) { @@ -103,7 +103,7 @@ void FuPresentationObjects::DoExecute( SfxRequest& ) break; } - if( pOutl->HasParaFlag( pPara, ParaFlag::ISPAGE ) != bPage ) + if( ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) != bPage ) { bUnique = false; break; diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx index f11a333c0300..53be94336ebf 100644 --- a/sd/source/ui/unoidl/unopback.cxx +++ b/sd/source/ui/unoidl/unopback.cxx @@ -254,7 +254,7 @@ void SAL_CALL SdUnoPageBackground::setPropertyValue( const OUString& aPropertyNa } else { - SvxItemPropertySet_setPropertyValue( *mpPropSet, pEntry, aValue, aSet ); + SvxItemPropertySet_setPropertyValue( pEntry, aValue, aSet ); } mpSet->Put( aSet ); @@ -308,7 +308,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyValue( const OUString& Propert aSet.Put( rPool.GetDefaultItem( pEntry->nWID ) ); // get value from ItemSet - aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( pEntry, aSet ); } } else @@ -436,7 +436,7 @@ uno::Any SAL_CALL SdUnoPageBackground::getPropertyDefault( const OUString& aProp SfxItemSet aSet( rPool, pEntry->nWID, pEntry->nWID); aSet.Put( rPool.GetDefaultItem( pEntry->nWID ) ); - aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pEntry, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( pEntry, aSet ); } } return aAny; diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx index dec6968b35c6..6a6297d32754 100644 --- a/sd/source/ui/view/drtxtob.cxx +++ b/sd/source/ui/view/drtxtob.cxx @@ -286,7 +286,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) { // allow move up if position is 2 or greater OR it // is a title object (and thus depth==1) - if(pOutl->GetAbsPos(pPara) > 1 || ( pOutl->HasParaFlag(pPara,ParaFlag::ISPAGE) && pOutl->GetAbsPos(pPara) > 0 ) ) + if(pOutl->GetAbsPos(pPara) > 1 || ( ::Outliner::HasParaFlag(pPara,ParaFlag::ISPAGE) && pOutl->GetAbsPos(pPara) > 0 ) ) { // not at top bDisableUp = false; @@ -308,14 +308,14 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) sal_Int16 nDepth = pOutl->GetDepth( pOutl->GetAbsPos( pPara ) ); - if (nDepth > 0 || (bOutlineViewSh && (nDepth <= 0) && !pOutl->HasParaFlag( pPara, ParaFlag::ISPAGE )) ) + if (nDepth > 0 || (bOutlineViewSh && (nDepth <= 0) && !::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE )) ) { // not minimum depth bDisableLeft = false; } if( (nDepth < pOLV->GetOutliner()->GetMaxDepth() && ( !bOutlineViewSh || pOutl->GetAbsPos(pPara) != 0 )) || - (bOutlineViewSh && (nDepth <= 0) && pOutl->HasParaFlag( pPara, ParaFlag::ISPAGE ) && pOutl->GetAbsPos(pPara) != 0) ) + (bOutlineViewSh && (nDepth <= 0) && ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) && pOutl->GetAbsPos(pPara) != 0) ) { // not maximum depth and not at top bDisableRight = false; @@ -336,7 +336,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet ) && pPara && 0 == pOutl->GetAbsPos(pPara) && pOutl->GetParagraphCount() > 1 - && !pOutl->HasParaFlag( pOutl->GetParagraph(1), ParaFlag::ISPAGE ) ) + && !::Outliner::HasParaFlag( pOutl->GetParagraph(1), ParaFlag::ISPAGE ) ) { // Needs to be disabled bDisableDown = true; diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 4c6c1fb996cd..850a9f99fbc9 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -810,7 +810,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) sal_Int16 nDepth; sal_Int16 nTmpDepth = rOutl.GetDepth( rOutl.GetAbsPos( pPara ) ); - bool bPage = rOutl.HasParaFlag( pPara, ParaFlag::ISPAGE ); + bool bPage = ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ); while (iter != aSelList.begin()) { @@ -818,7 +818,7 @@ void OutlineViewShell::GetMenuState( SfxItemSet &rSet ) nDepth = rOutl.GetDepth( rOutl.GetAbsPos( pPara ) ); - if( nDepth != nTmpDepth || bPage != rOutl.HasParaFlag( pPara, ParaFlag::ISPAGE )) + if( nDepth != nTmpDepth || bPage != ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE )) bUnique = false; if (rOutl.HasChildren(pPara)) @@ -1310,7 +1310,6 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) ::sd::Window* pWin = GetActiveWindow(); OutlinerView* pActiveView = pOlView->GetViewByWindow( pWin ); - ::Outliner& rOutliner = pOlView->GetOutliner(); std::vector aSelList; pActiveView->CreateSelectionList(aSelList); @@ -1324,10 +1323,10 @@ void OutlineViewShell::GetStatusBarState(SfxItemSet& rSet) pLastPara = *(aSelList.rbegin()); } - if( !rOutliner.HasParaFlag(pFirstPara,ParaFlag::ISPAGE) ) + if( !::Outliner::HasParaFlag(pFirstPara,ParaFlag::ISPAGE) ) pFirstPara = pOlView->GetPrevTitle( pFirstPara ); - if( !rOutliner.HasParaFlag(pLastPara, ParaFlag::ISPAGE) ) + if( !::Outliner::HasParaFlag(pLastPara, ParaFlag::ISPAGE) ) pLastPara = pOlView->GetPrevTitle( pLastPara ); // only one page selected? @@ -1689,7 +1688,7 @@ bool OutlineViewShell::UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ) sal_Int32 nPara = nTitlePara + 1; sal_Int32 nParasInLayout = 0L; pPara = rOutliner.GetParagraph( nPara ); - while( pPara && !rOutliner.HasParaFlag(pPara, ParaFlag::ISPAGE) ) + while( pPara && !::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) ) { nParasInLayout++; pPara = rOutliner.GetParagraph( ++nPara ); diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx index feeea971ae06..483de85d82eb 100644 --- a/sd/source/ui/view/outlview.cxx +++ b/sd/source/ui/view/outlview.cxx @@ -331,7 +331,7 @@ Paragraph* OutlineView::GetPrevTitle(const Paragraph* pPara) while(nPos) { pPara = mrOutliner.GetParagraph(--nPos); - if( mrOutliner.HasParaFlag(pPara, ParaFlag::ISPAGE) ) + if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) ) { return const_cast< Paragraph* >( pPara ); } @@ -353,7 +353,7 @@ Paragraph* OutlineView::GetNextTitle(const Paragraph* pPara) do { pResult = mrOutliner.GetParagraph(++nPos); - if( pResult && mrOutliner.HasParaFlag(pResult, ParaFlag::ISPAGE) ) + if( pResult && ::Outliner::HasParaFlag(pResult, ParaFlag::ISPAGE) ) return pResult; } while( pResult ); @@ -378,7 +378,9 @@ IMPL_LINK( OutlineView, ParagraphInsertedHdl, ::Outliner *, pOutliner ) UpdateParagraph( nAbsPos ); - if( (nAbsPos == 0) || mrOutliner.HasParaFlag(pPara,ParaFlag::ISPAGE) || mrOutliner.HasParaFlag(mrOutliner.GetParagraph( nAbsPos-1 ), ParaFlag::ISPAGE) ) + if( (nAbsPos == 0) || + ::Outliner::HasParaFlag(pPara,ParaFlag::ISPAGE) || + ::Outliner::HasParaFlag(mrOutliner.GetParagraph( nAbsPos-1 ), ParaFlag::ISPAGE) ) { InsertSlideForParagraph( pPara ); } @@ -511,7 +513,7 @@ IMPL_LINK( OutlineView, ParagraphRemovingHdl, ::Outliner *, pOutliner ) OutlineViewPageChangesGuard aGuard(this); Paragraph* pPara = pOutliner->GetHdlParagraph(); - if( pOutliner->HasParaFlag( pPara, ParaFlag::ISPAGE ) ) + if( ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) ) { // how many titles are in front of the title paragraph in question? sal_uLong nPos = 0L; @@ -570,7 +572,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) OutlineViewPageChangesGuard aGuard(this); Paragraph* pPara = pOutliner->GetHdlParagraph(); - if( pOutliner->HasParaFlag( pPara, ParaFlag::ISPAGE ) && ((pOutliner->GetPrevFlags() & ParaFlag::ISPAGE) == ParaFlag::NONE) ) + if( ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) && ((pOutliner->GetPrevFlags() & ParaFlag::ISPAGE) == ParaFlag::NONE) ) { // the current paragraph is transformed into a slide @@ -591,7 +593,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) { pParagraph = *iter; - if( !pOutliner->HasParaFlag( pParagraph, ParaFlag::ISPAGE ) && + if( !::Outliner::HasParaFlag( pParagraph, ParaFlag::ISPAGE ) && (pOutliner->GetDepth( pOutliner->GetAbsPos( pParagraph ) ) <= 0) ) mnPagesToProcess++; } @@ -640,7 +642,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) } pOutliner->UpdateFields(); } - else if( !pOutliner->HasParaFlag( pPara, ParaFlag::ISPAGE ) && ((pOutliner->GetPrevFlags() & ParaFlag::ISPAGE) != ParaFlag::NONE) ) + else if( !::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ) && ((pOutliner->GetPrevFlags() & ParaFlag::ISPAGE) != ParaFlag::NONE) ) { // the paragraph was a page but now becomes a normal paragraph @@ -735,7 +737,7 @@ IMPL_LINK( OutlineView, DepthChangedHdl, ::Outliner *, pOutliner ) sal_Int16 nDepth = pOutliner->GetDepth( nPara ); bool bSubTitle = pPage->GetPresObj(PRESOBJ_TEXT) != NULL; - if( pOutliner->HasParaFlag(pPara, ParaFlag::ISPAGE) ) + if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) ) { pStyleSheet = pPage->GetStyleSheetForPresObj( PRESOBJ_TITLE ); } @@ -831,7 +833,7 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner ) for (std::vector::iterator it = maSelectedParas.begin(); it != maSelectedParas.end();) { - if (!pOutliner->HasParaFlag(*it, ParaFlag::ISPAGE)) + if (!::Outliner::HasParaFlag(*it, ParaFlag::ISPAGE)) it = maSelectedParas.erase(it); else ++it; @@ -845,7 +847,7 @@ IMPL_LINK( OutlineView, BeginMovingHdl, ::Outliner *, pOutliner ) while(pPara) { - if( pOutliner->HasParaFlag(pPara, ParaFlag::ISPAGE) ) // one page? + if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) ) // one page? { maOldParaOrder.push_back(pPara); SdPage* pPage = mrDoc.GetSdPage(nPos, PK_STANDARD); @@ -881,7 +883,7 @@ IMPL_LINK( OutlineView, EndMovingHdl, ::Outliner *, pOutliner ) Paragraph* pPrev = NULL; while (pPara && pPara != pSearchIt) { - if( pOutliner->HasParaFlag(pPara, ParaFlag::ISPAGE) ) + if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) ) { nPosNewOrder++; pPrev = pPara; @@ -1239,7 +1241,7 @@ SdPage* OutlineView::GetActualPage() SdPage* OutlineView::GetPageForParagraph( Paragraph* pPara ) { - if( !mrOutliner.HasParaFlag(pPara,ParaFlag::ISPAGE) ) + if( !::Outliner::HasParaFlag(pPara,ParaFlag::ISPAGE) ) pPara = GetPrevTitle(pPara); sal_uInt32 nPageToSelect = 0; @@ -1267,7 +1269,7 @@ Paragraph* OutlineView::GetParagraphForPage( ::Outliner& rOutl, SdPage* pPage ) while( pPara ) { // if this paragraph is a page ... - if( mrOutliner.HasParaFlag(pPara,ParaFlag::ISPAGE) ) + if( ::Outliner::HasParaFlag(pPara,ParaFlag::ISPAGE) ) { // see if we already skipped enough pages if( 0 == nPagesToSkip ) @@ -1318,7 +1320,7 @@ void OutlineView::SetSelectedPages() for (std::vector::iterator it = aSelParas.begin(); it != aSelParas.end();) { - if (!mrOutliner.HasParaFlag(*it, ParaFlag::ISPAGE)) + if (!::Outliner::HasParaFlag(*it, ParaFlag::ISPAGE)) it = aSelParas.erase(it); else ++it; @@ -1332,7 +1334,7 @@ void OutlineView::SetSelectedPages() while(pPara) { - if( mrOutliner.HasParaFlag(pPara, ParaFlag::ISPAGE) ) // one page + if( ::Outliner::HasParaFlag(pPara, ParaFlag::ISPAGE) ) // one page { SdPage* pPage = mrDoc.GetSdPage(nPos, PK_STANDARD); DBG_ASSERT(pPage!=NULL, @@ -1674,13 +1676,13 @@ IMPL_LINK(OutlineView, PaintingFirstLineHdl, PaintFirstLineInfo*, pInfo) Size aOffset( 100, 100 ); // paint slide number - if( pPara && mrOutliner.HasParaFlag(pPara,ParaFlag::ISPAGE) ) + if( pPara && ::Outliner::HasParaFlag(pPara,ParaFlag::ISPAGE) ) { long nPage = 0; // todo, printing?? for ( sal_Int32 n = 0; n <= pInfo->mnPara; n++ ) { Paragraph* p = mrOutliner.GetParagraph( n ); - if ( mrOutliner.HasParaFlag(p,ParaFlag::ISPAGE) ) + if ( ::Outliner::HasParaFlag(p,ParaFlag::ISPAGE) ) nPage++; } @@ -1775,7 +1777,7 @@ void OutlineView::OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) { Paragraph* pPara = mrOutliner.GetParagraph( nPara ); - bool bPage = mrOutliner.HasParaFlag( pPara, ParaFlag::ISPAGE ); + bool bPage = ::Outliner::HasParaFlag( pPara, ParaFlag::ISPAGE ); if( !bPage ) { diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index a4c62ebda45e..32e8b24389cd 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -412,7 +412,7 @@ SdrOutliner* SdrMakeOutliner(sal_uInt16 nOutlinerMode, SdrModel& rModel) pOutl->SetEditTextObjectPool( pPool ); pOutl->SetStyleSheetPool( static_cast(rModel.GetStyleSheetPool())); pOutl->SetDefTab(rModel.GetDefaultTabulator()); - pOutl->SetForbiddenCharsTable(rModel.GetForbiddenCharsTable()); + Outliner::SetForbiddenCharsTable(rModel.GetForbiddenCharsTable()); pOutl->SetAsianCompressionMode(rModel.GetCharCompressType()); pOutl->SetKernAsianPunctuation(rModel.IsKernAsianPunctuation()); pOutl->SetAddExtLeading(rModel.IsAddExtLeading()); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 2f7366b6933a..0ae5ea568f38 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -778,7 +778,7 @@ void SdrModel::ImpSetOutlinerDefaults( SdrOutliner* pOutliner, bool bInit ) } pOutliner->SetRefDevice(GetRefDevice()); - pOutliner->SetForbiddenCharsTable(GetForbiddenCharsTable()); + Outliner::SetForbiddenCharsTable(GetForbiddenCharsTable()); pOutliner->SetAsianCompressionMode( mnCharCompressType ); pOutliner->SetKernAsianPunctuation( IsKernAsianPunctuation() ); pOutliner->SetAddExtLeading( IsAddExtLeading() ); diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index c88b4bd2005d..11aedb88cacf 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -994,7 +994,7 @@ sal_Int32 SAL_CALL Cell::getError( ) throw (RuntimeException, std::exception) Any Cell::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleEntry* pMap ) { - Any aAny( SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ) ); + Any aAny( SvxItemPropertySet_getPropertyValue( pMap, aSet ) ); if( pMap->aType != aAny.getValueType() ) { @@ -1150,7 +1150,7 @@ void SAL_CALL Cell::setPropertyValue( const OUString& rPropertyName, const Any& if( aSet.GetItemState( pMap->nWID ) == SfxItemState::SET ) { - SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rValue, aSet ); + SvxItemPropertySet_setPropertyValue( pMap, rValue, aSet ); } } } diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 58a3e7d14ff4..ce5c75e22124 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -632,7 +632,7 @@ void SvxItemPropertySet_ObtainSettingsFromPropertySet(const SvxItemPropertySet& if(SfxItemPool::IsWhich(pEntry->nWID)) rSet.Put(rSet.GetPool()->GetDefaultItem(pEntry->nWID)); // set - SvxItemPropertySet_setPropertyValue(rPropSet, pEntry, *pUsrAny, rSet); + SvxItemPropertySet_setPropertyValue(pEntry, *pUsrAny, rSet); } } } @@ -1725,7 +1725,7 @@ void SAL_CALL SvxShape::_setPropertyValue( const OUString& rPropertyName, const if( pSet->GetItemState( pMap->nWID ) == SfxItemState::SET ) { - SvxItemPropertySet_setPropertyValue( *mpPropSet, pMap, rVal, *pSet ); + SvxItemPropertySet_setPropertyValue( pMap, rVal, *pSet ); } } @@ -2007,7 +2007,7 @@ uno::Any SvxShape::GetAnyForItem( SfxItemSet& aSet, const SfxItemPropertySimpleE default: { // get value form ItemSet - aAny = SvxItemPropertySet_getPropertyValue( *mpPropSet, pMap, aSet ); + aAny = SvxItemPropertySet_getPropertyValue( pMap, aSet ); if( pMap->aType != aAny.getValueType() ) { @@ -4210,23 +4210,23 @@ SdrObject* SdrObject::getSdrObjectFromXShape( const ::com::sun::star::uno::Refer return pSvxShape ? pSvxShape->GetSdrObject() : 0; } -uno::Any SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) +uno::Any SvxItemPropertySet_getPropertyValue( const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet ) { if(!pMap || !pMap->nWID) return uno::Any(); // Check is for items that store either metric values if thei are positiv or percentage if thei are negativ. bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY ); - return rPropSet.getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES), bDontConvertNegativeValues ); + return SvxItemPropertySet::getPropertyValue( pMap, rSet, (pMap->nWID != SDRATTR_XMLATTRIBUTES), bDontConvertNegativeValues ); } -void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) +void SvxItemPropertySet_setPropertyValue( const SfxItemPropertySimpleEntry* pMap, const uno::Any& rVal, SfxItemSet& rSet ) { if(!pMap || !pMap->nWID) return; bool bDontConvertNegativeValues = ( pMap->nWID == XATTR_FILLBMP_SIZEX || pMap->nWID == XATTR_FILLBMP_SIZEY ); - rPropSet.setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues ); + SvxItemPropertySet::setPropertyValue( pMap, rVal, rSet, bDontConvertNegativeValues ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit