diff options
Diffstat (limited to 'framework/source/uielement/logotextstatusbarcontroller.cxx')
| -rw-r--r-- | framework/source/uielement/logotextstatusbarcontroller.cxx | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/framework/source/uielement/logotextstatusbarcontroller.cxx b/framework/source/uielement/logotextstatusbarcontroller.cxx index 925127fc03..6241acbc4b 100644 --- a/framework/source/uielement/logotextstatusbarcontroller.cxx +++ b/framework/source/uielement/logotextstatusbarcontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -31,13 +32,11 @@ #include <classes/fwlresid.hxx> #include <services.h> #include <classes/resource.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/status.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/unohlp.hxx> -#endif #include <toolkit/helper/convert.hxx> using namespace ::rtl; @@ -85,12 +84,12 @@ void SAL_CALL LogoTextStatusbarController::release() throw () { svt::StatusbarController::release(); } - -void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) + +void SAL_CALL LogoTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); - + SolarMutexGuard aSolarMutexGuard; + svt::StatusbarController::initialize( aArguments ); if ( m_xParentWindow.is() && m_nID > 0 ) @@ -110,14 +109,14 @@ throw (::com::sun::star::uno::RuntimeException) { svt::StatusbarController::dispose(); } - + // XEventListener void SAL_CALL LogoTextStatusbarController::disposing( const EventObject& Source ) throw ( RuntimeException ) { svt::StatusbarController::disposing( Source ); } - + // XStatusListener void SAL_CALL LogoTextStatusbarController::statusChanged( const FeatureStateEvent& ) throw ( RuntimeException ) @@ -178,3 +177,5 @@ void SAL_CALL LogoTextStatusbarController::doubleClick() throw (::com::sun::star } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |