diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2018-11-16 16:45:20 +0100 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2018-12-07 10:32:26 +0100 |
commit | 18ed62160e6bcd06ccd13ddda2d6c8459f015041 (patch) | |
tree | bdaafab7d2038322af97112b61f0332573b06b4e | |
parent | 1a8606c8c649a71e1fc0a6686682e7b46df6aaf9 (diff) |
sw: rename to SwTextNode::GetParaAttr(), at least that's unique
Change-Id: I1de6b544a4868f0d30077ba2c6d195bffd2e8b00
(cherry picked from commit 2b61043032e2e408e3a721bb91dd13577aa673dc)
-rw-r--r-- | sw/inc/ndtxt.hxx | 2 | ||||
-rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 34 | ||||
-rw-r--r-- | sw/source/core/doc/DocumentContentOperationsManager.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/doc/docfmt.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/edit/acorrect.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/edit/edattr.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/edit/edfmt.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/fields/expfld.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/txtnode/ndtxt.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/txtnode/thints.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unoobj2.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlfldw.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 3 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 |
15 files changed, 32 insertions, 31 deletions
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 8fd2c5449f7b..0818fde96434 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -302,7 +302,7 @@ public: the requested item set as a LR-SPACE item, if <bOnlyTextAttr> == false, corresponding node has not its own indent attributes and the position-and-space mode of the list level is SvxNumberFormat::LABEL_ALIGNMENT. */ - bool GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd, + bool GetParaAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd, const bool bOnlyTextAttr = false, const bool bGetFromChrFormat = true, const bool bMergeIndentValuesOfNumRule = false ) const; diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index 82867e7ea21a..fb399694ed9d 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -2402,7 +2402,7 @@ void SwUiWriterTest::testTdf72788() rIDCO.InsertPoolItem(*pCursor, aWeightItem); SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>{}); //Add selected text's attributes to aSet - pCursor->GetNode().GetTextNode()->GetAttr(aSet, 5, 12); + pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 5, 12); SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT); //Check that bold is active on the selection and it's in aSet CPPUNIT_ASSERT_EQUAL(true, (*pPoolItem == aWeightItem)); @@ -2423,7 +2423,7 @@ void SwUiWriterTest::testTdf72788() //In case of Regression RstTextAttr() call will result to infinite recursion //Check that bold is removed in first paragraph aSet.ClearItem(); - pTextNode->GetAttr(aSet, 5, 12); + pTextNode->GetParaAttr(aSet, 5, 12); SfxPoolItem const * pPoolItem2 = aSet.GetItem(RES_CHRATR_WEIGHT); CPPUNIT_ASSERT_EQUAL(true, (*pPoolItem2 != aWeightItem)); } @@ -3661,7 +3661,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT_EQUAL(OUString(OUStringLiteral1(CH_TXTATR_BREAKWORD) + u"foo" + OUStringLiteral1(CH_TXTATR_BREAKWORD)), pShell->GetCursor()->GetNode().GetTextNode()->GetText()); SfxPoolItem const* pItem; SfxItemSet query(pDoc->GetAttrPool(), svl::Items<RES_CHRATR_HIDDEN, RES_CHRATR_HIDDEN>{}); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 1, 4); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue()); query.ClearItem(RES_CHRATR_HIDDEN); @@ -3672,7 +3672,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0, RES_TXTATR_FLYCNT)); CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF)); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pShell->GetCursor()->GetNode().GetTextNode()->Len()); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 0, 1); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 0, 1); CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); query.ClearItem(RES_CHRATR_HIDDEN); rUndoManager.Undo(); @@ -3681,10 +3681,10 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF)); CPPUNIT_ASSERT_EQUAL(sal_Int32(5), pShell->GetCursor()->GetNode().GetTextNode()->Len()); CPPUNIT_ASSERT_EQUAL(OUString(OUStringLiteral1(CH_TXTATR_BREAKWORD) + u"foo" + OUStringLiteral1(CH_TXTATR_BREAKWORD)), pShell->GetCursor()->GetNode().GetTextNode()->GetText()); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 0, 1); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 0, 1); CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); query.ClearItem(RES_CHRATR_HIDDEN); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 1, 4); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue()); query.ClearItem(RES_CHRATR_HIDDEN); @@ -3692,7 +3692,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0, RES_TXTATR_FLYCNT)); CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF)); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pShell->GetCursor()->GetNode().GetTextNode()->Len()); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 0, 1); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 0, 1); CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); query.ClearItem(RES_CHRATR_HIDDEN); rUndoManager.Undo(); @@ -3701,10 +3701,10 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF)); CPPUNIT_ASSERT_EQUAL(sal_Int32(5), pShell->GetCursor()->GetNode().GetTextNode()->Len()); CPPUNIT_ASSERT_EQUAL(OUString(OUStringLiteral1(CH_TXTATR_BREAKWORD) + u"foo" + OUStringLiteral1(CH_TXTATR_BREAKWORD)), pShell->GetCursor()->GetNode().GetTextNode()->GetText()); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 0, 1); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 0, 1); CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); query.ClearItem(RES_CHRATR_HIDDEN); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 1, 4); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue()); query.ClearItem(RES_CHRATR_HIDDEN); @@ -3715,7 +3715,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0, RES_TXTATR_FLYCNT)); CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF)); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pShell->GetCursor()->GetNode().GetTextNode()->Len()); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 4, 5); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 4, 5); CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); query.ClearItem(RES_CHRATR_HIDDEN); rUndoManager.Undo(); @@ -3724,10 +3724,10 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF)); CPPUNIT_ASSERT_EQUAL(sal_Int32(5), pShell->GetCursor()->GetNode().GetTextNode()->Len()); CPPUNIT_ASSERT_EQUAL(OUString(OUStringLiteral1(CH_TXTATR_BREAKWORD) + u"foo" + OUStringLiteral1(CH_TXTATR_BREAKWORD)), pShell->GetCursor()->GetNode().GetTextNode()->GetText()); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 4, 5); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 4, 5); CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); query.ClearItem(RES_CHRATR_HIDDEN); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 1, 4); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue()); query.ClearItem(RES_CHRATR_HIDDEN); @@ -3735,7 +3735,7 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT(pShell->GetCursor()->GetNode().GetTextNode()->GetTextAttrForCharAt(0, RES_TXTATR_FLYCNT)); CPPUNIT_ASSERT_EQUAL(size_t(1), pDoc->GetFlyCount(FLYCNTTYPE_GRF)); CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pShell->GetCursor()->GetNode().GetTextNode()->Len()); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 4, 5); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 4, 5); CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); query.ClearItem(RES_CHRATR_HIDDEN); rUndoManager.Undo(); @@ -3744,10 +3744,10 @@ void SwUiWriterTest::testUndoDelAsCharTdf107512() CPPUNIT_ASSERT_EQUAL(size_t(2), pDoc->GetFlyCount(FLYCNTTYPE_GRF)); CPPUNIT_ASSERT_EQUAL(sal_Int32(5), pShell->GetCursor()->GetNode().GetTextNode()->Len()); CPPUNIT_ASSERT_EQUAL(OUString(OUStringLiteral1(CH_TXTATR_BREAKWORD) + u"foo" + OUStringLiteral1(CH_TXTATR_BREAKWORD)), pShell->GetCursor()->GetNode().GetTextNode()->GetText()); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 4, 5); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 4, 5); CPPUNIT_ASSERT_EQUAL(SfxItemState::DEFAULT, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); query.ClearItem(RES_CHRATR_HIDDEN); - pShell->GetCursor()->GetNode().GetTextNode()->GetAttr(query, 1, 4); + pShell->GetCursor()->GetNode().GetTextNode()->GetParaAttr(query, 1, 4); CPPUNIT_ASSERT_EQUAL(SfxItemState::SET, query.GetItemState(RES_CHRATR_HIDDEN, false, &pItem)); CPPUNIT_ASSERT(static_cast<SvxCharHiddenItem const*>(pItem)->GetValue()); query.ClearItem(RES_CHRATR_HIDDEN); @@ -3775,7 +3775,7 @@ void SwUiWriterTest::testUndoCharAttribute() rIDCO.InsertPoolItem(*pCursor, aWeightItem); SfxItemSet aSet( pDoc->GetAttrPool(), svl::Items<RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT>{}); // Adds selected text's attributes to aSet - pCursor->GetNode().GetTextNode()->GetAttr(aSet, 10, 19); + pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 10, 19); SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT); // Check that bold is active on the selection; checks if it's in aSet CPPUNIT_ASSERT_EQUAL(true, (*pPoolItem == aWeightItem)); @@ -3783,7 +3783,7 @@ void SwUiWriterTest::testUndoCharAttribute() rUndoManager.Undo(); // Check that bold is no longer active aSet.ClearItem(RES_CHRATR_WEIGHT); - pCursor->GetNode().GetTextNode()->GetAttr(aSet, 10, 19); + pCursor->GetNode().GetTextNode()->GetParaAttr(aSet, 10, 19); pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT); CPPUNIT_ASSERT_EQUAL(false, (*pPoolItem == aWeightItem)); } diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx index 72e0c5f81547..2727b3e39274 100644 --- a/sw/source/core/doc/DocumentContentOperationsManager.cxx +++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx @@ -3991,7 +3991,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt SfxItemSet aSet( m_rDoc.GetAttrPool(), svl::Items<RES_CHRATR_BEGIN, RES_TXTATR_WITHEND_END - 1, RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1>{} ); - pTextNd->GetAttr( aSet, nStt+1, nStt+1 ); + pTextNd->GetParaAttr( aSet, nStt+1, nStt+1 ); aSet.ClearItem( RES_TXTATR_REFMARK ); aSet.ClearItem( RES_TXTATR_TOXMARK ); diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx index 9f16c4131334..8f596083ed74 100644 --- a/sw/source/core/doc/docfmt.cxx +++ b/sw/source/core/doc/docfmt.cxx @@ -1820,7 +1820,7 @@ void SwDoc::SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& rSet } whichIds.push_back(0); SfxItemSet currentSet(GetAttrPool(), &whichIds[0]); - pTNd->GetAttr(currentSet, nEnd, nEnd); + pTNd->GetParaAttr(currentSet, nEnd, nEnd); for (size_t i = 0; whichIds[i]; i += 2) { // yuk - want to explicitly set the pool defaults too :-/ currentSet.Put(currentSet.Get(whichIds[i])); diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx index f5dbd66c27a4..a78c94942ec8 100644 --- a/sw/source/core/edit/acorrect.cxx +++ b/sw/source/core/edit/acorrect.cxx @@ -471,7 +471,7 @@ void SwDontExpandItem::SaveDontExpandItems( const SwPosition& rPos ) pDontExpItems.reset( new SfxItemSet( const_cast<SwDoc*>(pTextNd->GetDoc())->GetAttrPool(), aCharFormatSetRange ) ); const sal_Int32 n = rPos.nContent.GetIndex(); - if( !pTextNd->GetAttr( *pDontExpItems, n, n, + if (!pTextNd->GetParaAttr( *pDontExpItems, n, n, n != pTextNd->GetText().getLength() )) { pDontExpItems.reset(); diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx index e80ef6f109e1..5fe78b683964 100644 --- a/sw/source/core/edit/edattr.cxx +++ b/sw/source/core/edit/edattr.cxx @@ -141,7 +141,7 @@ bool SwEditShell::GetPaMAttr( SwPaM* pPaM, SfxItemSet& rSet, ? nEndCnt : pNd->GetTextNode()->GetText().getLength(); - static_cast<SwTextNode*>(pNd)->GetAttr( *pSet, nStt, nEnd, + static_cast<SwTextNode*>(pNd)->GetParaAttr(*pSet, nStt, nEnd, false, true, bMergeIndentValuesOfNumRule ); } diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx index 81722996aba6..6816bd84172a 100644 --- a/sw/source/core/edit/edfmt.cxx +++ b/sw/source/core/edit/edfmt.cxx @@ -93,7 +93,7 @@ void SwEditShell::FillByEx(SwCharFormat* pCharFormat) SfxItemSet aSet( mxDoc->GetAttrPool(), pCharFormat->GetAttrSet().GetRanges() ); - pTextNode->GetAttr( aSet, nStt, nEnd ); + pTextNode->GetParaAttr( aSet, nStt, nEnd ); pCharFormat->SetFormatAttr( aSet ); } else if( pCNd->HasSwAttrSet() ) diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx index 964d9d5d150f..d3787483c85b 100644 --- a/sw/source/core/fields/expfld.cxx +++ b/sw/source/core/fields/expfld.cxx @@ -1000,7 +1000,7 @@ sal_Int32 SwGetExpField::GetReferenceTextPos( const SwFormatField& rFormat, SwDo 0, 0 }; SwAttrSet aSet(rDoc.GetAttrPool(), nIds); - rTextNode.GetAttr(aSet, nRet, nRet+1); + rTextNode.GetParaAttr(aSet, nRet, nRet+1); if( RTL_TEXTENCODING_SYMBOL != static_cast<const SvxFontItem&>(aSet.Get( GetWhichOfScript( RES_CHRATR_FONT, nSrcpt )) ).GetCharSet() ) diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx index 3ac590b16784..3ddc6c4e54cb 100644 --- a/sw/source/core/txtnode/ndtxt.cxx +++ b/sw/source/core/txtnode/ndtxt.cxx @@ -5283,7 +5283,7 @@ void SwTextNode::dumpAsXml(xmlTextWriterPtr pWriter) const sal_uInt32 SwTextNode::GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const { SfxItemSet aSet( const_cast<SfxItemPool&>(static_cast<SfxItemPool const &>(GetDoc()->GetAttrPool())), svl::Items<RES_CHRATR_RSID, RES_CHRATR_RSID>{} ); - if ( GetAttr(aSet, nStt, nEnd) ) + if (GetParaAttr(aSet, nStt, nEnd)) { const SvxRsidItem* pRsid = aSet.GetItem<SvxRsidItem>(RES_CHRATR_RSID); if( pRsid ) diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index c2d9d1f09569..c319d135d93f 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -2048,7 +2048,7 @@ static void lcl_MergeListLevelIndentAsLRSpaceItem( const SwTextNode& rTextNode, } // request the attributes of the TextNode at the range -bool SwTextNode::GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd, +bool SwTextNode::GetParaAttr(SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd, const bool bOnlyTextAttr, const bool bGetFromChrFormat, const bool bMergeIndentValuesOfNumRule ) const { diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 80ef021dddfb..b2ddbe1e1997 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -405,7 +405,7 @@ void SwUnoCursorHelper::GetCursorAttr(SwPaM & rPam, const sal_Int32 nEnd = (n == nEndNd) ? rEnd.nContent.GetIndex() : pNd->GetTextNode()->GetText().getLength(); - pNd->GetTextNode()->GetAttr(*pSet, nStart, nEnd, bOnlyTextAttr, bGetFromChrFormat); + pNd->GetTextNode()->GetParaAttr(*pSet, nStart, nEnd, bOnlyTextAttr, bGetFromChrFormat); } break; diff --git a/sw/source/filter/html/htmlfldw.cxx b/sw/source/filter/html/htmlfldw.cxx index 24eb6bdfa4c4..7100a16b6f28 100644 --- a/sw/source/filter/html/htmlfldw.cxx +++ b/sw/source/filter/html/htmlfldw.cxx @@ -333,7 +333,7 @@ static Writer& OutHTML_SwField( Writer& rWrt, const SwField* pField, RES_CHRATR_POSTURE, RES_CHRATR_POSTURE, RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_WEIGHT>{} ); - rTextNd.GetAttr( aScriptItemSet, nFieldPos, nFieldPos+1 ); + rTextNd.GetParaAttr(aScriptItemSet, nFieldPos, nFieldPos+1); sal_uInt16 aWesternWhichIds[4] = { RES_CHRATR_FONT, RES_CHRATR_FONTSIZE, diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index 1895ae523cb3..a6dcefce8a89 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2100,7 +2100,8 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR if( pCNd && pCNd->IsTextNode()) { SfxItemSet aCoreSet(rDoc.GetAttrPool(), svl::Items<RES_CHRATR_ROTATE, RES_CHRATR_ROTATE>{}); - static_cast<const SwTextNode*>(pCNd)->GetAttr( aCoreSet, 0, static_cast<const SwTextNode*>(pCNd)->GetText().getLength()); + static_cast<const SwTextNode*>(pCNd)->GetParaAttr(aCoreSet, + 0, static_cast<const SwTextNode*>(pCNd)->GetText().getLength()); const SfxPoolItem * pRotItem; if ( SfxItemState::SET == aCoreSet.GetItemState(RES_CHRATR_ROTATE, true, &pRotItem)) { diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index d5e6d84fab2a..c8a3e0ab1d66 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -3414,7 +3414,7 @@ void WW8Export::WriteFootnoteBegin( const SwFormatFootnote& rFootnote, ww::bytes pCFormat = pInfo->GetCharFormat( *m_pDoc ); - pTextFootnote->GetTextNode().GetAttr(aSet, + pTextFootnote->GetTextNode().GetParaAttr(aSet, pTextFootnote->GetStart(), pTextFootnote->GetStart() + 1, true); if (aSet.Count()) { diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index 19171a4c8c6a..b1174771c554 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1494,7 +1494,7 @@ const SfxPoolItem* SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos, { const sal_Int32 nPos = rPos.nContent.GetIndex(); m_xScratchSet.reset(new SfxItemSet(pDoc->GetAttrPool(), {{nWhich, nWhich}})); - if (pNd->GetTextNode()->GetAttr(*m_xScratchSet, nPos, nPos)) + if (pNd->GetTextNode()->GetParaAttr(*m_xScratchSet, nPos, nPos)) pItem = m_xScratchSet->GetItem(nWhich); } |