1 files changed, 14 insertions, 13 deletions
diff --git a/framework/source/uielement/simpletextstatusbarcontroller.cxx b/framework/source/uielement/simpletextstatusbarcontroller.cxx
index e5fae0992f..85aeccaf72 100644
--- a/framework/source/uielement/simpletextstatusbarcontroller.cxx
+++ b/framework/source/uielement/simpletextstatusbarcontroller.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/fwkresid.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;
@@ -84,19 +83,19 @@ void SAL_CALL SimpleTextStatusbarController::release() throw ()
 {
     svt::StatusbarController::release();
 }
- 
-void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) 
+
+void SAL_CALL SimpleTextStatusbarController::initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
 throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException)
 {
     const rtl::OUString aPropValueName( RTL_CONSTASCII_USTRINGPARAM( "Value" ));
-    
-    vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); 
-    
+
+    SolarMutexGuard aSolarMutexGuard;
+
     svt::StatusbarController::initialize( aArguments );
 
     rtl::OUString        aValue;
     beans::PropertyValue aPropValue;
-    
+
     // Check arguments for optional "Value" property. We need it
     // to set our internal simple text.
     for ( int i = 0; i < aArguments.getLength(); i++ )
@@ -106,8 +105,8 @@ throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException
             aPropValue.Value >>= aValue;
             break;
         }
-    }  
-    
+    }
+
     m_aText = aValue;
     if ( m_xParentWindow.is() && m_nID > 0 )
     {
@@ -126,14 +125,14 @@ throw (::com::sun::star::uno::RuntimeException)
 {
     svt::StatusbarController::dispose();
 }
- 
+
 // XEventListener
 void SAL_CALL SimpleTextStatusbarController::disposing( const EventObject& Source )
 throw ( RuntimeException )
 {
     svt::StatusbarController::disposing( Source );
 }
- 
+
 // XStatusListener
 void SAL_CALL SimpleTextStatusbarController::statusChanged( const FeatureStateEvent& )
 throw ( RuntimeException )
@@ -194,3 +193,5 @@ void SAL_CALL SimpleTextStatusbarController::doubleClick() throw (::com::sun::st
 }
 
 }
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */