diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 11:10:57 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-20 15:04:11 +0100 |
| commit | 3a94a46fc2cba33fd7d735bbcd62692f1e51183a (patch) | |
| tree | b67e86e3c6a7b1776941800b85d455b4ad1d11f0 | |
| parent | 5d4f525da7f560f85c2ce18f1ca1570d3cc53a50 (diff) | |
Access safe members directly
Change-Id: I8d145fcf3dbcb2436392ee01740255a460c610a6
| -rw-r--r-- | framework/inc/jobs/shelljob.hxx | 4 | ||||
| -rw-r--r-- | framework/source/jobs/shelljob.cxx | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index 8d051ffe897b..1a7870f1e317 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_JOBS_SHELLJOB_HXX #define INCLUDED_FRAMEWORK_INC_JOBS_SHELLJOB_HXX -#include <threadhelp/threadhelpbase.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> @@ -49,8 +48,7 @@ namespace framework{ @author as96863 */ -class ShellJob : private ThreadHelpBase - ,public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob > +class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob > { // member diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index 8a63290fc4cc..997ce0644dd5 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -23,7 +23,6 @@ #include <jobs/shelljob.hxx> #include <jobs/jobconst.hxx> -#include <threadhelp/guard.hxx> #include <services.h> @@ -80,8 +79,7 @@ DEFINE_INIT_SERVICE(ShellJob, ShellJob::ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext) - : ThreadHelpBase( ) - , m_xContext (xContext) + : m_xContext (xContext) { } @@ -141,15 +139,9 @@ css::uno::Any ShellJob::impl_generateAnswer4Deactivation() OUString ShellJob::impl_substituteCommandVariables(const OUString& sCommand) { - // SYNCHRONIZED -> - Guard aReadLock(m_aLock); - css::uno::Reference< css::uno::XComponentContext > xContext = m_xContext; - aReadLock.unlock(); - // <- SYNCHRONIZED - try { - css::uno::Reference< css::util::XStringSubstitution > xSubst( css::util::PathSubstitution::create(xContext) ); + css::uno::Reference< css::util::XStringSubstitution > xSubst( css::util::PathSubstitution::create(m_xContext) ); const ::sal_Bool bSubstRequired = sal_True; const OUString sCompleteCommand = xSubst->substituteVariables(sCommand, bSubstRequired); |