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 /comphelper/source | |
| 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 'comphelper/source')
73 files changed, 775 insertions, 784 deletions
diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index f9653e5d6008..31d7d798da1e 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::lang; using namespace com::sun::star::i18n; -using ::rtl::OUString; //============================================================================= @@ -84,8 +83,8 @@ public: virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& ); }; diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 6e2062598f7f..38dca1d9ff62 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -65,13 +65,13 @@ public: throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); private: @@ -214,7 +214,7 @@ sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements( ) } //XServiceInfo -::rtl::OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return getImplementationName_static(); } @@ -224,19 +224,19 @@ OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName_static( return OUString( "IndexedPropertyValuesContainer" ); } -sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" ); return aServiceName == ServiceName; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { return getSupportedServiceNames_static(); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames_static( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames_static( ) { const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 83c1a395cfa6..61ff126ee849 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -42,25 +42,25 @@ public: virtual ~NamedPropertyValuesContainer() throw(); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -70,13 +70,13 @@ public: throw(::com::sun::star::uno::RuntimeException); //XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 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 sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) 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 (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); private: @@ -92,7 +92,7 @@ NamedPropertyValuesContainer::~NamedPropertyValuesContainer() throw() } // XNameContainer -void SAL_CALL NamedPropertyValuesContainer::insertByName( const rtl::OUString& aName, const uno::Any& aElement ) +void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -106,7 +106,7 @@ void SAL_CALL NamedPropertyValuesContainer::insertByName( const rtl::OUString& a maProperties.insert( NamedPropertyValues::value_type(aName ,aProps) ); } -void SAL_CALL NamedPropertyValuesContainer::removeByName( const ::rtl::OUString& Name ) +void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -118,7 +118,7 @@ void SAL_CALL NamedPropertyValuesContainer::removeByName( const ::rtl::OUString& } // XNameReplace -void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) +void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -134,7 +134,7 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString } // XNameAccess -::com::sun::star::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const ::rtl::OUString& aName ) +::com::sun::star::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -149,14 +149,14 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString return aElement; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( ) throw(::com::sun::star::uno::RuntimeException) { NamedPropertyValues::iterator aIter = maProperties.begin(); const NamedPropertyValues::iterator aEnd = maProperties.end(); - uno::Sequence< rtl::OUString > aNames( maProperties.size() ); - rtl::OUString* pNames = aNames.getArray(); + uno::Sequence< OUString > aNames( maProperties.size() ); + OUString* pNames = aNames.getArray(); while( aIter != aEnd ) { @@ -166,7 +166,7 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const ::rtl::OUString return aNames; } -sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); @@ -187,7 +187,7 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements( ) } //XServiceInfo -::rtl::OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return getImplementationName_static(); } @@ -203,13 +203,13 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& return aServiceName == ServiceName; } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) +::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) { return getSupportedServiceNames_static(); } -::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames_static( ) +::com::sun::star::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames_static( ) { const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index ad55865f6982..87b214e03cbc 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -53,7 +53,7 @@ namespace comphelper struct hashObjectName_Impl { - size_t operator()(const ::rtl::OUString Str) const + size_t operator()(const OUString Str) const { return (size_t)Str.hashCode(); } @@ -61,7 +61,7 @@ struct hashObjectName_Impl struct eqObjectName_Impl { - sal_Bool operator()(const ::rtl::OUString Str1, const ::rtl::OUString Str2) const + sal_Bool operator()(const OUString Str1, const OUString Str2) const { return ( Str1 == Str2 ); } @@ -69,7 +69,7 @@ struct eqObjectName_Impl typedef boost::unordered_map < - ::rtl::OUString, + OUString, ::com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >, hashObjectName_Impl, eqObjectName_Impl @@ -246,9 +246,9 @@ OUString EmbeddedObjectContainer::CreateUniqueObjectName() return aStr; } -uno::Sequence < ::rtl::OUString > EmbeddedObjectContainer::GetObjectNames() +uno::Sequence < OUString > EmbeddedObjectContainer::GetObjectNames() { - uno::Sequence < ::rtl::OUString > aSeq( pImpl->maObjectContainer.size() ); + uno::Sequence < OUString > aSeq( pImpl->maObjectContainer.size() ); EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); sal_Int32 nIdx=0; while ( aIt != pImpl->maObjectContainer.end() ) @@ -261,7 +261,7 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObjects() return pImpl->maObjectContainer.size() != 0; } -sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const ::rtl::OUString& rName ) +sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const OUString& rName ) { EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.find( rName ); if ( aIt == pImpl->maObjectContainer.end() ) @@ -287,7 +287,7 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const uno::Reference < embe return sal_False; } -sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OUString& rName ) +sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const OUString& rName ) { // allows to detect whether the object was already instantiated // currently the filter instantiate it on loading, so this method allows @@ -296,7 +296,7 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU return ( aIt != pImpl->maObjectContainer.end() ); } -::rtl::OUString EmbeddedObjectContainer::GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj ) +OUString EmbeddedObjectContainer::GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj ) { EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); while ( aIt != pImpl->maObjectContainer.end() ) @@ -308,10 +308,10 @@ sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const ::rtl::OU } OSL_FAIL( "Unknown object!" ); - return ::rtl::OUString(); + return OUString(); } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedObject( const ::rtl::OUString& rName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedObject( const OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::GetEmbeddedObject" ); @@ -322,9 +322,9 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedOb #if OSL_DEBUG_LEVEL > 1 uno::Reference < container::XNameAccess > xAccess( pImpl->mxStorage, uno::UNO_QUERY ); - uno::Sequence< ::rtl::OUString> aSeq = xAccess->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + uno::Sequence< OUString> aSeq = xAccess->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) { (void)*pIter; @@ -341,7 +341,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedOb return xObj; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( const ::rtl::OUString& rName, const uno::Reference < embed::XEmbeddedObject >& xCopy ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( const OUString& rName, const uno::Reference < embed::XEmbeddedObject >& xCopy ) { uno::Reference < embed::XEmbeddedObject > xObj; try @@ -390,7 +390,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( con } uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, - const uno::Sequence < beans::PropertyValue >& rArgs, ::rtl::OUString& rNewName ) + const uno::Sequence < beans::PropertyValue >& rArgs, OUString& rNewName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CreateEmbeddedObject" ); @@ -410,7 +410,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde aObjDescr[0].Value <<= pImpl->m_xModel.get(); ::std::copy( rArgs.getConstArray(), rArgs.getConstArray() + rArgs.getLength(), aObjDescr.getArray() + 1 ); xObj = uno::Reference < embed::XEmbeddedObject >( xFactory->createInstanceInitNew( - rClassId, ::rtl::OUString(), pImpl->mxStorage, rNewName, + rClassId, OUString(), pImpl->mxStorage, rNewName, aObjDescr ), uno::UNO_QUERY ); AddEmbeddedObject( xObj, rNewName ); @@ -427,12 +427,12 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde return xObj; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, ::rtl::OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbeddedObject( const uno::Sequence < sal_Int8 >& rClassId, OUString& rNewName ) { return CreateEmbeddedObject( rClassId, uno::Sequence < beans::PropertyValue >(), rNewName ); } -void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, const ::rtl::OUString& rName ) +void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, const OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::AddEmbeddedObject" ); @@ -463,8 +463,8 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re if ( (*aIt).second == xObj ) { // copy replacement image from temporary container (if there is any) - ::rtl::OUString aTempName = (*aIt).first; - ::rtl::OUString aMediaType; + OUString aTempName = (*aIt).first; + OUString aMediaType; uno::Reference < io::XInputStream > xStream = pImpl->mpTempObjectContainer->GetGraphicStream( xObj, &aMediaType ); if ( xStream.is() ) { @@ -496,7 +496,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re } } -sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName, sal_Bool bCopy ) +sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName, sal_Bool bCopy ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::StoreEmbeddedObject" ); @@ -538,7 +538,7 @@ sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < em return sal_True; } -sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName ) +sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( Object )" ); // store it into the container storage @@ -552,7 +552,7 @@ sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < e return sal_False; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < io::XInputStream >& xStm, ::rtl::OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < io::XInputStream >& xStm, OUString& rNewName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( InputStream )" ); @@ -616,7 +616,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde return xRet; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, ::rtl::OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString& rNewName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( MediaDescriptor )" ); @@ -650,7 +650,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde return xObj; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, ::rtl::OUString& rNewName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedLink( const ::com::sun::star::uno::Sequence < ::com::sun::star::beans::PropertyValue >& aMedium, OUString& rNewName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedLink" ); @@ -688,8 +688,8 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde } sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc, - const ::rtl::OUString& aOrigName, - const ::rtl::OUString& aTargetName ) + const OUString& aOrigName, + const OUString& aTargetName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::TryToCopyGraphReplacement" ); @@ -697,7 +697,7 @@ sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectConta if ( ( &rSrc != this || !aOrigName.equals( aTargetName ) ) && !aOrigName.isEmpty() && !aTargetName.isEmpty() ) { - ::rtl::OUString aMediaType; + OUString aMediaType; uno::Reference < io::XInputStream > xGrStream = rSrc.GetGraphicStream( aOrigName, &aMediaType ); if ( xGrStream.is() ) bResult = InsertGraphicStream( xGrStream, aTargetName, aMediaType ); @@ -706,7 +706,7 @@ sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectConta return bResult; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName ) +uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CopyAndGetEmbeddedObject" ); @@ -714,7 +714,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb // TODO/LATER: For now only objects that implement XEmbedPersist have a replacement image, it might change in future // do an incompatible change so that object name is provided in all the move and copy methods - ::rtl::OUString aOrigName; + OUString aOrigName; try { uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY_THROW ); @@ -741,7 +741,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb if ( xOrigLinkage.is() && xOrigLinkage->isLink() ) { // this is a OOo link, it has no persistence - ::rtl::OUString aURL = xOrigLinkage->getLinkURL(); + OUString aURL = xOrigLinkage->getLinkURL(); if ( aURL.isEmpty() ) throw uno::RuntimeException(); @@ -859,13 +859,13 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb return xResult; } -sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName ) +sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Object )" ); // get the object name before(!) it is assigned to a new storage uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); - ::rtl::OUString aName; + OUString aName; if ( xPersist.is() ) aName = xPersist->getEntryName(); @@ -923,7 +923,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r return bRet; } -sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& rName, sal_Bool bClose ) +sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Name )" ); @@ -934,7 +934,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const ::rtl::OUString& r return sal_False; } -sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const ::rtl::OUString& rName, EmbeddedObjectContainer& rCnt ) +sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& rCnt ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Name )" ); @@ -955,7 +955,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const ::rtl::OUString& rNa if ( xObj.is() ) { // move object - ::rtl::OUString aName( rName ); + OUString aName( rName ); rCnt.InsertEmbeddedObject( xObj, aName ); pImpl->maObjectContainer.erase( aIt ); uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); @@ -992,7 +992,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Object )" ); uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY ); - ::rtl::OUString aName; + OUString aName; if ( xPersist.is() ) aName = xPersist->getEntryName(); @@ -1033,7 +1033,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e uno::Sequence < beans::PropertyValue > aSeq; OUString aTmpPersistName = "Object "; - aTmpPersistName += ::rtl::OUString::valueOf( (sal_Int32) pImpl->maTempObjectContainer.size() ); + aTmpPersistName += OUString::valueOf( (sal_Int32) pImpl->maTempObjectContainer.size() ); xPersist->storeAsEntry( pImpl->mxTempStorage, aTmpPersistName, aSeq, aSeq ); xPersist->saveCompleted( sal_True ); @@ -1048,7 +1048,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e { // TODO/LATER: in future probably the temporary container will have two storages ( of two formats ) // the media type will be provided with object insertion - ::rtl::OUString aOrigStorMediaType; + OUString aOrigStorMediaType; uno::Reference< beans::XPropertySet > xStorProps( pImpl->mxStorage, uno::UNO_QUERY_THROW ); static const OUString s_sMediaType("MediaType"); xStorProps->getPropertyValue( s_sMediaType ) >>= aOrigStorMediaType; @@ -1066,7 +1066,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e } } - ::rtl::OUString aTempName, aMediaType; + OUString aTempName, aMediaType; pImpl->mpTempObjectContainer->InsertEmbeddedObject( xObj, aTempName ); uno::Reference < io::XInputStream > xStream = GetGraphicStream( xObj, &aMediaType ); @@ -1167,7 +1167,7 @@ sal_Bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < em return bFound; } -uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::rtl::OUString& aName, rtl::OUString* pMediaType ) +uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const OUString& aName, OUString* pMediaType ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::GetGraphicStream( Name )" ); @@ -1199,12 +1199,12 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c return xStream; } -uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, rtl::OUString* pMediaType ) +uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, OUString* pMediaType ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::GetGraphicStream( Object )" ); // get the object name - ::rtl::OUString aName; + OUString aName; EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); while ( aIt != pImpl->maObjectContainer.end() ) { @@ -1221,7 +1221,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c return GetGraphicStream( aName, pMediaType ); } -sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType ) +sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertGraphicStream" ); @@ -1258,7 +1258,7 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno return sal_True; } -sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const ::rtl::OUString& rObjectName, const rtl::OUString& rMediaType ) +sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertGraphicStreamDirectly" ); @@ -1290,7 +1290,7 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::s } -sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const ::rtl::OUString& rObjectName ) +sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName ) { RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveGraphicStream" ); @@ -1309,7 +1309,7 @@ sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const ::rtl::OUString& rO namespace { void InsertStreamIntoPicturesStorage_Impl( const uno::Reference< embed::XStorage >& xDocStor, const uno::Reference< io::XInputStream >& xInStream, - const ::rtl::OUString& aStreamName ) + const OUString& aStreamName ) { OSL_ENSURE( !aStreamName.isEmpty() && xInStream.is() && xDocStor.is(), "Misuse of the method!\n" ); @@ -1345,9 +1345,9 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo try { comphelper::EmbeddedObjectContainer aCnt( _xStorage ); - const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const uno::Sequence < OUString > aNames = GetObjectNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); @@ -1358,7 +1358,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo uno::Reference< embed::XLinkageSupport > xLink( xObj, uno::UNO_QUERY ); uno::Reference < io::XInputStream > xStream; - ::rtl::OUString aMediaType; + OUString aMediaType; sal_Int32 nCurState = xObj->getCurrentState(); if ( nCurState == embed::EmbedStates::LOADED || nCurState == embed::EmbedStates::RUNNING ) @@ -1460,9 +1460,9 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool _bObjectsOnly) { sal_Bool bResult = sal_True; - const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const uno::Sequence < OUString > aNames = GetObjectNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); @@ -1474,7 +1474,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool { // means that the object is active // the image must be regenerated - ::rtl::OUString aMediaType; + OUString aMediaType; // TODO/LATER: another aspect could be used uno::Reference < io::XInputStream > xStream = @@ -1521,7 +1521,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool uno::Reference< embed::XLinkageSupport > xLink( xObj, uno::UNO_QUERY ); if ( xLink.is() && xLink->isLink() ) { - ::rtl::OUString aMediaType; + OUString aMediaType; uno::Reference < io::XInputStream > xInStream = GetGraphicStream( xObj, &aMediaType ); if ( xInStream.is() ) InsertStreamIntoPicturesStorage_Impl( pImpl->mxStorage, xInStream, *pIter ); @@ -1558,7 +1558,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacementStream( sal_Int64 nViewAspect, const uno::Reference< embed::XEmbeddedObject >& xObj, - ::rtl::OUString* pMediaType ) + OUString* pMediaType ) { uno::Reference< io::XInputStream > xInStream; if ( xObj.is() ) @@ -1585,9 +1585,9 @@ uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacemen sal_Bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::XStorage >& _xStorage,bool _bClearModifedFlag) { sal_Bool bError = sal_False; - const uno::Sequence < ::rtl::OUString > aNames = GetObjectNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + const uno::Sequence < OUString > aNames = GetObjectNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { uno::Reference < embed::XEmbeddedObject > xObj = GetEmbeddedObject( *pIter ); diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index ad2b9c9888c4..e79f2a0875c7 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -214,14 +214,14 @@ namespace comphelper virtual ::sal_Bool SAL_CALL hasElements() throw (RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); public: // XServiceInfo, static version (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static( ); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static( ); + static OUString SAL_CALL getImplementationName_static( ); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static( ); static Reference< XInterface > SAL_CALL Create( const Reference< XComponentContext >& ); private: @@ -491,7 +491,7 @@ namespace comphelper if ( !bValid ) { - ::rtl::OUStringBuffer aMessage; + OUStringBuffer aMessage; aMessage.appendAscii( "Incompatible value type. Found '" ); aMessage.append( _value.getValueTypeName() ); aMessage.appendAscii( "', where '" ); @@ -688,15 +688,15 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL EnumerableMap::getImplementationName( ) throw (RuntimeException) + OUString SAL_CALL EnumerableMap::getImplementationName( ) throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL EnumerableMap::supportsService( const ::rtl::OUString& _serviceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() ); + Sequence< OUString > aServices( getSupportedServiceNames() ); for ( sal_Int32 i=0; i<aServices.getLength(); ++i ) if ( _serviceName == aServices[i] ) return sal_True; @@ -704,7 +704,7 @@ namespace comphelper } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } @@ -736,7 +736,7 @@ namespace comphelper ::sal_Bool MapEnumerator::hasMoreElements() { if ( m_disposed ) - throw DisposedException( ::rtl::OUString(), m_rParent ); + throw DisposedException( OUString(), m_rParent ); return m_mapPos != m_rMapData.m_pValues->end(); } diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index 2dd9ec940e73..b48e67eae2ed 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -40,7 +40,7 @@ OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::X //------------------------------------------------------------------------------ OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::XNameAccess>& _rxAccess, - const staruno::Sequence< ::rtl::OUString >& _aNames ) + const staruno::Sequence< OUString >& _aNames ) :m_aNames(_aNames) ,m_nPos(0) ,m_xAccess(_rxAccess) diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 28bd6a5be7c6..f1ee4150e391 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -41,25 +41,25 @@ namespace comphelper virtual ~NameContainer(); // XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL insertByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& Name ) + virtual void SAL_CALL removeByName( const OUString& Name ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // XElementAccess @@ -92,7 +92,7 @@ NameContainer::~NameContainer() } // XNameContainer -void SAL_CALL NameContainer::insertByName( const rtl::OUString& aName, const Any& aElement ) +void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { @@ -107,7 +107,7 @@ void SAL_CALL NameContainer::insertByName( const rtl::OUString& aName, const Any maProperties.insert( SvGenericNameContainerMapImpl::value_type(aName,aElement)); } -void SAL_CALL NameContainer::removeByName( const ::rtl::OUString& Name ) +void SAL_CALL NameContainer::removeByName( const OUString& Name ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -122,7 +122,7 @@ void SAL_CALL NameContainer::removeByName( const ::rtl::OUString& Name ) // XNameReplace -void SAL_CALL NameContainer::replaceByName( const ::rtl::OUString& aName, const Any& aElement ) +void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -140,7 +140,7 @@ void SAL_CALL NameContainer::replaceByName( const ::rtl::OUString& aName, const // XNameAccess -Any SAL_CALL NameContainer::getByName( const ::rtl::OUString& aName ) +Any SAL_CALL NameContainer::getByName( const OUString& aName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { @@ -153,7 +153,7 @@ Any SAL_CALL NameContainer::getByName( const ::rtl::OUString& aName ) return (*aIter).second; } -Sequence< ::rtl::OUString > SAL_CALL NameContainer::getElementNames( ) +Sequence< OUString > SAL_CALL NameContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard( maMutex ); @@ -161,8 +161,8 @@ Sequence< ::rtl::OUString > SAL_CALL NameContainer::getElementNames( ) SvGenericNameContainerMapImpl::iterator aIter = maProperties.begin(); const SvGenericNameContainerMapImpl::iterator aEnd = maProperties.end(); - Sequence< rtl::OUString > aNames( maProperties.size() ); - rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames( maProperties.size() ); + OUString* pNames = aNames.getArray(); while( aIter != aEnd ) { @@ -172,7 +172,7 @@ Sequence< ::rtl::OUString > SAL_CALL NameContainer::getElementNames( ) return aNames; } -sal_Bool SAL_CALL NameContainer::hasByName( const ::rtl::OUString& aName ) +sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName ) throw(RuntimeException) { MutexGuard aGuard( maMutex ); diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 0fea4be3a072..512e6fb786f3 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -59,7 +59,6 @@ using namespace com::sun::star::reflection; using namespace cppu; using namespace osl; -using ::rtl::OUString; namespace comphelper { diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index c355d50c53f6..b3169fd77be0 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -292,7 +292,7 @@ namespace comphelper xParentContext = xParent->getAccessibleContext(); if ( !xParentContext.is() ) - throw IllegalAccessibleComponentStateException( ::rtl::OUString(), *this ); + throw IllegalAccessibleComponentStateException( OUString(), *this ); return xParentContext->getLocale(); } diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index ab77650a7710..a724fdfe185e 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -104,7 +104,7 @@ namespace comphelper void OCommonAccessibleText::implGetGlyphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( implIsValidIndex( nIndex, sText.getLength() ) ) { @@ -136,7 +136,7 @@ namespace comphelper sal_Bool OCommonAccessibleText::implGetWordBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { sal_Bool bWord = sal_False; - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( implIsValidIndex( nIndex, sText.getLength() ) ) { @@ -168,7 +168,7 @@ namespace comphelper void OCommonAccessibleText::implGetSentenceBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( implIsValidIndex( nIndex, sText.getLength() ) ) { @@ -191,7 +191,7 @@ namespace comphelper void OCommonAccessibleText::implGetParagraphBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( implIsValidIndex( nIndex, sText.getLength() ) ) { @@ -217,7 +217,7 @@ namespace comphelper void OCommonAccessibleText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); if ( implIsValidIndex( nIndex, nLength ) || nIndex == nLength ) @@ -236,7 +236,7 @@ namespace comphelper sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( !implIsValidIndex( nIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); @@ -253,9 +253,9 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException) + OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException) { - ::rtl::OUString sText; + OUString sText; sal_Int32 nStartIndex; sal_Int32 nEndIndex; @@ -298,16 +298,16 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OCommonAccessibleText::getText() throw (RuntimeException) + OUString OCommonAccessibleText::getText() throw (RuntimeException) { return implGetText(); } // ----------------------------------------------------------------------------- - ::rtl::OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) ) throw IndexOutOfBoundsException(); @@ -322,7 +322,7 @@ namespace comphelper TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); if ( !implIsValidIndex( nIndex, nLength ) && nIndex != nLength ) @@ -427,7 +427,7 @@ namespace comphelper TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); if ( !implIsValidIndex( nIndex, nLength ) && nIndex != nLength ) @@ -552,7 +552,7 @@ namespace comphelper TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) { - ::rtl::OUString sText( implGetText() ); + OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); if ( !implIsValidIndex( nIndex, nLength ) && nIndex != nLength ) @@ -679,8 +679,8 @@ namespace comphelper // ----------------------------------------------------------------------------- bool OCommonAccessibleText::implInitTextChangedEvent( - const rtl::OUString& rOldString, - const rtl::OUString& rNewString, + const OUString& rOldString, + const OUString& rNewString, ::com::sun::star::uno::Any& rDeleted, ::com::sun::star::uno::Any& rInserted) // throw() { @@ -811,7 +811,7 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException) + OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -838,7 +838,7 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OAccessibleTextHelper::getText() throw (RuntimeException) + OUString OAccessibleTextHelper::getText() throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -847,7 +847,7 @@ namespace comphelper // ----------------------------------------------------------------------------- - ::rtl::OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 4996cb2d5d84..7f47f62f246a 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -278,8 +278,8 @@ namespace comphelper if ( xContext.is() ) { //TODO: do something - //::rtl::OUString sName = xContext->getAccessibleName(); - //::rtl::OUString sDescription = xContext->getAccessibleDescription(); + //OUString sName = xContext->getAccessibleName(); + //OUString sDescription = xContext->getAccessibleDescription(); //sal_Int32 nPlaceYourBreakpointHere = 0; } } @@ -573,13 +573,13 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) throw (RuntimeException) { return m_xInnerContext->getAccessibleDescription(); } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) throw (RuntimeException) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) throw (RuntimeException) { return m_xInnerContext->getAccessibleName(); } diff --git a/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx index 030ca27eaa01..c9ddbeea5487 100644 --- a/comphelper/source/misc/anytostring.cxx +++ b/comphelper/source/misc/anytostring.cxx @@ -30,14 +30,14 @@ namespace comphelper { namespace { void appendTypeError( - rtl::OUStringBuffer & buf, typelib_TypeDescriptionReference * typeRef ) + OUStringBuffer & buf, typelib_TypeDescriptionReference * typeRef ) { buf.append( "<cannot get type description of type " ); buf.append( OUString::unacquired( &typeRef->pTypeName ) ); buf.append( static_cast< sal_Unicode >('>') ); } -inline void appendChar( rtl::OUStringBuffer & buf, sal_Unicode c ) +inline void appendChar( OUStringBuffer & buf, sal_Unicode c ) { if (c < ' ' || c > '~') { buf.append( "\\X" ); @@ -53,7 +53,7 @@ inline void appendChar( rtl::OUStringBuffer & buf, sal_Unicode c ) } //------------------------------------------------------------------------------ -void appendValue( rtl::OUStringBuffer & buf, +void appendValue( OUStringBuffer & buf, void const * val, typelib_TypeDescriptionReference * typeRef, bool prependType ) { @@ -202,7 +202,7 @@ void appendValue( rtl::OUStringBuffer & buf, break; case typelib_TypeClass_STRING: { buf.append( static_cast< sal_Unicode >('\"') ); - rtl::OUString const & str = rtl::OUString::unacquired( + OUString const & str = OUString::unacquired( static_cast< rtl_uString * const * >(val) ); sal_Int32 len = str.getLength(); for ( sal_Int32 pos = 0; pos < len; ++pos ) @@ -311,9 +311,9 @@ void appendValue( rtl::OUStringBuffer & buf, } // anon namespace //============================================================================== -rtl::OUString anyToString( uno::Any const & value ) +OUString anyToString( uno::Any const & value ) { - rtl::OUStringBuffer buf; + OUStringBuffer buf; appendValue( buf, value.getValue(), value.getValueTypeRef(), true ); return buf.makeStringAndClear(); } diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx index 23318ba1bde1..d5066fbbbf65 100644 --- a/comphelper/source/misc/componentbase.cxx +++ b/comphelper/source/misc/componentbase.cxx @@ -40,14 +40,14 @@ namespace comphelper void ComponentBase::impl_checkDisposed_throw() const { if ( m_rBHelper.bDisposed ) - throw DisposedException( ::rtl::OUString(), getComponent() ); + throw DisposedException( OUString(), getComponent() ); } //-------------------------------------------------------------------- void ComponentBase::impl_checkInitialized_throw() const { if ( !m_bInitialized ) - throw NotInitializedException( ::rtl::OUString(), getComponent() ); + throw NotInitializedException( OUString(), getComponent() ); } //-------------------------------------------------------------------- diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx index 4a5abe05859f..dded964ed549 100644 --- a/comphelper/source/misc/componentcontext.cxx +++ b/comphelper/source/misc/componentcontext.cxx @@ -64,7 +64,7 @@ namespace comphelper } //------------------------------------------------------------------------ - Any ComponentContext::getContextValueByName( const ::rtl::OUString& _rName ) const + Any ComponentContext::getContextValueByName( const OUString& _rName ) const { Any aReturn; try @@ -79,7 +79,7 @@ namespace comphelper } //------------------------------------------------------------------------ - Reference< XInterface > ComponentContext::createComponent( const ::rtl::OUString& _rServiceName ) const + Reference< XInterface > ComponentContext::createComponent( const OUString& _rServiceName ) const { Reference< XInterface > xComponent( m_xORB->createInstanceWithContext( _rServiceName, m_xContext ) @@ -90,7 +90,7 @@ namespace comphelper } //------------------------------------------------------------------------ - Reference< XInterface > ComponentContext::createComponentWithArguments( const ::rtl::OUString& _rServiceName, const Sequence< Any >& _rArguments ) const + Reference< XInterface > ComponentContext::createComponentWithArguments( const OUString& _rServiceName, const Sequence< Any >& _rArguments ) const { Reference< XInterface > xComponent( m_xORB->createInstanceWithArgumentsAndContext( _rServiceName, _rArguments, m_xContext ) diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx index 0f686b21e9ef..a35a6779cb9d 100644 --- a/comphelper/source/misc/componentmodule.cxx +++ b/comphelper/source/misc/componentmodule.cxx @@ -116,10 +116,10 @@ namespace comphelper } //-------------------------------------------------------------------------- - void OModule::registerImplementation( const ::rtl::OUString& _rImplementationName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rServiceNames, + void OModule::registerImplementation( const OUString& _rImplementationName, const ::com::sun::star::uno::Sequence< OUString >& _rServiceNames, ::cppu::ComponentFactoryFunc _pCreateFunction, FactoryInstantiation _pFactoryFunction ) { - ComponentDescription aComponent( _rImplementationName, _rServiceNames, ::rtl::OUString(), _pCreateFunction, _pFactoryFunction ); + ComponentDescription aComponent( _rImplementationName, _rServiceNames, OUString(), _pCreateFunction, _pFactoryFunction ); registerImplementation( aComponent ); } @@ -127,12 +127,12 @@ namespace comphelper void* OModule::getComponentFactory( const sal_Char* _pImplementationName ) { Reference< XInterface > xFactory( getComponentFactory( - ::rtl::OUString::createFromAscii( _pImplementationName ) ) ); + OUString::createFromAscii( _pImplementationName ) ) ); return xFactory.get(); } //-------------------------------------------------------------------------- - Reference< XInterface > OModule::getComponentFactory( const ::rtl::OUString& _rImplementationName ) + Reference< XInterface > OModule::getComponentFactory( const OUString& _rImplementationName ) { Reference< XInterface > xReturn; diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx index 2935c4b0ce80..ea7643d36df9 100644 --- a/comphelper/source/misc/configuration.cxx +++ b/comphelper/source/misc/configuration.cxx @@ -71,7 +71,7 @@ OUString getDefaultLocale( } OUString extendLocalizedPath(OUString const & path, OUString const & locale) { - rtl::OUStringBuffer buf(path); + OUStringBuffer buf(path); buf.append("/['*"); SAL_WARN_IF( locale.match("*"), "comphelper", @@ -108,20 +108,20 @@ comphelper::ConfigurationChanges::ConfigurationChanges( {} void comphelper::ConfigurationChanges::setPropertyValue( - rtl::OUString const & path, css::uno::Any const & value) const + OUString const & path, css::uno::Any const & value) const { access_->replaceByHierarchicalName(path, value); } css::uno::Reference< css::container::XHierarchicalNameReplace > -comphelper::ConfigurationChanges::getGroup(rtl::OUString const & path) const +comphelper::ConfigurationChanges::getGroup(OUString const & path) const { return css::uno::Reference< css::container::XHierarchicalNameReplace >( access_->getByHierarchicalName(path), css::uno::UNO_QUERY_THROW); } css::uno::Reference< css::container::XNameContainer > -comphelper::ConfigurationChanges::getSet(rtl::OUString const & path) const +comphelper::ConfigurationChanges::getSet(OUString const & path) const { return css::uno::Reference< css::container::XNameContainer >( access_->getByHierarchicalName(path), css::uno::UNO_QUERY_THROW); @@ -143,14 +143,14 @@ comphelper::detail::ConfigurationWrapper::ConfigurationWrapper( comphelper::detail::ConfigurationWrapper::~ConfigurationWrapper() {} css::uno::Any comphelper::detail::ConfigurationWrapper::getPropertyValue( - rtl::OUString const & path) const + OUString const & path) const { return access_->getByHierarchicalName(path); } void comphelper::detail::ConfigurationWrapper::setPropertyValue( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path, com::sun::star::uno::Any const & value) const + OUString const & path, com::sun::star::uno::Any const & value) const { assert(batch.get() != 0); batch->setPropertyValue(path, value); @@ -158,7 +158,7 @@ void comphelper::detail::ConfigurationWrapper::setPropertyValue( css::uno::Any comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue( - rtl::OUString const & path) const + OUString const & path) const { return access_->getByHierarchicalName( extendLocalizedPath(path, getDefaultLocale(context_))); @@ -166,7 +166,7 @@ comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue( void comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path, com::sun::star::uno::Any const & value) const + OUString const & path, com::sun::star::uno::Any const & value) const { assert(batch.get() != 0); batch->setPropertyValue(path, value); @@ -174,7 +174,7 @@ void comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue( css::uno::Reference< css::container::XHierarchicalNameAccess > comphelper::detail::ConfigurationWrapper::getGroupReadOnly( - rtl::OUString const & path) const + OUString const & path) const { return css::uno::Reference< css::container::XHierarchicalNameAccess >( (css::configuration::ReadOnlyAccess::create( @@ -186,7 +186,7 @@ comphelper::detail::ConfigurationWrapper::getGroupReadOnly( css::uno::Reference< css::container::XHierarchicalNameReplace > comphelper::detail::ConfigurationWrapper::getGroupReadWrite( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path) const + OUString const & path) const { assert(batch.get() != 0); return batch->getGroup(path); @@ -194,7 +194,7 @@ comphelper::detail::ConfigurationWrapper::getGroupReadWrite( css::uno::Reference< css::container::XNameAccess > comphelper::detail::ConfigurationWrapper::getSetReadOnly( - rtl::OUString const & path) const + OUString const & path) const { return css::uno::Reference< css::container::XNameAccess >( (css::configuration::ReadOnlyAccess::create( @@ -206,7 +206,7 @@ comphelper::detail::ConfigurationWrapper::getSetReadOnly( css::uno::Reference< css::container::XNameContainer > comphelper::detail::ConfigurationWrapper::getSetReadWrite( boost::shared_ptr< ConfigurationChanges > const & batch, - rtl::OUString const & path) const + OUString const & path) const { assert(batch.get() != 0); return batch->getSet(path); diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index e42a324eb58f..14b82de407ff 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -76,8 +76,8 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons //----------------------------------------------- css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG , - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey ) + const OUString& sRelPath, + const OUString& sKey ) { css::uno::Reference< css::container::XHierarchicalNameAccess > xAccess(xCFG, css::uno::UNO_QUERY_THROW); @@ -85,7 +85,7 @@ css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< cs xAccess->getByHierarchicalName(sRelPath) >>= xProps; if (!xProps.is()) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The requested path \""); sMsg.append (sRelPath ); sMsg.appendAscii("\" does not exists." ); @@ -99,8 +99,8 @@ css::uno::Any ConfigurationHelper::readRelativeKey(const css::uno::Reference< cs //----------------------------------------------- void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno::XInterface > xCFG , - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey , + const OUString& sRelPath, + const OUString& sKey , const css::uno::Any& aValue ) { css::uno::Reference< css::container::XHierarchicalNameAccess > xAccess(xCFG, css::uno::UNO_QUERY_THROW); @@ -109,7 +109,7 @@ void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno:: xAccess->getByHierarchicalName(sRelPath) >>= xProps; if (!xProps.is()) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The requested path \""); sMsg.append (sRelPath ); sMsg.appendAscii("\" does not exists." ); @@ -123,15 +123,15 @@ void ConfigurationHelper::writeRelativeKey(const css::uno::Reference< css::uno:: //----------------------------------------------- css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNodeExists(const css::uno::Reference< css::uno::XInterface > xCFG , - const ::rtl::OUString& sRelPathToSet, - const ::rtl::OUString& sSetNode ) + const OUString& sRelPathToSet, + const OUString& sSetNode ) { css::uno::Reference< css::container::XHierarchicalNameAccess > xAccess(xCFG, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::container::XNameAccess > xSet; xAccess->getByHierarchicalName(sRelPathToSet) >>= xSet; if (!xSet.is()) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("The requested path \""); sMsg.append (sRelPathToSet ); sMsg.appendAscii("\" does not exists." ); @@ -157,9 +157,9 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::makeSureSetNode //----------------------------------------------- css::uno::Any ConfigurationHelper::readDirectKey(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sPackage, - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey , + const OUString& sPackage, + const OUString& sRelPath, + const OUString& sKey , sal_Int32 eMode ) { css::uno::Reference< css::uno::XInterface > xCFG = ConfigurationHelper::openConfig(rxContext, sPackage, eMode); @@ -168,9 +168,9 @@ css::uno::Any ConfigurationHelper::readDirectKey(const css::uno::Reference< css: //----------------------------------------------- void ConfigurationHelper::writeDirectKey(const css::uno::Reference< css::uno::XComponentContext >& rxContext, - const ::rtl::OUString& sPackage, - const ::rtl::OUString& sRelPath, - const ::rtl::OUString& sKey , + const OUString& sPackage, + const OUString& sRelPath, + const OUString& sKey , const css::uno::Any& aValue , sal_Int32 eMode ) { diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 7ab4865e1bdb..b941cbd15049 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -27,7 +27,6 @@ #include <rtl/random.h> #include <string.h> -using ::rtl::OUString; using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -44,13 +43,13 @@ namespace comphelper { // ============================================================================ -static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength ) +static uno::Sequence< sal_Int8 > GeneratePBKDF2Hash( const OUString& aPassword, const uno::Sequence< sal_Int8 >& aSalt, sal_Int32 nCount, sal_Int32 nHashLength ) { uno::Sequence< sal_Int8 > aResult; if ( !aPassword.isEmpty() && aSalt.getLength() && nCount && nHashLength ) { - ::rtl::OString aBytePass = ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ); + OString aBytePass = OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ); aResult.realloc( 16 ); rtl_digest_PBKDF2( reinterpret_cast < sal_uInt8 * > ( aResult.getArray() ), aResult.getLength(), @@ -71,7 +70,7 @@ IDocPasswordVerifier::~IDocPasswordVerifier() } // ============================================================================ -uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswordInfo( const ::rtl::OUString& aPassword ) +uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswordInfo( const OUString& aPassword ) { uno::Sequence< beans::PropertyValue > aResult; @@ -96,12 +95,12 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo } // ============================================================================ -sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPassword, const uno::Sequence< beans::PropertyValue >& aInfo ) +sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const OUString& aPassword, const uno::Sequence< beans::PropertyValue >& aInfo ) { sal_Bool bResult = sal_False; if ( !aPassword.isEmpty() && aInfo.getLength() ) { - ::rtl::OUString sAlgorithm; + OUString sAlgorithm; uno::Sequence< sal_Int8 > aSalt; uno::Sequence< sal_Int8 > aHash; sal_Int32 nCount = 0; @@ -134,7 +133,7 @@ sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const ::rtl::OUString& aPas // ============================================================================ sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32( - const ::rtl::OUString& aUString ) + const OUString& aUString ) { static sal_uInt16 pInitialCode[] = { 0xE1F0, // 1 @@ -211,12 +210,12 @@ sal_uInt32 DocPasswordHelper::GetWordHashAsUINT32( // ============================================================================ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16( - const ::rtl::OUString& aUString, + const OUString& aUString, rtl_TextEncoding nEnc ) { sal_uInt16 nResult = 0; - ::rtl::OString aString = ::rtl::OUStringToOString( aUString, nEnc ); + OString aString = OUStringToOString( aUString, nEnc ); if ( !aString.isEmpty() && aString.getLength() <= SAL_MAX_UINT16 ) { @@ -236,7 +235,7 @@ sal_uInt16 DocPasswordHelper::GetXLHashAsUINT16( // ============================================================================ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( - const ::rtl::OUString& aUString, + const OUString& aUString, rtl_TextEncoding nEnc ) { sal_uInt16 nHash = GetXLHashAsUINT16( aUString, nEnc ); @@ -264,7 +263,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence( // ============================================================================ -/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const ::rtl::OUString& aPassword, const uno::Sequence< sal_Int8 >& aDocId ) +/*static*/ uno::Sequence< sal_Int8 > DocPasswordHelper::GenerateStd97Key( const OUString& aPassword, const uno::Sequence< sal_Int8 >& aDocId ) { uno::Sequence< sal_Int8 > aResultKey; if ( !aPassword.isEmpty() && aDocId.getLength() == 16 ) diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index fbfc42ad3fbe..a674f7246026 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionPassword2.hpp> -using ::rtl::OUString; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Type; using ::com::sun::star::uno::Reference; diff --git a/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx index 5039c2d9d805..a436575fda7a 100644 --- a/comphelper/source/misc/documentinfo.cxx +++ b/comphelper/source/misc/documentinfo.cxx @@ -59,12 +59,12 @@ namespace comphelper { //==================================================================== namespace { - ::rtl::OUString lcl_getTitle( const Reference< XInterface >& _rxComponent ) + OUString lcl_getTitle( const Reference< XInterface >& _rxComponent ) { Reference< XTitle > xTitle( _rxComponent, UNO_QUERY ); if ( xTitle.is() ) return xTitle->getTitle(); - return ::rtl::OUString(); + return OUString(); } } @@ -72,14 +72,14 @@ namespace comphelper { //= DocumentInfo //==================================================================== //-------------------------------------------------------------------- - ::rtl::OUString DocumentInfo::getDocumentTitle( const Reference< XModel >& _rxDocument ) + OUString DocumentInfo::getDocumentTitle( const Reference< XModel >& _rxDocument ) { - ::rtl::OUString sTitle; + OUString sTitle; if ( !_rxDocument.is() ) return sTitle; - ::rtl::OUString sDocURL; + OUString sDocURL; try { // 1. ask the model and the controller for their XTitle::getTitle @@ -96,7 +96,7 @@ namespace comphelper { // private:object as URL sDocURL = _rxDocument->getURL(); if ( sDocURL.matchAsciiL( "private:", 8 ) ) - sDocURL = ::rtl::OUString(); + sDocURL = OUString(); // 2. if the document is not saved, yet, check the frame title if ( sDocURL.isEmpty() ) @@ -161,13 +161,13 @@ namespace comphelper { catch ( const Exception& ) { ::com::sun::star::uno::Any caught( ::cppu::getCaughtException() ); - ::rtl::OString sMessage( "caught an exception!" ); + OString sMessage( "caught an exception!" ); sMessage += "\ntype : "; - sMessage += ::rtl::OString( caught.getValueTypeName().getStr(), caught.getValueTypeName().getLength(), osl_getThreadTextEncoding() ); + sMessage += OString( caught.getValueTypeName().getStr(), caught.getValueTypeName().getLength(), osl_getThreadTextEncoding() ); sMessage += "\nmessage: "; ::com::sun::star::uno::Exception exception; caught >>= exception; - sMessage += ::rtl::OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() ); + sMessage += OString( exception.Message.getStr(), exception.Message.getLength(), osl_getThreadTextEncoding() ); sMessage += "\nin function:\n"; sMessage += BOOST_CURRENT_FUNCTION; sMessage += "\n"; diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index e9429b4a62bd..28df327710d9 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.cxx @@ -45,9 +45,9 @@ OSimpleLogRing::~OSimpleLogRing() } // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static() +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static() { - uno::Sequence< rtl::OUString > aResult( 1 ); + uno::Sequence< OUString > aResult( 1 ); aResult[0] = getServiceName_static(); return aResult; } @@ -78,7 +78,7 @@ uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( SAL_UNUSED_PA // XSimpleLogRing // ---------------------------------------------------------- -void SAL_CALL OSimpleLogRing::logString( const ::rtl::OUString& aMessage ) throw (uno::RuntimeException) +void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -94,13 +94,13 @@ void SAL_CALL OSimpleLogRing::logString( const ::rtl::OUString& aMessage ) throw } // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nResLen = m_bFull ? m_aMessages.getLength() : m_nPos; sal_Int32 nStart = m_bFull ? m_nPos : 0; - uno::Sequence< ::rtl::OUString > aResult( nResLen ); + uno::Sequence< OUString > aResult( nResLen ); for ( sal_Int32 nInd = 0; nInd < nResLen; nInd++ ) aResult[nInd] = m_aMessages[ ( nStart + nInd ) % m_aMessages.getLength() ]; @@ -136,15 +136,15 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu // XServiceInfo // ---------------------------------------------------------- -::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException) { return getImplementationName_static(); } // ---------------------------------------------------------- -::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) { - const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static(); + const uno::Sequence< OUString > & aSupportedNames = getSupportedServiceNames_static(); for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ ) { if ( aSupportedNames[ nInd ].equals( aServiceName ) ) @@ -155,7 +155,7 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu } // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 467d864b6709..99915c6dfc3d 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -37,7 +37,7 @@ class OSimpleLogRing : public ::cppu::WeakImplHelper3< ::com::sun::star::logging ::com::sun::star::lang::XServiceInfo > { ::osl::Mutex m_aMutex; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aMessages; + ::com::sun::star::uno::Sequence< OUString > m_aMessages; sal_Bool m_bInitialized; sal_Bool m_bFull; @@ -47,29 +47,29 @@ public: OSimpleLogRing(); virtual ~OSimpleLogRing(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static ::rtl::OUString SAL_CALL getImplementationName_static(); + static OUString SAL_CALL getImplementationName_static(); - static ::rtl::OUString SAL_CALL getSingletonName_static(); + static OUString SAL_CALL getSingletonName_static(); - static ::rtl::OUString SAL_CALL getServiceName_static(); + static OUString SAL_CALL getServiceName_static(); 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 >& rxContext ); // XSimpleLogRing - virtual void SAL_CALL logString( const ::rtl::OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getCollectedLog() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL logString( const OUString& aMessage ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (::com::sun::star::uno::RuntimeException); // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 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 ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/comphelper/source/misc/evtmethodhelper.cxx b/comphelper/source/misc/evtmethodhelper.cxx index 4a18372e8834..d69bdfd7c944 100644 --- a/comphelper/source/misc/evtmethodhelper.cxx +++ b/comphelper/source/misc/evtmethodhelper.cxx @@ -26,16 +26,16 @@ using ::com::sun::star::uno::Type; namespace comphelper { - Sequence< ::rtl::OUString> getEventMethodsForType(const Type& type) + Sequence< OUString> getEventMethodsForType(const Type& type) { typelib_InterfaceTypeDescription *pType=0; type.getDescription( (typelib_TypeDescription**)&pType); if(!pType) - return Sequence< ::rtl::OUString>(); + return Sequence< OUString>(); - Sequence< ::rtl::OUString> aNames(pType->nMembers); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString> aNames(pType->nMembers); + OUString* pNames = aNames.getArray(); for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames) { // the decription reference diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx index c6b6697eeb47..7999bbdcc835 100644 --- a/comphelper/source/misc/ihwrapnofilter.cxx +++ b/comphelper/source/misc/ihwrapnofilter.cxx @@ -102,16 +102,16 @@ namespace comphelper // XServiceInfo //---------------------------------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OIHWrapNoFilterDialog::getImplementationName() + OUString SAL_CALL OIHWrapNoFilterDialog::getImplementationName() throw ( uno::RuntimeException ) { return impl_staticGetImplementationName(); } - ::sal_Bool SAL_CALL OIHWrapNoFilterDialog::supportsService( const ::rtl::OUString& ServiceName ) + ::sal_Bool SAL_CALL OIHWrapNoFilterDialog::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > aSeq = impl_staticGetSupportedServiceNames(); + uno::Sequence< OUString > aSeq = impl_staticGetSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -120,7 +120,7 @@ namespace comphelper return sal_False; } - uno::Sequence< ::rtl::OUString > SAL_CALL OIHWrapNoFilterDialog::getSupportedServiceNames() + uno::Sequence< OUString > SAL_CALL OIHWrapNoFilterDialog::getSupportedServiceNames() throw ( uno::RuntimeException ) { return impl_staticGetSupportedServiceNames(); diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index a42852fa2b0c..f14be18a0ba1 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -190,17 +190,17 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg // XServiceInfo // -------------------------------------------------------- -::rtl::OUString SAL_CALL OInstanceLocker::getImplementationName( ) +OUString SAL_CALL OInstanceLocker::getImplementationName( ) throw (uno::RuntimeException) { return getImplementationName_static(); } // -------------------------------------------------------- -::sal_Bool SAL_CALL OInstanceLocker::supportsService( const ::rtl::OUString& ServiceName ) +::sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) { - uno::Sequence< ::rtl::OUString > aSeq = getSupportedServiceNames(); + uno::Sequence< OUString > aSeq = getSupportedServiceNames(); for ( sal_Int32 nInd = 0; nInd < aSeq.getLength(); nInd++ ) if ( ServiceName == aSeq[nInd] ) @@ -210,7 +210,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg } // -------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames() throw (uno::RuntimeException) { return getSupportedServiceNames_static(); diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index 7e5fd1430b01..ba80ce39ee8d 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -58,10 +58,10 @@ public: OInstanceLocker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); ~OInstanceLocker(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static ::rtl::OUString SAL_CALL getImplementationName_static(); + static OUString SAL_CALL getImplementationName_static(); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create( @@ -76,9 +76,9 @@ public: virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 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 ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index 4f922b3e8d7d..916858317bab 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.cxx @@ -32,13 +32,13 @@ namespace comphelper //= OInteractionPassword //========================================================================= //-------------------------------------------------------------------- - void SAL_CALL OInteractionPassword::setPassword( const ::rtl::OUString& _Password ) throw (RuntimeException) + void SAL_CALL OInteractionPassword::setPassword( const OUString& _Password ) throw (RuntimeException) { m_sPassword = _Password; } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException) + OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException) { return m_sPassword; } diff --git a/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx index bd3a09251880..98f38d878a9b 100644 --- a/comphelper/source/misc/logging.cxx +++ b/comphelper/source/misc/logging.cxx @@ -53,11 +53,11 @@ namespace comphelper { private: Reference< XComponentContext > m_aContext; - ::rtl::OUString m_sLoggerName; + OUString m_sLoggerName; Reference< XLogger > m_xLogger; public: - EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const ::rtl::OUString& _rLoggerName ) + EventLogger_Impl( const Reference< XComponentContext >& _rxContext, const OUString& _rLoggerName ) :m_aContext( _rxContext ) ,m_sLoggerName( _rLoggerName ) { @@ -65,7 +65,7 @@ namespace comphelper } inline bool isValid() const { return m_xLogger.is(); } - inline const ::rtl::OUString& getName() const { return m_sLoggerName; } + inline const OUString& getName() const { return m_sLoggerName; } inline const Reference< XLogger >& getLogger() const { return m_xLogger; } inline Reference< XComponentContext > getContext() const { return m_aContext; } @@ -99,7 +99,7 @@ namespace comphelper //==================================================================== //-------------------------------------------------------------------- EventLogger::EventLogger( const Reference< XComponentContext >& _rxContext, const sal_Char* _pAsciiLoggerName ) - :m_pImpl( new EventLogger_Impl( _rxContext, ::rtl::OUString::createFromAscii( _pAsciiLoggerName ) ) ) + :m_pImpl( new EventLogger_Impl( _rxContext, OUString::createFromAscii( _pAsciiLoggerName ) ) ) { } @@ -130,7 +130,7 @@ namespace comphelper //-------------------------------------------------------------------- namespace { - void lcl_replaceParameter( ::rtl::OUString& _inout_Message, const ::rtl::OUString& _rPlaceHolder, const ::rtl::OUString& _rReplacement ) + void lcl_replaceParameter( OUString& _inout_Message, const OUString& _rPlaceHolder, const OUString& _rReplacement ) { sal_Int32 nPlaceholderPosition = _inout_Message.indexOf( _rPlaceHolder ); OSL_ENSURE( nPlaceholderPosition >= 0, "lcl_replaceParameter: placeholder not found!" ); @@ -143,20 +143,20 @@ namespace comphelper //-------------------------------------------------------------------- bool EventLogger::impl_log( const sal_Int32 _nLogLevel, - const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const ::rtl::OUString& _rMessage, + const sal_Char* _pSourceClass, const sal_Char* _pSourceMethod, const OUString& _rMessage, const OptionalString& _rArgument1, const OptionalString& _rArgument2, const OptionalString& _rArgument3, const OptionalString& _rArgument4, const OptionalString& _rArgument5, const OptionalString& _rArgument6 ) const { - // (if ::rtl::OUString had an indexOfAscii, we could save those ugly statics ...) - static ::rtl::OUString sPH1( "$1$" ); - static ::rtl::OUString sPH2( "$2$" ); - static ::rtl::OUString sPH3( "$3$" ); - static ::rtl::OUString sPH4( "$4$" ); - static ::rtl::OUString sPH5( "$5$" ); - static ::rtl::OUString sPH6( "$6$" ); - - ::rtl::OUString sMessage( _rMessage ); + // (if OUString had an indexOfAscii, we could save those ugly statics ...) + static OUString sPH1( "$1$" ); + static OUString sPH2( "$2$" ); + static OUString sPH3( "$3$" ); + static OUString sPH4( "$4$" ); + static OUString sPH5( "$5$" ); + static OUString sPH6( "$6$" ); + + OUString sMessage( _rMessage ); if ( !!_rArgument1 ) lcl_replaceParameter( sMessage, sPH1, *_rArgument1 ); @@ -183,8 +183,8 @@ namespace comphelper { xLogger->logp( _nLogLevel, - ::rtl::OUString::createFromAscii( _pSourceClass ), - ::rtl::OUString::createFromAscii( _pSourceMethod ), + OUString::createFromAscii( _pSourceClass ), + OUString::createFromAscii( _pSourceMethod ), sMessage ); } @@ -208,7 +208,7 @@ namespace comphelper struct ResourceBasedEventLogger_Data { /// the base name of the resource bundle - ::rtl::OUString sBundleBaseName; + OUString sBundleBaseName; /// did we already attempt to load the bundle? bool bBundleLoaded; /// the lazily loaded bundle @@ -248,13 +248,13 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString lcl_loadString_nothrow( const Reference< XResourceBundle >& _rxBundle, const sal_Int32 _nMessageResID ) + OUString lcl_loadString_nothrow( const Reference< XResourceBundle >& _rxBundle, const sal_Int32 _nMessageResID ) { OSL_PRECOND( _rxBundle.is(), "lcl_loadString_nothrow: this will crash!" ); - ::rtl::OUString sMessage; + OUString sMessage; try { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "string:" ); aBuffer.append( _nMessageResID ); OSL_VERIFY( _rxBundle->getDirectElement( aBuffer.makeStringAndClear() ) >>= sMessage ); @@ -276,18 +276,18 @@ namespace comphelper :EventLogger( _rxContext, _pAsciiLoggerName ) ,m_pData( new ResourceBasedEventLogger_Data ) { - m_pData->sBundleBaseName = ::rtl::OUString::createFromAscii( _pResourceBundleBaseName ); + m_pData->sBundleBaseName = OUString::createFromAscii( _pResourceBundleBaseName ); } //-------------------------------------------------------------------- - ::rtl::OUString ResourceBasedEventLogger::impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const + OUString ResourceBasedEventLogger::impl_loadStringMessage_nothrow( const sal_Int32 _nMessageResID ) const { - ::rtl::OUString sMessage; + OUString sMessage; if ( lcl_loadBundle_nothrow( m_pImpl->getContext(), *m_pData ) ) sMessage = lcl_loadString_nothrow( m_pData->xBundle, _nMessageResID ); if ( sMessage.isEmpty() ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "<invalid event resource: '" ); aBuffer.append( m_pData->sBundleBaseName ); aBuffer.appendAscii( ":" ); diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx index 9cd4a15956a9..586f6fcb1675 100644 --- a/comphelper/source/misc/mediadescriptor.cxx +++ b/comphelper/source/misc/mediadescriptor.cxx @@ -50,45 +50,45 @@ namespace comphelper{ -const ::rtl::OUString& MediaDescriptor::PROP_ABORTED() +const OUString& MediaDescriptor::PROP_ABORTED() { - static const ::rtl::OUString sProp("Aborted"); + static const OUString sProp("Aborted"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_ASTEMPLATE() +const OUString& MediaDescriptor::PROP_ASTEMPLATE() { - static const ::rtl::OUString sProp("AsTemplate"); + static const OUString sProp("AsTemplate"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_COMPONENTDATA() +const OUString& MediaDescriptor::PROP_COMPONENTDATA() { - static const ::rtl::OUString sProp("ComponentData"); + static const OUString sProp("ComponentData"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_DOCUMENTSERVICE() +const OUString& MediaDescriptor::PROP_DOCUMENTSERVICE() { - static const ::rtl::OUString sProp("DocumentService"); + static const OUString sProp("DocumentService"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_ENCRYPTIONDATA() +const OUString& MediaDescriptor::PROP_ENCRYPTIONDATA() { - static const ::rtl::OUString sProp("EncryptionData"); + static const OUString sProp("EncryptionData"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FILENAME() +const OUString& MediaDescriptor::PROP_FILENAME() { - static const ::rtl::OUString sProp("FileName"); + static const OUString sProp("FileName"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FILTERNAME() +const OUString& MediaDescriptor::PROP_FILTERNAME() { - static const ::rtl::OUString sProp("FilterName"); + static const OUString sProp("FilterName"); return sProp; } @@ -98,57 +98,57 @@ const OUString& MediaDescriptor::PROP_FILTERPROVIDER() return aProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FILTEROPTIONS() +const OUString& MediaDescriptor::PROP_FILTEROPTIONS() { - static const ::rtl::OUString sProp("FilterOptions"); + static const OUString sProp("FilterOptions"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FRAME() +const OUString& MediaDescriptor::PROP_FRAME() { - static const ::rtl::OUString sProp("Frame"); + static const OUString sProp("Frame"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_FRAMENAME() +const OUString& MediaDescriptor::PROP_FRAMENAME() { - static const ::rtl::OUString sProp("FrameName"); + static const OUString sProp("FrameName"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_HIDDEN() +const OUString& MediaDescriptor::PROP_HIDDEN() { - static const ::rtl::OUString sProp("Hidden"); + static const OUString sProp("Hidden"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_INPUTSTREAM() +const OUString& MediaDescriptor::PROP_INPUTSTREAM() { - static const ::rtl::OUString sProp("InputStream"); + static const OUString sProp("InputStream"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_INTERACTIONHANDLER() +const OUString& MediaDescriptor::PROP_INTERACTIONHANDLER() { - static const ::rtl::OUString sProp("InteractionHandler"); + static const OUString sProp("InteractionHandler"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_JUMPMARK() +const OUString& MediaDescriptor::PROP_JUMPMARK() { - static const ::rtl::OUString sProp("JumpMark"); + static const OUString sProp("JumpMark"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_MACROEXECUTIONMODE() +const OUString& MediaDescriptor::PROP_MACROEXECUTIONMODE() { - static const ::rtl::OUString sProp("MacroExecutionMode"); + static const OUString sProp("MacroExecutionMode"); return sProp; } -const ::rtl::OUString& MediaDescriptor::PROP_MEDIATYPE() +const OUString& MediaDescriptor::PROP_MEDIATYPE() { - static const ::rtl::OUString sProp("MediaType"); + static const OUString sProp("MediaType"); return sProp; } @@ -348,7 +348,7 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const if (xContent.is()) { css::uno::Reference< css::ucb::XContentIdentifier > xId(xContent->getIdentifier(), css::uno::UNO_QUERY); - ::rtl::OUString aScheme; + OUString aScheme; if (xId.is()) aScheme = xId->getContentProviderScheme(); @@ -371,7 +371,7 @@ sal_Bool MediaDescriptor::isStreamReadOnly() const // ---------------------------------------------------------------------------- -css::uno::Any MediaDescriptor::getComponentDataEntry( const ::rtl::OUString& rName ) const +css::uno::Any MediaDescriptor::getComponentDataEntry( const OUString& rName ) const { css::uno::Any aEntry; SequenceAsHashMap::const_iterator aPropertyIter = find( PROP_COMPONENTDATA() ); @@ -380,7 +380,7 @@ css::uno::Any MediaDescriptor::getComponentDataEntry( const ::rtl::OUString& rNa return css::uno::Any(); } -void MediaDescriptor::setComponentDataEntry( const ::rtl::OUString& rName, const css::uno::Any& rValue ) +void MediaDescriptor::setComponentDataEntry( const OUString& rName, const css::uno::Any& rValue ) { if( rValue.hasValue() ) { @@ -406,7 +406,7 @@ void MediaDescriptor::setComponentDataEntry( const ::rtl::OUString& rName, const } } -void MediaDescriptor::clearComponentDataEntry( const ::rtl::OUString& rName ) +void MediaDescriptor::clearComponentDataEntry( const OUString& rName ) { SequenceAsHashMap::iterator aPropertyIter = find( PROP_COMPONENTDATA() ); if( aPropertyIter != end() ) @@ -464,22 +464,22 @@ sal_Bool MediaDescriptor::impl_addInputStream( sal_Bool bLockFile ) } // b) ... or we must get it from the given URL - ::rtl::OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), ::rtl::OUString()); + OUString sURL = getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), OUString()); if (sURL.isEmpty()) throw css::uno::Exception( OUString( "Found no URL." ), css::uno::Reference< css::uno::XInterface >()); // Parse URL! Only the main part has to be used further. E.g. a jumpmark can make trouble - ::rtl::OUString sNormalizedURL = impl_normalizeURL( sURL ); + OUString sNormalizedURL = impl_normalizeURL( sURL ); return impl_openStreamWithURL( sNormalizedURL, bLockFile ); } #if OSL_DEBUG_LEVEL > 0 catch(const css::uno::Exception& ex) { - ::rtl::OUStringBuffer sMsg(256); + OUStringBuffer sMsg(256); sMsg.appendAscii("Invalid MediaDescriptor detected:\n"); sMsg.append (ex.Message ); - OSL_FAIL(::rtl::OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(OUStringToOString(sMsg.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr()); } #else catch(const css::uno::Exception&) @@ -508,7 +508,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference css::uno::Reference< css::ucb::XCommandEnvironment > xCommandEnv(static_cast< css::ucb::XCommandEnvironment* >(pCommandEnv), css::uno::UNO_QUERY); // media type - ::rtl::OUString sMediaType = getUnpackedValueOrDefault(MediaDescriptor::PROP_MEDIATYPE(), ::rtl::OUString()); + OUString sMediaType = getUnpackedValueOrDefault(MediaDescriptor::PROP_MEDIATYPE(), OUString()); if (sMediaType.isEmpty()) { sMediaType = "application/x-www-form-urlencoded"; @@ -535,7 +535,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithPostData( const css::uno::Reference css::uno::Reference< css::io::XActiveDataSink > xSink( new ucbhelper::ActiveDataSink ); aPostArgument.Sink = xSink; aPostArgument.MediaType = sMediaType; - aPostArgument.Referer = getUnpackedValueOrDefault( PROP_REFERRER(), ::rtl::OUString() ); + aPostArgument.Referer = getUnpackedValueOrDefault( PROP_REFERRER(), OUString() ); OUString sCommandName( "post" ); aContent.executeCommand( sCommandName, css::uno::makeAny( aPostArgument ) ); @@ -694,7 +694,7 @@ sal_Bool MediaDescriptor::impl_openStreamWithURL( const OUString& sURL, sal_Bool return xInputStream.is(); } -::rtl::OUString MediaDescriptor::impl_normalizeURL(const ::rtl::OUString& sURL) +OUString MediaDescriptor::impl_normalizeURL(const OUString& sURL) { /* Remove Jumpmarks (fragments) of an URL only here. They are not part of any URL and as a result may be diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index c483c1ea4654..733bf2645873 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -42,7 +42,7 @@ MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< uno::XCo } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Sequence< sal_Int8 >& aClassID ) +OUString MimeConfigurationHelper::GetStringClassIDRepresentation( const uno::Sequence< sal_Int8 >& aClassID ) { OUString aResult; @@ -55,8 +55,8 @@ MimeConfigurationHelper::MimeConfigurationHelper( const uno::Reference< uno::XCo sal_Int32 nDigit1 = (sal_Int32)( (sal_uInt8)aClassID[nInd] / 16 ); sal_Int32 nDigit2 = (sal_uInt8)aClassID[nInd] % 16; - aResult += ::rtl::OUString::valueOf( nDigit1, 16 ); - aResult += ::rtl::OUString::valueOf( nDigit2, 16 ); + aResult += OUString::valueOf( nDigit1, 16 ); + aResult += OUString::valueOf( nDigit2, 16 ); } } @@ -77,12 +77,12 @@ sal_uInt8 GetDigit_Impl( sal_Char aChar ) } //----------------------------------------------------------------------- -uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentation( const ::rtl::OUString& aClassID ) +uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentation( const OUString& aClassID ) { sal_Int32 nLength = aClassID.getLength(); if ( nLength == 36 ) { - ::rtl::OString aCharClassID = ::rtl::OUStringToOString( aClassID, RTL_TEXTENCODING_ASCII_US ); + OString aCharClassID = OUStringToOString( aClassID, RTL_TEXTENCODING_ASCII_US ); const sal_Char* pString = aCharClassID.getStr(); if ( pString ) { @@ -113,7 +113,7 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassIDRepresentat } //----------------------------------------------------------------------- -uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurationByPath( const ::rtl::OUString& aPath ) +uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetConfigurationByPath( const OUString& aPath ) { osl::MutexGuard aGuard( m_aMutex ); @@ -173,7 +173,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetMediaTypeCo if ( !m_xMediaTypeConfig.is() ) m_xMediaTypeConfig = GetConfigurationByPath( - ::rtl::OUString( "/org.openoffice.Office.Embedding/MimeTypeClassIDRelations" )); + OUString( "/org.openoffice.Office.Embedding/MimeTypeClassIDRelations" )); return m_xMediaTypeConfig; } @@ -192,9 +192,9 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto } //------------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const ::rtl::OUString& aFilterName ) +OUString MimeConfigurationHelper::GetDocServiceNameFromFilter( const OUString& aFilterName ) { - ::rtl::OUString aDocServiceName; + OUString aDocServiceName; try { @@ -218,7 +218,7 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto } //------------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const ::rtl::OUString& aMediaType ) +OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const OUString& aMediaType ) { uno::Reference< container::XContainerQuery > xTypeCFG( m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.document.TypeDetection", m_xContext), @@ -257,11 +257,11 @@ uno::Reference< container::XNameAccess > MimeConfigurationHelper::GetFilterFacto {} } - return ::rtl::OUString(); + return OUString(); } //------------------------------------------------------------------------- -sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const ::rtl::OUString& aVerbShortcut, +sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortcut, embed::VerbDescriptor& aDescriptor ) { sal_Bool bResult = sal_False; @@ -301,7 +301,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi { try { - uno::Sequence< ::rtl::OUString > aObjPropNames = xObjectProps->getElementNames(); + uno::Sequence< OUString > aObjPropNames = xObjectProps->getElementNames(); aResult.realloc( aObjPropNames.getLength() + 1 ); aResult[0].Name = "ClassID"; @@ -313,7 +313,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi if ( aObjPropNames[nInd] == "ObjectVerbs" ) { - uno::Sequence< ::rtl::OUString > aVerbShortcuts; + uno::Sequence< OUString > aVerbShortcuts; if ( xObjectProps->getByName( aObjPropNames[nInd] ) >>= aVerbShortcuts ) { uno::Sequence< embed::VerbDescriptor > aVerbDescriptors( aVerbShortcuts.getLength() ); @@ -340,9 +340,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetExplicitlyRegisteredObjClassID( const ::rtl::OUString& aMediaType ) +OUString MimeConfigurationHelper::GetExplicitlyRegisteredObjClassID( const OUString& aMediaType ) { - ::rtl::OUString aStringClassID; + OUString aStringClassID; uno::Reference< container::XNameAccess > xMediaTypeConfig = GetMediaTypeConfiguration(); try @@ -360,7 +360,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjPropsFromConfi //----------------------------------------------------------------------- uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByStringClassID( - const ::rtl::OUString& aStringClassID ) + const OUString& aStringClassID ) { uno::Sequence< beans::NamedValue > aObjProps; @@ -402,12 +402,12 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByClas { aObjProps.realloc(2); aObjProps[0].Name = "ObjectFactory"; - aObjProps[0].Value <<= ::rtl::OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ); + aObjProps[0].Value <<= OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ); aObjProps[1].Name = "ClassID"; aObjProps[1].Value <<= aClassID; } - ::rtl::OUString aStringClassID = GetStringClassIDRepresentation( aClassID ); + OUString aStringClassID = GetStringClassIDRepresentation( aClassID ); if ( !aStringClassID.isEmpty() ) { uno::Reference< container::XNameAccess > xObjConfig = GetObjConfiguration(); @@ -426,14 +426,14 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByClas } //----------------------------------------------------------------------- -uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMediaType( const ::rtl::OUString& aMediaType ) +uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMediaType( const OUString& aMediaType ) { uno::Sequence< beans::NamedValue > aObject = GetObjectPropsByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) ); if ( aObject.getLength() ) return aObject; - ::rtl::OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType ); + OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType ); if ( !aDocumentName.isEmpty() ) return GetObjectPropsByDocumentName( aDocumentName ); @@ -441,9 +441,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByMedi } //----------------------------------------------------------------------- -uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByFilter( const ::rtl::OUString& aFilterName ) +uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByFilter( const OUString& aFilterName ) { - ::rtl::OUString aDocumentName = GetDocServiceNameFromFilter( aFilterName ); + OUString aDocumentName = GetDocServiceNameFromFilter( aFilterName ); if ( !aDocumentName.isEmpty() ) return GetObjectPropsByDocumentName( aDocumentName ); @@ -460,7 +460,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu { try { - uno::Sequence< ::rtl::OUString > aClassIDs = xObjConfig->getElementNames(); + uno::Sequence< OUString > aClassIDs = xObjConfig->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aClassIDs.getLength(); nInd++ ) { uno::Reference< container::XNameAccess > xObjectProps; @@ -484,15 +484,15 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetFactoryNameByClassID( const uno::Sequence< sal_Int8 >& aClassID ) +OUString MimeConfigurationHelper::GetFactoryNameByClassID( const uno::Sequence< sal_Int8 >& aClassID ) { return GetFactoryNameByStringClassID( GetStringClassIDRepresentation( aClassID ) ); } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const ::rtl::OUString& aStringClassID ) +OUString MimeConfigurationHelper::GetFactoryNameByStringClassID( const OUString& aStringClassID ) { - ::rtl::OUString aResult; + OUString aResult; if ( !aStringClassID.isEmpty() ) { @@ -501,13 +501,13 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu try { if ( xObjConfig.is() && ( xObjConfig->getByName( aStringClassID.toAsciiUpperCase() ) >>= xObjectProps ) && xObjectProps.is() ) - xObjectProps->getByName( ::rtl::OUString( "ObjectFactory" ) ) >>= aResult; + xObjectProps->getByName( OUString( "ObjectFactory" ) ) >>= aResult; } catch( uno::Exception& ) { uno::Sequence< sal_Int8 > aClassID = GetSequenceClassIDRepresentation( aStringClassID ); if ( ClassIDsEqual( aClassID, GetSequenceClassID( SO3_DUMMY_CLASSID ) ) ) - return ::rtl::OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ); + return OUString( "com.sun.star.embed.OOoSpecialEmbeddedObjectFactory" ); } } @@ -515,9 +515,9 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const ::rtl::OUString& aDocName ) +OUString MimeConfigurationHelper::GetFactoryNameByDocumentName( const OUString& aDocName ) { - ::rtl::OUString aResult; + OUString aResult; if ( !aDocName.isEmpty() ) { @@ -526,7 +526,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu { try { - uno::Sequence< ::rtl::OUString > aClassIDs = xObjConfig->getElementNames(); + uno::Sequence< OUString > aClassIDs = xObjConfig->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aClassIDs.getLength(); nInd++ ) { uno::Reference< container::XNameAccess > xObjectProps; @@ -552,13 +552,13 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const ::rtl::OUString& aMediaType ) +OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const OUString& aMediaType ) { - ::rtl::OUString aResult = GetFactoryNameByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) ); + OUString aResult = GetFactoryNameByStringClassID( GetExplicitlyRegisteredObjClassID( aMediaType ) ); if ( aResult.isEmpty() ) { - ::rtl::OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType ); + OUString aDocumentName = GetDocServiceNameFromMediaType( aMediaType ); if ( !aDocumentName.isEmpty() ) aResult = GetFactoryNameByDocumentName( aDocumentName ); } @@ -567,11 +567,11 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu } //----------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( +OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( uno::Sequence< beans::PropertyValue >& aMediaDescr, sal_Bool bIgnoreType ) { - ::rtl::OUString aFilterName; + OUString aFilterName; for ( sal_Int32 nInd = 0; nInd < aMediaDescr.getLength(); nInd++ ) if ( aMediaDescr[nInd].Name == "FilterName" ) @@ -592,7 +592,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu uno::Sequence< beans::PropertyValue > aTempMD( aMediaDescr ); // get TypeName - ::rtl::OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aTempMD, sal_True ); + OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aTempMD, sal_True ); // get FilterName for ( sal_Int32 nInd = 0; nInd < aTempMD.getLength(); nInd++ ) @@ -632,11 +632,11 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu return aFilterName; } -::rtl::OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( +OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( uno::Sequence< beans::PropertyValue >& aMediaDescr, uno::Sequence< beans::NamedValue >& aObject ) { - ::rtl::OUString aDocName; + OUString aDocName; for ( sal_Int32 nInd = 0; nInd < aObject.getLength(); nInd++ ) if ( aObject[nInd].Name == "ObjectDocumentServiceName" ) { @@ -669,7 +669,7 @@ uno::Sequence< beans::NamedValue > MimeConfigurationHelper::GetObjectPropsByDocu #ifdef WNT -sal_Int32 MimeConfigurationHelper::GetFilterFlags( const ::rtl::OUString& aFilterName ) +sal_Int32 MimeConfigurationHelper::GetFilterFlags( const OUString& aFilterName ) { sal_Int32 nFlags = 0; try @@ -699,7 +699,7 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile( { sal_Bool bResult = sal_False; - ::rtl::OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False ); + OUString aFilterName = UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_False ); if ( !aFilterName.isEmpty() ) { sal_Int32 nFlags = GetFilterFlags( aFilterName ); @@ -712,9 +712,9 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile( #endif //----------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const ::rtl::OUString& aServiceName, sal_Int32 nVersion ) +OUString MimeConfigurationHelper::GetDefaultFilterFromServiceName( const OUString& aServiceName, sal_Int32 nVersion ) { - rtl::OUString aResult; + OUString aResult; if ( !aServiceName.isEmpty() && nVersion ) try @@ -764,9 +764,9 @@ sal_Bool MimeConfigurationHelper::AddFilterNameCheckOwnFile( } //------------------------------------------------------------------------- -::rtl::OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const ::rtl::OUString& aImportFilterName ) +OUString MimeConfigurationHelper::GetExportFilterFromImportFilter( const OUString& aImportFilterName ) { - ::rtl::OUString aExportFilterName; + OUString aExportFilterName; try { @@ -851,7 +851,7 @@ uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter( if ( xFilterEnum->nextElement() >>= aProps ) { SequenceAsHashMap aPropsHM( aProps ); - sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( ::rtl::OUString("Flags"), + sal_Int32 nFlags = aPropsHM.getUnpackedValueOrDefault( OUString("Flags"), (sal_Int32)0 ); if ( ( ( nFlags & nMustFlags ) == nMustFlags ) && !( nFlags & nDontFlags ) ) { diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx index 8b390d7fdd7a..c0d3d0342889 100644 --- a/comphelper/source/misc/namedvaluecollection.cxx +++ b/comphelper/source/misc/namedvaluecollection.cxx @@ -58,7 +58,7 @@ namespace comphelper //==================================================================== //= NamedValueCollection_Impl //==================================================================== - typedef ::boost::unordered_map< ::rtl::OUString, Any, ::rtl::OUStringHash > NamedValueRepository; + typedef ::boost::unordered_map< OUString, Any, OUStringHash > NamedValueRepository; struct NamedValueCollection_Impl { @@ -162,9 +162,9 @@ namespace comphelper } //-------------------------------------------------------------------- - ::std::vector< ::rtl::OUString > NamedValueCollection::getNames() const + ::std::vector< OUString > NamedValueCollection::getNames() const { - ::std::vector< ::rtl::OUString > aNames; + ::std::vector< OUString > aNames; for ( NamedValueRepository::const_iterator it = m_pImpl->aValues.begin(), end = m_pImpl->aValues.end(); it != end; ++it ) { aNames.push_back( it->first ); @@ -251,7 +251,7 @@ namespace comphelper } //-------------------------------------------------------------------- - bool NamedValueCollection::get_ensureType( const ::rtl::OUString& _rValueName, void* _pValueLocation, const Type& _rExpectedValueType ) const + bool NamedValueCollection::get_ensureType( const OUString& _rValueName, void* _pValueLocation, const Type& _rExpectedValueType ) const { NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName ); if ( pos != m_pImpl->aValues.end() ) @@ -267,7 +267,7 @@ namespace comphelper return true; // argument exists, but is of wrong type - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.appendAscii( "Invalid value type for '" ); aBuffer.append ( _rValueName ); aBuffer.appendAscii( "'.\nExpected: " ); @@ -287,7 +287,7 @@ namespace comphelper } //-------------------------------------------------------------------- - const Any& NamedValueCollection::impl_get( const ::rtl::OUString& _rValueName ) const + const Any& NamedValueCollection::impl_get( const OUString& _rValueName ) const { NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName ); if ( pos != m_pImpl->aValues.end() ) @@ -297,14 +297,14 @@ namespace comphelper } //-------------------------------------------------------------------- - bool NamedValueCollection::impl_has( const ::rtl::OUString& _rValueName ) const + bool NamedValueCollection::impl_has( const OUString& _rValueName ) const { NamedValueRepository::const_iterator pos = m_pImpl->aValues.find( _rValueName ); return ( pos != m_pImpl->aValues.end() ); } //-------------------------------------------------------------------- - bool NamedValueCollection::impl_put( const ::rtl::OUString& _rValueName, const Any& _rValue ) + bool NamedValueCollection::impl_put( const OUString& _rValueName, const Any& _rValue ) { bool bHas = impl_has( _rValueName ); m_pImpl->aValues[ _rValueName ] = _rValue; @@ -312,7 +312,7 @@ namespace comphelper } //-------------------------------------------------------------------- - bool NamedValueCollection::impl_remove( const ::rtl::OUString& _rValueName ) + bool NamedValueCollection::impl_remove( const OUString& _rValueName ) { NamedValueRepository::iterator pos = m_pImpl->aValues.find( _rValueName ); if ( pos == m_pImpl->aValues.end() ) diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index aa9d43578283..f7f4d122c009 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -53,7 +53,7 @@ void NumberedCollection::setOwner(const css::uno::Reference< css::uno::XInterfac } //----------------------------------------------- -void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix) +void NumberedCollection::setUntitledPrefix(const OUString& sPrefix) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -72,7 +72,7 @@ void NumberedCollection::setUntitledPrefix(const ::rtl::OUString& sPrefix) ::osl::ResettableMutexGuard aLock(m_aMutex); if ( ! xComponent.is ()) - throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); + throw css::lang::IllegalArgumentException (OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); long pComponent = (long) xComponent.get (); TNumberedItemHash::const_iterator pIt = m_lComponents.find (pComponent); @@ -148,7 +148,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe ::osl::ResettableMutexGuard aLock(m_aMutex); if ( ! xComponent.is ()) - throw css::lang::IllegalArgumentException (rtl::OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); + throw css::lang::IllegalArgumentException (OUString(ERRMSG_INVALID_COMPONENT_PARAM), m_xOwner.get(), 1); long pComponent = (long) xComponent.get (); TNumberedItemHash::iterator pIt = m_lComponents.find (pComponent); @@ -164,7 +164,7 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe } //----------------------------------------------- -::rtl::OUString SAL_CALL NumberedCollection::getUntitledPrefix() +OUString SAL_CALL NumberedCollection::getUntitledPrefix() throw (css::uno::RuntimeException) { // SYNCHRONIZED -> diff --git a/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx index 48b232ba334f..8bd744f77946 100644 --- a/comphelper/source/misc/numbers.cxx +++ b/comphelper/source/misc/numbers.cxx @@ -72,7 +72,7 @@ staruno::Any getNumberFormatDecimals(const staruno::Reference<starutil::XNumberF staruno::Reference<starbeans::XPropertySet> xFormat( xFormats->getByKey(nKey)); if (xFormat.is()) { - static ::rtl::OUString PROPERTY_DECIMALS( "Decimals" ); + static OUString PROPERTY_DECIMALS( "Decimals" ); return xFormat->getPropertyValue(PROPERTY_DECIMALS); } } @@ -105,7 +105,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::beans; //------------------------------------------------------------------------------ -Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter, sal_Int32 _nKey, const rtl::OUString& _rPropertyName ) +Any getNumberFormatProperty( const Reference< XNumberFormatter >& _rxFormatter, sal_Int32 _nKey, const OUString& _rPropertyName ) { Any aReturn; diff --git a/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx index 384b809dee99..01b4e98ccf69 100644 --- a/comphelper/source/misc/officeresourcebundle.cxx +++ b/comphelper/source/misc/officeresourcebundle.cxx @@ -48,13 +48,13 @@ namespace comphelper { private: Reference< XComponentContext > m_xContext; - ::rtl::OUString m_sBaseName; + OUString m_sBaseName; Reference< XResourceBundle > m_xBundle; bool m_bAttemptedCreate; mutable ::osl::Mutex m_aMutex; public: - ResourceBundle_Impl( const Reference< XComponentContext >& _context, const ::rtl::OUString& _baseName ) + ResourceBundle_Impl( const Reference< XComponentContext >& _context, const OUString& _baseName ) :m_xContext( _context ) ,m_sBaseName( _baseName ) ,m_bAttemptedCreate( false ) @@ -70,7 +70,7 @@ namespace comphelper an empty string is returned. In a non-product version, an OSL_ENSURE will notify you of this then. */ - ::rtl::OUString loadString( sal_Int32 _resourceId ) const; + OUString loadString( sal_Int32 _resourceId ) const; /** determines whether the resource bundle has a string with the given id @param _resourceId @@ -94,25 +94,25 @@ namespace comphelper /** returns the resource bundle key for a string with a given resource id */ - static ::rtl::OUString + static OUString impl_getStringResourceKey( sal_Int32 _resourceId ); }; //-------------------------------------------------------------------- - ::rtl::OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId ) + OUString ResourceBundle_Impl::impl_getStringResourceKey( sal_Int32 _resourceId ) { - ::rtl::OUStringBuffer key; + OUStringBuffer key; key.appendAscii( "string:" ); key.append( _resourceId ); return key.makeStringAndClear(); } //-------------------------------------------------------------------- - ::rtl::OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const + OUString ResourceBundle_Impl::loadString( sal_Int32 _resourceId ) const { ::osl::MutexGuard aGuard( m_aMutex ); - ::rtl::OUString sString; + OUString sString; if ( const_cast< ResourceBundle_Impl* >( this )->impl_loadBundle_nothrow() ) { @@ -189,7 +189,7 @@ namespace comphelper //==================================================================== //-------------------------------------------------------------------- OfficeResourceBundle::OfficeResourceBundle( const Reference< XComponentContext >& _context, const sal_Char* _bundleBaseAsciiName ) - :m_pImpl( new ResourceBundle_Impl( _context, ::rtl::OUString::createFromAscii( _bundleBaseAsciiName ) ) ) + :m_pImpl( new ResourceBundle_Impl( _context, OUString::createFromAscii( _bundleBaseAsciiName ) ) ) { if ( !_context.is() ) throw NullPointerException(); @@ -201,7 +201,7 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const + OUString OfficeResourceBundle::loadString( sal_Int32 _resourceId ) const { return m_pImpl->loadString( _resourceId ); } diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index fed0410ab134..8bde58a3b321 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -32,9 +32,9 @@ namespace comphelper { // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames_static() +uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames_static() { - uno::Sequence< rtl::OUString > aResult( 1 ); + uno::Sequence< OUString > aResult( 1 ); aResult[0] = getServiceName_static(); return aResult; } @@ -133,7 +133,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) // Turn Quickstarter veto off uno::Reference< beans::XPropertySet > xPropertySet( xDesktop, uno::UNO_QUERY_THROW ); - ::rtl::OUString aVetoPropName( "SuspendQuickstartVeto" ); + OUString aVetoPropName( "SuspendQuickstartVeto" ); uno::Any aValue; aValue <<= (sal_Bool)sal_True; xPropertySet->setPropertyValue( aVetoPropName, aValue ); @@ -163,15 +163,15 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) // XServiceInfo // ---------------------------------------------------------- -::rtl::OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException) +OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException) { return getImplementationName_static(); } // ---------------------------------------------------------- -::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException) +::sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException) { - const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static(); + const uno::Sequence< OUString > & aSupportedNames = getSupportedServiceNames_static(); for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ ) { if ( aSupportedNames[ nInd ].equals( aServiceName ) ) @@ -182,7 +182,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) } // ---------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index f4594f590aab..536484952b59 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -51,14 +51,14 @@ public: virtual ~OOfficeRestartManager() {} - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static ::rtl::OUString SAL_CALL getImplementationName_static(); + static OUString SAL_CALL getImplementationName_static(); - static ::rtl::OUString SAL_CALL getSingletonName_static(); + static OUString SAL_CALL getSingletonName_static(); - static ::rtl::OUString SAL_CALL getServiceName_static(); + static OUString SAL_CALL getServiceName_static(); 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 >& rxContext ); @@ -71,9 +71,9 @@ public: virtual void SAL_CALL notify( const ::com::sun::star::uno::Any& aData ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 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 ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); }; diff --git a/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx index 3d3bac67e39b..da1eb7f4058c 100644 --- a/comphelper/source/misc/scopeguard.cxx +++ b/comphelper/source/misc/scopeguard.cxx @@ -36,7 +36,7 @@ ScopeGuard::~ScopeGuard() catch (com::sun::star::uno::Exception & exc) { (void) exc; // avoid warning about unused variable OSL_FAIL( - rtl::OUStringToOString( "UNO exception occurred: " + + OUStringToOString( "UNO exception occurred: " + exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (...) { diff --git a/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx index dacba9d62be6..9c412390db12 100644 --- a/comphelper/source/misc/sequence.cxx +++ b/comphelper/source/misc/sequence.cxx @@ -25,7 +25,7 @@ namespace comphelper //......................................................................... //------------------------------------------------------------------------------ -staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString >& _rList, const ::rtl::OUString& _rValue, sal_Bool _bOnlyFirst) +staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, sal_Bool _bOnlyFirst) { sal_Int32 nLength = _rList.getLength(); @@ -34,7 +34,7 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString ////////////////////////////////////////////////////////////////////// // An welcher Position finde ich den Wert? sal_Int32 nPos = -1; - const ::rtl::OUString* pTArray = _rList.getConstArray(); + const OUString* pTArray = _rList.getConstArray(); for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray) { if( pTArray->equals(_rValue) ) @@ -64,7 +64,7 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString ////////////////////////////////////////////////////////////////////// // Wie oft kommt der Wert vor? - const ::rtl::OUString* pTArray = _rList.getConstArray(); + const OUString* pTArray = _rList.getConstArray(); for (sal_Int32 i = 0; i < nLength; ++i, ++pTArray) { if( pTArray->equals(_rValue) ) @@ -80,10 +80,10 @@ staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< ::rtl::OUString } } // ----------------------------------------------------------------------------- -sal_Bool existsValue(const ::rtl::OUString& Value,const staruno::Sequence< ::rtl::OUString >& _aList) +sal_Bool existsValue(const OUString& Value,const staruno::Sequence< OUString >& _aList) { - const ::rtl::OUString * pIter = _aList.getConstArray(); - const ::rtl::OUString * pEnd = pIter + _aList.getLength(); + const OUString * pIter = _aList.getConstArray(); + const OUString * pEnd = pIter + _aList.getLength(); return ::std::find(pIter,pEnd,Value) != pEnd; } diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index 61f39c74a8bc..24dd7edc9637 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -211,7 +211,7 @@ sal_Bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const pCheck != rCheck.end() ; ++pCheck ) { - const ::rtl::OUString& sCheckName = pCheck->first; + const OUString& sCheckName = pCheck->first; const css::uno::Any& aCheckValue = pCheck->second; const_iterator pFound = find(sCheckName); @@ -233,7 +233,7 @@ void SequenceAsHashMap::update(const SequenceAsHashMap& rUpdate) pUpdate != rUpdate.end() ; ++pUpdate ) { - const ::rtl::OUString& sName = pUpdate->first; + const OUString& sName = pUpdate->first; const css::uno::Any& aValue = pUpdate->second; (*this)[sName] = aValue; diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index b5fd79948020..d48fd4c41789 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -42,11 +42,11 @@ public: : m_rServiceDecl(rServiceDecl) {} // XServiceInfo: - virtual rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( rtl::OUString const& name ) + virtual sal_Bool SAL_CALL supportsService( OUString const& name ) throw (uno::RuntimeException); - virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() + virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw (uno::RuntimeException); // XSingleComponentFactory: virtual uno::Reference<uno::XInterface> SAL_CALL createInstanceWithContext( @@ -69,19 +69,19 @@ ServiceDecl::Factory::~Factory() } // XServiceInfo: -rtl::OUString ServiceDecl::Factory::getImplementationName() +OUString ServiceDecl::Factory::getImplementationName() throw (uno::RuntimeException) { return m_rServiceDecl.getImplementationName(); } -sal_Bool ServiceDecl::Factory::supportsService( rtl::OUString const& name ) +sal_Bool ServiceDecl::Factory::supportsService( OUString const& name ) throw (uno::RuntimeException) { return m_rServiceDecl.supportsService(name); } -uno::Sequence<rtl::OUString> ServiceDecl::Factory::getSupportedServiceNames() +uno::Sequence<OUString> ServiceDecl::Factory::getSupportedServiceNames() throw (uno::RuntimeException) { return m_rServiceDecl.getSupportedServiceNames(); @@ -116,15 +116,15 @@ void * ServiceDecl::getFactory( sal_Char const* pImplName ) const return 0; } -uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const +uno::Sequence<OUString> ServiceDecl::getSupportedServiceNames() const { - std::vector<rtl::OUString> vec; + std::vector<OUString> vec; - rtl::OString const str(m_pServiceNames); + OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { - rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) ); - vec.push_back( rtl::OUString( token.getStr(), token.getLength(), + OString const token( str.getToken( 0, m_cDelim, nIndex ) ); + vec.push_back( OUString( token.getStr(), token.getLength(), RTL_TEXTENCODING_ASCII_US ) ); } while (nIndex >= 0); @@ -132,12 +132,12 @@ uno::Sequence<rtl::OUString> ServiceDecl::getSupportedServiceNames() const return comphelper::containerToSequence(vec); } -bool ServiceDecl::supportsService( ::rtl::OUString const& name ) const +bool ServiceDecl::supportsService( OUString const& name ) const { - rtl::OString const str(m_pServiceNames); + OString const str(m_pServiceNames); sal_Int32 nIndex = 0; do { - rtl::OString const token( str.getToken( 0, m_cDelim, nIndex ) ); + OString const token( str.getToken( 0, m_cDelim, nIndex ) ); if (name.equalsAsciiL( token.getStr(), token.getLength() )) return true; } @@ -145,9 +145,9 @@ bool ServiceDecl::supportsService( ::rtl::OUString const& name ) const return false; } -rtl::OUString ServiceDecl::getImplementationName() const +OUString ServiceDecl::getImplementationName() const { - return rtl::OUString::createFromAscii(m_pImplName); + return OUString::createFromAscii(m_pImplName); } } // namespace service_decl diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 1aef59a036d5..896a9296ac5e 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -27,20 +27,20 @@ namespace comphelper { /** returns an empty UString(). most times sufficient */ -::rtl::OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) +OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException ) { - return ::rtl::OUString(); + return OUString(); } /** the base implementation iterates over the service names from <code>getSupportedServiceNames</code> */ -sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException) { return supportsService( ServiceName, getSupportedServiceNames() ); } -sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw() +sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const OUString& ServiceName, const ::com::sun::star::uno::Sequence< OUString >& SupportedServices ) throw() { - const ::rtl::OUString * pArray = SupportedServices.getConstArray(); + const OUString * pArray = SupportedServices.getConstArray(); for( sal_Int32 i = 0; i < SupportedServices.getLength(); i++ ) if( pArray[i] == ServiceName ) return sal_True; @@ -48,25 +48,25 @@ sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& Ser } /** the base implementation has no supported services */ -::com::sun::star::uno::Sequence< ::rtl::OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) +::com::sun::star::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException ) { - ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq(0); + ::com::sun::star::uno::Sequence< OUString> aSeq(0); return aSeq; } /** this method adds a variable number of char pointer to a given Sequence */ -void ServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw() +void ServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw() { sal_uInt32 nCount = rSeq.getLength(); rSeq.realloc( nCount + nServices ); - rtl::OUString* pStrings = rSeq.getArray(); + OUString* pStrings = rSeq.getArray(); va_list marker; va_start( marker, nServices ); for( sal_uInt16 i = 0 ; i < nServices; i++ ) - pStrings[nCount++] = rtl::OUString::createFromAscii(va_arg( marker, char*)); + pStrings[nCount++] = OUString::createFromAscii(va_arg( marker, char*)); va_end( marker ); } diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 45f1d79c5d34..d9077ab882f6 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -85,7 +85,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetTemporaryStorage( // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL( - const ::rtl::OUString& aURL, + const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) throw ( uno::Exception ) @@ -104,7 +104,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL( // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2( - const ::rtl::OUString& aURL, + const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) throw ( uno::Exception ) @@ -199,7 +199,7 @@ void OStorageHelper::CopyInputToOutput( // ---------------------------------------------------------------------- uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL( - const ::rtl::OUString& aURL, + const OUString& aURL, const uno::Reference< uno::XComponentContext >& context ) throw ( uno::Exception ) { @@ -282,8 +282,8 @@ sal_Int32 OStorageHelper::GetXStorageFormat( // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL( - const ::rtl::OUString& aFormat, - const ::rtl::OUString& aURL, + const OUString& aFormat, + const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext, sal_Bool bRepairStorage ) @@ -314,7 +314,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL( // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStream( - const ::rtl::OUString& aFormat, + const OUString& aFormat, const uno::Reference < io::XInputStream >& xStream, const uno::Reference< uno::XComponentContext >& rxContext, sal_Bool bRepairStorage ) @@ -345,7 +345,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStr // ---------------------------------------------------------------------- uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream( - const ::rtl::OUString& aFormat, + const OUString& aFormat, const uno::Reference < io::XStream >& xStream, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext, @@ -376,7 +376,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream( } // ---------------------------------------------------------------------- -uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const ::rtl::OUString& aPassword ) +uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( const OUString& aPassword ) { // TODO/LATER: Should not the method be part of DocPasswordHelper? uno::Sequence< beans::NamedValue > aEncryptionData; @@ -391,7 +391,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( uno::Reference< xml::crypto::XNSSInitializer > xDigestContextSupplier = xml::crypto::NSSInitializer::create(xContext); uno::Reference< xml::crypto::XDigestContext > xDigestContext( xDigestContextSupplier->getDigestContext( xml::crypto::DigestID::SHA256, uno::Sequence< beans::NamedValue >() ), uno::UNO_SET_THROW ); - ::rtl::OString aUTF8Password( ::rtl::OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ) ); + OString aUTF8Password( OUStringToOString( aPassword, RTL_TEXTENCODING_UTF8 ) ); xDigestContext->updateDigest( uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aUTF8Password.getStr() ), aUTF8Password.getLength() ) ); uno::Sequence< sal_Int8 > aDigest = xDigestContext->finalizeDigestAndDispose(); @@ -415,7 +415,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( for ( sal_Int32 nInd = 0; nInd < 2; nInd++ ) { - ::rtl::OString aByteStrPass = ::rtl::OUStringToOString( aPassword, pEncoding[nInd] ); + OString aByteStrPass = OUStringToOString( aPassword, pEncoding[nInd] ); sal_uInt8 pBuffer[RTL_DIGEST_LENGTH_SHA1]; rtlDigestError nError = rtl_digest_SHA1( aByteStrPass.getStr(), @@ -437,7 +437,7 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( } // ---------------------------------------------------------------------- -sal_Bool OStorageHelper::IsValidZipEntryFileName( const ::rtl::OUString& aName, sal_Bool bSlashAllowed ) +sal_Bool OStorageHelper::IsValidZipEntryFileName( const OUString& aName, sal_Bool bSlashAllowed ) { return IsValidZipEntryFileName( aName.getStr(), aName.getLength(), bSlashAllowed ); } @@ -471,7 +471,7 @@ sal_Bool OStorageHelper::IsValidZipEntryFileName( } // ---------------------------------------------------------------------- -sal_Bool OStorageHelper::PathHasSegment( const ::rtl::OUString& aPath, const ::rtl::OUString& aSegment ) +sal_Bool OStorageHelper::PathHasSegment( const OUString& aPath, const OUString& aSegment ) { sal_Bool bResult = sal_False; const sal_Int32 nPathLen = aPath.getLength(); @@ -521,8 +521,8 @@ void LifecycleProxy::commitStorages() } } -static void splitPath( std::vector<rtl::OUString> &rElems, - const ::rtl::OUString& rPath ) +static void splitPath( std::vector<OUString> &rElems, + const OUString& rPath ) { for (sal_Int32 i = 0; i >= 0;) rElems.push_back( rPath.getToken( 0, '/', i ) ); @@ -530,7 +530,7 @@ static void splitPath( std::vector<rtl::OUString> &rElems, static uno::Reference< embed::XStorage > LookupStorageAtPath( const uno::Reference< embed::XStorage > &xParentStorage, - std::vector<rtl::OUString> &rElems, sal_uInt32 nOpenMode, + std::vector<OUString> &rElems, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ) { uno::Reference< embed::XStorage > xStorage( xParentStorage ); @@ -545,22 +545,22 @@ static uno::Reference< embed::XStorage > LookupStorageAtPath( uno::Reference< embed::XStorage > OStorageHelper::GetStorageAtPath( const uno::Reference< embed::XStorage > &xStorage, - const ::rtl::OUString& rPath, sal_uInt32 nOpenMode, + const OUString& rPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ) { - std::vector<rtl::OUString> aElems; + std::vector<OUString> aElems; splitPath( aElems, rPath ); return LookupStorageAtPath( xStorage, aElems, nOpenMode, rNastiness ); } uno::Reference< io::XStream > OStorageHelper::GetStreamAtPath( const uno::Reference< embed::XStorage > &xParentStorage, - const ::rtl::OUString& rPath, sal_uInt32 nOpenMode, + const OUString& rPath, sal_uInt32 nOpenMode, LifecycleProxy &rNastiness ) { - std::vector<rtl::OUString> aElems; + std::vector<OUString> aElems; splitPath( aElems, rPath ); - rtl::OUString aName( aElems.back() ); + OUString aName( aElems.back() ); aElems.pop_back(); sal_uInt32 nStorageMode = nOpenMode & ~embed::ElementModes::TRUNCATE; uno::Reference< embed::XStorage > xStorage( @@ -571,7 +571,7 @@ uno::Reference< io::XStream > OStorageHelper::GetStreamAtPath( uno::Reference< io::XStream > OStorageHelper::GetStreamAtPackageURL( uno::Reference< embed::XStorage > const& xParentStorage, - const ::rtl::OUString& rURL, sal_uInt32 const nOpenMode, + const OUString& rURL, sal_uInt32 const nOpenMode, LifecycleProxy & rNastiness) { static char const s_PkgScheme[] = "vnd.sun.star.Package:"; @@ -579,7 +579,7 @@ uno::Reference< io::XStream > OStorageHelper::GetStreamAtPackageURL( rURL.getStr(), rURL.getLength(), s_PkgScheme, SAL_N_ELEMENTS(s_PkgScheme) - 1)) { - ::rtl::OUString const path(rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1)); + OUString const path(rURL.copy(SAL_N_ELEMENTS(s_PkgScheme)-1)); return GetStreamAtPath(xParentStorage, path, nOpenMode, rNastiness); } return 0; diff --git a/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx index 8af97dc75685..fc15b09f17a1 100644 --- a/comphelper/source/misc/string.cxx +++ b/comphelper/source/misc/string.cxx @@ -62,14 +62,14 @@ namespace } } -rtl::OString stripStart(const rtl::OString &rIn, sal_Char c) +OString stripStart(const OString &rIn, sal_Char c) { - return tmpl_stripStart<rtl::OString, sal_Char>(rIn, c); + return tmpl_stripStart<OString, sal_Char>(rIn, c); } -rtl::OUString stripStart(const rtl::OUString &rIn, sal_Unicode c) +OUString stripStart(const OUString &rIn, sal_Unicode c) { - return tmpl_stripStart<rtl::OUString, sal_Unicode>(rIn, c); + return tmpl_stripStart<OUString, sal_Unicode>(rIn, c); } namespace @@ -93,22 +93,22 @@ namespace } } -rtl::OString stripEnd(const rtl::OString &rIn, sal_Char c) +OString stripEnd(const OString &rIn, sal_Char c) { - return tmpl_stripEnd<rtl::OString, sal_Char>(rIn, c); + return tmpl_stripEnd<OString, sal_Char>(rIn, c); } -rtl::OUString stripEnd(const rtl::OUString &rIn, sal_Unicode c) +OUString stripEnd(const OUString &rIn, sal_Unicode c) { - return tmpl_stripEnd<rtl::OUString, sal_Unicode>(rIn, c); + return tmpl_stripEnd<OUString, sal_Unicode>(rIn, c); } -rtl::OString strip(const rtl::OString &rIn, sal_Char c) +OString strip(const OString &rIn, sal_Char c) { return stripEnd(stripStart(rIn, c), c); } -rtl::OUString strip(const rtl::OUString &rIn, sal_Unicode c) +OUString strip(const OUString &rIn, sal_Unicode c) { return stripEnd(stripStart(rIn, c), c); } @@ -132,18 +132,18 @@ namespace } } -sal_Int32 getTokenCount(const rtl::OString &rIn, sal_Char cTok) +sal_Int32 getTokenCount(const OString &rIn, sal_Char cTok) { - return tmpl_getTokenCount<rtl::OString, sal_Char>(rIn, cTok); + return tmpl_getTokenCount<OString, sal_Char>(rIn, cTok); } -sal_Int32 getTokenCount(const rtl::OUString &rIn, sal_Unicode cTok) +sal_Int32 getTokenCount(const OUString &rIn, sal_Unicode cTok) { - return tmpl_getTokenCount<rtl::OUString, sal_Unicode>(rIn, cTok); + return tmpl_getTokenCount<OUString, sal_Unicode>(rIn, cTok); } sal_uInt32 decimalStringToNumber( - ::rtl::OUString const & str ) + OUString const & str ) { sal_uInt32 result = 0; for( sal_Int32 i = 0 ; i < str.getLength() ; ) @@ -243,10 +243,10 @@ using namespace ::com::sun::star; // convert between sequence of string and comma separated string -::rtl::OUString convertCommaSeparated( - uno::Sequence< ::rtl::OUString > const& i_rSeq) +OUString convertCommaSeparated( + uno::Sequence< OUString > const& i_rSeq) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; ::comphelper::intersperse( ::comphelper::stl_begin(i_rSeq), ::comphelper::stl_end(i_rSeq), ::comphelper::OUStringBufferAppender(buf), @@ -254,26 +254,26 @@ using namespace ::com::sun::star; return buf.makeStringAndClear(); } -uno::Sequence< ::rtl::OUString > - convertCommaSeparated( ::rtl::OUString const& i_rString ) +uno::Sequence< OUString > + convertCommaSeparated( OUString const& i_rString ) { - std::vector< ::rtl::OUString > vec; + std::vector< OUString > vec; sal_Int32 idx = 0; do { - ::rtl::OUString kw = + OUString kw = i_rString.getToken(0, static_cast<sal_Unicode> (','), idx); kw = kw.trim(); if (!kw.isEmpty()) { vec.push_back(kw); } } while (idx >= 0); - uno::Sequence< ::rtl::OUString > kws(vec.size()); + uno::Sequence< OUString > kws(vec.size()); std::copy(vec.begin(), vec.end(), stl_begin(kws)); return kws; } -sal_Int32 compareNatural( const ::rtl::OUString & rLHS, const ::rtl::OUString & rRHS, +sal_Int32 compareNatural( const OUString & rLHS, const OUString & rRHS, const uno::Reference< i18n::XCollator > &rCollator, const uno::Reference< i18n::XBreakIterator > &rBI, const lang::Locale &rLocale ) @@ -365,12 +365,12 @@ namespace } } -bool isdigitAsciiString(const rtl::OString &rString) +bool isdigitAsciiString(const OString &rString) { return tmpl_is_OPER_AsciiString<isdigitAscii>(rString); } -bool isdigitAsciiString(const rtl::OUString &rString) +bool isdigitAsciiString(const OUString &rString) { return tmpl_is_OPER_AsciiString<isdigitAscii>(rString); } @@ -390,17 +390,17 @@ namespace } } -rtl::OUString reverseString(const rtl::OUString &rStr) +OUString reverseString(const OUString &rStr) { - return tmpl_reverseString<rtl::OUString, rtl::OUStringBuffer>(rStr); + return tmpl_reverseString<OUString, OUStringBuffer>(rStr); } -rtl::OString reverseString(const rtl::OString &rStr) +OString reverseString(const OString &rStr) { - return tmpl_reverseString<rtl::OString, rtl::OStringBuffer>(rStr); + return tmpl_reverseString<OString, OStringBuffer>(rStr); } -sal_Int32 indexOfAny(rtl::OUString const& rIn, +sal_Int32 indexOfAny(OUString const& rIn, sal_Unicode const*const pChars, sal_Int32 const nPos) { for (sal_Int32 i = nPos; i < rIn.getLength(); ++i) diff --git a/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx index d56f78b680b6..265c052b1436 100644 --- a/comphelper/source/misc/synchronousdispatch.cxx +++ b/comphelper/source/misc/synchronousdispatch.cxx @@ -41,8 +41,8 @@ using namespace ::com::sun::star; uno::Reference< lang::XComponent > SynchronousDispatch::dispatch( const uno::Reference< uno::XInterface > &xStartPoint, - const rtl::OUString &sURL, - const rtl::OUString &sTarget, + const OUString &sURL, + const OUString &sTarget, const sal_Int32 nFlags, const uno::Sequence< beans::PropertyValue > &lArguments ) { diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index 62d24e9e78e6..e77176fb2351 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -111,9 +111,9 @@ float getFloat(const Any& _rAny) } //------------------------------------------------------------------------------ -::rtl::OUString getString(const Any& _rAny) +OUString getString(const Any& _rAny) { - ::rtl::OUString nReturn; + OUString nReturn; OSL_VERIFY( _rAny >>= nReturn ); return nReturn; } @@ -229,7 +229,7 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) } case TypeClass_STRING: { - ::rtl::OUString aDummy; + OUString aDummy; bConversionSuccess = tryCompare(pData, _rValue, bRes, aDummy); break; } @@ -393,20 +393,20 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) memcmp(rLeftSeq.getConstArray(), rRightSeq.getConstArray(), rLeftSeq.getLength()*sizeof(sal_uInt32)) == 0; } } - else if (isA(_rType, static_cast< Sequence< ::rtl::OUString >* >(NULL))) + else if (isA(_rType, static_cast< Sequence< OUString >* >(NULL))) { - Sequence< ::rtl::OUString > aTemp; + Sequence< OUString > aTemp; bConversionSuccess = _rValue >>= aTemp; if (bConversionSuccess) { - const Sequence< ::rtl::OUString >& rLeftSeq = *reinterpret_cast<const Sequence< ::rtl::OUString>*>(pData); - const Sequence< ::rtl::OUString >& rRightSeq = aTemp; + const Sequence< OUString >& rLeftSeq = *reinterpret_cast<const Sequence< OUString>*>(pData); + const Sequence< OUString >& rRightSeq = aTemp; sal_Int32 nSeqLen = rLeftSeq.getLength(); bRes = ( nSeqLen == rRightSeq.getLength() ); for ( sal_Int32 n = 0; bRes && ( n < nSeqLen ); n++ ) { - const ::rtl::OUString& rS1 = rLeftSeq.getConstArray()[n]; - const ::rtl::OUString& rS2 = rRightSeq.getConstArray()[n]; + const OUString& rS1 = rLeftSeq.getConstArray()[n]; + const OUString& rS2 = rRightSeq.getConstArray()[n]; bRes = ( rS1 == rS2 ); } } diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index e04b6801026a..30915a7a0a28 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -41,13 +41,13 @@ using namespace comphelper; //========================================================================= //========================================================================= -static bool makeCanonicalFileURL( rtl::OUString & rURL ) +static bool makeCanonicalFileURL( OUString & rURL ) { OSL_ENSURE( rURL.matchAsciiL( "file:", sizeof( "file:" ) - 1 , 0 ) , "File URL expected!" ); - rtl::OUString aNormalizedURL; - if ( osl::FileBase::getAbsoluteFileURL( rtl::OUString(), + OUString aNormalizedURL; + if ( osl::FileBase::getAbsoluteFileURL( OUString(), rURL, aNormalizedURL ) == osl::DirectoryItem::E_None ) @@ -113,42 +113,42 @@ OfficeInstallationDirectories::~OfficeInstallationDirectories() //========================================================================= // virtual -rtl::OUString SAL_CALL +OUString SAL_CALL OfficeInstallationDirectories::getOfficeInstallationDirectoryURL() throw ( uno::RuntimeException ) { initDirs(); - return rtl::OUString( *m_pOfficeBrandDir ); + return OUString( *m_pOfficeBrandDir ); } //========================================================================= // virtual -rtl::OUString SAL_CALL +OUString SAL_CALL OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() throw ( uno::RuntimeException ) { initDirs(); - return rtl::OUString( *m_pUserDir ); + return OUString( *m_pUserDir ); } //========================================================================= // virtual -rtl::OUString SAL_CALL -OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL ) +OUString SAL_CALL +OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) throw ( uno::RuntimeException ) { if ( !URL.isEmpty() ) { initDirs(); - rtl::OUString aCanonicalURL( URL ); + OUString aCanonicalURL( URL ); makeCanonicalFileURL( aCanonicalURL ); sal_Int32 nIndex = aCanonicalURL.indexOf( *m_pOfficeBrandDir ); if ( nIndex != -1 ) { - return rtl::OUString( + return OUString( aCanonicalURL.replaceAt( nIndex, m_pOfficeBrandDir->getLength(), m_aOfficeBrandDirMacro ) ); @@ -158,20 +158,20 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL ) nIndex = aCanonicalURL.indexOf( *m_pUserDir ); if ( nIndex != -1 ) { - return rtl::OUString( + return OUString( aCanonicalURL.replaceAt( nIndex, m_pUserDir->getLength(), m_aUserDirMacro ) ); } } } - return rtl::OUString( URL ); + return OUString( URL ); } //========================================================================= // virtual -rtl::OUString SAL_CALL -OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL ) +OUString SAL_CALL +OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) throw ( uno::RuntimeException ) { if ( !URL.isEmpty() ) @@ -181,7 +181,7 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL ) { initDirs(); - return rtl::OUString( + return OUString( URL.replaceAt( nIndex, m_aOfficeBrandDirMacro.getLength(), *m_pOfficeBrandDir ) ); @@ -193,14 +193,14 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL ) { initDirs(); - return rtl::OUString( + return OUString( URL.replaceAt( nIndex, m_aUserDirMacro.getLength(), *m_pUserDir ) ); } } } - return rtl::OUString( URL ); + return OUString( URL ); } //========================================================================= @@ -208,7 +208,7 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL ) //========================================================================= // virtual -rtl::OUString SAL_CALL +OUString SAL_CALL OfficeInstallationDirectories::getImplementationName() throw ( uno::RuntimeException ) { @@ -218,12 +218,12 @@ OfficeInstallationDirectories::getImplementationName() //========================================================================= // virtual sal_Bool SAL_CALL -OfficeInstallationDirectories::supportsService( const rtl::OUString& ServiceName ) +OfficeInstallationDirectories::supportsService( const OUString& ServiceName ) throw ( uno::RuntimeException ) { - const uno::Sequence< rtl::OUString > & aNames + const uno::Sequence< OUString > & aNames = getSupportedServiceNames(); - const rtl::OUString * p = aNames.getConstArray(); + const OUString * p = aNames.getConstArray(); for ( sal_Int32 nPos = 0; nPos < aNames.getLength(); nPos++ ) { if ( p[ nPos ].equals( ServiceName ) ) @@ -235,7 +235,7 @@ OfficeInstallationDirectories::supportsService( const rtl::OUString& ServiceName //========================================================================= // virtual -uno::Sequence< ::rtl::OUString > SAL_CALL +uno::Sequence< OUString > SAL_CALL OfficeInstallationDirectories::getSupportedServiceNames() throw ( uno::RuntimeException ) { @@ -244,7 +244,7 @@ OfficeInstallationDirectories::getSupportedServiceNames() //========================================================================= // static -rtl::OUString SAL_CALL +OUString SAL_CALL OfficeInstallationDirectories::getImplementationName_static() { return OUString("com.sun.star.comp.util.OfficeInstallationDirectories"); @@ -287,8 +287,8 @@ void OfficeInstallationDirectories::initDirs() osl::MutexGuard aGuard( m_aMutex ); if ( m_pOfficeBrandDir == 0 ) { - m_pOfficeBrandDir = new rtl::OUString; - m_pUserDir = new rtl::OUString; + m_pOfficeBrandDir = new OUString; + m_pUserDir = new OUString; uno::Reference< util::XMacroExpander > xExpander = util::theMacroExpander::get(m_xCtx); diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index a9cc4d736463..22517fa0e1ab 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -49,36 +49,36 @@ public: virtual ~OfficeInstallationDirectories(); // XOfficeInstallationDirectories - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getOfficeInstallationDirectoryURL() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getOfficeUserDataDirectoryURL() throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL - makeRelocatableURL( const ::rtl::OUString& URL ) + virtual OUString SAL_CALL + makeRelocatableURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL - makeAbsoluteURL( const ::rtl::OUString& URL ) + virtual OUString SAL_CALL + makeAbsoluteURL( const OUString& URL ) throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL - supportsService( const ::rtl::OUString& ServiceName ) + supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL + static OUString SAL_CALL getImplementationName_static(); - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + static ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); - static ::rtl::OUString SAL_CALL + static OUString SAL_CALL getSingletonName_static(); 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 >& ); @@ -86,13 +86,13 @@ public: private: void initDirs(); - rtl::OUString m_aOfficeBrandDirMacro; - rtl::OUString m_aOfficeBaseDirMacro; - rtl::OUString m_aUserDirMacro; + OUString m_aOfficeBrandDirMacro; + OUString m_aOfficeBaseDirMacro; + OUString m_aUserDirMacro; com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xCtx; - rtl::OUString * m_pOfficeBrandDir; - rtl::OUString * m_pUserDir; + OUString * m_pOfficeBrandDir; + OUString * m_pUserDir; }; } // namespace comphelper diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index 1fb16b302f6f..cd078a9f59e9 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -51,7 +51,7 @@ Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo( return mxInfo; } -void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue ) +void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -69,7 +69,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const ::rtl::OUString& rPr _postSetValues(); } -Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -90,32 +90,32 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const ::rtl::OUString& rPro return aAny; } -void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } // XMultiPropertySet -void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) +void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -149,7 +149,7 @@ void SAL_CALL ChainablePropertySet::setPropertyValues( const Sequence< ::rtl::OU } } -Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) +Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -183,7 +183,7 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues( const Sequence return aValues; } -void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo @@ -195,14 +195,14 @@ void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Refere // todo } -void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } // XPropertyState -PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUString& PropertyName ) +PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find( PropertyName ); @@ -218,7 +218,7 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const ::rtl::OUSt return aState; } -Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames ) +Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) throw(UnknownPropertyException, RuntimeException) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -244,7 +244,7 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons return aStates; } -void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) +void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -254,7 +254,7 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const ::rtl::OUString& _setPropertyToDefault( *((*aIter).second) ); } -Any SAL_CALL ChainablePropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertyInfoHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx index 413651814157..c645af7c1c15 100644 --- a/comphelper/source/property/ChainablePropertySetInfo.cxx +++ b/comphelper/source/property/ChainablePropertySetInfo.cxx @@ -20,7 +20,6 @@ #include <comphelper/ChainablePropertySetInfo.hxx> #include <comphelper/TypeGeneration.hxx> -using ::rtl::OUString; using ::comphelper::PropertyInfo; using ::comphelper::GenerateCppuType; using ::comphelper::ChainablePropertySetInfo; @@ -67,7 +66,7 @@ void ChainablePropertySetInfo::add( PropertyInfo* pMap, sal_Int32 nCount ) } } -void ChainablePropertySetInfo::remove( const rtl::OUString& aName ) +void ChainablePropertySetInfo::remove( const OUString& aName ) throw() { maMap.erase ( aName ); @@ -99,7 +98,7 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() return maProperties; } -Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) +Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& rName ) throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { PropertyInfoHash::iterator aIter = maMap.find( rName ); @@ -118,7 +117,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const ::rtl::OUSt return aProperty; } -sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) +sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() ); diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index 1cc524b95a88..f996e8b1fc7d 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -101,7 +101,7 @@ void MasterPropertySet::registerSlave ( ChainablePropertySet *pNewSet ) mpInfo->add ( pNewSet->mpInfo->maMap, mnLastId ); } -void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPropertyName, const Any& rValue ) +void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -135,7 +135,7 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const ::rtl::OUString& rPrope } } -Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -171,32 +171,32 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const ::rtl::OUString& rProper return aAny; } -void SAL_CALL MasterPropertySet::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL MasterPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL MasterPropertySet::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) +void SAL_CALL MasterPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL MasterPropertySet::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL MasterPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) +void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } // XMultiPropertySet -void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) +void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -262,7 +262,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< ::rtl::OUStr } } -Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) +Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). @@ -328,7 +328,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< : return aValues; } -void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo @@ -340,14 +340,14 @@ void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference // todo } -void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) +void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } // XPropertyState -PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUString& PropertyName ) +PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find( PropertyName ); @@ -379,7 +379,7 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const ::rtl::OUStrin return aState; } -Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< ::rtl::OUString >& rPropertyNames ) +Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) throw(UnknownPropertyException, RuntimeException) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -426,7 +426,7 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S return aStates; } -void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rPropertyName ) +void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); @@ -436,7 +436,7 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const ::rtl::OUString& rP _setPropertyToDefault( *((*aIter).second->mpInfo) ); } -Any SAL_CALL MasterPropertySet::getPropertyDefault( const ::rtl::OUString& rPropertyName ) +Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertyDataHash::const_iterator aIter = mpInfo->maMap.find ( rPropertyName ); diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index e59d907d163f..e85d7402eb3a 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -20,7 +20,6 @@ #include <comphelper/MasterPropertySetInfo.hxx> #include <comphelper/TypeGeneration.hxx> -using ::rtl::OUString; using ::comphelper::PropertyInfo; using ::comphelper::GenerateCppuType; using ::comphelper::MasterPropertySetInfo; @@ -116,7 +115,7 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() return maProperties; } -Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUString& rName ) +Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rName ) throw(::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { PropertyDataHash::iterator aIter = maMap.find( rName ); @@ -136,7 +135,7 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const ::rtl::OUStrin return aProperty; } -sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const ::rtl::OUString& rName ) +sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() ); diff --git a/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx index 6925c67848ae..a5b27bc66d87 100644 --- a/comphelper/source/property/TypeGeneration.cxx +++ b/comphelper/source/property/TypeGeneration.cxx @@ -123,7 +123,6 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/awt/Gradient.hpp> -using ::rtl::OUString; using namespace ::com::sun::star; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -204,7 +203,7 @@ namespace comphelper case CPPUTYPE_REFTXTTABLE: pType = &::getCppuType( (Reference<text::XTextTable>*)0 ); break; case CPPUTYPE_AWTPOINT: pType = &::getCppuType( (awt::Point*)0 ); break; case CPPUTYPE_REFLIBCONTAINER: pType = &::getCppuType( (Reference< script::XLibraryContainer >*)0); break; - case CPPUTYPE_OUSTRINGS: pType = &::getCppuType( (Sequence< ::rtl::OUString >*)0); break; + case CPPUTYPE_OUSTRINGS: pType = &::getCppuType( (Sequence< OUString >*)0); break; case CPPUTYPE_SEQANY: pType = &::getCppuType( (Sequence< uno::Any >*)0); break; case CPPUTYPE_REFRESULTSET: pType = &::getCppuType( (Reference< sdbc::XResultSet >*)0); break; case CPPUTYPE_REFCONNECTION: pType = &::getCppuType( (Reference< sdbc::XConnection >*)0); break; diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 92f220787392..831dc5908e00 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -57,7 +57,7 @@ namespace comphelper { private: GenericAnyMapImpl maAnyMap; - ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, ::rtl::OUStringHash,UStringEqual> m_aListener; + ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, OUStringHash,UStringEqual> m_aListener; protected: virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ); @@ -78,13 +78,13 @@ namespace comphelper virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw( RuntimeException); // XServiceInfo - virtual rtl::OUString SAL_CALL getImplementationName() throw( RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const rtl::OUString& ServiceName ) throw( RuntimeException ); - virtual Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw( RuntimeException ); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException ); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException ); // XPropertySet - virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); }; } @@ -100,7 +100,7 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw() GenericPropertySet::~GenericPropertySet() throw() { } -void SAL_CALL GenericPropertySet::addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); if ( xInfo.is() ) @@ -122,7 +122,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const ::rtl::OUStri } } -void SAL_CALL GenericPropertySet::removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard( maMutex ); Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index f7418ba148d1..a3d3a64d501e 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -121,22 +121,22 @@ namespace comphelper } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException) + OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } //-------------------------------------------------------------------- - ::sal_Bool SAL_CALL OPropertyBag::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames_static() ); - const ::rtl::OUString* pStart = aServices.getConstArray(); - const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); + Sequence< OUString > aServices( getSupportedServiceNames_static() ); + const OUString* pStart = aServices.getConstArray(); + const OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, rServiceName ) != pEnd; } //-------------------------------------------------------------------- - Sequence< ::rtl::OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } @@ -225,7 +225,7 @@ namespace comphelper // If we ever have a smarter XPropertyContainer::addProperty interface, we can remove this, ehm, well, hack. Property aProperty; if ( !( _element >>= aProperty ) ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); ::osl::ClearableMutexGuard g( m_aMutex ); @@ -234,7 +234,7 @@ namespace comphelper if ( !m_aAllowedTypes.empty() && m_aAllowedTypes.find( aProperty.Type ) == m_aAllowedTypes.end() ) - throw IllegalTypeException( ::rtl::OUString(), *this ); + throw IllegalTypeException( OUString(), *this ); m_aDynamicProperties.addVoidProperty( aProperty.Name, aProperty.Type, findFreeHandle(), aProperty.Attributes ); @@ -250,7 +250,7 @@ namespace comphelper { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty - throw NoSuchElementException( ::rtl::OUString(), *this ); + throw NoSuchElementException( OUString(), *this ); } @@ -332,7 +332,7 @@ namespace comphelper } //-------------------------------------------------------------------- - void SAL_CALL OPropertyBag::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) + void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -343,7 +343,7 @@ namespace comphelper && !m_aAllowedTypes.empty() && m_aAllowedTypes.find( aPropertyType ) == m_aAllowedTypes.end() ) - throw IllegalTypeException( ::rtl::OUString(), *this ); + throw IllegalTypeException( OUString(), *this ); m_aDynamicProperties.addProperty( _rName, findFreeHandle(), _nAttributes, _rInitialValue ); @@ -355,7 +355,7 @@ namespace comphelper } //-------------------------------------------------------------------- - void SAL_CALL OPropertyBag::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) + void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -380,9 +380,9 @@ namespace comphelper }; template< typename CLASS > - struct TransformPropertyToName : public ::std::unary_function< CLASS, ::rtl::OUString > + struct TransformPropertyToName : public ::std::unary_function< CLASS, OUString > { - const ::rtl::OUString& operator()( const CLASS& _rProp ) + const OUString& operator()( const CLASS& _rProp ) { return _rProp.Name; } @@ -407,7 +407,7 @@ namespace comphelper m_aDynamicProperties.describeProperties( aProperties ); // their names - Sequence< ::rtl::OUString > aNames( aProperties.getLength() ); + Sequence< OUString > aNames( aProperties.getLength() ); ::std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), @@ -436,8 +436,8 @@ namespace comphelper ::cppu::IPropertyArrayHelper& rPropInfo = getInfoHelper(); Sequence< PropertyValue > aPropertyValues( aNames.getLength() ); - const ::rtl::OUString* pName = aNames.getConstArray(); - const ::rtl::OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); + const OUString* pName = aNames.getConstArray(); + const OUString* pNamesEnd = aNames.getConstArray() + aNames.getLength(); const Any* pValue = aValues.getArray(); PropertyValue* pPropertyValue = aPropertyValues.getArray(); @@ -464,7 +464,7 @@ namespace comphelper ); // a sequence of names - Sequence< ::rtl::OUString > aNames( aProperties.getLength() ); + Sequence< OUString > aNames( aProperties.getLength() ); ::std::transform( aProperties.getConstArray(), aProperties.getConstArray() + aProperties.getLength(), @@ -485,7 +485,7 @@ namespace comphelper Sequence< sal_Int32 > aHandles( nCount ); sal_Int32* pHandle = aHandles.getArray(); const PropertyValue* pProperty = aProperties.getConstArray(); - for ( const ::rtl::OUString* pName = aNames.getConstArray(); + for ( const OUString* pName = aNames.getConstArray(); pName != aNames.getConstArray() + aNames.getLength(); ++pName, ++pHandle, ++pProperty ) @@ -526,7 +526,7 @@ namespace comphelper catch( const UnknownPropertyException& ) { throw; } catch( const Exception& ) { - throw WrappedTargetException( ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + throw WrappedTargetException( OUString(), *this, ::cppu::getCaughtException() ); } } diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 2127c6611c94..93fa44510921 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -96,8 +96,8 @@ namespace comphelper public: // XServiceInfo - static versions - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) 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 >&); @@ -112,9 +112,9 @@ namespace comphelper virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) 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 ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XModifiable: virtual ::sal_Bool SAL_CALL isModified( ) @@ -134,8 +134,8 @@ namespace comphelper throw (::com::sun::star::uno::RuntimeException); // XPropertyContainer - virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeProperty( const ::rtl::OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException); // XPropertyAccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index bc24d9499527..983b2bba4c91 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -45,7 +45,7 @@ namespace comphelper //------------------------------------------------------------------------------ namespace { - const Property* lcl_findPropertyByName( const Sequence< Property >& _rProps, const ::rtl::OUString& _rName ) + const Property* lcl_findPropertyByName( const Sequence< Property >& _rProps, const OUString& _rName ) { sal_Int32 nLen = _rProps.getLength(); const Property* pProperties = _rProps.getConstArray(); @@ -80,7 +80,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( // if properties are present both at the delegatee and the aggregate, then the former are supposed to win. // So, we'll need an existence check. - ::std::set< ::rtl::OUString > aDelegatorProps; + ::std::set< OUString > aDelegatorProps; // create the map for the delegator properties sal_Int32 nMPLoop = 0; @@ -148,7 +148,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper( } //------------------------------------------------------------------ -OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper::classifyProperty( const ::rtl::OUString& _rName ) +OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper::classifyProperty( const OUString& _rName ) { PropertyOrigin eOrigin = UNKNOWN_PROPERTY; // look up the name @@ -167,7 +167,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper: } //------------------------------------------------------------------ -Property OPropertyArrayAggregationHelper::getPropertyByName( const ::rtl::OUString& _rPropertyName ) throw( UnknownPropertyException ) +Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName ) throw( UnknownPropertyException ) { const Property* pProperty = findPropertyByName( _rPropertyName ); @@ -178,19 +178,19 @@ Property OPropertyArrayAggregationHelper::getPropertyByName( const ::rtl::OUStri } //------------------------------------------------------------------------------ -sal_Bool OPropertyArrayAggregationHelper::hasPropertyByName(const ::rtl::OUString& _rPropertyName) +sal_Bool OPropertyArrayAggregationHelper::hasPropertyByName(const OUString& _rPropertyName) { return NULL != findPropertyByName( _rPropertyName ); } //------------------------------------------------------------------------------ -const Property* OPropertyArrayAggregationHelper::findPropertyByName(const :: rtl::OUString& _rName ) const +const Property* OPropertyArrayAggregationHelper::findPropertyByName(const :: OUString& _rName ) const { return lcl_findPropertyByName( m_aProperties, _rName ); } //------------------------------------------------------------------------------ -sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const ::rtl::OUString& _rPropertyName) +sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const OUString& _rPropertyName) { const Property* pProperty = findPropertyByName( _rPropertyName ); return pProperty ? pProperty->Handle : -1; @@ -198,7 +198,7 @@ sal_Int32 OPropertyArrayAggregationHelper::getHandleByName(const ::rtl::OUString //------------------------------------------------------------------------------ sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle( - ::rtl::OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle) + OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle) { ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle); sal_Bool bRet = i != m_aPropertyAccessors.end(); @@ -227,7 +227,7 @@ sal_Bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandl //------------------------------------------------------------------------------ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( - ::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const + OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const { ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle); bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate; @@ -255,21 +255,21 @@ bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( //------------------------------------------------------------------------------ sal_Int32 OPropertyArrayAggregationHelper::fillHandles( - sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropNames ) + sal_Int32* _pHandles, const ::com::sun::star::uno::Sequence< OUString >& _rPropNames ) { sal_Int32 nHitCount = 0; - const ::rtl::OUString* pReqProps = _rPropNames.getConstArray(); + const OUString* pReqProps = _rPropNames.getConstArray(); sal_Int32 nReqLen = _rPropNames.getLength(); #if OSL_DEBUG_LEVEL > 0 // assure that the sequence is sorted { - const ::rtl::OUString* pLookup = _rPropNames.getConstArray(); - const ::rtl::OUString* pEnd = _rPropNames.getConstArray() + _rPropNames.getLength() - 1; + const OUString* pLookup = _rPropNames.getConstArray(); + const OUString* pEnd = _rPropNames.getConstArray() + _rPropNames.getLength() - 1; for (; pLookup < pEnd; ++pLookup) { - const ::rtl::OUString* pCompare = pLookup + 1; - const ::rtl::OUString* pCompareEnd = pEnd + 1; + const OUString* pCompare = pLookup + 1; + const OUString* pCompareEnd = pEnd + 1; for (; pCompare < pCompareEnd; ++pCompare) { OSL_ENSURE(pLookup->compareTo(*pCompare) < 0, "OPropertyArrayAggregationHelper::fillHandles : property names are not sorted!"); @@ -477,7 +477,7 @@ void OPropertySetAggregationHelper::disposing() { // register as a single listener m_xAggregateMultiSet->removePropertiesChangeListener(this); - m_xAggregateSet->removeVetoableChangeListener(::rtl::OUString(), this); + m_xAggregateSet->removeVetoableChangeListener(OUString(), this); m_bListening = sal_False; } @@ -564,7 +564,7 @@ void OPropertySetAggregationHelper::setAggregation(const ::com::sun::star::uno: if (m_bListening && m_xAggregateSet.is()) { m_xAggregateMultiSet->removePropertiesChangeListener(this); - m_xAggregateSet->removeVetoableChangeListener(::rtl::OUString(), this); + m_xAggregateSet->removeVetoableChangeListener(OUString(), this); m_bListening = sal_False; } @@ -586,16 +586,16 @@ void OPropertySetAggregationHelper::startListening() if (!m_bListening && m_xAggregateSet.is()) { // register as a single listener - ::com::sun::star::uno::Sequence< ::rtl::OUString > aPropertyNames; + ::com::sun::star::uno::Sequence< OUString > aPropertyNames; m_xAggregateMultiSet->addPropertiesChangeListener(aPropertyNames, this); - m_xAggregateSet->addVetoableChangeListener(::rtl::OUString(), this); + m_xAggregateSet->addVetoableChangeListener(OUString(), this); m_bListening = sal_True; } } //------------------------------------------------------------------------------ -void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const ::rtl::OUString& _rPropertyName, +void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener>& _rxListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -605,7 +605,7 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const ::r } //------------------------------------------------------------------------------ -void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const ::rtl::OUString& _rPropertyName, +void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener>& _rxListener) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { @@ -615,7 +615,7 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const ::r } //------------------------------------------------------------------------------ -void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropertyNames, +void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener>& _rxListener) throw( ::com::sun::star::uno::RuntimeException) { @@ -634,7 +634,7 @@ sal_Int32 OPropertySetAggregationHelper::getOriginalHandle(sal_Int32 nHandle) co } //-------------------------------------------------------------------------- -::rtl::OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) const +OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) const { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( const_cast<OPropertySetAggregationHelper*>(this)->getInfoHelper() ); Property aProperty; @@ -649,7 +649,7 @@ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHa ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; // does the handle belong to the aggregation ? @@ -666,7 +666,7 @@ void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHa void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const { OPropertyArrayAggregationHelper& rPH = (OPropertyArrayAggregationHelper&)const_cast<OPropertySetAggregationHelper*>(this)->getInfoHelper(); - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) @@ -691,7 +691,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; ::com::sun::star::uno::Any aValue; @@ -710,7 +710,7 @@ void OPropertySetAggregationHelper::getFastPropertyValue( ::com::sun::star::uno: //------------------------------------------------------------------------------ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( - const Sequence< ::rtl::OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) + const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) { OSL_ENSURE( !rBHelper.bInDispose, "OPropertySetAggregationHelper::setPropertyValues : do not use within the dispose call !"); @@ -729,9 +729,9 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( { // by definition of XMultiPropertySet::setPropertyValues, unknown properties are to be ignored #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer aMessage; + OStringBuffer aMessage; aMessage.append( "OPropertySetAggregationHelper::setPropertyValues: unknown property '" ); - aMessage.append( ::rtl::OUStringToOString( _rPropertyNames[0], RTL_TEXTENCODING_ASCII_US ) ); + aMessage.append( OUStringToOString( _rPropertyNames[0], RTL_TEXTENCODING_ASCII_US ) ); aMessage.append( "'" ); aMessage.append( "\n(implementation " ); aMessage.append( typeid( *this ).name() ); @@ -745,7 +745,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); // determine which properties belong to the aggregate, and which ones to the delegator - const ::rtl::OUString* pNames = _rPropertyNames.getConstArray(); + const OUString* pNames = _rPropertyNames.getConstArray(); sal_Int32 nAggCount(0); sal_Int32 nLen(_rPropertyNames.getLength()); @@ -753,7 +753,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( { OPropertyArrayAggregationHelper::PropertyOrigin ePropOrg = rPH.classifyProperty( *pNames ); if ( OPropertyArrayAggregationHelper::UNKNOWN_PROPERTY == ePropOrg ) - throw WrappedTargetException( ::rtl::OUString(), static_cast< XMultiPropertySet* >( this ), makeAny( UnknownPropertyException( ) ) ); + throw WrappedTargetException( OUString(), static_cast< XMultiPropertySet* >( this ), makeAny( UnknownPropertyException( ) ) ); // due to a flaw in the API design, this method is not allowed to throw an UnknownPropertyException // so we wrap it into a WrappedTargetException @@ -784,15 +784,15 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // dividing the Names and _rValues // aggregate's names - Sequence< ::rtl::OUString > AggPropertyNames( nAggCount ); - ::rtl::OUString* pAggNames = AggPropertyNames.getArray(); + Sequence< OUString > AggPropertyNames( nAggCount ); + OUString* pAggNames = AggPropertyNames.getArray(); // aggregate's values Sequence< Any > AggValues( nAggCount ); Any* pAggValues = AggValues.getArray(); // delegator names - Sequence< ::rtl::OUString > DelPropertyNames( nLen - nAggCount ); - ::rtl::OUString* pDelNames = DelPropertyNames.getArray(); + Sequence< OUString > DelPropertyNames( nLen - nAggCount ); + OUString* pDelNames = DelPropertyNames.getArray(); // delegator values Sequence< Any > DelValues( nLen - nAggCount ); @@ -896,7 +896,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // XPropertyState //------------------------------------------------------------------------------ - ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const ::rtl::OUString& _rPropertyName) + ::com::sun::star::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); @@ -907,7 +907,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( throw ::com::sun::star::beans::UnknownPropertyException(); } - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { @@ -921,7 +921,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( } //------------------------------------------------------------------------------ -void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::OUString& _rPropertyName) +void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); @@ -931,7 +931,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O throw ::com::sun::star::beans::UnknownPropertyException(); } - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { @@ -954,7 +954,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O } //------------------------------------------------------------------------------ - ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const ::rtl::OUString& aPropertyName) + ::com::sun::star::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); @@ -963,7 +963,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const ::rtl::O if ( nHandle == -1 ) throw ::com::sun::star::beans::UnknownPropertyException(); - ::rtl::OUString aPropName; + OUString aPropName; sal_Int32 nOriginalHandle = -1; if (rPH.fillAggregatePropertyInfoByHandle(&aPropName, &nOriginalHandle, nHandle)) { diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index 669a28bf4470..f1c544f3c93b 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.cxx @@ -91,15 +91,15 @@ void copyProperties(const Reference<XPropertySet>& _rxSource, catch (Exception&) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer aBuffer; + OStringBuffer aBuffer; aBuffer.append( "::comphelper::copyProperties: could not copy property '" ); - aBuffer.append( ::rtl::OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ) ); + aBuffer.append( OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ) ); aBuffer.append( "' to the destination set (a '" ); Reference< XServiceInfo > xSI( _rxDest, UNO_QUERY ); if ( xSI.is() ) { - aBuffer.append( ::rtl::OUStringToOString( xSI->getImplementationName(), osl_getThreadTextEncoding() ) ); + aBuffer.append( OUStringToOString( xSI->getImplementationName(), osl_getThreadTextEncoding() ) ); } else { @@ -109,15 +109,15 @@ void copyProperties(const Reference<XPropertySet>& _rxSource, Any aException( ::cppu::getCaughtException() ); aBuffer.append( "Caught an exception of type '" ); - ::rtl::OUString sExceptionType( aException.getValueTypeName() ); - aBuffer.append( ::rtl::OString( sExceptionType.getStr(), sExceptionType.getLength(), RTL_TEXTENCODING_ASCII_US ) ); + OUString sExceptionType( aException.getValueTypeName() ); + aBuffer.append( OString( sExceptionType.getStr(), sExceptionType.getLength(), RTL_TEXTENCODING_ASCII_US ) ); aBuffer.append( "'" ); Exception aBaseException; if ( ( aException >>= aBaseException ) && !aBaseException.Message.isEmpty() ) { aBuffer.append( ", saying '" ); - aBuffer.append( ::rtl::OString( aBaseException.Message.getStr(), aBaseException.Message.getLength(), osl_getThreadTextEncoding() ) ); + aBuffer.append( OString( aBaseException.Message.getStr(), aBaseException.Message.getLength(), osl_getThreadTextEncoding() ) ); aBuffer.append( "'" ); } aBuffer.append( "." ); @@ -130,7 +130,7 @@ void copyProperties(const Reference<XPropertySet>& _rxSource, } //------------------------------------------------------------------ -sal_Bool hasProperty(const rtl::OUString& _rName, const Reference<XPropertySet>& _rxSet) +sal_Bool hasProperty(const OUString& _rName, const Reference<XPropertySet>& _rxSet) { if (_rxSet.is()) { @@ -141,7 +141,7 @@ sal_Bool hasProperty(const rtl::OUString& _rName, const Reference<XPropertySet>& } //------------------------------------------------------------------ -void RemoveProperty(Sequence<Property>& _rProps, const rtl::OUString& _rPropName) +void RemoveProperty(Sequence<Property>& _rProps, const OUString& _rPropName) { sal_Int32 nLen = _rProps.getLength(); @@ -159,7 +159,7 @@ void RemoveProperty(Sequence<Property>& _rProps, const rtl::OUString& _rPropName } //------------------------------------------------------------------ -void ModifyPropertyAttributes(Sequence<Property>& seqProps, const ::rtl::OUString& sPropName, sal_Int16 nAddAttrib, sal_Int16 nRemoveAttrib) +void ModifyPropertyAttributes(Sequence<Property>& seqProps, const OUString& sPropName, sal_Int16 nAddAttrib, sal_Int16 nRemoveAttrib) { sal_Int32 nLen = seqProps.getLength(); diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx index ba612a53db8e..79225fc492e6 100644 --- a/comphelper/source/property/propertybag.cxx +++ b/comphelper/source/property/propertybag.cxx @@ -77,7 +77,7 @@ namespace comphelper //-------------------------------------------------------------------- namespace { - void lcl_checkForEmptyName( const bool _allowEmpty, const ::rtl::OUString& _name ) + void lcl_checkForEmptyName( const bool _allowEmpty, const OUString& _name ) { if ( !_allowEmpty && _name.isEmpty() ) throw IllegalArgumentException( @@ -88,7 +88,7 @@ namespace comphelper ); } - void lcl_checkNameAndHandle( const ::rtl::OUString& _name, const sal_Int32 _handle, const PropertyBag& _container ) + void lcl_checkNameAndHandle( const OUString& _name, const sal_Int32 _handle, const PropertyBag& _container ) { if ( _container.hasPropertyByName( _name ) || _container.hasPropertyByHandle( _handle ) ) throw PropertyExistException( @@ -100,7 +100,7 @@ namespace comphelper } //-------------------------------------------------------------------- - void PropertyBag::addVoidProperty( const ::rtl::OUString& _rName, const Type& _rType, sal_Int32 _nHandle, sal_Int32 _nAttributes ) + void PropertyBag::addVoidProperty( const OUString& _rName, const Type& _rType, sal_Int32 _nHandle, sal_Int32 _nAttributes ) { if ( _rType.getTypeClass() == TypeClass_VOID ) throw IllegalArgumentException( @@ -123,7 +123,7 @@ namespace comphelper } //-------------------------------------------------------------------- - void PropertyBag::addProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Any& _rInitialValue ) + void PropertyBag::addProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Any& _rInitialValue ) { // check type sanity Type aPropertyType = _rInitialValue.getValueType(); @@ -146,12 +146,12 @@ namespace comphelper } //-------------------------------------------------------------------- - void PropertyBag::removeProperty( const ::rtl::OUString& _rName ) + void PropertyBag::removeProperty( const OUString& _rName ) { const Property& rProp = getProperty( _rName ); // will throw an UnknownPropertyException if necessary if ( ( rProp.Attributes & PropertyAttribute::REMOVABLE ) == 0 ) - throw NotRemoveableException( ::rtl::OUString(), NULL ); + throw NotRemoveableException( OUString(), NULL ); const sal_Int32 nHandle = rProp.Handle; revokeProperty( nHandle ); diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index 9720762c5657..6715567276d0 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -59,8 +59,8 @@ namespace // comparing two property descriptions (by name) struct PropertyDescriptionNameMatch : public ::std::unary_function< PropertyDescription, bool > { - ::rtl::OUString m_rCompare; - PropertyDescriptionNameMatch( const ::rtl::OUString& _rCompare ) : m_rCompare( _rCompare ) { } + OUString m_rCompare; + PropertyDescriptionNameMatch( const OUString& _rCompare ) : m_rCompare( _rCompare ) { } bool operator() (const PropertyDescription& x ) const { @@ -84,7 +84,7 @@ OPropertyContainerHelper::~OPropertyContainerHelper() } //-------------------------------------------------------------------------- -void OPropertyContainerHelper::registerProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, +void OPropertyContainerHelper::registerProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType) { OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) == 0, @@ -112,7 +112,7 @@ void OPropertyContainerHelper::revokeProperty( sal_Int32 _nHandle ) } //-------------------------------------------------------------------------- -void OPropertyContainerHelper::registerMayBeVoidProperty(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, +void OPropertyContainerHelper::registerMayBeVoidProperty(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, Any* _pPointerToMember, const Type& _rExpectedType) { OSL_ENSURE((_nAttributes & PropertyAttribute::MAYBEVOID) != 0, @@ -134,7 +134,7 @@ void OPropertyContainerHelper::registerMayBeVoidProperty(const ::rtl::OUString& //-------------------------------------------------------------------------- -void OPropertyContainerHelper::registerPropertyNoMember(const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, +void OPropertyContainerHelper::registerPropertyNoMember(const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue) { OSL_ENSURE(!_rType.equals(::getCppuType(static_cast< Any* >(NULL))), @@ -161,7 +161,7 @@ sal_Bool OPropertyContainerHelper::isRegisteredProperty( sal_Int32 _nHandle ) co } //-------------------------------------------------------------------------- -sal_Bool OPropertyContainerHelper::isRegisteredProperty( const ::rtl::OUString& _rName ) const +sal_Bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) const { // TODO: the current structure is from a time where properties were // static, not dynamic. Since we allow that properties are also dynamic, @@ -214,7 +214,7 @@ namespace { void lcl_throwIllegalPropertyValueTypeException( const PropertyDescription& _rProperty, const Any& _rValue ) { - ::rtl::OUStringBuffer aErrorMessage; + OUStringBuffer aErrorMessage; aErrorMessage.appendAscii( "The given value cannot be converted to the required property type." ); aErrorMessage.appendAscii( "\n(property name \"" ); aErrorMessage.append( _rProperty.aProperty.Name ); @@ -464,7 +464,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan } //-------------------------------------------------------------------------- -const Property& OPropertyContainerHelper::getProperty( const ::rtl::OUString& _rName ) const +const Property& OPropertyContainerHelper::getProperty( const OUString& _rName ) const { ConstPropertiesIterator pos = ::std::find_if( m_aProperties.begin(), diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index 27b4c0eeb5b7..e1422cf21f3f 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -82,7 +82,7 @@ Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) return mp->mpInfo; } -void SAL_CALL PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { PropertyMapEntry* aEntries[2]; aEntries[0] = mp->find( aPropertyName ); @@ -95,7 +95,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPrope _setPropertyValues( (const PropertyMapEntry**)aEntries, &aValue ); } -Any SAL_CALL PropertySetHelper::getPropertyValue( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertyMapEntry* aEntries[2]; aEntries[0] = mp->find( PropertyName ); @@ -111,28 +111,28 @@ Any SAL_CALL PropertySetHelper::getPropertyValue( const ::rtl::OUString& Propert return aAny; } -void SAL_CALL PropertySetHelper::addPropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL PropertySetHelper::removePropertyChangeListener( const ::rtl::OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL PropertySetHelper::addVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } -void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const ::rtl::OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { // todo } // XMultiPropertySet -void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -163,7 +163,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< ::rtl::OUStr } } -Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< ::rtl::OUString >& aPropertyNames ) throw(RuntimeException) +Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< OUString >& aPropertyNames ) throw(RuntimeException) { const sal_Int32 nCount = aPropertyNames.getLength(); @@ -197,7 +197,7 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< : return aValues; } -void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } @@ -207,13 +207,13 @@ void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference // todo } -void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< ::rtl::OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) +void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException) { // todo } // XPropertyState -PropertyState SAL_CALL PropertySetHelper::getPropertyState( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) +PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyMapEntry* aEntries[2]; @@ -229,7 +229,7 @@ PropertyState SAL_CALL PropertySetHelper::getPropertyState( const ::rtl::OUStrin return aState; } -Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< ::rtl::OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) +Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) { const sal_Int32 nCount = aPropertyName.getLength(); @@ -264,7 +264,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S return aStates; } -void SAL_CALL PropertySetHelper::setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) +void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { PropertyMapEntry *pEntry = mp->find( PropertyName ); if( NULL == pEntry ) @@ -273,7 +273,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const ::rtl::OUString& Pr _setPropertyToDefault( pEntry ); } -Any SAL_CALL PropertySetHelper::getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) +Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { PropertyMapEntry* pEntry = mp->find( aPropertyName ); if( NULL == pEntry ) diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index c38c1f877360..2567a0630109 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -173,7 +173,7 @@ void PropertySetInfo::add( PropertyMapEntry* pMap ) throw() mpMap->add( pMap ); } -void PropertySetInfo::remove( const rtl::OUString& aName ) throw() +void PropertySetInfo::remove( const OUString& aName ) throw() { mpMap->remove( aName ); } @@ -183,12 +183,12 @@ Sequence< ::com::sun::star::beans::Property > SAL_CALL PropertySetInfo::getPrope return mpMap->getProperties(); } -Property SAL_CALL PropertySetInfo::getPropertyByName( const ::rtl::OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) +Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { return mpMap->getPropertyByName( aName ); } -sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const ::rtl::OUString& Name ) throw(::com::sun::star::uno::RuntimeException) +sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(::com::sun::star::uno::RuntimeException) { return mpMap->hasPropertyByName( Name ); } diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx index 257c3eb821dc..2155d555e180 100644 --- a/comphelper/source/property/propertystatecontainer.cxx +++ b/comphelper/source/property/propertystatecontainer.cxx @@ -31,13 +31,13 @@ namespace comphelper namespace { - static ::rtl::OUString lcl_getUnknownPropertyErrorMessage( const ::rtl::OUString& _rPropertyName ) + static OUString lcl_getUnknownPropertyErrorMessage( const OUString& _rPropertyName ) { // TODO: perhaps it's time to think about resources in the comphelper module? // Would be nice to have localized exception strings (a simply resource file containing // strings only would suffice, and could be realized with an UNO service, so we do not // need the dependency to the Tools project) - ::rtl::OUStringBuffer sMessage; + OUStringBuffer sMessage; sMessage.appendAscii( "The property \"" ); sMessage.append( _rPropertyName ); sMessage.appendAscii( "\" is unknown." ); @@ -67,7 +67,7 @@ namespace comphelper IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyStateContainer, OPropertyContainer, OPropertyStateContainer_TBase ) //-------------------------------------------------------------------- - sal_Int32 OPropertyStateContainer::getHandleForName( const ::rtl::OUString& _rPropertyName ) SAL_THROW( ( UnknownPropertyException ) ) + sal_Int32 OPropertyStateContainer::getHandleForName( const OUString& _rPropertyName ) SAL_THROW( ( UnknownPropertyException ) ) { // look up the handle for the name ::cppu::IPropertyArrayHelper& rPH = getInfoHelper(); @@ -80,13 +80,13 @@ namespace comphelper } //-------------------------------------------------------------------- - PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { return getPropertyStateByHandle( getHandleForName( _rPropertyName ) ); } //-------------------------------------------------------------------- - Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< ::rtl::OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException) + Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException) { sal_Int32 nProperties = _rPropertyNames.getLength(); Sequence< PropertyState> aStates( nProperties ); @@ -96,17 +96,17 @@ namespace comphelper #ifdef _DEBUG // precondition: property sequence is sorted (the algorythm below relies on this) { - const ::rtl::OUString* pNames = _rPropertyNames.getConstArray(); - const ::rtl::OUString* pNamesCompare = pNames + 1; - const ::rtl::OUString* pNamesEnd = _rPropertyNames.getConstArray() + _rPropertyNames.getLength(); + const OUString* pNames = _rPropertyNames.getConstArray(); + const OUString* pNamesCompare = pNames + 1; + const OUString* pNamesEnd = _rPropertyNames.getConstArray() + _rPropertyNames.getLength(); for ( ; pNamesCompare != pNamesEnd; ++pNames, ++pNamesCompare ) OSL_PRECOND( pNames->compareTo( *pNamesCompare ) < 0, "OPropertyStateContainer::getPropertyStates: property sequence not sorted!" ); } #endif - const ::rtl::OUString* pLookup = _rPropertyNames.getConstArray(); - const ::rtl::OUString* pLookupEnd = pLookup + nProperties; + const OUString* pLookup = _rPropertyNames.getConstArray(); + const OUString* pLookupEnd = pLookup + nProperties; PropertyState* pStates = aStates.getArray(); cppu::IPropertyArrayHelper& rHelper = getInfoHelper(); @@ -139,13 +139,13 @@ namespace comphelper } //-------------------------------------------------------------------- - void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) + void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) { setPropertyToDefaultByHandle( getHandleForName( _rPropertyName ) ); } //-------------------------------------------------------------------- - Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) + Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { Any aDefault; getPropertyDefaultByHandle( getHandleForName( _rPropertyName ), aDefault ); diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx index 7efee0cf33e5..e6cd40f0f344 100644 --- a/comphelper/source/property/propmultiplex.cxx +++ b/comphelper/source/property/propmultiplex.cxx @@ -111,7 +111,7 @@ void OPropertyChangeMultiplexer::dispose() { Reference< XPropertyChangeListener> xPreventDelete(this); - const ::rtl::OUString* pProperties = m_aProperties.getConstArray(); + const OUString* pProperties = m_aProperties.getConstArray(); for (sal_Int32 i = 0; i < m_aProperties.getLength(); ++i, ++pProperties) m_xSet->removePropertyChangeListener(*pProperties, static_cast< XPropertyChangeListener*>(this)); @@ -155,7 +155,7 @@ void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeE } //------------------------------------------------------------------ -void OPropertyChangeMultiplexer::addProperty(const ::rtl::OUString& _sPropertyName) +void OPropertyChangeMultiplexer::addProperty(const OUString& _sPropertyName) { if (m_xSet.is()) { diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index dbc36ce2c41c..1b4e1324936a 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -83,7 +83,7 @@ namespace comphelper // XPropertyState //--------------------------------------------------------------------- - ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const ::rtl::OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -95,7 +95,7 @@ namespace comphelper } //--------------------------------------------------------------------- - void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const ::rtl::OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -107,7 +107,7 @@ namespace comphelper } //--------------------------------------------------------------------- - ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const ::rtl::OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -119,12 +119,12 @@ namespace comphelper } //--------------------------------------------------------------------- - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const ::com::sun::star::uno::Sequence< OUString >& _rPropertyNames) throw( ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException) { sal_Int32 nLen = _rPropertyNames.getLength(); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState> aRet(nLen); ::com::sun::star::beans::PropertyState* pValues = aRet.getArray(); - const ::rtl::OUString* pNames = _rPropertyNames.getConstArray(); + const OUString* pNames = _rPropertyNames.getConstArray(); cppu::IPropertyArrayHelper& rHelper = getInfoHelper(); diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx index 8c39c2902c51..8a683a738570 100644 --- a/comphelper/source/streaming/basicio.cxx +++ b/comphelper/source/streaming/basicio.cxx @@ -89,14 +89,14 @@ const staruno::Reference<stario::XObjectOutputStream>& operator << (const starun } //------------------------------------------------------------------------------ -const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, ::rtl::OUString& rStr) +const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, OUString& rStr) { rStr = _rxInStream->readUTF(); return _rxInStream; } //------------------------------------------------------------------------------ -const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const ::rtl::OUString& rStr) +const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, const OUString& rStr) { _rxOutStream->writeUTF(rStr); return _rxOutStream; diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index fb654abb4f23..572715e334d1 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -29,7 +29,6 @@ #include <string.h> #include <vector> -using ::rtl::OUString; using ::cppu::OWeakObject; using ::cppu::WeakImplHelper4; using namespace ::com::sun::star::io; @@ -71,8 +70,8 @@ public: virtual void SAL_CALL truncate() throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static Reference< XInterface > SAL_CALL Create( const Reference< ::com::sun::star::uno::XComponentContext >& ); private: @@ -210,12 +209,12 @@ void SAL_CALL UNOMemoryStream::truncate() throw (IOException, RuntimeException) mnCursor = 0; } -::rtl::OUString SAL_CALL UNOMemoryStream::getImplementationName_static() +OUString SAL_CALL UNOMemoryStream::getImplementationName_static() { - return ::rtl::OUString("com.sun.star.comp.MemoryStream"); + return OUString("com.sun.star.comp.MemoryStream"); } -Sequence< ::rtl::OUString > SAL_CALL UNOMemoryStream::getSupportedServiceNames_static() +Sequence< OUString > SAL_CALL UNOMemoryStream::getSupportedServiceNames_static() { Sequence< OUString > aSeq(1); aSeq[0] = getImplementationName_static(); diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 419362bbab3d..23764161a316 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -41,10 +41,10 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) { if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); if (nBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); ::osl::MutexGuard aGuard( m_aMutex ); @@ -53,7 +53,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 sal_uInt64 nRead = 0; FileBase::RC eError = m_pFile->read((void*)aData.getArray(), nBytesToRead, nRead); if (eError != FileBase::E_None) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); // Wenn gelesene Zeichen < MaxLength, staruno::Sequence anpassen if (nRead < (sal_uInt32)nBytesToRead) @@ -66,10 +66,10 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(staruno::Sequence< sal_Int8 sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(staruno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( stario::NotConnectedException, stario::BufferSizeExceededException, staruno::RuntimeException ) { if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); if (nMaxBytesToRead < 0) - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); return readBytes(aData, nMaxBytesToRead); } @@ -79,7 +79,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); sal_uInt64 nCurrentPos; m_pFile->getPos(nCurrentPos); @@ -88,7 +88,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( st FileBase::RC eError = m_pFile->setPos(osl_Pos_Absolut, nNewPos); if (eError != FileBase::E_None) { - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); } } @@ -97,27 +97,27 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnecte { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); sal_uInt64 nPos; FileBase::RC eError = m_pFile->getPos(nPos); if (eError != FileBase::E_None) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); sal_uInt64 nDummy = 0; eError = m_pFile->setPos(osl_Pos_End, nDummy); if (eError != FileBase::E_None) - throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this)); sal_uInt64 nAvailable; eError = m_pFile->getPos(nAvailable); if (eError != FileBase::E_None) - throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this)); nAvailable = nAvailable - nPos; eError = m_pFile->setPos(osl_Pos_Absolut, nPos); if (eError != FileBase::E_None) - throw stario::NotConnectedException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(),static_cast<staruno::XWeak*>(this)); return sal::static_int_cast< sal_Int32 >( std::max(nAvailable, sal::static_int_cast< sal_uInt64 >(SAL_MAX_INT32))); } @@ -126,7 +126,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( stario::NotConnecte void SAL_CALL OSLInputStreamWrapper::closeInput() throw( stario::NotConnectedException, staruno::RuntimeException ) { if (!m_pFile) - throw stario::NotConnectedException(::rtl::OUString(), static_cast<staruno::XWeak*>(this)); + throw stario::NotConnectedException(OUString(), static_cast<staruno::XWeak*>(this)); m_pFile->close(); @@ -150,7 +150,7 @@ void SAL_CALL OSLOutputStreamWrapper::writeBytes(const staruno::Sequence< sal_In if (eError != FileBase::E_None || nWritten != sal::static_int_cast< sal_uInt32 >(aData.getLength())) { - throw stario::BufferSizeExceededException(::rtl::OUString(),static_cast<staruno::XWeak*>(this)); + throw stario::BufferSizeExceededException(OUString(),static_cast<staruno::XWeak*>(this)); } } diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index c26c7bd9bbff..de10a03d686d 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -48,13 +48,13 @@ public: explicit SequenceInputStreamService(); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString & ServiceName ) throw ( uno::RuntimeException ); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException ); + virtual ::sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException ); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); // ::com::sun::star::io::XInputStream: @@ -90,7 +90,7 @@ SequenceInputStreamService::SequenceInputStreamService() {} // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException ) +OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException ) { return getImplementationName_static(); } @@ -100,9 +100,9 @@ OUString SAL_CALL SequenceInputStreamService::getImplementationName_static() return OUString( "com.sun.star.comp.SequenceInputStreamService" ); } -::sal_Bool SAL_CALL SequenceInputStreamService::supportsService( ::rtl::OUString const & serviceName ) throw ( uno::RuntimeException ) +::sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > serviceNames = getSupportedServiceNames(); + uno::Sequence< OUString > serviceNames = getSupportedServiceNames(); for ( ::sal_Int32 i = 0; i < serviceNames.getLength(); ++i ) { if ( serviceNames[i] == serviceName ) return sal_True; @@ -110,7 +110,7 @@ OUString SAL_CALL SequenceInputStreamService::getImplementationName_static() return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 9dc868b461e9..1acb945f2e11 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -42,13 +42,13 @@ public: explicit SequenceOutputStreamService(); // ::com::sun::star::lang::XServiceInfo: - virtual ::rtl::OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString & ServiceName ) throw ( uno::RuntimeException ); - virtual uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException ); + virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException ); + virtual ::sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException ); + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException ); // XServiceInfo - static versions (used for component registration) - static ::rtl::OUString SAL_CALL getImplementationName_static(); - static uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_static(); + static OUString SAL_CALL getImplementationName_static(); + static uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_static(); static uno::Reference< uno::XInterface > SAL_CALL Create( const uno::Reference< uno::XComponentContext >& ); // ::com::sun::star::io::XOutputStream: @@ -76,7 +76,7 @@ SequenceOutputStreamService::SequenceOutputStreamService() } // com.sun.star.uno.XServiceInfo: -::rtl::OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException ) +OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException ) { return getImplementationName_static(); } @@ -86,9 +86,9 @@ OUString SAL_CALL SequenceOutputStreamService::getImplementationName_static() return OUString("com.sun.star.comp.SequenceOutputStreamService"); } -::sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( ::rtl::OUString const & serviceName ) throw ( uno::RuntimeException ) +::sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException ) { - uno::Sequence< ::rtl::OUString > serviceNames = getSupportedServiceNames(); + uno::Sequence< OUString > serviceNames = getSupportedServiceNames(); for ( ::sal_Int32 i = 0; i < serviceNames.getLength(); ++i ) { if ( serviceNames[i] == serviceName ) return sal_True; @@ -96,7 +96,7 @@ OUString SAL_CALL SequenceOutputStreamService::getImplementationName_static() return sal_False; } -uno::Sequence< ::rtl::OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) +uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException ) { return getSupportedServiceNames_static(); } diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index b2680793febb..242af3a39b4c 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -44,7 +44,7 @@ SequenceInputStream::SequenceInputStream(const ByteSequence& rData) inline sal_Int32 SequenceInputStream::avail() { if (m_nPos == -1) - throw NotConnectedException(::rtl::OUString(), *this); + throw NotConnectedException(OUString(), *this); return m_aData.getLength() - m_nPos; } @@ -60,7 +60,7 @@ sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence<sal_Int8>& aData, sa sal_Int32 nAvail = avail(); if (nBytesToRead < 0) - throw BufferSizeExceededException(::rtl::OUString(),*this); + throw BufferSizeExceededException(OUString(),*this); if (nAvail < nBytesToRead) nBytesToRead = nAvail; @@ -91,7 +91,7 @@ void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 nAvail = avail(); if (nBytesToSkip < 0) - throw BufferSizeExceededException(::rtl::OUString(),*this); + throw BufferSizeExceededException(OUString(),*this); if (nAvail < nBytesToSkip) nBytesToSkip = nAvail; @@ -113,7 +113,7 @@ void SAL_CALL SequenceInputStream::closeInput( ) throw(NotConnectedException, IOException, RuntimeException) { if (m_nPos == -1) - throw NotConnectedException(::rtl::OUString(), *this); + throw NotConnectedException(OUString(), *this); m_nPos = -1; } diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index b6f95c7bf9bd..33157cf92df0 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -25,7 +25,6 @@ using namespace osl; using namespace com::sun::star; -using ::rtl::OUString; namespace comphelper { diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index 609ae165a8c6..6a98d305cf9b 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; namespace comphelper { // ----------------------------------- -uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext ) +uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const OUString aStreamName, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { OUString aStringID = OUString( "_rels/" ); @@ -126,14 +126,14 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu xWriter->setOutputStream( xOutStream ); - ::rtl::OUString aTypesElement( "Types" ); - ::rtl::OUString aDefaultElement( "Default" ); - ::rtl::OUString aOverrideElement( "Override" ); - ::rtl::OUString aExtensionAttr( "Extension" ); - ::rtl::OUString aPartNameAttr( "PartName" ); - ::rtl::OUString aContentTypeAttr( "ContentType" ); - ::rtl::OUString aCDATAString( "CDATA" ); - ::rtl::OUString aWhiteSpace( " " ); + OUString aTypesElement( "Types" ); + OUString aDefaultElement( "Default" ); + OUString aOverrideElement( "Override" ); + OUString aExtensionAttr( "Extension" ); + OUString aPartNameAttr( "PartName" ); + OUString aContentTypeAttr( "ContentType" ); + OUString aCDATAString( "CDATA" ); + OUString aWhiteSpace( " " ); // write the namespace AttributeList* pRootAttrList = new AttributeList; @@ -179,7 +179,7 @@ void SAL_CALL OFOPXMLHelper::WriteContentSequence( const uno::Reference< io::XOu // ================================================================================== // ----------------------------------- -uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const ::rtl::OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext > xContext ) +uno::Sequence< uno::Sequence< beans::StringPair > > SAL_CALL OFOPXMLHelper::ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext > xContext ) throw( uno::Exception ) { if ( !xContext.is() || !xInStream.is() || nFormat > FORMAT_MAX_ID ) @@ -246,7 +246,7 @@ void SAL_CALL OFOPXMLHelper::endDocument() } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) +void SAL_CALL OFOPXMLHelper::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw( xml::sax::SAXException, uno::RuntimeException ) { if ( m_nFormat == RELATIONINFO_FORMAT ) @@ -277,13 +277,13 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u sal_Int32 nAttrNum = 0; m_aResultSeq[nNewEntryNum-1].realloc( 4 ); // the maximal expected number of arguments is 4 - ::rtl::OUString aIDValue = xAttribs->getValueByName( m_aIDAttr ); + OUString aIDValue = xAttribs->getValueByName( m_aIDAttr ); if ( aIDValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ID value must present - ::rtl::OUString aTypeValue = xAttribs->getValueByName( m_aTypeAttr ); - ::rtl::OUString aTargetValue = xAttribs->getValueByName( m_aTargetAttr ); - ::rtl::OUString aTargetModeValue = xAttribs->getValueByName( m_aTargetModeAttr ); + OUString aTypeValue = xAttribs->getValueByName( m_aTypeAttr ); + OUString aTargetValue = xAttribs->getValueByName( m_aTargetAttr ); + OUString aTargetModeValue = xAttribs->getValueByName( m_aTargetModeAttr ); m_aResultSeq[nNewEntryNum-1][++nAttrNum - 1].First = m_aIDAttr; m_aResultSeq[nNewEntryNum-1][nAttrNum - 1].Second = aIDValue; @@ -343,11 +343,11 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u if ( m_aResultSeq.getLength() != 2 ) throw uno::RuntimeException(); - ::rtl::OUString aExtensionValue = xAttribs->getValueByName( m_aExtensionAttr ); + OUString aExtensionValue = xAttribs->getValueByName( m_aExtensionAttr ); if ( aExtensionValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the Extension value must present - ::rtl::OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr ); + OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr ); if ( aContentTypeValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ContentType value must present @@ -372,11 +372,11 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u if ( m_aResultSeq.getLength() != 2 ) throw uno::RuntimeException(); - ::rtl::OUString aPartNameValue = xAttribs->getValueByName( m_aPartNameAttr ); + OUString aPartNameValue = xAttribs->getValueByName( m_aPartNameAttr ); if ( aPartNameValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the PartName value must present - ::rtl::OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr ); + OUString aContentTypeValue = xAttribs->getValueByName( m_aContentTypeAttr ); if ( aContentTypeValue.isEmpty() ) throw xml::sax::SAXException(); // TODO: the ContentType value must present @@ -394,7 +394,7 @@ void SAL_CALL OFOPXMLHelper::startElement( const ::rtl::OUString& aName, const u } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName ) +void SAL_CALL OFOPXMLHelper::endElement( const OUString& aName ) throw( xml::sax::SAXException, uno::RuntimeException ) { if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT ) @@ -411,19 +411,19 @@ void SAL_CALL OFOPXMLHelper::endElement( const ::rtl::OUString& aName ) } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::characters( const ::rtl::OUString& /*aChars*/ ) +void SAL_CALL OFOPXMLHelper::characters( const OUString& /*aChars*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) +void SAL_CALL OFOPXMLHelper::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } // ----------------------------------- -void SAL_CALL OFOPXMLHelper::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) +void SAL_CALL OFOPXMLHelper::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw(xml::sax::SAXException, uno::RuntimeException) { } diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx index 1f5f2c3c20d1..a73a4535fee8 100644 --- a/comphelper/source/xml/xmltools.cxx +++ b/comphelper/source/xml/xmltools.cxx @@ -94,7 +94,7 @@ namespace comphelper { namespace xml { - rtl::OString makeXMLChaff() + OString makeXMLChaff() { rtlRandomPool pool = rtl_random_createPool(); @@ -110,7 +110,7 @@ namespace comphelper encodeChaff(aChaff); - return rtl::OString(reinterpret_cast<const sal_Char*>(&aChaff[0]), nLength); + return OString(reinterpret_cast<const sal_Char*>(&aChaff[0]), nLength); } } } |