diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 16:48:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-18 17:37:54 +0100 |
| commit | 98861476f23c54adb1514f9ebf62b28a34002e99 (patch) | |
| tree | df5f8d5f7fc520f0a6eea7ebd4414a52f01c9441 /framework/source/recording | |
| parent | Use SolarMutexGuard directly (diff) | |
| download | core-98861476f23c54adb1514f9ebf62b28a34002e99.tar.gz core-98861476f23c54adb1514f9ebf62b28a34002e99.zip | |
Use SolarMutexGuard directly
Change-Id: Ifa48a4cb78466b120e357412c64031f5de2b75d1
Diffstat (limited to 'framework/source/recording')
| -rw-r--r-- | framework/source/recording/dispatchrecorder.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 9e10d7b7859f..1017885acd2c 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -21,7 +21,6 @@ #include <recording/dispatchrecorder.hxx> #include <com/sun/star/frame/DispatchStatement.hpp> #include <com/sun/star/script/Converter.hpp> -#include <threadhelp/guard.hxx> #include <services.h> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> @@ -101,8 +100,7 @@ Sequence< Any > make_seq_out_of_struct( DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::uno::XComponentContext >& xContext ) - : ThreadHelpBase ( &Application::GetSolarMutex() ) - , m_xConverter( css::script::Converter::create(xContext) ) + : m_xConverter( css::script::Converter::create(xContext) ) { } @@ -142,16 +140,13 @@ void SAL_CALL DispatchRecorder::recordDispatchAsComment( const css::util::URL& void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException, std::exception ) { - /* SAFE{ */ - Guard aWriteLock(m_aLock); + SolarMutexGuard g; m_aStatements.clear(); - /* } */ } OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException, std::exception ) { - /* SAFE{ */ - Guard aWriteLock(m_aLock); + SolarMutexGuard g; if ( m_aStatements.empty() ) return OUString(); @@ -174,7 +169,6 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeE implts_recordMacro( p->aCommand, p->aArgs, p->bIsComment, aScriptBuffer ); OUString sScript = aScriptBuffer.makeStringAndClear(); return sScript; - /* } */ } |