mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ofz#3663: returning SfxPoolItem belonging to local

Browse Source 
Change-Id: Ib9760efb1231ef057dfd62d06095c15e3bf73a87
Reviewed-on: https://gerrit.libreoffice.org/43425
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2017-10-16 14:23:22 +01:00
parent e5a5369030
commit f09d48069b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sw/source/filter/ww8/ww8par.cxx
View File

@@ -1480,9 +1480,9 @@ const SfxPoolItem* SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos,
if (pNd->IsTextNode()) if (pNd->IsTextNode())
{ {
const sal_Int32 nPos = rPos.nContent.GetIndex(); const sal_Int32 nPos = rPos.nContent.GetIndex();
SfxItemSet aSet(pDoc->GetAttrPool(), {{nWhich, nWhich}}); m_xScratchSet.reset(new SfxItemSet(pDoc->GetAttrPool(), {{nWhich, nWhich}}));
if (pNd->GetTextNode()->GetAttr(aSet, nPos, nPos)) if (pNd->GetTextNode()->GetAttr(*m_xScratchSet, nPos, nPos))
pItem = aSet.GetItem(nWhich); pItem = m_xScratchSet->GetItem(nWhich);
} }
if (!pItem) if (!pItem)

1
sw/source/filter/ww8/ww8par.hxx
View File

@@ -357,6 +357,7 @@ class SwWW8FltControlStack : public SwFltControlStack
{ {
private: private:
SwWW8ImplReader& rReader; SwWW8ImplReader& rReader;
std::unique_ptr<SfxItemSet> m_xScratchSet;
sal_uInt16 nToggleAttrFlags; sal_uInt16 nToggleAttrFlags;
sal_uInt16 nToggleBiDiAttrFlags; sal_uInt16 nToggleBiDiAttrFlags;
SwWW8FltControlStack(const SwWW8FltControlStack&) = delete; SwWW8FltControlStack(const SwWW8FltControlStack&) = delete;