From 1946794ae09ba732022fe6a74ea45e304ab70b84 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Sun, 7 Apr 2013 12:06:47 +0200 Subject: 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 --- ucb/source/ucp/ext/ucpext_content.cxx | 116 ++++++++++++++--------------- ucb/source/ucp/ext/ucpext_content.hxx | 28 +++---- ucb/source/ucp/ext/ucpext_datasupplier.cxx | 36 ++++----- ucb/source/ucp/ext/ucpext_datasupplier.hxx | 2 +- ucb/source/ucp/ext/ucpext_provider.cxx | 34 ++++----- ucb/source/ucp/ext/ucpext_provider.hxx | 12 +-- 6 files changed, 114 insertions(+), 114 deletions(-) (limited to 'ucb/source/ucp/ext') diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index c40b932273a6..fce8befeb400 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -102,11 +102,11 @@ namespace ucb { namespace ucp { namespace ext namespace { //-------------------------------------------------------------------------------------------------------------- - ::rtl::OUString lcl_compose( const ::rtl::OUString& i_rBaseURL, const ::rtl::OUString& i_rRelativeURL ) + OUString lcl_compose( const OUString& i_rBaseURL, const OUString& i_rRelativeURL ) { ENSURE_OR_RETURN( !i_rBaseURL.isEmpty(), "illegal base URL", i_rRelativeURL ); - ::rtl::OUStringBuffer aComposer( i_rBaseURL ); + OUStringBuffer aComposer( i_rBaseURL ); if ( i_rBaseURL.getStr()[ i_rBaseURL.getLength() - 1 ] != '/' ) aComposer.append( sal_Unicode( '/' ) ); aComposer.append( i_rRelativeURL ); @@ -114,9 +114,9 @@ namespace ucb { namespace ucp { namespace ext } //-------------------------------------------------------------------------------------------------------------- - struct SelectPropertyName : public ::std::unary_function< Property, ::rtl::OUString > + struct SelectPropertyName : public ::std::unary_function< Property, OUString > { - const ::rtl::OUString& operator()( const Property& i_rProperty ) const + const OUString& operator()( const Property& i_rProperty ) const { return i_rProperty.Name; } @@ -136,14 +136,14 @@ namespace ucb { namespace ucp { namespace ext ,m_sExtensionId() ,m_sPathIntoExtension() { - const ::rtl::OUString sURL( getIdentifier()->getContentIdentifier() ); + const OUString sURL( getIdentifier()->getContentIdentifier() ); if ( denotesRootContent( sURL ) ) { m_eExtContentType = E_ROOT; } else { - const ::rtl::OUString sRelativeURL( sURL.copy( ContentProvider::getRootURL().getLength() ) ); + const OUString sRelativeURL( sURL.copy( ContentProvider::getRootURL().getLength() ) ); const sal_Int32 nSepPos = sRelativeURL.indexOf( '/' ); if ( ( nSepPos == -1 ) || ( nSepPos == sRelativeURL.getLength() - 1 ) ) { @@ -157,7 +157,7 @@ namespace ucb { namespace ucp { namespace ext if ( m_eExtContentType != E_ROOT ) { - const ::rtl::OUString sRootURL = ContentProvider::getRootURL(); + const OUString sRootURL = ContentProvider::getRootURL(); m_sExtensionId = sURL.copy( sRootURL.getLength() ); const sal_Int32 nNextSep = m_sExtensionId.indexOf( '/' ); @@ -176,22 +176,22 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL Content::getImplementationName() throw( RuntimeException ) + OUString SAL_CALL Content::getImplementationName() throw( RuntimeException ) { - return ::rtl::OUString( "org.openoffice.comp.ucp.ext.Content" ); + return OUString( "org.openoffice.comp.ucp.ext.Content" ); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) + Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aServiceNames(2); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.ucb.Content" ); - aServiceNames[1] = ::rtl::OUString( "com.sun.star.ucb.ExtensionContent" ); + Sequence< OUString > aServiceNames(2); + aServiceNames[0] = OUString( "com.sun.star.ucb.Content" ); + aServiceNames[1] = OUString( "com.sun.star.ucb.ExtensionContent" ); return aServiceNames; } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL Content::getContentType() throw( RuntimeException ) + OUString SAL_CALL Content::getContentType() throw( RuntimeException ) { impl_determineContentType(); return *m_aContentType; @@ -209,7 +209,7 @@ namespace ucb { namespace ucp { namespace ext if ( !( aCommand.Argument >>= Properties ) ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -222,7 +222,7 @@ namespace ucb { namespace ucp { namespace ext if ( !( aCommand.Argument >>= aProperties ) ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -230,7 +230,7 @@ namespace ucb { namespace ucp { namespace ext if ( !aProperties.getLength() ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -253,7 +253,7 @@ namespace ucb { namespace ucp { namespace ext if ( !( aCommand.Argument >>= aOpenCommand ) ) { ::ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - ::rtl::OUString(), *this, -1 ) ), + OUString(), *this, -1 ) ), i_rEvironment ); // unreachable } @@ -272,16 +272,16 @@ namespace ucb { namespace ucp { namespace ext if ( aOpenCommand.Sink.is() ) { - const ::rtl::OUString sPhysicalContentURL( getPhysicalURL() ); + const OUString sPhysicalContentURL( getPhysicalURL() ); ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEvironment, m_xContext ); - aRet = aRequestedContent.executeCommand( ::rtl::OUString( "open" ), makeAny( aOpenCommand ) ); + aRet = aRequestedContent.executeCommand( OUString( "open" ), makeAny( aOpenCommand ) ); } } else { ::ucbhelper::cancelCommandExecution( makeAny( UnsupportedCommandException( - ::rtl::OUString(), *this ) ), + OUString(), *this ) ), i_rEvironment ); // unreachable } @@ -295,22 +295,22 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::encodeIdentifier( const ::rtl::OUString& i_rIdentifier ) + OUString Content::encodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::encode( i_rIdentifier, rtl_UriCharClassRegName, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::decodeIdentifier( const ::rtl::OUString& i_rIdentifier ) + OUString Content::decodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::decode( i_rIdentifier, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); } //------------------------------------------------------------------------------------------------------------------ - bool Content::denotesRootContent( const ::rtl::OUString& i_rContentIdentifier ) + bool Content::denotesRootContent( const OUString& i_rContentIdentifier ) { - const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); + const OUString sRootURL( ContentProvider::getRootURL() ); if ( i_rContentIdentifier == sRootURL ) return true; @@ -325,9 +325,9 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::getParentURL() + OUString Content::getParentURL() { - const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); + const OUString sRootURL( ContentProvider::getRootURL() ); switch ( m_eExtContentType ) { @@ -341,7 +341,7 @@ namespace ucb { namespace ucp { namespace ext case E_EXTENSION_CONTENT: { - const ::rtl::OUString sURL = m_xIdentifier->getContentIdentifier(); + const OUString sURL = m_xIdentifier->getContentIdentifier(); // cut the root URL if ( !sURL.match( sRootURL, 0 ) ) @@ -350,10 +350,10 @@ namespace ucb { namespace ucp { namespace ext break; } - ::rtl::OUString sRelativeURL( sURL.copy( sRootURL.getLength() ) ); + OUString sRelativeURL( sURL.copy( sRootURL.getLength() ) ); // cut the extension ID - const ::rtl::OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + ::rtl::OUString( sal_Unicode( '/' ) ) ); + const OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + OUString( sal_Unicode( '/' ) ) ); if ( !sRelativeURL.match( sSeparatedExtensionId ) ) { SAL_INFO( "ucb.ucp", "illegal URL structure - no extension ID" ); @@ -376,7 +376,7 @@ namespace ucb { namespace ucp { namespace ext const sal_Int32 nLastSep = sRelativeURL.lastIndexOf( '/' ); sRelativeURL = sRelativeURL.copy( 0, nLastSep != -1 ? nLastSep : 0 ); - ::rtl::OUStringBuffer aComposer; + OUStringBuffer aComposer; aComposer.append( sRootURL ); aComposer.append( sSeparatedExtensionId ); aComposer.append( sRelativeURL ); @@ -387,12 +387,12 @@ namespace ucb { namespace ucp { namespace ext OSL_FAIL( "Content::getParentURL: unhandled case!" ); break; } - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ Reference< XRow > Content::getArtificialNodePropertyValues( const Reference< XComponentContext >& rxContext, - const Sequence< Property >& i_rProperties, const ::rtl::OUString& i_rTitle ) + const Sequence< Property >& i_rProperties, const OUString& i_rTitle ) { // note: empty sequence means "get values of all supported properties". ::rtl::Reference< ::ucbhelper::PropertyValueSet > xRow = new ::ucbhelper::PropertyValueSet( rxContext ); @@ -434,22 +434,22 @@ namespace ucb { namespace ucp { namespace ext else { // Append all Core Properties. - xRow->appendString ( Property( ::rtl::OUString("ContentType"), + xRow->appendString ( Property( OUString("ContentType"), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), ContentProvider::getArtificialNodeContentType() ); - xRow->appendString ( Property( ::rtl::OUString("Title"), + xRow->appendString ( Property( OUString("Title"), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), i_rTitle ); - xRow->appendBoolean( Property( ::rtl::OUString("IsDocument"), + xRow->appendBoolean( Property( OUString("IsDocument"), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), sal_False ); - xRow->appendBoolean( Property( ::rtl::OUString("IsFolder"), + xRow->appendBoolean( Property( OUString("IsFolder"), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), @@ -460,13 +460,13 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString Content::getPhysicalURL() const + OUString Content::getPhysicalURL() const { - ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", ::rtl::OUString() ); + ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", OUString() ); // create an ucb::XContent for the physical file within the deployed extension const Reference< XPackageInformationProvider > xPackageInfo = PackageInformationProvider::get(m_xContext); - const ::rtl::OUString sPackageLocation( xPackageInfo->getPackageLocation( m_sExtensionId ) ); + const OUString sPackageLocation( xPackageInfo->getPackageLocation( m_sExtensionId ) ); if ( m_sPathIntoExtension.isEmpty() ) return sPackageLocation; @@ -486,11 +486,11 @@ namespace ucb { namespace ucp { namespace ext return getArtificialNodePropertyValues( m_xContext, i_rProperties, m_sExtensionId ); case E_EXTENSION_CONTENT: { - const ::rtl::OUString sPhysicalContentURL( getPhysicalURL() ); + const OUString sPhysicalContentURL( getPhysicalURL() ); ::ucbhelper::Content aRequestedContent( sPhysicalContentURL, i_rEnv, m_xContext ); // translate the property request - Sequence< ::rtl::OUString > aPropertyNames( i_rProperties.getLength() ); + Sequence< OUString > aPropertyNames( i_rProperties.getLength() ); ::std::transform( i_rProperties.getConstArray(), i_rProperties.getConstArray() + i_rProperties.getLength(), @@ -538,7 +538,7 @@ namespace ucb { namespace ucp { namespace ext for ( sal_Int32 n = 0; n < nCount; ++n, ++pValues ) { // all our properties are read-only ... - aRet[ n ] <<= IllegalAccessException( ::rtl::OUString("property is read-only."), *this ); + aRet[ n ] <<= IllegalAccessException( OUString("property is read-only."), *this ); } return aRet; @@ -554,23 +554,23 @@ namespace ucb { namespace ucp { namespace ext // Mandatory commands /////////////////////////////////////////////////////////////// CommandInfo( - ::rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ), CommandInfo( - ::rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ), CommandInfo( - ::rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< Sequence< Property > * >( 0 ) ) ), CommandInfo( - ::rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< Sequence< PropertyValue > * >( 0 ) ) @@ -579,7 +579,7 @@ namespace ucb { namespace ucp { namespace ext // Optional standard commands /////////////////////////////////////////////////////////////// , CommandInfo( - ::rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< OpenCommandArgument2 * >( 0 ) ) ) @@ -594,27 +594,27 @@ namespace ucb { namespace ucp { namespace ext static Property aProperties[] = { Property( - ::rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - ::rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - ::rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), Property( - ::rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const ::rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ) }; @@ -631,7 +631,7 @@ namespace ucb { namespace ucp { namespace ext try { Sequence< Property > aProps(1); - aProps[0].Name = ::rtl::OUString( "IsFolder" ); + aProps[0].Name = OUString( "IsFolder" ); Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW ); bIsFolder = xRow->getBoolean(1); } @@ -655,7 +655,7 @@ namespace ucb { namespace ucp { namespace ext try { Sequence< Property > aProps(1); - aProps[0].Name = ::rtl::OUString( "ContentType" ); + aProps[0].Name = OUString( "ContentType" ); Reference< XRow > xRow( getPropertyValues( aProps, NULL ), UNO_SET_THROW ); m_aContentType.reset( xRow->getString(1) ); } diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index ee29fd9778a0..f28fa7f4097b 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -63,7 +63,7 @@ namespace ucb { namespace ucp { namespace ext getArtificialNodePropertyValues( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& rProperties, - const ::rtl::OUString& rTitle + const OUString& rTitle ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > @@ -72,29 +72,29 @@ namespace ucb { namespace ucp { namespace ext const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ); - static ::rtl::OUString - encodeIdentifier( const ::rtl::OUString& i_rIdentifier ); - static ::rtl::OUString - decodeIdentifier( const ::rtl::OUString& i_rIdentifier ); + static OUString + encodeIdentifier( const OUString& i_rIdentifier ); + static OUString + decodeIdentifier( const OUString& i_rIdentifier ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); ExtensionContentType getExtensionContentType() const { return m_eExtContentType; } /** retrieves the URL of the underlying physical content. Not to be called when getExtensionContentType() returns E_ROOT. */ - ::rtl::OUString getPhysicalURL() const; + OUString getPhysicalURL() const; protected: virtual ~Content(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XContent - virtual rtl::OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); // XCommandProcessor virtual com::sun::star::uno::Any SAL_CALL @@ -125,7 +125,7 @@ namespace ucb { namespace ucp { namespace ext const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ); - static bool denotesRootContent( const ::rtl::OUString& i_rContentIdentifier ); + static bool denotesRootContent( const OUString& i_rContentIdentifier ); bool impl_isFolder(); void impl_determineContentType(); @@ -133,9 +133,9 @@ namespace ucb { namespace ucp { namespace ext private: ExtensionContentType m_eExtContentType; ::boost::optional< bool > m_aIsFolder; - ::boost::optional< ::rtl::OUString > m_aContentType; - ::rtl::OUString m_sExtensionId; - ::rtl::OUString m_sPathIntoExtension; + ::boost::optional< OUString > m_aContentType; + OUString m_sExtensionId; + OUString m_sPathIntoExtension; }; //...................................................................................................................... diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index ff93dc977b74..6f86da239e2e 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -70,7 +70,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== struct ResultListEntry { - ::rtl::OUString sId; + OUString sId; Reference< XContentIdentifier > xId; ::rtl::Reference< Content > pContent; Reference< XRow > xRow; @@ -109,11 +109,11 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== namespace { - ::rtl::OUString lcl_compose( const ::rtl::OUString& i_rBaseURL, const ::rtl::OUString& i_rRelativeURL ) + OUString lcl_compose( const OUString& i_rBaseURL, const OUString& i_rRelativeURL ) { ENSURE_OR_RETURN( !i_rBaseURL.isEmpty(), "illegal base URL", i_rRelativeURL ); - ::rtl::OUStringBuffer aComposer( i_rBaseURL ); + OUStringBuffer aComposer( i_rBaseURL ); if ( i_rBaseURL.getStr()[ i_rBaseURL.getLength() - 1 ] != '/' ) aComposer.append( sal_Unicode( '/' ) ); aComposer.append( i_rRelativeURL ); @@ -140,14 +140,14 @@ namespace ucb { namespace ucp { namespace ext { const Reference< XPackageInformationProvider > xPackageInfo = PackageInformationProvider::get( m_pImpl->m_xContext ); - const ::rtl::OUString sContentIdentifier( m_pImpl->m_xContent->getIdentifier()->getContentIdentifier() ); + const OUString sContentIdentifier( m_pImpl->m_xContent->getIdentifier()->getContentIdentifier() ); switch ( m_pImpl->m_xContent->getExtensionContentType() ) { case E_ROOT: { - Sequence< Sequence< ::rtl::OUString > > aExtensionInfo( xPackageInfo->getExtensionList() ); - for ( const Sequence< ::rtl::OUString >* pExtInfo = aExtensionInfo.getConstArray(); + Sequence< Sequence< OUString > > aExtensionInfo( xPackageInfo->getExtensionList() ); + for ( const Sequence< OUString >* pExtInfo = aExtensionInfo.getConstArray(); pExtInfo != aExtensionInfo.getConstArray() + aExtensionInfo.getLength(); ++pExtInfo ) @@ -158,9 +158,9 @@ namespace ucb { namespace ucp { namespace ext continue; } - const ::rtl::OUString& rLocalId = (*pExtInfo)[0]; + const OUString& rLocalId = (*pExtInfo)[0]; ResultListEntry aEntry; - aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + ::rtl::OUString( sal_Unicode( '/' ) ); + aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + OUString( sal_Unicode( '/' ) ); m_pImpl->m_aResults.push_back( aEntry ); } } @@ -168,12 +168,12 @@ namespace ucb { namespace ucp { namespace ext case E_EXTENSION_ROOT: case E_EXTENSION_CONTENT: { - const ::rtl::OUString sPackageLocation( m_pImpl->m_xContent->getPhysicalURL() ); + const OUString sPackageLocation( m_pImpl->m_xContent->getPhysicalURL() ); ::ucbhelper::Content aWrappedContent( sPackageLocation, getResultSet()->getEnvironment(), m_pImpl->m_xContext ); // obtain the properties which our result set is set up for from the wrapped content - Sequence< ::rtl::OUString > aPropertyNames(1); - aPropertyNames[0] = ::rtl::OUString( "Title" ); + Sequence< OUString > aPropertyNames(1); + aPropertyNames[0] = OUString( "Title" ); const Reference< XResultSet > xFolderContent( aWrappedContent.createCursor( aPropertyNames ), UNO_SET_THROW ); const Reference< XRow > xContentRow( xFolderContent, UNO_QUERY_THROW ); @@ -202,19 +202,19 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex ) + OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( i_nIndex < m_pImpl->m_aResults.size() ) { - const ::rtl::OUString sId = m_pImpl->m_aResults[ i_nIndex ].sId; + const OUString sId = m_pImpl->m_aResults[ i_nIndex ].sId; if ( !sId.isEmpty() ) return sId; } OSL_FAIL( "DataSupplier::queryContentIdentifierString: illegal index, or illegal result entry id!" ); - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------------------------------------------------ @@ -229,7 +229,7 @@ namespace ucb { namespace ucp { namespace ext return xId; } - ::rtl::OUString sId = queryContentIdentifierString( i_nIndex ); + OUString sId = queryContentIdentifierString( i_nIndex ); if ( !sId.isEmpty() ) { Reference< XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( sId ); @@ -319,9 +319,9 @@ namespace ucb { namespace ucp { namespace ext { case E_ROOT: { - const ::rtl::OUString& rId( m_pImpl->m_aResults[ i_nIndex ].sId ); - const ::rtl::OUString sRootURL( ContentProvider::getRootURL() ); - ::rtl::OUString sTitle = Content::decodeIdentifier( rId.copy( sRootURL.getLength() ) ); + const OUString& rId( m_pImpl->m_aResults[ i_nIndex ].sId ); + const OUString sRootURL( ContentProvider::getRootURL() ); + OUString sTitle = Content::decodeIdentifier( rId.copy( sRootURL.getLength() ) ); if ( !sTitle.isEmpty() && ( sTitle[ sTitle.getLength() - 1 ] == '/' ) ) sTitle = sTitle.copy( 0, sTitle.getLength() - 1 ); xRow = Content::getArtificialNodePropertyValues( m_pImpl->m_xContext, getResultSet()->getProperties(), sTitle ); diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index 291b3a17c716..cfa5e04be074 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -51,7 +51,7 @@ namespace ucb { namespace ucp { namespace ext protected: virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > queryContent( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 4115f52a4b96..37c384d8effb 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -63,28 +63,28 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) + OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); + return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException) + OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServiceNames(2); - aServiceNames[0] = ::rtl::OUString( "com.sun.star.ucb.ContentProvider" ); - aServiceNames[1] = ::rtl::OUString( "com.sun.star.ucb.ExtensionContentProvider" ); + Sequence< OUString > aServiceNames(2); + aServiceNames[0] = OUString( "com.sun.star.ucb.ContentProvider" ); + aServiceNames[1] = OUString( "com.sun.star.ucb.ExtensionContentProvider" ); return aServiceNames; } //------------------------------------------------------------------------------------------------------------------ - Sequence< ::rtl::OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } @@ -96,21 +96,21 @@ namespace ucb { namespace ucp { namespace ext } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ContentProvider::getRootURL() + OUString ContentProvider::getRootURL() { - return ::rtl::OUString( "vnd.sun.star.extension://" ); + return OUString( "vnd.sun.star.extension://" ); } //------------------------------------------------------------------------------------------------------------------ - ::rtl::OUString ContentProvider::getArtificialNodeContentType() + OUString ContentProvider::getArtificialNodeContentType() { - return ::rtl::OUString( "application/vnd.sun.star.extension-content" ); + return OUString( "application/vnd.sun.star.extension-content" ); } //------------------------------------------------------------------------------------------------------------------ namespace { - void lcl_ensureAndTransfer( ::rtl::OUString& io_rIdentifierFragment, ::rtl::OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar ) + void lcl_ensureAndTransfer( OUString& io_rIdentifierFragment, OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar ) { if ( ( io_rIdentifierFragment.isEmpty() ) || ( io_rIdentifierFragment[0] != i_nLeadingChar ) ) throw IllegalIdentifierException(); @@ -124,19 +124,19 @@ namespace ucb { namespace ucp { namespace ext throw( IllegalIdentifierException, RuntimeException ) { // Check URL scheme... - const ::rtl::OUString sScheme( "vnd.sun.star.extension" ); + const OUString sScheme( "vnd.sun.star.extension" ); if ( !i_rIdentifier->getContentProviderScheme().equalsIgnoreAsciiCase( sScheme ) ) throw IllegalIdentifierException(); // normalize the identifier - const ::rtl::OUString sIdentifier( i_rIdentifier->getContentIdentifier() ); + const OUString sIdentifier( i_rIdentifier->getContentIdentifier() ); // the scheme needs to be lower-case - ::rtl::OUStringBuffer aComposer; + OUStringBuffer aComposer; aComposer.append( sIdentifier.copy( 0, sScheme.getLength() ).toAsciiLowerCase() ); // one : is required after the scheme - ::rtl::OUString sRemaining( sIdentifier.copy( sScheme.getLength() ) ); + OUString sRemaining( sIdentifier.copy( sScheme.getLength() ) ); lcl_ensureAndTransfer( sRemaining, aComposer, ':' ); // and at least one / diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index 88c7f58325fa..55ddc498553f 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -38,20 +38,20 @@ namespace ucb { namespace ucp { namespace ext virtual ~ContentProvider(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions - static ::rtl::OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static() throw (::com::sun::star::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_static( ) throw (::com::sun::star::uno::RuntimeException); + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static() throw (::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext ); // XContentProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > SAL_CALL queryContent( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& Identifier ) throw (::com::sun::star::ucb::IllegalIdentifierException, ::com::sun::star::uno::RuntimeException); public: - static ::rtl::OUString getRootURL(); - static ::rtl::OUString getArtificialNodeContentType(); + static OUString getRootURL(); + static OUString getArtificialNodeContentType(); }; //...................................................................................................................... -- cgit