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 /filter/source/config | |
| parent | Typo in comment in resmgr.hxx (diff) | |
| download | core-1946794ae09ba732022fe6a74ea45e304ab70b84.tar.gz core-1946794ae09ba732022fe6a74ea45e304ab70b84.zip | |
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 'filter/source/config')
20 files changed, 305 insertions, 305 deletions
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx index 92491f883ef9..ebbb7f2b38d8 100644 --- a/filter/source/config/cache/basecontainer.cxx +++ b/filter/source/config/cache/basecontainer.cxx @@ -67,8 +67,8 @@ BaseContainer::~BaseContainer() void BaseContainer::init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , - const ::rtl::OUString& sImplementationName, - const css::uno::Sequence< ::rtl::OUString >& lServiceNames , + const OUString& sImplementationName, + const css::uno::Sequence< OUString >& lServiceNames , FilterCache::EItemType eType ) { // SAFE -> @@ -152,7 +152,7 @@ FilterCache* BaseContainer::impl_getWorkingCache() const -::rtl::OUString SAL_CALL BaseContainer::getImplementationName() +OUString SAL_CALL BaseContainer::getImplementationName() throw (css::uno::RuntimeException) { // SAFE -> @@ -163,14 +163,14 @@ FilterCache* BaseContainer::impl_getWorkingCache() const -sal_Bool SAL_CALL BaseContainer::supportsService(const ::rtl::OUString& sServiceName) +sal_Bool SAL_CALL BaseContainer::supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); sal_Int32 c = m_lServiceNames.getLength(); - const ::rtl::OUString* pNames = m_lServiceNames.getConstArray(); + const OUString* pNames = m_lServiceNames.getConstArray(); for (sal_Int32 i=0; i<c; ++i) { if (pNames[i].equals(sServiceName)) @@ -182,7 +182,7 @@ sal_Bool SAL_CALL BaseContainer::supportsService(const ::rtl::OUString& sService -css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL BaseContainer::getSupportedServiceNames() throw (css::uno::RuntimeException) { // SAFE -> @@ -193,7 +193,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getSupportedServic -void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , +void SAL_CALL BaseContainer::insertByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::ElementExistException, @@ -225,7 +225,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , FilterCache* pCache = impl_getWorkingCache(); if (pCache->hasItem(m_eType, sItem)) - throw css::container::ElementExistException(::rtl::OUString(), static_cast< css::container::XNameContainer* >(this)); + throw css::container::ElementExistException(OUString(), static_cast< css::container::XNameContainer* >(this)); pCache->setItem(m_eType, sItem, aItem); aLock.clear(); @@ -234,7 +234,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem , -void SAL_CALL BaseContainer::removeByName(const ::rtl::OUString& sItem) +void SAL_CALL BaseContainer::removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ) @@ -256,7 +256,7 @@ void SAL_CALL BaseContainer::removeByName(const ::rtl::OUString& sItem) -void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , +void SAL_CALL BaseContainer::replaceByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -288,7 +288,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , FilterCache* pCache = impl_getWorkingCache(); if (!pCache->hasItem(m_eType, sItem)) - throw css::container::NoSuchElementException(::rtl::OUString(), static_cast< css::container::XNameContainer* >(this)); + throw css::container::NoSuchElementException(OUString(), static_cast< css::container::XNameContainer* >(this)); pCache->setItem(m_eType, sItem, aItem); aLock.clear(); @@ -297,7 +297,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem , -css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem) +css::uno::Any SAL_CALL BaseContainer::getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ) @@ -338,10 +338,10 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem) -css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getElementNames() +css::uno::Sequence< OUString > SAL_CALL BaseContainer::getElementNames() throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > lNames; + css::uno::Sequence< OUString > lNames; impl_loadOnDemand(); @@ -367,7 +367,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL BaseContainer::getElementNames() -sal_Bool SAL_CALL BaseContainer::hasByName(const ::rtl::OUString& sItem) +sal_Bool SAL_CALL BaseContainer::hasByName(const OUString& sItem) throw (css::uno::RuntimeException) { sal_Bool bHasOne = sal_False; @@ -433,12 +433,12 @@ sal_Bool SAL_CALL BaseContainer::hasElements() -css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const ::rtl::OUString& /* sQuery */ ) +css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::createSubSetEnumerationByQuery(const OUString& /* sQuery */ ) throw (css::uno::RuntimeException) { OSL_FAIL("not pure virtual ... but not realy implemented .-)"); - ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, css::uno::Sequence< ::rtl::OUString >()); + ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, css::uno::Sequence< OUString >()); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); } @@ -485,7 +485,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL BaseContainer::crea Further its easiear to work directly with the return value instaed of checking of NULL returns! */ - css::uno::Sequence< ::rtl::OUString > lSubSet; + css::uno::Sequence< OUString > lSubSet; lKeys >> lSubSet; ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, lSubSet); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx index 61fb4e90c861..a2259a5df1d7 100644 --- a/filter/source/config/cache/basecontainer.hxx +++ b/filter/source/config/cache/basecontainer.hxx @@ -69,11 +69,11 @@ class BaseContainer : public BaseLock /** @short the implementation name of our derived class, which we provide at the interface XServiceInfo of our class ... */ - ::rtl::OUString m_sImplementationName; + OUString m_sImplementationName; /** @short the list of supported uno service names of our derived class, which we provide at the interface XServiceInfo of our class ... */ - css::uno::Sequence< ::rtl::OUString > m_lServiceNames; + css::uno::Sequence< OUString > m_lServiceNames; /** @short reference(!) to a singleton filter cache implementation, which is used to work with the underlying configuration. */ @@ -156,8 +156,8 @@ class BaseContainer : public BaseLock must be wrapped by this container interface. */ virtual void init(const css::uno::Reference< css::uno::XComponentContext >& rxContext , - const ::rtl::OUString& sImplementationName, - const css::uno::Sequence< ::rtl::OUString >& lServiceNames , + const OUString& sImplementationName, + const css::uno::Sequence< OUString >& lServiceNames , FilterCache::EItemType eType ); //------------------------------------------- @@ -214,26 +214,26 @@ class BaseContainer : public BaseLock //--------------------------------------- // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); //--------------------------------------- // XNameContainer - virtual void SAL_CALL insertByName(const ::rtl::OUString& sItem , + virtual void SAL_CALL insertByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::ElementExistException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual void SAL_CALL removeByName(const ::rtl::OUString& sItem) + virtual void SAL_CALL removeByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ); @@ -241,7 +241,7 @@ class BaseContainer : public BaseLock //--------------------------------------- // XNameReplace - virtual void SAL_CALL replaceByName(const ::rtl::OUString& sItem , + virtual void SAL_CALL replaceByName(const OUString& sItem , const css::uno::Any& aValue) throw (css::lang::IllegalArgumentException , css::container::NoSuchElementException, @@ -251,15 +251,15 @@ class BaseContainer : public BaseLock //--------------------------------------- // XElementAccess - virtual css::uno::Any SAL_CALL getByName(const ::rtl::OUString& sItem) + virtual css::uno::Any SAL_CALL getByName(const OUString& sItem) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException , css::uno::RuntimeException ); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames() + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& sItem) + virtual sal_Bool SAL_CALL hasByName(const OUString& sItem) throw (css::uno::RuntimeException); virtual css::uno::Type SAL_CALL getElementType() @@ -274,7 +274,7 @@ class BaseContainer : public BaseLock // must be implemented realy by derived class ... // We implement return of an empty result here only! // But we show an assertion :-) - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException); virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByProperties(const css::uno::Sequence< css::beans::NamedValue >& lProperties) diff --git a/filter/source/config/cache/cacheitem.cxx b/filter/source/config/cache/cacheitem.cxx index d33c3fb9e364..8f91437fce30 100644 --- a/filter/source/config/cache/cacheitem.cxx +++ b/filter/source/config/cache/cacheitem.cxx @@ -53,7 +53,7 @@ void CacheItem::update(const CacheItem& rUpdateItem) -void CacheItem::validateUINames(const ::rtl::OUString& sActLocale) +void CacheItem::validateUINames(const OUString& sActLocale) { if (sActLocale.isEmpty()) return; @@ -66,7 +66,7 @@ void CacheItem::validateUINames(const ::rtl::OUString& sActLocale) if (pUINames != end()) lUINames << pUINames->second; - ::rtl::OUString sUIName; + OUString sUIName; if (pUIName != end()) pUIName->second >>= sUIName; @@ -99,7 +99,7 @@ css::uno::Sequence< css::beans::PropertyValue > CacheItem::getAsPackedPropertyVa pProp != end() ; ++pProp ) { - const ::rtl::OUString& rName = pProp->first; + const OUString& rName = pProp->first; const css::uno::Any& rValue = pProp->second; if (!rValue.hasValue()) @@ -151,8 +151,8 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, //--------------------------------------- case css::uno::TypeClass_STRING : { - ::rtl::OUString v1; - ::rtl::OUString v2; + OUString v1; + OUString v2; if ( (aSubSet >>= v1) && @@ -224,8 +224,8 @@ sal_Bool isSubSet(const css::uno::Any& aSubSet, //--------------------------------------- case css::uno::TypeClass_SEQUENCE : { - css::uno::Sequence< ::rtl::OUString > uno_s1; - css::uno::Sequence< ::rtl::OUString > uno_s2; + css::uno::Sequence< OUString > uno_s1; + css::uno::Sequence< OUString > uno_s2; if ( (aSubSet >>= uno_s1) && diff --git a/filter/source/config/cache/cacheitem.hxx b/filter/source/config/cache/cacheitem.hxx index d20981ebe71a..8285644df326 100644 --- a/filter/source/config/cache/cacheitem.hxx +++ b/filter/source/config/cache/cacheitem.hxx @@ -49,7 +49,7 @@ struct BaseLock }; -typedef ::comphelper::SequenceAsVector< ::rtl::OUString > OUStringList; +typedef ::comphelper::SequenceAsVector< OUString > OUStringList; //_______________________________________________ @@ -148,7 +148,7 @@ class CacheItem : public ::comphelper::SequenceAsHashMap Its needed to address the UIName property inside the list of possible ones. */ - void validateUINames(const ::rtl::OUString& sActLocale); + void validateUINames(const OUString& sActLocale); //--------------------------------------- @@ -172,10 +172,10 @@ class CacheItem : public ::comphelper::SequenceAsHashMap /** @short represent an item list of a FilterCache instance. */ -typedef ::boost::unordered_map< ::rtl::OUString , +typedef ::boost::unordered_map< OUString , CacheItem , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > CacheItemList; + OUStringHash , + ::std::equal_to< OUString > > CacheItemList; //_______________________________________________ @@ -191,10 +191,10 @@ typedef ::boost::unordered_map< ::rtl::OUString , there we need key-value pairs too, which cant be provided by a pure vector! */ -typedef ::boost::unordered_map< ::rtl::OUString , +typedef ::boost::unordered_map< OUString , OUStringList , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > CacheItemRegistration; + OUStringHash , + ::std::equal_to< OUString > > CacheItemRegistration; //_______________________________________________ @@ -209,7 +209,7 @@ typedef ::boost::unordered_map< ::rtl::OUString , struct FlatDetectionInfo { // the internal type name - ::rtl::OUString sType; + OUString sType; // this type was found by a matching the URL extension bool bMatchByExtension; diff --git a/filter/source/config/cache/cacheupdatelistener.cxx b/filter/source/config/cache/cacheupdatelistener.cxx index 0455c88259d3..e32704739533 100644 --- a/filter/source/config/cache/cacheupdatelistener.cxx +++ b/filter/source/config/cache/cacheupdatelistener.cxx @@ -104,12 +104,12 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven { const css::util::ElementChange& aChange = aEvent.Changes[i]; - ::rtl::OUString sOrgPath ; - ::rtl::OUString sTempPath; + OUString sOrgPath ; + OUString sTempPath; - ::rtl::OUString sProperty; - ::rtl::OUString sNode ; - ::rtl::OUString sLocale ; + OUString sProperty; + OUString sNode ; + OUString sLocale ; /* at least we must be able to retrieve 2 path elements But sometimes the original path can contain 3 of them ... in case @@ -126,8 +126,8 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven if ( ! ::utl::splitLastFromConfigurationPath(sOrgPath, sTempPath, sProperty)) { sNode = sLocale; - sProperty = ::rtl::OUString(); - sLocale = ::rtl::OUString(); + sProperty = OUString(); + sLocale = OUString(); } else { @@ -136,7 +136,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven { sNode = sProperty; sProperty = sLocale; - sLocale = ::rtl::OUString(); + sLocale = OUString(); } } @@ -154,7 +154,7 @@ void SAL_CALL CacheUpdateListener::changesOccurred(const css::util::ChangesEven pIt != lChangedItems.end() ; ++pIt ) { - const ::rtl::OUString& sItem = *pIt; + const OUString& sItem = *pIt; try { m_rCache.refreshItem(eType, sItem); diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx index 881d71a99226..4ccdb10c13e6 100644 --- a/filter/source/config/cache/configflush.cxx +++ b/filter/source/config/cache/configflush.cxx @@ -42,7 +42,7 @@ ConfigFlush::~ConfigFlush() } //----------------------------------------------- -::rtl::OUString SAL_CALL ConfigFlush::getImplementationName() +OUString SAL_CALL ConfigFlush::getImplementationName() throw (css::uno::RuntimeException) { return impl_getImplementationName(); @@ -50,12 +50,12 @@ ConfigFlush::~ConfigFlush() } //----------------------------------------------- -sal_Bool SAL_CALL ConfigFlush::supportsService(const ::rtl::OUString& sServiceName) +sal_Bool SAL_CALL ConfigFlush::supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException) { - css::uno::Sequence< ::rtl::OUString > lServiceNames = impl_getSupportedServiceNames(); + css::uno::Sequence< OUString > lServiceNames = impl_getSupportedServiceNames(); sal_Int32 c = lServiceNames.getLength(); - const ::rtl::OUString* pNames = lServiceNames.getConstArray(); + const OUString* pNames = lServiceNames.getConstArray(); for (sal_Int32 i=0; i<c; ++i) { if (pNames[i].equals(sServiceName)) @@ -65,7 +65,7 @@ sal_Bool SAL_CALL ConfigFlush::supportsService(const ::rtl::OUString& sServiceNa } //----------------------------------------------- -css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigFlush::getSupportedServiceNames() +css::uno::Sequence< OUString > SAL_CALL ConfigFlush::getSupportedServiceNames() throw (css::uno::RuntimeException) { return impl_getSupportedServiceNames(); @@ -125,15 +125,15 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css: } //----------------------------------------------- -::rtl::OUString ConfigFlush::impl_getImplementationName() +OUString ConfigFlush::impl_getImplementationName() { - return ::rtl::OUString("com.sun.star.comp.filter.config.ConfigFlush"); + return OUString("com.sun.star.comp.filter.config.ConfigFlush"); } //----------------------------------------------- -css::uno::Sequence< ::rtl::OUString > ConfigFlush::impl_getSupportedServiceNames() +css::uno::Sequence< OUString > ConfigFlush::impl_getSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > lServiceNames(1); + css::uno::Sequence< OUString > lServiceNames(1); lServiceNames[0] = "com.sun.star.document.FilterConfigRefresh"; return lServiceNames; } diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx index df1c3b12740a..a7381493ba85 100644 --- a/filter/source/config/cache/configflush.hxx +++ b/filter/source/config/cache/configflush.hxx @@ -79,13 +79,13 @@ class ConfigFlush : public BaseLock //--------------------------------------- // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService(const ::rtl::OUString& sServiceName) + virtual sal_Bool SAL_CALL supportsService(const OUString& sServiceName) throw (css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException); //--------------------------------------- @@ -102,8 +102,8 @@ class ConfigFlush : public BaseLock //--------------------------------------- // interface to register/create this instance as an UNO service - static ::rtl::OUString impl_getImplementationName(); - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static OUString impl_getImplementationName(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); static css::uno::Reference< css::uno::XInterface > impl_createInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR); }; diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx index 4c7ccfa5e918..a2b251bed7d8 100644 --- a/filter/source/config/cache/contenthandlerfactory.cxx +++ b/filter/source/config/cache/contenthandlerfactory.cxx @@ -49,7 +49,7 @@ ContentHandlerFactory::~ContentHandlerFactory() -css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const ::rtl::OUString& sHandler) +css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstance(const OUString& sHandler) throw(css::uno::Exception , css::uno::RuntimeException) { @@ -58,7 +58,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea -css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const ::rtl::OUString& sHandler , +css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -68,7 +68,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sRealHandler = sHandler; + OUString sRealHandler = sHandler; #ifdef _FILTER_CONFIG_MIGRATION_Q_ @@ -82,7 +82,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea { _FILTER_CONFIG_LOG_("ContentHandlerFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); - css::uno::Sequence< ::rtl::OUString > lTypes(1); + css::uno::Sequence< OUString > lTypes(1); lTypes[0] = sHandler; css::uno::Sequence< css::beans::NamedValue > lQuery(1); @@ -139,7 +139,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ContentHandlerFactory::crea -css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() +css::uno::Sequence< OUString > SAL_CALL ContentHandlerFactory::getAvailableServiceNames() throw(css::uno::RuntimeException) { // must be the same list as ((XNameAccess*)this)->getElementNames() return! diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx index 936b9dcb9db8..d2c0f9a2a7f4 100644 --- a/filter/source/config/cache/contenthandlerfactory.hxx +++ b/filter/source/config/cache/contenthandlerfactory.hxx @@ -69,16 +69,16 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain //--------------------------------------- // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& sHandler) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sHandler) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& sHandler , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sHandler , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException); //------------------------------------------- @@ -96,7 +96,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -108,7 +108,7 @@ class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContain @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx index 9551329ee875..84703a3d92cf 100644 --- a/filter/source/config/cache/filtercache.cxx +++ b/filter/source/config/cache/filtercache.cxx @@ -339,7 +339,7 @@ OUStringList FilterCache::getItemNames(EItemType eType) const sal_Bool FilterCache::hasItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -373,7 +373,7 @@ sal_Bool FilterCache::hasItem( EItemType eType, CacheItem FilterCache::getItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -403,7 +403,7 @@ CacheItem FilterCache::getItem( EItemType eType, if (eType == E_FILTER) { CacheItem& rFilter = pIt->second; - ::rtl::OUString sDocService; + OUString sDocService; rFilter[PROPNAME_DOCUMENTSERVICE] >>= sDocService; // In Standalone-Impress the module WriterWeb is not installed @@ -425,7 +425,7 @@ CacheItem FilterCache::getItem( EItemType eType, void FilterCache::removeItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -447,7 +447,7 @@ void FilterCache::removeItem( EItemType eType, void FilterCache::setItem( EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , const CacheItem& aValue) throw(css::uno::Exception) { @@ -476,7 +476,7 @@ void FilterCache::setItem( EItemType eType , //----------------------------------------------- void FilterCache::refreshItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { // SAFE -> @@ -487,7 +487,7 @@ void FilterCache::refreshItem( EItemType eType, void FilterCache::addStatePropsToItem( EItemType eType, - const ::rtl::OUString& sItem, + const OUString& sItem, CacheItem& rItem) throw(css::uno::Exception) { @@ -524,7 +524,7 @@ void FilterCache::addStatePropsToItem( EItemType eType, => set it to readonly/required everytimes :-) */ css::uno::Any aDirectValue = impl_getDirectCFGValue(CFGDIRECTKEY_DEFAULTFRAMELOADER); - ::rtl::OUString sDefaultFrameLoader; + OUString sDefaultFrameLoader; if ( (aDirectValue >>= sDefaultFrameLoader) && (!sDefaultFrameLoader.isEmpty() ) && @@ -649,7 +649,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN pIt != lItems.end() ; ++pIt ) { - const ::rtl::OUString& sItem = *pIt; + const OUString& sItem = *pIt; EItemFlushState eState = impl_specifyFlushOperation(xSet, rCache, sItem); switch(eState) { @@ -705,7 +705,7 @@ void FilterCache::detectFlatForURL(const css::util::URL& aURL , // Note further: It must be converted to lower case, because the optimize hash // (which maps extensions to types) work with lower case key strings! INetURLObject aParser (aURL.Main); - ::rtl::OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , + OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , sal_True , INetURLObject::DECODE_WITH_CHARSET); sExtension = sExtension.toAsciiLowerCase(); @@ -807,10 +807,10 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig { ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sPath ; + OUString sPath ; css::uno::Reference< css::uno::XInterface >* pConfig = 0; css::uno::Reference< css::uno::XInterface > xOld ; - ::rtl::OString sRtlLog ; + OString sRtlLog ; switch(eProvider) { @@ -889,10 +889,10 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig -css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirectKey) +css::uno::Any FilterCache::impl_getDirectCFGValue(const OUString& sDirectKey) { - ::rtl::OUString sRoot; - ::rtl::OUString sKey ; + OUString sRoot; + OUString sKey ; if ( (!::utl::splitLastFromConfigurationPath(sDirectKey, sRoot, sKey)) || @@ -925,7 +925,7 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirect #endif { #if OSL_DEBUG_LEVEL > 0 - OSL_FAIL(::rtl::OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); + OSL_FAIL(OUStringToOString(ex.Message, RTL_TEXTENCODING_UTF8).getStr()); #endif aValue.clear(); } @@ -935,7 +935,7 @@ css::uno::Any FilterCache::impl_getDirectCFGValue(const ::rtl::OUString& sDirect -css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess(const ::rtl::OUString& sRoot , +css::uno::Reference< css::uno::XInterface > FilterCache::impl_createConfigAccess(const OUString& sRoot , sal_Bool bReadOnly , sal_Bool bLocalesMode) { @@ -1043,12 +1043,12 @@ void FilterCache::impl_validateAndOptimize() for (pIt = m_lTypes.begin(); pIt != m_lTypes.end(); ++pIt) { - ::rtl::OUString sType = pIt->first; + OUString sType = pIt->first; CacheItem aType = pIt->second; // create list of all known detect services / frame loader / content handler on demand // Because these information are available as type properties! - ::rtl::OUString sDetectService; + OUString sDetectService; aType[PROPNAME_DETECTSERVICE ] >>= sDetectService; if (!sDetectService.isEmpty()) impl_resolveItem4TypeRegistration(&m_lDetectServices, sDetectService, sType); @@ -1059,8 +1059,8 @@ void FilterCache::impl_validateAndOptimize() // only in case there is no filled set of Extensions AND // no filled set of URLPattern -> we must try to remove this invalid item // from this cache! - css::uno::Sequence< ::rtl::OUString > lExtensions; - css::uno::Sequence< ::rtl::OUString > lURLPattern; + css::uno::Sequence< OUString > lExtensions; + css::uno::Sequence< OUString > lURLPattern; aType[PROPNAME_EXTENSIONS] >>= lExtensions; aType[PROPNAME_URLPATTERN] >>= lURLPattern; sal_Int32 ce = lExtensions.getLength(); @@ -1068,7 +1068,7 @@ void FilterCache::impl_validateAndOptimize() #if OSL_DEBUG_LEVEL > 0 - ::rtl::OUString sInternalTypeNameCheck; + OUString sInternalTypeNameCheck; aType[PROPNAME_NAME] >>= sInternalTypeNameCheck; if (!sInternalTypeNameCheck.equals(sType)) { @@ -1094,12 +1094,12 @@ void FilterCache::impl_validateAndOptimize() sal_Bool bPreferred = sal_False; aType[PROPNAME_PREFERRED] >>= bPreferred; - const ::rtl::OUString* pExtensions = lExtensions.getConstArray(); + const OUString* pExtensions = lExtensions.getConstArray(); for (sal_Int32 e=0; e<ce; ++e) { // Note: We must be sure that address the right hash entry // does not depend from any upper/lower case problems ... - ::rtl::OUString sNormalizedExtension = pExtensions[e].toAsciiLowerCase(); + OUString sNormalizedExtension = pExtensions[e].toAsciiLowerCase(); OUStringList& lTypesForExtension = m_lExtensions2Types[sNormalizedExtension]; if (::std::find(lTypesForExtension.begin(), lTypesForExtension.end(), sType) != lTypesForExtension.end()) @@ -1111,7 +1111,7 @@ void FilterCache::impl_validateAndOptimize() lTypesForExtension.push_back(sType); } - const ::rtl::OUString* pURLPattern = lURLPattern.getConstArray(); + const OUString* pURLPattern = lURLPattern.getConstArray(); for (sal_Int32 u=0; u<cu; ++u) { OUStringList& lTypesForURLPattern = m_lURLPattern2Types[pURLPattern[u]]; @@ -1133,7 +1133,7 @@ void FilterCache::impl_validateAndOptimize() if (!bAllFiltersShouldExist) continue; - ::rtl::OUString sPrefFilter; + OUString sPrefFilter; aType[PROPNAME_PREFERREDFILTER] >>= sPrefFilter; if (sPrefFilter.isEmpty()) { @@ -1180,7 +1180,7 @@ void FilterCache::impl_validateAndOptimize() } CacheItem aPrefFilter = pIt2->second; - ::rtl::OUString sFilterTypeReg; + OUString sFilterTypeReg; aPrefFilter[PROPNAME_TYPE] >>= sFilterTypeReg; if (sFilterTypeReg != sType) { @@ -1198,7 +1198,7 @@ void FilterCache::impl_validateAndOptimize() ++nErrors; } - ::rtl::OUString sInternalFilterNameCheck; + OUString sInternalFilterNameCheck; aPrefFilter[PROPNAME_NAME] >>= sInternalFilterNameCheck; if (!sInternalFilterNameCheck.equals(sPrefFilter)) { @@ -1214,7 +1214,7 @@ void FilterCache::impl_validateAndOptimize() // and all types (and of course if registered filters), which // does not registered for any other loader. css::uno::Any aDirectValue = impl_getDirectCFGValue(CFGDIRECTKEY_DEFAULTFRAMELOADER); - ::rtl::OUString sDefaultFrameLoader; + OUString sDefaultFrameLoader; if ( (!(aDirectValue >>= sDefaultFrameLoader)) || @@ -1238,7 +1238,7 @@ void FilterCache::impl_validateAndOptimize() // Because we replace its registration later completely with all // types, which are not referenced by any other loader. // So we can avaoid our code against the complexity of a diff! - ::rtl::OUString sLoader = pIt->first; + OUString sLoader = pIt->first; if (sLoader.equals(sDefaultFrameLoader)) continue; @@ -1260,14 +1260,14 @@ void FilterCache::impl_validateAndOptimize() rDefaultLoader[PROPNAME_NAME ] <<= sDefaultFrameLoader; rDefaultLoader[PROPNAME_TYPES] <<= lTypes.getAsConstList(); - ::rtl::OUString sLogOut = sLog.makeStringAndClear(); - OSL_ENSURE(!nErrors, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); + OUString sLogOut = sLog.makeStringAndClear(); + OSL_ENSURE(!nErrors, OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); if (nErrors>0) throw css::document::CorruptedFilterConfigurationException( "filter configuration: " + sLogOut, css::uno::Reference< css::uno::XInterface >(), sLogOut); - OSL_ENSURE(!nWarnings, ::rtl::OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); + OSL_ENSURE(!nWarnings, OUStringToOString(sLogOut,RTL_TEXTENCODING_UTF8).getStr()); // <- SAFE } @@ -1275,7 +1275,7 @@ void FilterCache::impl_validateAndOptimize() void FilterCache::impl_addItem2FlushList( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { OUStringList* pList = 0; @@ -1313,7 +1313,7 @@ void FilterCache::impl_addItem2FlushList( EItemType eType, FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , const CacheItemList& rList, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { sal_Bool bExistsInConfigLayer = xSet->hasByName(sItem); @@ -1337,8 +1337,8 @@ FilterCache::EItemFlushState FilterCache::impl_specifyFlushOperation(const css:: void FilterCache::impl_resolveItem4TypeRegistration( CacheItemList* pList, - const ::rtl::OUString& sItem, - const ::rtl::OUString& sType) + const OUString& sItem, + const OUString& sType) throw(css::uno::Exception) { CacheItem& rItem = (*pList)[sItem]; @@ -1470,7 +1470,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA throw(css::uno::Exception) { // get access to the right configuration set - ::rtl::OUString sSetName; + OUString sSetName; switch(eType) { case E_TYPE : @@ -1492,7 +1492,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA } css::uno::Reference< css::container::XNameAccess > xSet; - css::uno::Sequence< ::rtl::OUString > lItems; + css::uno::Sequence< OUString > lItems; try { @@ -1518,7 +1518,7 @@ void FilterCache::impl_loadSet(const css::uno::Reference< css::container::XNameA // But dont update optimized structures like e.g. hash // for mapping extensions to its types! - const ::rtl::OUString* pItems = lItems.getConstArray(); + const OUString* pItems = lItems.getConstArray(); sal_Int32 c = lItems.getLength(); for (sal_Int32 i=0; i<c; ++i) { @@ -1581,9 +1581,9 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe // SAFE -> ---------------------------------- ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sFormatName = m_sFormatName ; - ::rtl::OUString sFormatVersion = m_sFormatVersion; - ::rtl::OUString sActLocale = m_sActLocale ; + OUString sFormatName = m_sFormatName ; + OUString sFormatVersion = m_sFormatVersion; + OUString sActLocale = m_sActLocale ; aLock.clear(); // <- SAFE ---------------------------------- @@ -1592,8 +1592,8 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe if (!(aVal >>= xUIName) && !xUIName.is()) return; - const ::comphelper::SequenceAsVector< ::rtl::OUString > lLocales(xUIName->getElementNames()); - ::comphelper::SequenceAsVector< ::rtl::OUString >::const_iterator pLocale ; + const ::comphelper::SequenceAsVector< OUString > lLocales(xUIName->getElementNames()); + ::comphelper::SequenceAsVector< OUString >::const_iterator pLocale ; ::comphelper::SequenceAsHashMap lUINames; const char FORMATNAME_VAR[] = "%productname%"; @@ -1603,9 +1603,9 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe pLocale != lLocales.end() ; ++pLocale ) { - const ::rtl::OUString& sLocale = *pLocale; + const OUString& sLocale = *pLocale; - ::rtl::OUString sValue; + OUString sValue; xUIName->getByName(sLocale) >>= sValue; // replace %productname% @@ -1637,7 +1637,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe #if OSL_DEBUG_LEVEL > 0 if ( sActLocale == "en-US" ) return; - ::rtl::OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, ::rtl::OUString()); + OUString sName = rItem.getUnpackedValueOrDefault(PROPNAME_NAME, OUString()); OUString sMsg("Fallback scenario for filter or type '" + sName + "' and locale '" + sActLocale + "' failed. Please check your filter configuration."); @@ -1647,7 +1647,7 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe return; } - const ::rtl::OUString& sLocale = *pLocale; + const OUString& sLocale = *pLocale; ::comphelper::SequenceAsHashMap::const_iterator pUIName = lUINames.find(sLocale); if (pUIName != lUINames.end()) rItem[PROPNAME_UINAME] = pUIName->second; @@ -1684,7 +1684,7 @@ void FilterCache::impl_savePatchUINames(const css::uno::Reference< css::containe -----------------------------------------------*/ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , EReadOption eOption) throw(css::uno::Exception) { @@ -1767,7 +1767,7 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: // special handling for flags! Convert it from a list of names to its // int representation ... - css::uno::Sequence< ::rtl::OUString > lFlagNames; + css::uno::Sequence< OUString > lFlagNames; if (xItem->getByName(PROPNAME_FLAGS) >>= lFlagNames) aItem[PROPNAME_FLAGS] <<= FilterCache::impl_convertFlagNames2FlagField(lFlagNames); } @@ -1805,12 +1805,12 @@ CacheItem FilterCache::impl_loadItem(const css::uno::Reference< css::container:: CacheItemList::iterator FilterCache::impl_loadItemOnDemand( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { CacheItemList* pList = 0; css::uno::Reference< css::uno::XInterface > xConfig ; - ::rtl::OUString sSet ; + OUString sSet ; switch(eType) { @@ -1986,7 +1986,7 @@ void FilterCache::impl_saveItem(const css::uno::Reference< css::container::XName /*----------------------------------------------- static! => no locks neccessary -----------------------------------------------*/ -css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNames(sal_Int32 nFlags) +css::uno::Sequence< OUString > FilterCache::impl_convertFlagField2FlagNames(sal_Int32 nFlags) { OUStringList lFlagNames; @@ -2021,11 +2021,11 @@ css::uno::Sequence< ::rtl::OUString > FilterCache::impl_convertFlagField2FlagNam /*----------------------------------------------- static! => no locks neccessary -----------------------------------------------*/ -sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< ::rtl::OUString >& lNames) +sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames) { sal_Int32 nField = 0; - const ::rtl::OUString* pNames = lNames.getConstArray(); + const OUString* pNames = lNames.getConstArray(); sal_Int32 c = lNames.getLength(); for (sal_Int32 i=0; i<c; ++i) { @@ -2156,7 +2156,7 @@ sal_Int32 FilterCache::impl_convertFlagNames2FlagField(const css::uno::Sequence< -void FilterCache::impl_interpretDataVal4Type(const ::rtl::OUString& sValue, +void FilterCache::impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ) { @@ -2187,7 +2187,7 @@ void FilterCache::impl_interpretDataVal4Type(const ::rtl::OUString& sValue, -void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString& sValue, +void FilterCache::impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ) { @@ -2254,27 +2254,27 @@ void FilterCache::impl_readOldFormat() catch(const css::uno::Exception&) { return; } - ::rtl::OUString TYPES_SET("Types"); + OUString TYPES_SET("Types"); // May be there is no type set ... if (xCfg->hasByName(TYPES_SET)) { css::uno::Reference< css::container::XNameAccess > xSet; xCfg->getByName(TYPES_SET) >>= xSet; - const css::uno::Sequence< ::rtl::OUString > lItems = xSet->getElementNames(); - const ::rtl::OUString* pItems = lItems.getConstArray(); + const css::uno::Sequence< OUString > lItems = xSet->getElementNames(); + const OUString* pItems = lItems.getConstArray(); for (sal_Int32 i=0; i<lItems.getLength(); ++i) m_lTypes[pItems[i]] = impl_readOldItem(xSet, E_TYPE, pItems[i]); } - ::rtl::OUString FILTER_SET("Filters"); + OUString FILTER_SET("Filters"); // May be there is no filter set ... if (xCfg->hasByName(FILTER_SET)) { css::uno::Reference< css::container::XNameAccess > xSet; xCfg->getByName(FILTER_SET) >>= xSet; - const css::uno::Sequence< ::rtl::OUString > lItems = xSet->getElementNames(); - const ::rtl::OUString* pItems = lItems.getConstArray(); + const css::uno::Sequence< OUString > lItems = xSet->getElementNames(); + const OUString* pItems = lItems.getConstArray(); for (sal_Int32 i=0; i<lItems.getLength(); ++i) m_lFilters[pItems[i]] = impl_readOldItem(xSet, E_FILTER, pItems[i]); } @@ -2284,7 +2284,7 @@ void FilterCache::impl_readOldFormat() CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception) { css::uno::Reference< css::container::XNameAccess > xItem; @@ -2302,7 +2302,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe impl_readPatchUINames(xItem, aItem); // Data - ::rtl::OUString sData; + OUString sData; OUStringList lData; xItem->getByName( "Data" ) >>= sData; lData = impl_tokenizeString(sData, (sal_Unicode)','); @@ -2319,7 +2319,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe pProp != lData.end() ; ++pProp ) { - const ::rtl::OUString& sProp = *pProp; + const OUString& sProp = *pProp; switch(eType) { case E_TYPE : @@ -2339,14 +2339,14 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe -OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , +OUStringList FilterCache::impl_tokenizeString(const OUString& sData , sal_Unicode cSeperator) { OUStringList lData ; sal_Int32 nToken = 0; do { - ::rtl::OUString sToken = sData.getToken(0, cSeperator, nToken); + OUString sToken = sData.getToken(0, cSeperator, nToken); lData.push_back(sToken); } while(nToken >= 0); @@ -2356,14 +2356,14 @@ OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , #if OSL_DEBUG_LEVEL > 0 -::rtl::OUString FilterCache::impl_searchFrameLoaderForType(const ::rtl::OUString& sType) const +OUString FilterCache::impl_searchFrameLoaderForType(const OUString& sType) const { CacheItemList::const_iterator pIt; for ( pIt = m_lFrameLoaders.begin(); pIt != m_lFrameLoaders.end() ; ++pIt ) { - const ::rtl::OUString& sItem = pIt->first; + const OUString& sItem = pIt->first; ::comphelper::SequenceAsHashMap lProps(pIt->second); OUStringList lTypes(lProps[PROPNAME_TYPES]); @@ -2371,19 +2371,19 @@ OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , return sItem; } - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString FilterCache::impl_searchContentHandlerForType(const ::rtl::OUString& sType) const +OUString FilterCache::impl_searchContentHandlerForType(const OUString& sType) const { CacheItemList::const_iterator pIt; for ( pIt = m_lContentHandlers.begin(); pIt != m_lContentHandlers.end() ; ++pIt ) { - const ::rtl::OUString& sItem = pIt->first; + const OUString& sItem = pIt->first; ::comphelper::SequenceAsHashMap lProps(pIt->second); OUStringList lTypes(lProps[PROPNAME_TYPES]); @@ -2391,13 +2391,13 @@ OUStringList FilterCache::impl_tokenizeString(const ::rtl::OUString& sData , return sItem; } - return ::rtl::OUString(); + return OUString(); } #endif -sal_Bool FilterCache::impl_isModuleInstalled(const ::rtl::OUString& sModule) +sal_Bool FilterCache::impl_isModuleInstalled(const OUString& sModule) { css::uno::Reference< css::container::XNameAccess > xCfg; diff --git a/filter/source/config/cache/filtercache.hxx b/filter/source/config/cache/filtercache.hxx index 3ea66610c0dc..8a44eea06cce 100644 --- a/filter/source/config/cache/filtercache.hxx +++ b/filter/source/config/cache/filtercache.hxx @@ -220,15 +220,15 @@ class FilterCache : public BaseLock //--------------------------------------- /** @short contains the current locale of the office and will be used to work with localized configuration values. */ - ::rtl::OUString m_sActLocale; + OUString m_sActLocale; //--------------------------------------- /** TODO */ - ::rtl::OUString m_sFormatName; + OUString m_sFormatName; //--------------------------------------- /** TODO */ - ::rtl::OUString m_sFormatVersion; + OUString m_sFormatVersion; //--------------------------------------- /** @short contains status, which cache items/properties @@ -484,7 +484,7 @@ class FilterCache : public BaseLock any longer, because any operation before damage it. */ virtual sal_Bool hasItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -514,7 +514,7 @@ class FilterCache : public BaseLock any longer, because any operation before damage it. */ virtual CacheItem getItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -522,7 +522,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ virtual void removeItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -530,7 +530,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ virtual void setItem( EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , const CacheItem& aValue) throw(css::uno::Exception); @@ -539,7 +539,7 @@ class FilterCache : public BaseLock /** TODO document me ... */ virtual void refreshItem( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -580,7 +580,7 @@ class FilterCache : public BaseLock to such items ... */ virtual void addStatePropsToItem( EItemType eType, - const ::rtl::OUString& sItem, + const OUString& sItem, CacheItem& rItem) throw(css::uno::Exception); @@ -703,7 +703,7 @@ class FilterCache : public BaseLock and initialized within the requested modes successfully; a NULL reference otherwise. */ - css::uno::Reference< css::uno::XInterface > impl_createConfigAccess(const ::rtl::OUString& sRoot , + css::uno::Reference< css::uno::XInterface > impl_createConfigAccess(const OUString& sRoot , sal_Bool bReadOnly , sal_Bool bLocalesMode); @@ -728,7 +728,7 @@ class FilterCache : public BaseLock Can be empty if an internal error occurred or if the requested key does not exists! */ - css::uno::Any impl_getDirectCFGValue(const ::rtl::OUString& sDirectKey); + css::uno::Any impl_getDirectCFGValue(const OUString& sDirectKey); //--------------------------------------- @@ -793,8 +793,8 @@ class FilterCache : public BaseLock That does not include double registrations! */ void impl_resolveItem4TypeRegistration( CacheItemList* pList, - const ::rtl::OUString& sItem, - const ::rtl::OUString& sType) + const OUString& sItem, + const OUString& sType) throw(css::uno::Exception); //------------------------------------------- @@ -861,7 +861,7 @@ class FilterCache : public BaseLock */ CacheItem impl_loadItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType , - const ::rtl::OUString& sItem , + const OUString& sItem , EReadOption eOption) throw(css::uno::Exception); @@ -893,7 +893,7 @@ class FilterCache : public BaseLock if an unrecoverable error occurs inside this operation. */ CacheItemList::iterator impl_loadItemOnDemand( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -908,7 +908,7 @@ class FilterCache : public BaseLock /** TODO */ void impl_addItem2FlushList( EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); @@ -952,7 +952,7 @@ class FilterCache : public BaseLock */ EItemFlushState impl_specifyFlushOperation(const css::uno::Reference< css::container::XNameAccess >& xSet , const CacheItemList& rList, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- @@ -980,35 +980,35 @@ class FilterCache : public BaseLock /** TODO */ CacheItem impl_readOldItem(const css::uno::Reference< css::container::XNameAccess >& xSet , EItemType eType, - const ::rtl::OUString& sItem) + const OUString& sItem) throw(css::uno::Exception); //--------------------------------------- /** TODO */ - void impl_interpretDataVal4Type(const ::rtl::OUString& sValue, + void impl_interpretDataVal4Type(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); //--------------------------------------- /** TODO */ - void impl_interpretDataVal4Filter(const ::rtl::OUString& sValue, + void impl_interpretDataVal4Filter(const OUString& sValue, sal_Int32 nProp , CacheItem& rItem ); //--------------------------------------- /** TODO */ - OUStringList impl_tokenizeString(const ::rtl::OUString& sData , + OUStringList impl_tokenizeString(const OUString& sData , sal_Unicode cSeperator); //--------------------------------------- #if OSL_DEBUG_LEVEL > 0 /** TODO */ - ::rtl::OUString impl_searchFrameLoaderForType(const ::rtl::OUString& sType) const; - ::rtl::OUString impl_searchContentHandlerForType(const ::rtl::OUString& sType) const; + OUString impl_searchFrameLoaderForType(const OUString& sType) const; + OUString impl_searchContentHandlerForType(const OUString& sType) const; #endif //--------------------------------------- @@ -1019,7 +1019,7 @@ class FilterCache : public BaseLock @return sal_True if the requested module is installed; sal_False otherwise. */ - sal_Bool impl_isModuleInstalled(const ::rtl::OUString& sModule); + sal_Bool impl_isModuleInstalled(const OUString& sModule); //--------------------------------------- @@ -1031,7 +1031,7 @@ class FilterCache : public BaseLock @return [sal_Int32] the converted flag field. */ - static sal_Int32 impl_convertFlagNames2FlagField(const css::uno::Sequence< ::rtl::OUString >& lNames); + static sal_Int32 impl_convertFlagNames2FlagField(const css::uno::Sequence< OUString >& lNames); //--------------------------------------- @@ -1043,7 +1043,7 @@ class FilterCache : public BaseLock @return [seq< string >] the converted flag name list. */ - static css::uno::Sequence< ::rtl::OUString > impl_convertFlagField2FlagNames(sal_Int32 nFlags); + static css::uno::Sequence< OUString > impl_convertFlagField2FlagNames(sal_Int32 nFlags); }; } // namespace config diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx index 9270a166bc2d..ac0d5ad827cc 100644 --- a/filter/source/config/cache/filterfactory.cxx +++ b/filter/source/config/cache/filterfactory.cxx @@ -66,7 +66,7 @@ FilterFactory::~FilterFactory() -css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const ::rtl::OUString& sFilter) +css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstance(const OUString& sFilter) throw(css::uno::Exception , css::uno::RuntimeException) { @@ -75,7 +75,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan -css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const ::rtl::OUString& sFilter , +css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -83,7 +83,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sRealFilter = sFilter; + OUString sRealFilter = sFilter; #ifdef _FILTER_CONFIG_MIGRATION_Q_ @@ -122,7 +122,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan // search filter on cache CacheItem aFilter = m_rCache->getItem(FilterCache::E_FILTER, sRealFilter); - ::rtl::OUString sFilterService; + OUString sFilterService; aFilter[PROPNAME_FILTERSERVICE] >>= sFilterService; // create service instance @@ -156,7 +156,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FilterFactory::createInstan -css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServiceNames() +css::uno::Sequence< OUString > SAL_CALL FilterFactory::getAvailableServiceNames() throw(css::uno::RuntimeException) { /* Attention: Instead of getElementNames() this method have to return only filter names, @@ -167,7 +167,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServic */ CacheItem lIProps; CacheItem lEProps; - lEProps[PROPNAME_FILTERSERVICE] <<= ::rtl::OUString(); + lEProps[PROPNAME_FILTERSERVICE] <<= OUString(); OUStringList lUNOFilters; try @@ -184,7 +184,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FilterFactory::getAvailableServic -css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) +css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException) { // reject old deprecated queries ... @@ -194,7 +194,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea static_cast< css::container::XContainerQuery* >(this)); // convert "_query_xxx:..." to "getByDocService=xxx:..." - ::rtl::OUString sNewQuery(sQuery); + OUString sNewQuery(sQuery); sal_Int32 pos = sNewQuery.indexOf("_query_"); if (pos != -1) { @@ -233,7 +233,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea // pack list of item names as an enum list // Attention: Do not return empty reference for empty list! // The outside check "hasMoreElements()" should be enough, to detect this state :-) - css::uno::Sequence< ::rtl::OUString > lSet = lEnumSet.getAsConstList(); + css::uno::Sequence< OUString > lSet = lEnumSet.getAsConstList(); ::comphelper::OEnumerationByName* pEnum = new ::comphelper::OEnumerationByName(this, lSet); return css::uno::Reference< css::container::XEnumeration >(static_cast< css::container::XEnumeration* >(pEnum), css::uno::UNO_QUERY); } @@ -245,7 +245,7 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize // analyze query QueryTokenizer::const_iterator pIt; - ::rtl::OUString sDocumentService; + OUString sDocumentService; sal_Int32 nIFlags = 0; sal_Int32 nEFlags = 0; @@ -258,47 +258,47 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize if ( sDocumentService == "writer" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.text.TextDocument" ); + sDocumentService = OUString( "com.sun.star.text.TextDocument" ); } else if ( sDocumentService == "web" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.text.WebDocument" ); + sDocumentService = OUString( "com.sun.star.text.WebDocument" ); } else if ( sDocumentService == "global" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.text.GlobalDocument" ); + sDocumentService = OUString( "com.sun.star.text.GlobalDocument" ); } else if ( sDocumentService == "calc" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ); + sDocumentService = OUString( "com.sun.star.sheet.SpreadsheetDocument" ); } else if ( sDocumentService == "draw" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" ); + sDocumentService = OUString( "com.sun.star.drawing.DrawingDocument" ); } else if ( sDocumentService == "impress" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" ); + sDocumentService = OUString( "com.sun.star.presentation.PresentationDocument" ); } else if ( sDocumentService == "math" ) { OSL_FAIL("DEPRECATED!\nPlease use right document service for filter query!"); - sDocumentService = ::rtl::OUString( "com.sun.star.formula.FormulaProperties" ); + sDocumentService = OUString( "com.sun.star.formula.FormulaProperties" ); } #endif pIt = lTokens.find(QUERY_PARAM_IFLAGS); if (pIt != lTokens.end()) - nIFlags = ::rtl::OUString(pIt->second).toInt32(); + nIFlags = OUString(pIt->second).toInt32(); pIt = lTokens.find(QUERY_PARAM_EFLAGS); if (pIt != lTokens.end()) - nEFlags = ::rtl::OUString(pIt->second).toInt32(); + nEFlags = OUString(pIt->second).toInt32(); // SAFE -> ---------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -314,14 +314,14 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize { try { - const ::rtl::OUString& sName = *pName; + const OUString& sName = *pName; const CacheItem aFilter = pCache->getItem(FilterCache::E_FILTER, sName); CacheItem::const_iterator pProp ; // "matchByDocumentService=" => any filter will be addressed here // "matchByDocumentService=all" => any filter will be addressed here // "matchByDocumentService=com.sun.star..." => only filter matching this document service will be addressed - ::rtl::OUString sCheckValue = aFilter.getUnpackedValueOrDefault(PROPNAME_DOCUMENTSERVICE, ::rtl::OUString()); + OUString sCheckValue = aFilter.getUnpackedValueOrDefault(PROPNAME_DOCUMENTSERVICE, OUString()); if ( (!sDocumentService.isEmpty() ) && (!sDocumentService.equals(QUERY_CONSTVALUE_ALL)) && @@ -390,7 +390,7 @@ class stlcomp_removeIfMatchFlags , m_bIFlags(bIFlags) {} - bool operator() (const ::rtl::OUString& sFilter) const + bool operator() (const OUString& sFilter) const { try { @@ -421,7 +421,7 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke // analyze the given query parameter QueryTokenizer::const_iterator pIt1; - ::rtl::OUString sModule; + OUString sModule; sal_Int32 nIFlags = -1; sal_Int32 nEFlags = -1; @@ -430,10 +430,10 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke sModule = pIt1->second; pIt1 = lTokens.find(QUERY_PARAM_IFLAGS); if (pIt1 != lTokens.end()) - nIFlags = ::rtl::OUString(pIt1->second).toInt32(); + nIFlags = OUString(pIt1->second).toInt32(); pIt1 = lTokens.find(QUERY_PARAM_EFLAGS); if (pIt1 != lTokens.end()) - nEFlags = ::rtl::OUString(pIt1->second).toInt32(); + nEFlags = OUString(pIt1->second).toInt32(); // simple search for filters of one specific module. OUStringList lFilterList; @@ -456,7 +456,7 @@ OUStringList FilterFactory::impl_getSortedFilterList(const QueryTokenizer& lToke pIt3 != lFilters4Module.end() ; ++pIt3 ) { - const ::rtl::OUString& sFilter = *pIt3; + const OUString& sFilter = *pIt3; lFilterList.push_back(sFilter); } } @@ -495,7 +495,7 @@ OUStringList FilterFactory::impl_getListOfInstalledModules() const -OUStringList FilterFactory::impl_getSortedFilterListForModule(const ::rtl::OUString& sModule, +OUStringList FilterFactory::impl_getSortedFilterListForModule(const OUString& sModule, sal_Int32 nIFlags, sal_Int32 nEFlags) const { @@ -524,7 +524,7 @@ OUStringList FilterFactory::impl_getSortedFilterListForModule(const ::rtl::OUStr pIt2 != lOtherFilters.end() ; ++pIt2 ) { - const ::rtl::OUString& rFilter = *pIt2; + const OUString& rFilter = *pIt2; pIt3 = ::std::find(lSortedFilters.begin(), lSortedFilters.end(), rFilter); if (pIt3 == lSortedFilters.end()) lMergedFilters.push_back(rFilter); @@ -550,7 +550,7 @@ OUStringList FilterFactory::impl_getSortedFilterListForModule(const ::rtl::OUStr -OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUString& sModule) const +OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const OUString& sModule) const { // SAFE -> ---------------------- ::osl::ResettableMutexGuard aLock(m_aLock); @@ -589,17 +589,17 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS -::rtl::OUString FilterFactory::impl_getImplementationName() +OUString FilterFactory::impl_getImplementationName() { - return ::rtl::OUString( "com.sun.star.comp.filter.config.FilterFactory" ); + return OUString( "com.sun.star.comp.filter.config.FilterFactory" ); } -css::uno::Sequence< ::rtl::OUString > FilterFactory::impl_getSupportedServiceNames() +css::uno::Sequence< OUString > FilterFactory::impl_getSupportedServiceNames() { - css::uno::Sequence< ::rtl::OUString > lServiceNames(1); - lServiceNames[0] = ::rtl::OUString( "com.sun.star.document.FilterFactory" ); + css::uno::Sequence< OUString > lServiceNames(1); + lServiceNames[0] = OUString( "com.sun.star.document.FilterFactory" ); return lServiceNames; } diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx index 02ffc825a3f0..9d4697732ae9 100644 --- a/filter/source/config/cache/filterfactory.hxx +++ b/filter/source/config/cache/filterfactory.hxx @@ -70,22 +70,22 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer //--------------------------------------- // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& sFilter) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sFilter) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& sFilter , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sFilter , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException); //--------------------------------------- // XContainerQuery - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const ::rtl::OUString& sQuery) + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createSubSetEnumerationByQuery(const OUString& sQuery) throw (css::uno::RuntimeException); //------------------------------------------- @@ -128,7 +128,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer /** TODO document me */ - OUStringList impl_getSortedFilterListForModule(const ::rtl::OUString& sModule, + OUStringList impl_getSortedFilterListForModule(const OUString& sModule, sal_Int32 nIFlags, sal_Int32 nEFlags) const; @@ -143,7 +143,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return A string list of internal filter names. Can be empty. */ - OUStringList impl_readSortedFilterListFromConfig(const ::rtl::OUString& sModule) const; + OUStringList impl_readSortedFilterListFromConfig(const OUString& sModule) const; //------------------------------------------- // static uno helper! @@ -160,7 +160,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -172,7 +172,7 @@ class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx index fa65dcc57b19..7ded4936dc3b 100644 --- a/filter/source/config/cache/frameloaderfactory.cxx +++ b/filter/source/config/cache/frameloaderfactory.cxx @@ -48,7 +48,7 @@ FrameLoaderFactory::~FrameLoaderFactory() -css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const ::rtl::OUString& sLoader) +css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstance(const OUString& sLoader) throw(css::uno::Exception , css::uno::RuntimeException) { @@ -57,7 +57,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI -css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const ::rtl::OUString& sLoader , +css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException) @@ -65,7 +65,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); - ::rtl::OUString sRealLoader = sLoader; + OUString sRealLoader = sLoader; #ifdef _FILTER_CONFIG_MIGRATION_Q_ @@ -79,7 +79,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI { _FILTER_CONFIG_LOG_("FrameLoaderFactory::createInstanceWithArguments() ... simulate old type search functionality!\n"); - css::uno::Sequence< ::rtl::OUString > lTypes(1); + css::uno::Sequence< OUString > lTypes(1); lTypes[0] = sLoader; css::uno::Sequence< css::beans::NamedValue > lQuery(1); @@ -136,7 +136,7 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FrameLoaderFactory::createI -css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() +css::uno::Sequence< OUString > SAL_CALL FrameLoaderFactory::getAvailableServiceNames() throw(css::uno::RuntimeException) { // must be the same list as ((XNameAccess*)this)->getElementNames() return! diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx index 38acef126b62..fb2e32f21214 100644 --- a/filter/source/config/cache/frameloaderfactory.hxx +++ b/filter/source/config/cache/frameloaderfactory.hxx @@ -69,16 +69,16 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer //--------------------------------------- // XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const ::rtl::OUString& sLoader) + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(const OUString& sLoader) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const ::rtl::OUString& sLoader , + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(const OUString& sLoader , const css::uno::Sequence< css::uno::Any >& lArguments) throw(css::uno::Exception , css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw(css::uno::RuntimeException); //------------------------------------------- @@ -96,7 +96,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -108,7 +108,7 @@ class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- diff --git a/filter/source/config/cache/querytokenizer.cxx b/filter/source/config/cache/querytokenizer.cxx index a75d1290e873..8a28f1e2cf60 100644 --- a/filter/source/config/cache/querytokenizer.cxx +++ b/filter/source/config/cache/querytokenizer.cxx @@ -27,13 +27,13 @@ namespace filter{ -QueryTokenizer::QueryTokenizer(const ::rtl::OUString& sQuery) +QueryTokenizer::QueryTokenizer(const OUString& sQuery) : m_bValid(sal_True) { sal_Int32 token = 0; while(token != -1) { - ::rtl::OUString sToken = sQuery.getToken(0, ':', token); + OUString sToken = sQuery.getToken(0, ':', token); if (!sToken.isEmpty()) { sal_Int32 equal = sToken.indexOf('='); @@ -42,8 +42,8 @@ QueryTokenizer::QueryTokenizer(const ::rtl::OUString& sQuery) m_bValid = sal_False; OSL_ENSURE(m_bValid, "QueryTokenizer::QueryTokenizer()\nFound non boolean query parameter ... but its key is empty. Will be ignored!\n"); - ::rtl::OUString sKey; - ::rtl::OUString sVal; + OUString sKey; + OUString sVal; sKey = sToken; if (equal > 0) diff --git a/filter/source/config/cache/querytokenizer.hxx b/filter/source/config/cache/querytokenizer.hxx index c7e45eb724b9..3b9ab22c4622 100644 --- a/filter/source/config/cache/querytokenizer.hxx +++ b/filter/source/config/cache/querytokenizer.hxx @@ -45,10 +45,10 @@ namespace filter{ @attention This class is not threadsafe implemented. Because its not neccessary. But you have to make shure, that ist not used as such :-) */ -class QueryTokenizer : public ::boost::unordered_map< ::rtl::OUString , - ::rtl::OUString , - ::rtl::OUStringHash , - ::std::equal_to< ::rtl::OUString > > +class QueryTokenizer : public ::boost::unordered_map< OUString , + OUString , + OUStringHash , + ::std::equal_to< OUString > > { //------------------------------------------- // member @@ -78,7 +78,7 @@ class QueryTokenizer : public ::boost::unordered_map< ::rtl::OUString @param sQuery the query string. */ - QueryTokenizer(const ::rtl::OUString& sQuery); + QueryTokenizer(const OUString& sQuery); //--------------------------------------- diff --git a/filter/source/config/cache/registration.cxx b/filter/source/config/cache/registration.cxx index e4a7baea55d2..952f5d746e55 100644 --- a/filter/source/config/cache/registration.cxx +++ b/filter/source/config/cache/registration.cxx @@ -43,7 +43,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xSMGR = reinterpret_cast< com::sun::star::lang::XMultiServiceFactory* >(pServiceManager); com::sun::star::uno::Reference< com::sun::star::lang::XSingleServiceFactory > xFactory; - rtl::OUString sImplName = rtl::OUString::createFromAscii(pImplementationName); + OUString sImplName = OUString::createFromAscii(pImplementationName); if (TypeDetection::impl_getImplementationName() == sImplName) xFactory = cppu::createSingleFactory( xSMGR, diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx index 3e4c224b2a11..5e3697c0474f 100644 --- a/filter/source/config/cache/typedetection.cxx +++ b/filter/source/config/cache/typedetection.cxx @@ -64,10 +64,10 @@ TypeDetection::~TypeDetection() -::rtl::OUString SAL_CALL TypeDetection::queryTypeByURL(const ::rtl::OUString& sURL) +OUString SAL_CALL TypeDetection::queryTypeByURL(const OUString& sURL) throw (css::uno::RuntimeException) { - ::rtl::OUString sType; + OUString sType; // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -122,7 +122,7 @@ namespace { * In each category, rank them from strictly-structured to * loosely-structured. */ -int getFlatTypeRank(const rtl::OUString& rType) +int getFlatTypeRank(const OUString& rType) { // List formats from more complex to less complex. // TODO: Add more. @@ -365,7 +365,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) } -::rtl::OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, +OUString SAL_CALL TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, sal_Bool bAllowDeep ) throw (css::uno::RuntimeException) { @@ -377,7 +377,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) //******************************************* // parse given URL to split it into e.g. main and jump marks ... - ::rtl::OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString()); + OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), OUString()); #if OSL_DEBUG_LEVEL > 0 if (stlDescriptor.find( "FileName" ) != stlDescriptor.end()) @@ -389,14 +389,14 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) css::uno::Reference< css::util::XURLTransformer > xParser(css::util::URLTransformer::create(m_xContext)); xParser->parseStrict(aURL); - rtl::OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault( - comphelper::MediaDescriptor::PROP_FILTERNAME(), rtl::OUString()); + OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault( + comphelper::MediaDescriptor::PROP_FILTERNAME(), OUString()); if (!aSelectedFilter.isEmpty()) { // Caller specified the filter type. Honor it. Just get the default // type for that filter, and bail out. if (impl_validateAndSetFilterOnDescriptor(stlDescriptor, aSelectedFilter)) - return stlDescriptor[comphelper::MediaDescriptor::PROP_TYPENAME()].get<rtl::OUString>(); + return stlDescriptor[comphelper::MediaDescriptor::PROP_TYPENAME()].get<OUString>(); } FlatDetection lFlatTypes; @@ -409,8 +409,8 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) lFlatTypes.sort(SortByPriority()); lFlatTypes.unique(EqualByType()); - ::rtl::OUString sType ; - ::rtl::OUString sLastChance; + OUString sType ; + OUString sLastChance; try { @@ -446,7 +446,7 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) catch(const css::uno::RuntimeException&) { throw; } catch(const css::uno::Exception&) - { sType = ::rtl::OUString(); } + { sType = OUString(); } //******************************************* // adapt media descriptor, so it contains the right values @@ -461,27 +461,27 @@ void printFlatDetectionList(const char* caption, const FlatDetection& types) void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescriptor& rDescriptor, - ::rtl::OUString& sType ) + OUString& sType ) { // a) // Dont overwrite a might preselected filter! - ::rtl::OUString sFilter = rDescriptor.getUnpackedValueOrDefault( + OUString sFilter = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_FILTERNAME(), - ::rtl::OUString()); + OUString()); if (!sFilter.isEmpty()) return; // b) // check a preselected document service too. // Then we have to search a suitable filter witin this module. - ::rtl::OUString sDocumentService = rDescriptor.getUnpackedValueOrDefault( + OUString sDocumentService = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_DOCUMENTSERVICE(), - ::rtl::OUString()); + OUString()); if (!sDocumentService.isEmpty()) { try { - ::rtl::OUString sRealType = sType; + OUString sRealType = sType; // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -539,7 +539,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip // - or to any other filter if no preferred filter was set. // Note: It's an optimization only! // It's not guaranteed, that such preferred filter exists. - sFilter = ::rtl::OUString(); + sFilter = OUString(); try { // SAFE -> @@ -562,7 +562,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip // d) // Search for any import(!) filter, which is registered for this type. - sFilter = ::rtl::OUString(); + sFilter = OUString(); try { // SAFE -> @@ -603,7 +603,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip aLock.clear(); // <- SAFE - sFilter = ::rtl::OUString(); + sFilter = OUString(); } if (!sFilter.isEmpty()) @@ -637,7 +637,7 @@ bool TypeDetection::impl_getPreselectionForType( bool bMatchByExtension = false; // validate type - ::rtl::OUString sType(sPreSelType); + OUString sType(sPreSelType); CacheItem aType; try { @@ -649,7 +649,7 @@ bool TypeDetection::impl_getPreselectionForType( } catch(const css::container::NoSuchElementException&) { - sType = ::rtl::OUString(); + sType = OUString(); bBreakDetection = true; } @@ -665,7 +665,7 @@ bool TypeDetection::impl_getPreselectionForType( { // extract extension from URL .. to check it case-insensitive ! INetURLObject aParser (aParsedURL.Main); - ::rtl::OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , + OUString sExtension = aParser.getExtension(INetURLObject::LAST_SEGMENT , sal_True , INetURLObject::DECODE_WITH_CHARSET); sExtension = sExtension.toAsciiLowerCase(); @@ -679,7 +679,7 @@ bool TypeDetection::impl_getPreselectionForType( pIt != lExtensions.end() ; ++pIt ) { - ::rtl::OUString sCheckExtension(pIt->toAsciiLowerCase()); + OUString sCheckExtension(pIt->toAsciiLowerCase()); if (sCheckExtension.equals(sExtension)) { bBreakDetection = true; @@ -864,15 +864,15 @@ void TypeDetection::impl_getAllFormatTypes( -::rtl::OUString TypeDetection::impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , +OUString TypeDetection::impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , const FlatDetection& lFlatTypes , sal_Bool bAllowDeep , OUStringList& rUsedDetectors, - ::rtl::OUString& rLastChance ) + OUString& rLastChance ) { // reset it everytimes, so the outside code can distinguish between // a set and a not set value. - rLastChance = ::rtl::OUString(); + rLastChance = OUString(); rUsedDetectors.clear(); // step over all possible types for this URL. @@ -916,7 +916,7 @@ void TypeDetection::impl_getAllFormatTypes( CacheItem aType = m_rCache->getItem(FilterCache::E_TYPE, sFlatType); aLock.clear(); - ::rtl::OUString sDetectService; + OUString sDetectService; aType[PROPNAME_DETECTSERVICE] >>= sDetectService; // c) @@ -936,7 +936,7 @@ void TypeDetection::impl_getAllFormatTypes( // Such detectors will be ignored if may be "impl_detectTypeDeepOnly()" // must be called later! rUsedDetectors.push_back(sDetectService); - ::rtl::OUString sDeepType = impl_askDetectService(sDetectService, rDescriptor); + OUString sDeepType = impl_askDetectService(sDetectService, rDescriptor); // d) if (!sDeepType.isEmpty()) @@ -947,7 +947,7 @@ void TypeDetection::impl_getAllFormatTypes( // e) } - return ::rtl::OUString(); + return OUString(); // <- SAFE ---------------------------------- } @@ -975,7 +975,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript } } -::rtl::OUString TypeDetection::impl_askDetectService(const ::rtl::OUString& sDetectService, +OUString TypeDetection::impl_askDetectService(const OUString& sDetectService, ::comphelper::MediaDescriptor& rDescriptor ) { // Open the stream and add it to the media descriptor if this method is called for the first time. @@ -1015,9 +1015,9 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript } if ( ! xDetector.is()) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sDeepType; + OUString sDeepType; try { // start deep detection @@ -1039,7 +1039,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // Thrown exceptions mostly will end in crash recovery ... // But might be we find another deep detection service which can detect the same // document without a problem .-) - sDeepType = ::rtl::OUString(); + sDeepType = OUString(); } // seek to 0 is an optional feature to be more robust against @@ -1057,23 +1057,23 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript if (bValidType) return sDeepType; - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor) +OUString TypeDetection::impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor) { css::uno::Reference< css::task::XInteractionHandler > xInteraction = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_INTERACTIONHANDLER(), css::uno::Reference< css::task::XInteractionHandler >()); if (!xInteraction.is()) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sURL = + OUString sURL = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), - ::rtl::OUString()); + OUString()); css::uno::Reference< css::io::XInputStream > xStream = rDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_INPUTSTREAM(), @@ -1089,7 +1089,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript (!xStream.is() ) || // non existing file ! (sURL.equalsIgnoreAsciiCase("private:stream")) // not a good idea .-) ) - return ::rtl::OUString(); + return OUString(); try { @@ -1099,7 +1099,7 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // "Cancel" pressed? => return with error if (aRequest.isAbort()) - return ::rtl::OUString(); + return OUString(); // "OK" pressed => verify the selected filter, get it's coressponding // type and return it. (BTW: We must update the media descriptor here ...) @@ -1107,18 +1107,18 @@ void TypeDetection::impl_seekStreamToZero(comphelper::MediaDescriptor& rDescript // a type here only. But we must be shure, that the selected filter is used // too and no ambigous filter registration disturb us .-) - ::rtl::OUString sFilter = aRequest.getFilter(); + OUString sFilter = aRequest.getFilter(); if (!impl_validateAndSetFilterOnDescriptor(rDescriptor, sFilter)) - return ::rtl::OUString(); + return OUString(); - ::rtl::OUString sType; + OUString sType; rDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] >>= sType; return sType; } catch(const css::uno::Exception&) {} - return ::rtl::OUString(); + return OUString(); } @@ -1127,7 +1127,7 @@ void TypeDetection::impl_openStream(::comphelper::MediaDescriptor& rDescriptor) throw (css::uno::Exception) { sal_Bool bSuccess = sal_False; - ::rtl::OUString sURL = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString() ); + OUString sURL = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_URL(), OUString() ); sal_Bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault( ::comphelper::MediaDescriptor::PROP_READONLY(), sal_False ); if ( !sURL.isEmpty() && ::utl::LocalFileHelper::IsLocalFile( INetURLObject( sURL ).GetMainURL( INetURLObject::NO_DECODE ) ) ) { @@ -1165,7 +1165,7 @@ void TypeDetection::impl_removeTypeFilterFromDescriptor(::comphelper::MediaDescr sal_Bool TypeDetection::impl_validateAndSetTypeOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sType ) + const OUString& sType ) { // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); @@ -1185,7 +1185,7 @@ sal_Bool TypeDetection::impl_validateAndSetTypeOnDescriptor( ::comphelper:: sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sFilter ) + const OUString& sFilter ) { try { @@ -1193,7 +1193,7 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper ::osl::ResettableMutexGuard aLock(m_aLock); CacheItem aFilter = m_rCache->getItem(FilterCache::E_FILTER, sFilter); - ::rtl::OUString sType; + OUString sType; aFilter[PROPNAME_TYPE] >>= sType; CacheItem aType = m_rCache->getItem(FilterCache::E_TYPE, sType); diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx index f1dc34886fc8..e58042c58d89 100644 --- a/filter/source/config/cache/typedetection.hxx +++ b/filter/source/config/cache/typedetection.hxx @@ -126,11 +126,11 @@ private: An empty value if detection failed. .... but see rLastChance for additional returns! */ - ::rtl::OUString impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , + OUString impl_detectTypeFlatAndDeep( ::comphelper::MediaDescriptor& rDescriptor , const FlatDetection& lFlatTypes , sal_Bool bAllowDeep , OUStringList& rUsedDetectors, - ::rtl::OUString& rLastChance ); + OUString& rLastChance ); //--------------------------------------- @@ -165,7 +165,7 @@ private: @param rDescriptor a stl representation of the MediaDescriptor as in/out parameter. */ - ::rtl::OUString impl_askDetectService(const ::rtl::OUString& sDetectService, + OUString impl_askDetectService(const OUString& sDetectService, ::comphelper::MediaDescriptor& rDescriptor ); //--------------------------------------- @@ -183,7 +183,7 @@ private: @return [string] a valid type name or an empty string if user canceled interaction. */ - ::rtl::OUString impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor); + OUString impl_askUserForTypeAndFilterIfAllowed(::comphelper::MediaDescriptor& rDescriptor); //--------------------------------------- @@ -244,7 +244,7 @@ private: could be set on the descriptor. */ sal_Bool impl_validateAndSetTypeOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sType ); + const OUString& sType ); //--------------------------------------- @@ -266,7 +266,7 @@ private: could be set on the descriptor. */ sal_Bool impl_validateAndSetFilterOnDescriptor( ::comphelper::MediaDescriptor& rDescriptor, - const ::rtl::OUString& sFilter ); + const OUString& sFilter ); //--------------------------------------- @@ -316,7 +316,7 @@ private: (see code) */ void impl_checkResultsAndAddBestFilter(::comphelper::MediaDescriptor& rDescriptor, - ::rtl::OUString& sType ); + OUString& sType ); //------------------------------------------- // uno interface @@ -326,10 +326,10 @@ public: //--------------------------------------- // XTypeDetection - virtual ::rtl::OUString SAL_CALL queryTypeByURL(const ::rtl::OUString& sURL) + virtual OUString SAL_CALL queryTypeByURL(const OUString& sURL) throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, + virtual OUString SAL_CALL queryTypeByDescriptor(css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, sal_Bool bAllowDeep ) throw (css::uno::RuntimeException); @@ -348,7 +348,7 @@ public: @return The fix uno implementation name of this class. */ - static ::rtl::OUString impl_getImplementationName(); + static OUString impl_getImplementationName(); //--------------------------------------- @@ -360,7 +360,7 @@ public: @return The fix list of uno services supported by this class. */ - static css::uno::Sequence< ::rtl::OUString > impl_getSupportedServiceNames(); + static css::uno::Sequence< OUString > impl_getSupportedServiceNames(); //--------------------------------------- |