diff options
Diffstat (limited to 'stoc/source/defaultregistry/defaultregistry.cxx')
| -rw-r--r-- | stoc/source/defaultregistry/defaultregistry.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx index b56e47698c02..f36b2f172aa7 100644 --- a/stoc/source/defaultregistry/defaultregistry.cxx +++ b/stoc/source/defaultregistry/defaultregistry.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,18 +29,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" #include <osl/mutex.hxx> -#ifndef _OSL_DIAGNOSE_HXX_ #include <osl/diagnose.h> -#endif #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase3.hxx> -#ifndef _CPPUHELPER_IMPLEMENTATIONENTRY_HXX_ #include <cppuhelper/implementationentry.hxx> -#endif #include <registry/registry.hxx> #include <com/sun/star/registry/XSimpleRegistry.hpp> @@ -58,8 +55,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::container; using namespace cppu; using namespace osl; -using namespace rtl; - +using ::rtl::OUString; #define SERVICENAME "com.sun.star.registry.NestedRegistry" #define IMPLNAME "com.sun.star.comp.stoc.NestedRegistry" @@ -1291,7 +1287,7 @@ void SAL_CALL NestedRegistryImpl::open( const OUString&, sal_Bool, sal_Bool ) throw(InvalidRegistryException, RuntimeException) { throw InvalidRegistryException( - OUString::createFromAscii("the 'open' method is not specified for a nested registry"), + OUString(RTL_CONSTASCII_USTRINGPARAM("the 'open' method is not specified for a nested registry")), Reference< XInterface >() ); } @@ -1327,7 +1323,7 @@ void SAL_CALL NestedRegistryImpl::close( ) } /* throw InvalidRegistryException( - OUString::createFromAscii("the 'close' method is not specified for a nested registry"), + OUString(RTL_CONSTASCII_USTRINGPARAM("the 'close' method is not specified for a nested registry")), Reference< XInterface >() ); */ } @@ -1337,7 +1333,7 @@ void SAL_CALL NestedRegistryImpl::destroy( ) throw(InvalidRegistryException, RuntimeException) { throw InvalidRegistryException( - OUString::createFromAscii("the 'destroy' method is not specified for a nested registry"), + OUString(RTL_CONSTASCII_USTRINGPARAM("the 'destroy' method is not specified for a nested registry")), Reference< XInterface >() ); } @@ -1421,3 +1417,4 @@ Reference<XInterface> SAL_CALL NestedRegistry_CreateInstance( const Reference<XC } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |