diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:17:07 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:17:07 +0000 |
| commit | ee2ed319c7eb83b185a6659fbae4853d67efba13 (patch) | |
| tree | 03d400850d832e49b08025a719254d6a35a2a54b /sd/source/ui/unoidl/detreg.cxx | |
| parent | b37e6f4953ab2728ac5cf4a108655721414e73c8 (diff) | |
INTEGRATION: CWS obo30 (1.7.46); FILE MERGED
2008/06/04 09:53:02 obo 1.7.46.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'sd/source/ui/unoidl/detreg.cxx')
| -rw-r--r-- | sd/source/ui/unoidl/detreg.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sd/source/ui/unoidl/detreg.cxx b/sd/source/ui/unoidl/detreg.cxx index 61c9533b8a13..8c674f5f6647 100644 --- a/sd/source/ui/unoidl/detreg.cxx +++ b/sd/source/ui/unoidl/detreg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: detreg.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -38,7 +38,6 @@ #include <rtl/ustring.hxx> #include "sal/types.h" -using namespace ::rtl; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -59,8 +58,8 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( Reference< ::registry::XRegistryKey > xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ; - OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") ); - OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ); + ::rtl::OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") ); + ::rtl::OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ); // Eigentliche Implementierung und ihre Services registrieren sal_Int32 i; @@ -69,7 +68,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( xNewKey = xKey->createKey( aDelimiter + SdFilterDetect::impl_getStaticImplementationName() + aUnoServices ); - Sequence< OUString > aServices = SdFilterDetect::impl_getStaticSupportedServiceNames(); + Sequence< ::rtl::OUString > aServices = SdFilterDetect::impl_getStaticSupportedServiceNames(); for(i = 0; i < aServices.getLength(); i++ ) xNewKey->createKey( aServices.getConstArray()[i] ); @@ -115,4 +114,3 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( } // extern "C" - |