diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 18:54:02 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 14:41:41 -0600 |
| commit | fcbefea01766e0888f7813672d9eddbdec5a9046 (patch) | |
| tree | 8861652061bb2189350824217c98a259a9a9d2ec /framework/inc/threadhelp/lockhelper.hxx | |
| parent | a395c9fa387eabf2d09360f1023f5e3e66af21a8 (diff) | |
Remove visual noise from framework
Conflicts:
framework/inc/dispatch/oxt_handler.hxx
framework/inc/services/layoutmanager.hxx
framework/inc/tabwin/tabwindow.hxx
framework/source/dispatch/menudispatcher.cxx
framework/source/helper/dockingareadefaultacceptor.cxx
framework/source/helper/ocomponentaccess.cxx
framework/source/helper/ocomponentenumeration.cxx
framework/source/helper/oframes.cxx
framework/source/layoutmanager/toolbarlayoutmanager.hxx
framework/source/recording/dispatchrecorder.cxx
framework/source/services/desktop.cxx
framework/source/services/frame.cxx
framework/source/services/urltransformer.cxx
Change-Id: Ibb04e3f6f0796e7f2be16dcce38542f8b90708d4
Reviewed-on: https://gerrit.libreoffice.org/8265
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework/inc/threadhelp/lockhelper.hxx')
| -rw-r--r-- | framework/inc/threadhelp/lockhelper.hxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx index b5ca773c1f62..f961f2c2a40e 100644 --- a/framework/inc/threadhelp/lockhelper.hxx +++ b/framework/inc/threadhelp/lockhelper.hxx @@ -30,7 +30,7 @@ namespace framework{ -/*-************************************************************************************************************//** +/*-************************************************************************************************************ @short helper to set right lock in right situation @descr This helper support different types of locking: a) no locks - transparent for user! @@ -60,45 +60,45 @@ class FWI_DLLPUBLIC LockHelper : public IMutex , public IRWLock , private INonCopyable { - //------------------------------------------------------------------------------------------------------------- + // public methods - //------------------------------------------------------------------------------------------------------------- + public: - //------------------------------------------------------------------------------------------------------------- + // ctor/dtor - //------------------------------------------------------------------------------------------------------------- + LockHelper( comphelper::SolarMutex* pSolarMutex = NULL ); virtual ~LockHelper( ); - //------------------------------------------------------------------------------------------------------------- + // interface ::framework::IMutex - //------------------------------------------------------------------------------------------------------------- + virtual void acquire(); virtual void release(); - //------------------------------------------------------------------------------------------------------------- + // interface ::framework::IRWLock - //------------------------------------------------------------------------------------------------------------- + virtual void acquireReadAccess (); virtual void releaseReadAccess (); virtual void acquireWriteAccess (); virtual void releaseWriteAccess (); virtual void downgradeWriteAccess(); - //------------------------------------------------------------------------------------------------------------- + // something else - //------------------------------------------------------------------------------------------------------------- + static LockHelper& getGlobalLock(); //TODO: this presumable should return the SolarMutex, though it // actually returns some independent mutex ::osl::Mutex& getShareableOslMutex( ); - //------------------------------------------------------------------------------------------------------------- + // private member // Make some member mutable for using in const functions! - //------------------------------------------------------------------------------------------------------------- + private: mutable comphelper::SolarMutex* m_pSolarMutex ; |