diff options
Diffstat (limited to 'ucb/source/core/ucb.cxx')
-rw-r--r-- | ucb/source/core/ucb.cxx | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index f944980f8971..2cd0f6d1d238 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -59,7 +59,6 @@ #include <regexpmap.tpt> #endif -using namespace rtl; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -68,6 +67,8 @@ using namespace ucb_impl; using namespace com::sun::star; using namespace ucbhelper; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; #define CONFIG_CONTENTPROVIDERS_KEY \ "/org.openoffice.ucb.Configuration/ContentProviders" @@ -75,14 +76,14 @@ using namespace ucbhelper; namespace { -bool fillPlaceholders(rtl::OUString const & rInput, +bool fillPlaceholders(OUString const & rInput, uno::Sequence< uno::Any > const & rReplacements, - rtl::OUString * pOutput) + OUString * pOutput) { sal_Unicode const * p = rInput.getStr(); sal_Unicode const * pEnd = p + rInput.getLength(); sal_Unicode const * pCopy = p; - rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; while (p != pEnd) switch (*p++) { @@ -120,13 +121,13 @@ bool fillPlaceholders(rtl::OUString const & rInput, ++q; if (q == pEnd) break; - rtl::OUString aKey(p, q - p); - rtl::OUString aValue; + OUString aKey(p, q - p); + OUString aValue; bool bFound = false; for (sal_Int32 i = 2; i + 1 < rReplacements.getLength(); i += 2) { - rtl::OUString aReplaceKey; + OUString aReplaceKey; if ((rReplacements[i] >>= aReplaceKey) && aReplaceKey == aKey && (rReplacements[i + 1] >>= aValue)) @@ -149,7 +150,7 @@ bool fillPlaceholders(rtl::OUString const & rInput, } void makeAndAppendXMLName( - rtl::OUStringBuffer & rBuffer, const rtl::OUString & rIn ) + OUStringBuffer & rBuffer, const OUString & rIn ) { sal_Int32 nCount = rIn.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) @@ -185,15 +186,15 @@ void makeAndAppendXMLName( } bool createContentProviderData( - const rtl::OUString & rProvider, + const OUString & rProvider, const uno::Reference< container::XHierarchicalNameAccess >& rxHierNameAccess, ContentProviderData & rInfo) { // Obtain service name. - rtl::OUStringBuffer aKeyBuffer (rProvider); + OUStringBuffer aKeyBuffer (rProvider); aKeyBuffer.appendAscii( "/ServiceName" ); - rtl::OUString aValue; + OUString aValue; try { if ( !( rxHierNameAccess->getByHierarchicalName( @@ -659,7 +660,7 @@ Any SAL_CALL UniversalContentBroker::execute( { ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "Wrong argument type!" )), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -677,7 +678,7 @@ Any SAL_CALL UniversalContentBroker::execute( ucbhelper::cancelCommandExecution( makeAny( UnsupportedCommandException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -718,7 +719,7 @@ void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& for ( sal_Int32 n = 0; n < nCount; ++n ) { const util::ElementChange& rElem = pElementChanges[ n ]; - rtl::OUString aKey; + OUString aKey; rElem.Accessor >>= aKey; ContentProviderData aInfo; @@ -780,8 +781,8 @@ Reference< XContentProvider > UniversalContentBroker::queryContentProvider( bool UniversalContentBroker::configureUcb() throw (uno::RuntimeException) { - rtl::OUString aKey1; - rtl::OUString aKey2; + OUString aKey1; + OUString aKey2; if (m_aArguments.getLength() < 2 || !(m_aArguments[0] >>= aKey1) || !(m_aArguments[1] >>= aKey2)) { @@ -808,7 +809,7 @@ void UniversalContentBroker::prepareAndRegister( for (ContentProviderDataList::const_iterator aIt(rData.begin()); aIt != aEnd; ++aIt) { - rtl::OUString aProviderArguments; + OUString aProviderArguments; if (fillPlaceholders(aIt->Arguments, m_aArguments, &aProviderArguments)) @@ -829,8 +830,8 @@ void UniversalContentBroker::prepareAndRegister( //========================================================================= bool UniversalContentBroker::getContentProviderData( - const rtl::OUString & rKey1, - const rtl::OUString & rKey2, + const OUString & rKey1, + const OUString & rKey2, ContentProviderDataList & rListToFill ) { if ( !m_xSMgr.is() || !rKey1.getLength() || !rKey2.getLength() ) @@ -844,11 +845,11 @@ bool UniversalContentBroker::getContentProviderData( { uno::Reference< lang::XMultiServiceFactory > xConfigProv( m_xSMgr->createInstance( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( + OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" )) ), uno::UNO_QUERY_THROW ); - rtl::OUStringBuffer aFullPath; + OUStringBuffer aFullPath; aFullPath.appendAscii( CONFIG_CONTENTPROVIDERS_KEY "/['" ); makeAndAppendXMLName( aFullPath, rKey1 ); aFullPath.appendAscii( "']/SecondaryKeys/['" ); @@ -858,13 +859,13 @@ bool UniversalContentBroker::getContentProviderData( uno::Sequence< uno::Any > aArguments( 1 ); beans::PropertyValue aProperty; aProperty.Name - = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); + = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ) ); aProperty.Value <<= aFullPath.makeStringAndClear(); aArguments[ 0 ] <<= aProperty; uno::Reference< uno::XInterface > xInterface( xConfigProv->createInstanceWithArguments( - rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( + OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" ) ), aArguments ) ); @@ -879,8 +880,8 @@ bool UniversalContentBroker::getContentProviderData( uno::Reference< container::XNameAccess > xNameAccess( xInterface, uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aElems = xNameAccess->getElementNames(); - const rtl::OUString* pElems = aElems.getConstArray(); + uno::Sequence< OUString > aElems = xNameAccess->getElementNames(); + const OUString* pElems = aElems.getConstArray(); sal_Int32 nCount = aElems.getLength(); if ( nCount > 0 ) @@ -897,7 +898,7 @@ bool UniversalContentBroker::getContentProviderData( ContentProviderData aInfo; - rtl::OUStringBuffer aElemBuffer; + OUStringBuffer aElemBuffer; aElemBuffer.appendAscii( "['" ); makeAndAppendXMLName( aElemBuffer, pElems[ n ] ); aElemBuffer.appendAscii( "']" ); |