summaryrefslogtreecommitdiffstats
path: root/framework/source/tabwin/tabwinfactory.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-17 18:00:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-17 18:00:10 +0100
commit07b32bc2bf0cd329258b4924839e5b900b7e6196 (patch)
tree72158346b5677065a032010c44f878ae2f6696df /framework/source/tabwin/tabwinfactory.cxx
parentNo need for framework::LockHelper to derive from framework::IMutex (diff)
downloadcore-07b32bc2bf0cd329258b4924839e5b900b7e6196.tar.gz
core-07b32bc2bf0cd329258b4924839e5b900b7e6196.zip
Consolidate framework::{Resetable,}Guard
Change-Id: I97290c2504992f4a92e6aeb71e02a2542dd35faa
Diffstat (limited to 'framework/source/tabwin/tabwinfactory.cxx')
-rw-r--r--framework/source/tabwin/tabwinfactory.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index b5486723b5f9..373a48df59e8 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -20,7 +20,7 @@
#include <tabwin/tabwinfactory.hxx>
#include <tabwin/tabwindow.hxx>
-#include <threadhelp/resetableguard.hxx>
+#include <threadhelp/guard.hxx>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
@@ -80,7 +80,7 @@ throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
const OUString aTopWindowArgName( "TopWindow");
/* SAFE AREA ----------------------------------------------------------------------------------------------- */
- ResetableGuard aLock( m_aLock );
+ Guard aLock( m_aLock );
css::uno::Reference< css::awt::XToolkit2 > xToolkit = m_xToolkit;
css::uno::Reference< css::uno::XComponentContext > xContext( m_xContext );
aLock.unlock();