[Libreoffice-commits] core.git: Branch 'feature/cib_contract57' - sfx2/source

[Samuel Mehrbrodt]

 sfx2/source/doc/sfxbasemodel.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4b1a86f0e87c33ed938ffb5bd5474bffa3d400ab
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Wed Oct 26 10:33:00 2016 +0200

    Revert "Don't operate on destroyed SfxShell in listener"
    
    This reverts commit dee20bd1e0cd0d9649d1cc851befb1e92aa99338.

diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 8185e6a..20f15ee 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -146,10 +146,10 @@ class SfxDocInfoListener_Impl : public ::cppu::WeakImplHelper1<
 {
 
 public:
-    SfxObjectShellRef m_pShell;
+    SfxObjectShell& m_rShell;
 
-    SfxDocInfoListener_Impl( const SfxObjectShellRef& i_rDoc )
-        : m_pShell(i_rDoc)
+    SfxDocInfoListener_Impl( SfxObjectShell& i_rDoc )
+        : m_rShell(i_rDoc)
     { };
 
     virtual ~SfxDocInfoListener_Impl();
@@ -168,7 +168,7 @@ void SAL_CALL SfxDocInfoListener_Impl::modified( const lang::EventObject& )
     SolarMutexGuard aSolarGuard;
 
     // notify changes to the SfxObjectShell
-    m_pShell->FlushDocInfo();
+    m_rShell.FlushDocInfo();
 }
 
 void SAL_CALL SfxDocInfoListener_Impl::disposing( const lang::EventObject& )
@@ -826,7 +826,7 @@ IMPL_SfxBaseModel_DataContainer::impl_setDocumentProperties(
     {
         Reference<util::XModifyBroadcaster> const xMB(
             m_xDocumentProperties, UNO_QUERY_THROW);
-        xMB->addModifyListener(new SfxDocInfoListener_Impl(m_pObjectShell));
+        xMB->addModifyListener(new SfxDocInfoListener_Impl(*m_pObjectShell));
     }
 }