[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - sw/inc sw/source

[Noel Grandin (via logerrit)]

 sw/inc/numrule.hxx                 |    4 +++-
 sw/source/core/doc/number.cxx      |   17 +++++++++++++++++
 sw/source/ui/misc/outline.cxx      |    2 +-
 sw/source/uibase/config/uinums.cxx |    9 ++++-----
 sw/source/uibase/inc/uinums.hxx    |    2 +-
 5 files changed, 26 insertions(+), 8 deletions(-)

New commits:
commit 662649d953c1f0f461d8df019731bb8854b5922b
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Feb 27 15:05:21 2021 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Feb 27 21:13:44 2021 +0100

    tdf#140528 Crash in writer when switching from Numbering to Position
    
    regression from
        commit e5ecb998fd78137aec32ad2cc996eaa4bb3e499d
        Date:   Mon Dec 5 09:52:43 2016 +0000
        avoid coverity#1371269 Missing move assignment operator
    
    rather write this code in a more obvious fashion, and bypass
    the use of the very weird operator= method, which barely
    copies anything at all.
    
    Change-Id: I548d8f73224c2625ed6389861551038b18396b0f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111677
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 9ab2284660857f52efc9b68b9d2dd8ea768d6916)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111695
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index a6136a4db141..fd333da0d864 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -136,7 +136,7 @@ private:
     bool mbCountPhantoms;
     bool mbUsedByRedline;    /// it needs to export as part of tracked numbering change
 
-    const SvxNumberFormat::SvxNumPositionAndSpaceMode meDefaultNumberFormatPositionAndSpaceMode;
+    SvxNumberFormat::SvxNumPositionAndSpaceMode meDefaultNumberFormatPositionAndSpaceMode;
     OUString msDefaultListId;
     std::shared_ptr<SfxGrabBagItem> mpGrabBagItem; ///< Style InteropGrabBag.
 
@@ -153,6 +153,8 @@ public:
     bool operator==( const SwNumRule& ) const;
     bool operator!=( const SwNumRule& r ) const { return !(*this == r); }
 
+    void Reset( const OUString& rName );
+
     const SwNumFormat* GetNumFormat( sal_uInt16 i ) const;
     const SwNumFormat& Get( sal_uInt16 i ) const;
 
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 10e6a9695291..4b2405830ad1 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -553,6 +553,23 @@ SwNumRule& SwNumRule::operator=( const SwNumRule& rNumRule )
     return *this;
 }
 
+void SwNumRule::Reset( const OUString& rName )
+{
+    for( sal_uInt16 n = 0; n < MAXLEVEL; ++n )
+        Set( n, nullptr);
+
+    meRuleType = NUM_RULE;
+    msName = rName;
+    mbAutoRuleFlag = true;
+    mbInvalidRuleFlag = true;
+    mbContinusNum = false;
+    mbAbsSpaces = false;
+    mbHidden = false;
+    mnPoolFormatId = USHRT_MAX;
+    mnPoolHelpId = USHRT_MAX;
+    mnPoolHlpFileId = UCHAR_MAX;
+}
+
 bool SwNumRule::operator==( const SwNumRule& rRule ) const
 {
     bool bRet = meRuleType == rRule.meRuleType &&
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 4553025946ea..e9b147f4d343 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -277,7 +277,7 @@ IMPL_LINK(SwOutlineTabDialog, MenuSelectHdl, const OString&, rIdent, void)
         const SwNumRulesWithName *pRules = pChapterNumRules->GetRules( nLevelNo );
         if( pRules )
         {
-            xNumRule = pRules->MakeNumRule(rWrtSh);
+            pRules->ResetNumRule(rWrtSh, *xNumRule);
             xNumRule->SetRuleType( OUTLINE_RULE );
             SfxTabPage* pOutlinePage = GetTabPage("numbering");
             assert(pOutlinePage);
diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
index 261d097a32a1..0c2602f48c5f 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -143,19 +143,18 @@ SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName &rCop
     return *this;
 }
 
-std::unique_ptr<SwNumRule> SwNumRulesWithName::MakeNumRule(SwWrtShell& rSh) const
+void SwNumRulesWithName::ResetNumRule(SwWrtShell& rSh, SwNumRule& rNumRule) const
 {
     // #i89178#
-    std::unique_ptr<SwNumRule> pChg(new SwNumRule(maName, numfunc::GetDefaultPositionAndSpaceMode()));
-    pChg->SetAutoRule( false );
+    rNumRule.Reset(maName);
+    rNumRule.SetAutoRule( false );
     for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
     {
         SwNumFormatGlobal* pFormat = aFormats[ n ].get();
         if (!pFormat)
             continue;
-        pChg->Set(n, pFormat->MakeNumFormat(rSh));
+        rNumRule.Set(n, pFormat->MakeNumFormat(rSh));
     }
-    return pChg;
 }
 
 void SwNumRulesWithName::GetNumFormat(
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 7da897aa5860..0ba7d3f59525 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -72,7 +72,7 @@ public:
     SwNumRulesWithName &operator=(const SwNumRulesWithName &);
 
     const OUString& GetName() const               { return maName; }
-    std::unique_ptr<SwNumRule> MakeNumRule(SwWrtShell& rSh) const;
+    void ResetNumRule(SwWrtShell& rSh, SwNumRule& ) const;
 
     void GetNumFormat(size_t, SwNumFormat const*&, OUString const*&) const;
 };