diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess/ModelImpl.hxx')
| -rw-r--r-- | dbaccess/source/core/dataaccess/ModelImpl.hxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index f83b2230c2b4..804e2f976acf 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -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. @@ -80,7 +81,8 @@ #include <sfx2/docstoragemodifylistener.hxx> #include <tools/string.hxx> #include <unotools/sharedunocomponent.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> +#include <rtl/ref.hxx> #include <memory> @@ -139,7 +141,7 @@ class OSharedConnectionManager; //============================================================ /** a class which provides an IMutex interface to an OSL-based mutex */ -class VosMutexFacade : public ::vos::IMutex +class VosMutexFacade : public ::osl::SolarMutex { public: /** beware of life time: the mutex you pass here must live as least as long @@ -562,7 +564,7 @@ public: { return getMutex(); } - inline ::rtl::Reference< ODatabaseModelImpl > getImpl( GuardAccess ) + inline ::rtl::Reference< ODatabaseModelImpl > getImpl( GuardAccess ) const { return m_pImpl; } @@ -571,7 +573,7 @@ public: inline void checkDisposed() const { if ( !m_pImpl.is() ) - throw ::com::sun::star::lang::DisposedException( ::rtl::OUString::createFromAscii( "Component is already disposed." ), getThis() ); + throw ::com::sun::star::lang::DisposedException( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Component is already disposed.")), getThis() ); } inline void lockModify() @@ -639,3 +641,4 @@ public: #endif // _DBA_COREDATAACCESS_DATALINK_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |