Kaydet (Commit) a2ca21fa authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Miklos Vajna

ofz: returning SfxPoolItem belonging to local

Change-Id: Ib9760efb1231ef057dfd62d06095c15e3bf73a87
Reviewed-on: https://gerrit.libreoffice.org/43426Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 70205e37
......@@ -1496,9 +1496,9 @@ const SfxPoolItem* SwWW8FltControlStack::GetFormatAttr(const SwPosition& rPos,
if (pNd->IsTextNode())
{
const sal_Int32 nPos = rPos.nContent.GetIndex();
SfxItemSet aSet(pDoc->GetAttrPool(), nWhich, nWhich);
if (pNd->GetTextNode()->GetAttr(aSet, nPos, nPos))
pItem = aSet.GetItem(nWhich);
m_xScratchSet.reset(new SfxItemSet(pDoc->GetAttrPool(), nWhich, nWhich));
if (pNd->GetTextNode()->GetAttr(*m_xScratchSet, nPos, nPos))
pItem = m_xScratchSet->GetItem(nWhich);
}
if (!pItem)
......
......@@ -357,6 +357,7 @@ class SwWW8FltControlStack : public SwFltControlStack
{
private:
SwWW8ImplReader& rReader;
std::unique_ptr<SfxItemSet> m_xScratchSet;
sal_uInt16 nToggleAttrFlags;
sal_uInt16 nToggleBiDiAttrFlags;
SwWW8FltControlStack(const SwWW8FltControlStack&) = delete;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment