diff options
Diffstat (limited to 'framework/source/helper/tagwindowasmodified.cxx')
-rw-r--r-- | framework/source/helper/tagwindowasmodified.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index b59730fc66..50f7420740 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -43,9 +44,7 @@ //_________________________________________________________________________________________________________________ #include <com/sun/star/awt/XWindow.hpp> -#ifndef _COM_SUN_STAR_LANG_XSERVICXEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/FrameAction.hpp> @@ -54,9 +53,7 @@ // other includes //_________________________________________________________________________________________________________________ -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <vcl/window.hxx> #include <vcl/syswin.hxx> #include <vcl/svapp.hxx> @@ -137,21 +134,21 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent (aEvent.Source != xModel) ) return; - + aReadLock.unlock(); // <- SAFE ---------------------------------- - + ::sal_Bool bModified = xModel->isModified (); - + // SYNCHRONIZED -> - ::vos::OClearableGuard aSolarGuard(Application::GetSolarMutex()); - + SolarMutexGuard aSolarGuard; + Window* pWindow = VCLUnoHelper::GetWindow(xWindow); if ( ! pWindow) return; - - sal_Bool bSystemWindow = pWindow->IsSystemWindow(); - sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); + + sal_Bool bSystemWindow = pWindow->IsSystemWindow(); + sal_Bool bWorkWindow = (pWindow->GetType() == WINDOW_WORKWINDOW); if (!bSystemWindow && !bWorkWindow) return; @@ -159,8 +156,6 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent pWindow->SetExtendedStyle(WB_EXT_DOCMODIFIED); else pWindow->SetExtendedStyle( ! WB_EXT_DOCMODIFIED); - - aSolarGuard.clear(); // <- SYNCHRONIZED } @@ -254,3 +249,5 @@ void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XF } } // namespace framework + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |