summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--framework/inc/recording/dispatchrecorder.hxx4
-rw-r--r--framework/source/recording/dispatchrecorder.cxx12
2 files changed, 4 insertions, 12 deletions
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index 8daeee7a70fc..d27025a30858 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -25,7 +25,6 @@
*/
#include <vector>
-#include <threadhelp/threadhelpbase.hxx>
#include <macros/xinterface.hxx>
#include <macros/xtypeprovider.hxx>
#include <macros/xserviceinfo.hxx>
@@ -49,8 +48,7 @@ namespace framework{
typedef ::std::vector < com::sun::star::frame::DispatchStatement > DispatchStatementList;
class DispatchRecorder
- : private ThreadHelpBase
- , public ::cppu::WeakImplHelper3<
+ : public ::cppu::WeakImplHelper3<
css::lang::XServiceInfo
, css::frame::XDispatchRecorder
, css::container::XIndexReplace >
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;
- /* } */
}