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

[Stephan Bergmann]

 sw/source/uibase/uno/unoatxt.cxx |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

New commits:
commit 3d0618db2d2e3a994309d3462b206f46edee9df7
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 4 14:26:33 2017 +0100

    Clean up ~SwXAutoTextEntry
    
    The "DocShell must be cleared..." comment was a leftover from
    2613afee051fee15ac78b06f611da493989f893c "INTEGRATION: CWS sw008", pertained to
    code that had been moved into implFlushDocument.  The extra code block and
    accompanying "Thus, an own block..." comment are just nonsense.
    
    Change-Id: I7e60b488c609796d86bedf518218b06c612e494d

diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx
index ef41ed8..f50550a 100644
--- a/sw/source/uibase/uno/unoatxt.cxx
+++ b/sw/source/uibase/uno/unoatxt.cxx
@@ -728,17 +728,10 @@ SwXAutoTextEntry::SwXAutoTextEntry(SwGlossaries* pGlss, const OUString& rGroupNa
 
 SwXAutoTextEntry::~SwXAutoTextEntry()
 {
-    {
-        SolarMutexGuard aGuard;
-
-        // ensure that any pending modifications are written
-        implFlushDocument( true );
+    SolarMutexGuard aGuard;
 
-        //! Bug #96559
-        // DocShell must be cleared before mutex is lost.
-        // Needs to be done explicitly since xDocSh is a class member.
-        // Thus, an own block here, guarded by the SolarMutex
-    }
+    // ensure that any pending modifications are written
+    implFlushDocument( true );
 }
 
 void SwXAutoTextEntry::implFlushDocument( bool _bCloseDoc )