[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - framework/source

[akash]

 framework/source/fwe/helper/titlehelper.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0dbd5b7195669225bbe2aafb53aeed577394170e
Author: akash <akash96j at gmail.com>
Date:   Fri Mar 25 10:09:07 2016 +0530

    tdf#96896-Fix infinite recursion to prevent Writer crash
    
    To prevent infinite recursion set m_xOwner to null.
    Removed impl_sendTitleChangedEvent from disposing method ensuring that
    title is never constructed for a component that is disposing.
    
    Change-Id: I9bc20a9a582d5d911509d2aa30fb0d0122eb588e
    Reviewed-on: https://gerrit.libreoffice.org/23509
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit f80de31099be1ba7c6f753187f6703a915151c27)
    Reviewed-on: https://gerrit.libreoffice.org/24138
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index c9aba3e..c7b5bf4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -249,13 +249,13 @@ void SAL_CALL TitleHelper::disposing(const css::lang::EventObject& aEvent)
     // SYNCHRONIZED ->
     aLock.reset ();
 
+         m_xOwner        = nullptr;
          m_sTitle        = OUString ();
          m_nLeasedNumber = css::frame::UntitledNumbersConst::INVALID_NUMBER;
 
     aLock.clear ();
     // <- SYNCHRONIZED
 
-    impl_sendTitleChangedEvent ();
 }
 
 void TitleHelper::impl_sendTitleChangedEvent ()