sw/source/filter/ww8/ww8par.hxx | 2 +- sw/source/filter/ww8/ww8par2.cxx | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-)
New commits: commit e853558b86a28e50bc64e95768843371fd99398d Author: Caolán McNamara <caol...@redhat.com> Date: Sun Feb 18 21:16:06 2018 +0000 ofz#6450 use the rule name, not the rule itself Change-Id: I62541dc48b7e9d5a906f32791437a86a8283a7bf Reviewed-on: https://gerrit.libreoffice.org/49953 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Michael Stahl <mst...@redhat.com> diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 968edc8eb73c..b0af113b8194 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -974,7 +974,7 @@ struct ANLDRuleMap OUString msOutlineNumRule; // WinWord 6 numbering, variant 1 OUString msNumberingNumRule; // WinWord 6 numbering, variant 2 SwNumRule* GetNumRule(const SwDoc& rDoc, sal_uInt8 nNumType); - void SetNumRule(const SwNumRule*, sal_uInt8 nNumType); + void SetNumRule(const OUString& rNumRule, sal_uInt8 nNumType); }; struct SprmReadInfo; diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 54498ea7cc04..43320f9efb2e 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -1021,13 +1021,12 @@ SwNumRule *ANLDRuleMap::GetNumRule(const SwDoc& rDoc, sal_uInt8 nNumType) return rDoc.FindNumRulePtr(rNumRule); } -void ANLDRuleMap::SetNumRule(const SwNumRule *pRule, sal_uInt8 nNumType) +void ANLDRuleMap::SetNumRule(const OUString& rNumRule, sal_uInt8 nNumType) { - OUString sNumRule = pRule ? pRule->GetName() : OUString(); if (WW8_Numbering == nNumType) - msNumberingNumRule = sNumRule; + msNumberingNumRule = rNumRule; else - msOutlineNumRule = sNumRule; + msOutlineNumRule = rNumRule; } // StartAnl is called at the beginning of a row area that contains @@ -1099,7 +1098,7 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13) m_xCtrlStck->NewAttr(*m_pPaM->GetPoint(), SfxStringItem(RES_FLTR_NUMRULE, sNumRule)); - m_aANLDRules.SetNumRule(pNumRule, m_nWwNumType); + m_aANLDRules.SetNumRule(sNumRule, m_nWwNumType); } // NextAnlLine() is called once for every row of a _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits