diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-02-18 21:16:06 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-03-06 21:57:26 +0100 |
| commit | 5fb9bbe54b33377dfd0b312dce3881e39319cabd (patch) | |
| tree | 690639b8d2c2bcf582cbef845da5250dcf82d476 | |
| parent | 229417c91d44f00e6a91622696d080cb085e4acc (diff) | |
ofz#6450 use the rule name, not the rule itself
Change-Id: I62541dc48b7e9d5a906f32791437a86a8283a7bf
Reviewed-on: https://gerrit.libreoffice.org/49954
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit 744c267f8f6de0ba4a829874992c1404b5b79e28)
| -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 424835eb133b..a1abaa068bd8 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -976,7 +976,7 @@ struct ANLDRuleMap OUString msOutlineNumRule; // WinWord 6 numbering, variant 1 OUString msNumberingNumRule; // WinWord 6 numbering, variant 2 SwNumRule* GetNumRule(SwDoc& rDoc, sal_uInt8 nNumType); - void SetNumRule(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 83b8a5fbb1a8..efc967099f9c 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -1028,13 +1028,12 @@ SwNumRule *ANLDRuleMap::GetNumRule(SwDoc& rDoc, sal_uInt8 nNumType) return rDoc.FindNumRulePtr(rNumRule); } -void ANLDRuleMap::SetNumRule(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 @@ -1106,7 +1105,7 @@ void SwWW8ImplReader::StartAnl(const sal_uInt8* pSprm13) m_pCtrlStck->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 |