diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-18 21:16:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-02-19 00:29:39 +0100 |
| commit | 99457255b69e67b276339d98f977ada8caa25753 (patch) | |
| tree | 0d95f7a16840b54463ee77f829e338aebce47599 | |
| parent | 68cebacac864da199ace7fe03db0e054e6b36966 (diff) | |
ofz#6450 use the rule name, not the rule itself
Change-Id: I62541dc48b7e9d5a906f32791437a86a8283a7bf
Reviewed-on: https://gerrit.libreoffice.org/49952
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/filter/ww8/ww8par.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index 5b7b9a6f10e2..ed797637a04b 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -979,7 +979,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 f284886201cd..3005b5dcc16a 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -874,13 +874,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 @@ -952,7 +951,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 |