diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-03-31 23:43:57 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-04-02 14:53:48 +0100 |
commit | 15f14ec79477142cf2bcb1484511b7bea6f1485b (patch) | |
tree | f8286d0e17062b579289a43fe3aa01ddb421d6d2 /desktop/source | |
parent | ae9219769106648ac35d594fc07c83103a62ecbe (diff) |
reorganize trickier statics
Diffstat (limited to 'desktop/source')
-rw-r--r-- | desktop/source/deployment/misc/dp_resource.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index 4999e7870d4c..cb594f0aee99 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -63,21 +63,21 @@ struct DeploymentResMgr : public rtl::StaticWithInit< } }; -osl::Mutex s_mutex; +class theResourceMutex : public rtl::Static<osl::Mutex, theResourceMutex> {}; } // anon namespace //============================================================================== ResId getResId( sal_uInt16 id ) { - const osl::MutexGuard guard( s_mutex ); + const osl::MutexGuard guard( theResourceMutex::get() ); return ResId( id, *DeploymentResMgr::get() ); } //============================================================================== String getResourceString( sal_uInt16 id ) { - const osl::MutexGuard guard( s_mutex ); + const osl::MutexGuard guard( theResourceMutex::get() ); String ret( ResId( id, *DeploymentResMgr::get() ) ); ret.SearchAndReplaceAllAscii( "%PRODUCTNAME", utl::ConfigManager::getProductName() ); |