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/vclstatusindicator.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/vclstatusindicator.cxx')
| -rw-r--r-- | framework/source/helper/vclstatusindicator.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index 3e66b5dc87b4..099e02a8b57f 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -19,8 +19,7 @@ #include <helper/vclstatusindicator.hxx> -#include <threadhelp/readguard.hxx> -#include <threadhelp/writeguard.hxx> +#include <threadhelp/guard.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> @@ -54,7 +53,7 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText , throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- - ReadGuard aReadLock(m_aLock); + Guard aReadLock(m_aLock); css::uno::Reference< css::awt::XWindow > xParentWindow = m_xParentWindow; aReadLock.unlock(); // <- SAFE ---------------------------------- @@ -81,7 +80,7 @@ void SAL_CALL VCLStatusIndicator::start(const OUString& sText , // <- SOLAR SAFE ---------------------------- // SAFE -> ---------------------------------- - WriteGuard aWriteLock(m_aLock); + Guard aWriteLock(m_aLock); m_sText = sText; m_nRange = nRange; m_nValue = 0; @@ -108,7 +107,7 @@ void SAL_CALL VCLStatusIndicator::end() throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- - WriteGuard aWriteLock(m_aLock); + Guard aWriteLock(m_aLock); m_sText = OUString(); m_nRange = 0; m_nValue = 0; @@ -135,7 +134,7 @@ void SAL_CALL VCLStatusIndicator::setText(const OUString& sText) throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- - WriteGuard aWriteLock(m_aLock); + Guard aWriteLock(m_aLock); m_sText = sText; aWriteLock.unlock(); // <- SAFE ---------------------------------- @@ -154,7 +153,7 @@ void SAL_CALL VCLStatusIndicator::setValue(sal_Int32 nValue) throw(css::uno::RuntimeException, std::exception) { // SAFE -> ---------------------------------- - WriteGuard aWriteLock(m_aLock); + Guard aWriteLock(m_aLock); if (nValue <= m_nRange) m_nValue = nValue; |