diff options
Diffstat (limited to 'editeng/source/accessibility/AccessibleImageBullet.cxx')
-rw-r--r-- | editeng/source/accessibility/AccessibleImageBullet.cxx | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/editeng/source/accessibility/AccessibleImageBullet.cxx b/editeng/source/accessibility/AccessibleImageBullet.cxx index d9c727cc32fc..1a4bd5603307 100644 --- a/editeng/source/accessibility/AccessibleImageBullet.cxx +++ b/editeng/source/accessibility/AccessibleImageBullet.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. @@ -28,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_editeng.hxx" #include <tools/gen.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/awt/Point.hpp> @@ -167,7 +168,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // Get the string from the resource for the specified id. return ::rtl::OUString( String( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_DESCRIPTION) ) ); @@ -177,7 +178,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // Get the string from the resource for the specified id. return ::rtl::OUString( String ( EditResId (RID_SVXSTR_A11Y_IMAGEBULLET_NAME) ) ); @@ -195,7 +196,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // Create a copy of the state set and return it. ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get()); @@ -210,7 +211,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; lang::Locale aLocale; @@ -241,7 +242,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::contains: index value overflow"); @@ -265,7 +266,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; DBG_ASSERT(GetParagraphIndex() >= 0 && GetParagraphIndex() <= USHRT_MAX, "AccessibleEditableTextPara::getBounds: index value overflow"); @@ -304,7 +305,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; awt::Rectangle aRect = getBounds(); @@ -315,7 +316,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // relate us to parent uno::Reference< XAccessible > xParent = getAccessibleParent(); @@ -342,7 +343,7 @@ namespace accessibility { DBG_CHKTHIS( AccessibleImageBullet, NULL ); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; awt::Rectangle aRect = getBounds(); @@ -649,3 +650,4 @@ namespace accessibility } // end of namespace accessibility +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |