diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /svtools/source/graphic/descriptor.cxx | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'svtools/source/graphic/descriptor.cxx')
-rw-r--r-- | svtools/source/graphic/descriptor.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx index dac63180f188..9c8ca91dc769 100644 --- a/svtools/source/graphic/descriptor.cxx +++ b/svtools/source/graphic/descriptor.cxx @@ -78,7 +78,7 @@ void GraphicDescriptor::init( const ::Graphic& rGraphic ) // ------------------------------------------------------------------------------ -void GraphicDescriptor::init( const ::rtl::OUString& rURL ) +void GraphicDescriptor::init( const OUString& rURL ) throw() { SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rURL, STREAM_READ ); @@ -92,7 +92,7 @@ void GraphicDescriptor::init( const ::rtl::OUString& rURL ) // ------------------------------------------------------------------------------ -void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const ::rtl::OUString& rURL ) +void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, const OUString& rURL ) throw() { SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( rxIStm ); @@ -106,7 +106,7 @@ void GraphicDescriptor::init( const uno::Reference< io::XInputStream >& rxIStm, // ------------------------------------------------------------------------------ -void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL ) +void GraphicDescriptor::implCreate( SvStream& rIStm, const OUString* pURL ) { String aURL; if( pURL ) @@ -114,7 +114,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL ::GraphicDescriptor aDescriptor( rIStm, &aURL ); mpGraphic = NULL; - maMimeType = ::rtl::OUString(); + maMimeType = OUString(); meType = GRAPHIC_NONE; mnBitsPerPixel = 0; mbTransparent = false; @@ -172,20 +172,20 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL // ------------------------------------------------------------------------------ -::rtl::OUString GraphicDescriptor::getImplementationName_Static() +OUString GraphicDescriptor::getImplementationName_Static() throw() { - return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicDescriptor" ); + return OUString( "com.sun.star.comp.graphic.GraphicDescriptor" ); } // ------------------------------------------------------------------------------ -uno::Sequence< ::rtl::OUString > GraphicDescriptor::getSupportedServiceNames_Static() +uno::Sequence< OUString > GraphicDescriptor::getSupportedServiceNames_Static() throw( ) { - uno::Sequence< ::rtl::OUString > aSeq( 1 ); + uno::Sequence< OUString > aSeq( 1 ); - aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicDescriptor" ); + aSeq.getArray()[ 0 ] = OUString( "com.sun.star.graphic.GraphicDescriptor" ); return aSeq; } @@ -239,7 +239,7 @@ void SAL_CALL GraphicDescriptor::release() // ------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL GraphicDescriptor::getImplementationName() +OUString SAL_CALL GraphicDescriptor::getImplementationName() throw( uno::RuntimeException ) { return getImplementationName_Static(); @@ -247,11 +247,11 @@ void SAL_CALL GraphicDescriptor::release() // ------------------------------------------------------------------------------ -sal_Bool SAL_CALL GraphicDescriptor::supportsService( const rtl::OUString& ServiceName ) +sal_Bool SAL_CALL GraphicDescriptor::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSNL( getSupportedServiceNames() ); - const ::rtl::OUString* pArray = aSNL.getConstArray(); + uno::Sequence< OUString > aSNL( getSupportedServiceNames() ); + const OUString* pArray = aSNL.getConstArray(); for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) if( pArray[i] == ServiceName ) @@ -262,7 +262,7 @@ sal_Bool SAL_CALL GraphicDescriptor::supportsService( const rtl::OUString& Servi // ------------------------------------------------------------------------------ -uno::Sequence< rtl::OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL GraphicDescriptor::getSupportedServiceNames() throw( uno::RuntimeException ) { return getSupportedServiceNames_Static(); @@ -307,7 +307,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicDescriptor::getImplementationId() static ::comphelper::PropertyMapEntry aEntries[] = { { MAP_CHAR_LEN( "GraphicType" ), UNOGRAPHIC_GRAPHICTYPE, &::getCppuType( (const sal_Int8*)(0)), beans::PropertyAttribute::READONLY, 0 }, - { MAP_CHAR_LEN( "MimeType" ), UNOGRAPHIC_MIMETYPE, &::getCppuType( (const ::rtl::OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, + { MAP_CHAR_LEN( "MimeType" ), UNOGRAPHIC_MIMETYPE, &::getCppuType( (const OUString*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "SizePixel" ), UNOGRAPHIC_SIZEPIXEL, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "Size100thMM" ), UNOGRAPHIC_SIZE100THMM, &::getCppuType( (const awt::Size*)(0)), beans::PropertyAttribute::READONLY, 0 }, { MAP_CHAR_LEN( "BitsPerPixel" ), UNOGRAPHIC_BITSPERPIXEL, &::getCppuType( (const sal_uInt8*)(0)), beans::PropertyAttribute::READONLY, 0 }, @@ -358,7 +358,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** case( UNOGRAPHIC_MIMETYPE ): { - ::rtl::OUString aMimeType; + OUString aMimeType; if( mpGraphic ) { @@ -384,11 +384,11 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry** } if( pMimeType ) - aMimeType = ::rtl::OUString::createFromAscii( pMimeType ); + aMimeType = OUString::createFromAscii( pMimeType ); } if( aMimeType.isEmpty() && ( mpGraphic->GetType() != GRAPHIC_NONE ) ) - aMimeType = ::rtl::OUString(MIMETYPE_VCLGRAPHIC ); + aMimeType = OUString(MIMETYPE_VCLGRAPHIC ); } else aMimeType = maMimeType; |