[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/ui/misc/outline.cxx    |    3 +++
 sw/source/uibase/inc/outline.hxx |    5 +++++
 2 files changed, 8 insertions(+)

New commits:
commit a4b581bb996142d2906f23161ec673f958511649
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 4 10:08:53 2017 +0100

    Resolves: tdf#107603 crash after loading new numrule in numbering dialog
    
    Change-Id: I0f270793a4b0312e23079789a37c402b31e54238

diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 8aa522fc0d87..f58153e81672 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -307,6 +307,9 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
         {
             xNumRule.reset(pRules->MakeNumRule(rWrtSh));
             xNumRule->SetRuleType( OUTLINE_RULE );
+            SfxTabPage* pOutlinePage = GetTabPage(m_nOutlineId);
+            assert(pOutlinePage);
+            static_cast<SwOutlineSettingsTabPage*>(pOutlinePage)->SetNumRule(xNumRule.get());
         }
         else
             *xNumRule = *rWrtSh.GetOutlineNumRule();
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index b45ca7f26a90..7154dd394cc4 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -133,6 +133,11 @@ public:
     virtual void        Reset( const SfxItemSet* rSet ) override;
     static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
                                        const SfxItemSet* rAttrSet);
+    void SetNumRule(SwNumRule *pRule)
+    {
+        pNumRule = pRule;
+        m_pPreviewWIN->SetNumRule(pNumRule);
+    }
 };
 
 #endif