diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:42:49 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 15:42:49 +0000 |
| commit | bbd4bfeecac3b2ccdf9252f6d8c857f5774b50e2 (patch) | |
| tree | 3b10696aaf5624a32ab148aa6ef5bae9dcb9e441 /svx/source/unodraw | |
| parent | 5962cbb05b03562b959f367f7e13891c827a179f (diff) | |
INTEGRATION: CWS obo30 (1.10.90); FILE MERGED
2008/06/02 12:27:51 obo 1.10.90.1: #i90100# ambigous Reference during ENABLE_PCH build
Diffstat (limited to 'svx/source/unodraw')
| -rw-r--r-- | svx/source/unodraw/unoshcol.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 5c7835ae69..0cc232efdc 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -1,13 +1,13 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: unoshcol.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -35,7 +35,6 @@ #include "unoshcol.hxx" #include <svx/unoprov.hxx> -using namespace ::rtl; using namespace ::cppu; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -225,33 +224,33 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements() throw( uno::RuntimeException //---------------------------------------------------------------------- // XServiceInfo //---------------------------------------------------------------------- -OUString SAL_CALL SvxShapeCollection::getImplementationName() +::rtl::OUString SAL_CALL SvxShapeCollection::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); } -OUString SvxShapeCollection::getImplementationName_Static() +::rtl::OUString SvxShapeCollection::getImplementationName_Static() { - return OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SvxShapeCollection") ); + return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.SvxShapeCollection") ); } -sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceName ) +sal_Bool SAL_CALL SvxShapeCollection::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException ) { return SvxServiceInfoHelper::supportsService( ServiceName, getSupportedServiceNames() ); } -uno::Sequence< OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException ) +uno::Sequence< ::rtl::OUString > SAL_CALL SvxShapeCollection::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); } -uno::Sequence< OUString > SvxShapeCollection::getSupportedServiceNames_Static() +uno::Sequence< ::rtl::OUString > SvxShapeCollection::getSupportedServiceNames_Static() { - uno::Sequence< OUString > aSeq(2); - aSeq.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shapes") ); - aSeq.getArray()[1] = OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection") ); + uno::Sequence< ::rtl::OUString > aSeq(2); + aSeq.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Shapes") ); + aSeq.getArray()[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ShapeCollection") ); return aSeq; } @@ -259,4 +258,3 @@ Reference< XInterface > SAL_CALL SvxShapeCollection_createInstance( const Refere { return *( new SvxShapeCollection() ); } - |