diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-17 16:14:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-17 16:52:34 +0100 |
| commit | ab3acb7ef79fcae8776b8d1ce0e81da5698ef516 (patch) | |
| tree | 0dad3a5d6c6897887cc8ff5c6837d83b7e89a070 /framework/source/helper/titlebarupdate.cxx | |
| parent | 803a8a04e980d24bf6c336e4416615a49614367f (diff) | |
Consolidate framework::{Read,Write}Guard
...now that it is obvious that they both do the same
Change-Id: I6878acca4750ef4204fe32a695b6d9e1c5140115
Diffstat (limited to 'framework/source/helper/titlebarupdate.cxx')
| -rw-r--r-- | framework/source/helper/titlebarupdate.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 5a95a936e504..1805872aa5cd 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -20,8 +20,7 @@ #include <helper/titlebarupdate.hxx> #include <pattern/window.hxx> -#include <threadhelp/writeguard.hxx> -#include <threadhelp/readguard.hxx> +#include <threadhelp/guard.hxx> #include <macros/generic.hxx> #include <services.h> #include <properties.h> @@ -87,7 +86,7 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any 1); // SYNCHRONIZED -> - WriteGuard aWriteLock(m_aLock); + Guard aWriteLock(m_aLock); // hold the frame as weak reference(!) so it can die everytimes :-) m_xFrame = xFrame; aWriteLock.unlock(); @@ -146,7 +145,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr try { // SYNCHRONIZED -> - ReadGuard aReadLock(m_aLock); + Guard aReadLock(m_aLock); css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext; aReadLock.unlock(); // <- SYNCHRONIZED @@ -217,7 +216,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr return sal_False; // SYNCHRONIZED -> - ReadGuard aReadLock(m_aLock); + Guard aReadLock(m_aLock); css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext; aReadLock.unlock(); // <- SYNCHRONIZED @@ -248,7 +247,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr void TitleBarUpdate::impl_forceUpdate() { // SYNCHRONIZED -> - ReadGuard aReadLock(m_aLock); + Guard aReadLock(m_aLock); css::uno::Reference< css::frame::XFrame > xFrame(m_xFrame.get(), css::uno::UNO_QUERY); aReadLock.unlock(); // <- SYNCHRONIZED |