From 3d0618db2d2e3a994309d3462b206f46edee9df7 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 4 Jan 2017 14:26:33 +0100 Subject: 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 --- sw/source/uibase/uno/unoatxt.cxx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'sw') diff --git a/sw/source/uibase/uno/unoatxt.cxx b/sw/source/uibase/uno/unoatxt.cxx index ef41ed8649aa..f50550a2c661 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 ) -- cgit