diff options
Diffstat (limited to 'desktop/source/deployment/registry')
28 files changed, 282 insertions, 300 deletions
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx index fb871f629139..d6fdfc4a4251 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/component-registry/2010" #define NS_PREFIX "comp" @@ -43,7 +42,7 @@ namespace component { ComponentBackendDb::ComponentBackendDb( Reference<XComponentContext> const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } @@ -68,7 +67,7 @@ OUString ComponentBackendDb::getKeyElementName() return OUString(KEY_ELEMENT_NAME); } -void ComponentBackendDb::addEntry(::rtl::OUString const & url, Data const & data) +void ComponentBackendDb::addEntry(OUString const & url, Data const & data) { try{ if (!activateEntry(url)) @@ -104,7 +103,7 @@ void ComponentBackendDb::addEntry(::rtl::OUString const & url, Data const & data } } -ComponentBackendDb::Data ComponentBackendDb::getEntry(::rtl::OUString const & url) +ComponentBackendDb::Data ComponentBackendDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx index c7b9522da73b..39aeeacae3be 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx @@ -65,18 +65,18 @@ namespace component { class ComponentBackendDb: public dp_registry::backend::BackendDb { protected: - virtual ::rtl::OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getDbNSName(); + virtual OUString getNSPrefix(); + virtual OUString getRootElementName(); + virtual OUString getKeyElementName(); public: struct Data { Data(): javaTypeLibrary(false) {}; - ::std::list< ::rtl::OUString> implementationNames; - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString> >singletons; + ::std::list< OUString> implementationNames; + ::std::vector< ::std::pair< OUString, OUString> >singletons; // map from singleton names to implementation names bool javaTypeLibrary; }; @@ -84,11 +84,11 @@ public: public: ComponentBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & url); + OUString const & url); - void addEntry(::rtl::OUString const & url, Data const & data); + void addEntry(OUString const & url, Data const & data); - Data getEntry(::rtl::OUString const & url); + Data getEntry(OUString const & url); }; diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 15878e187574..e72aa32883a0 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -54,7 +54,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -87,7 +86,7 @@ bool jarManifestHeaderPresent( OUString const & url, OUString const & name, Reference<XCommandEnvironment> const & xCmdEnv ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "vnd.sun.star.zip://" ); buf.append( ::rtl::Uri::encode( @@ -269,7 +268,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool bSwitchedRdbFiles; typedef ::boost::unordered_map< OUString, Reference<XInterface>, - ::rtl::OUStringHash > t_string2object; + OUStringHash > t_string2object; t_string2object m_backendObjects; // PackageRegistryBackend @@ -673,7 +672,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( { // xxx todo: probe and evaluate component xml description - INetContentTypeParameter const * param = params.find(rtl::OString("platform")); + INetContentTypeParameter const * param = params.find(OString("platform")); bool bPlatformFits(param == 0); String aPlatform; if (!bPlatformFits) // platform is specified, we have to check @@ -684,7 +683,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( // If the package is being removed, do not care whether // platform fits. We won't be using it anyway. if (bPlatformFits || bRemoved) { - param = params.find(rtl::OString("type")); + param = params.find(OString("type")); if (param != 0) { String const & value = param->m_sValue; @@ -716,7 +715,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } else if (subType.equalsIgnoreAsciiCase("vnd.sun.star.uno-components")) { - INetContentTypeParameter const * param = params.find(rtl::OString("platform")); + INetContentTypeParameter const * param = params.find(OString("platform")); if (param == 0 || platform_fits( param->m_sValue )) { return new BackendImpl::ComponentsPackageImpl( this, url, name, m_xComponentsTypeInfo, bRemoved, @@ -725,7 +724,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } else if (subType.equalsIgnoreAsciiCase( "vnd.sun.star.uno-typelibrary")) { - INetContentTypeParameter const * param = params.find(rtl::OString("type")); + INetContentTypeParameter const * param = params.find(OString("type")); if (param != 0) { String const & value = param->m_sValue; if (value.EqualsIgnoreCaseAscii("RDB")) @@ -827,7 +826,7 @@ void BackendImpl::unorc_verify_init( for (sal_Int32 i = RTL_CONSTASCII_LENGTH("UNO_SERVICES="); i >= 0;) { - rtl::OUString token(line.getToken(0, ' ', i)); + OUString token(line.getToken(0, ' ', i)); if (!token.isEmpty()) { if (state == 1 && token.match("?$ORIGIN/")) @@ -878,11 +877,11 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) if (!m_unorc_inited || !m_unorc_modified) return; - ::rtl::OStringBuffer buf; + OStringBuffer buf; buf.append("ORIGIN="); OUString sOrigin = dp_misc::makeRcTerm(m_cachePath); - ::rtl::OString osOrigin = ::rtl::OUStringToOString(sOrigin, RTL_TEXTENCODING_UTF8); + OString osOrigin = OUStringToOString(sOrigin, RTL_TEXTENCODING_UTF8); buf.append(osOrigin); buf.append(LF); @@ -893,8 +892,8 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) buf.append( "UNO_JAVA_CLASSPATH=" ); while (iPos != iEnd) { // encoded ASCII file-urls: - const ::rtl::OString item( - ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); + const OString item( + OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); buf.append( item ); ++iPos; if (iPos != iEnd) @@ -910,8 +909,8 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) while (iPos != iEnd) { buf.append( '?' ); // encoded ASCII file-urls: - const ::rtl::OString item( - ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); + const OString item( + OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); buf.append( item ); ++iPos; if (iPos != iEnd) @@ -934,7 +933,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) if (!sCommonRDB.isEmpty()) { buf.append( "?$ORIGIN/" ); - buf.append( ::rtl::OUStringToOString( + buf.append( OUStringToOString( sCommonRDB, RTL_TEXTENCODING_ASCII_US ) ); space = true; } @@ -948,12 +947,12 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) space = true; // write native rc: - ::rtl::OStringBuffer buf2; + OStringBuffer buf2; buf2.append("ORIGIN="); buf2.append(osOrigin); buf2.append(LF); buf2.append( "UNO_SERVICES=?$ORIGIN/" ); - buf2.append( ::rtl::OUStringToOString( + buf2.append( OUStringToOString( sNativeRDB, RTL_TEXTENCODING_ASCII_US ) ); buf2.append(LF); @@ -975,7 +974,7 @@ void BackendImpl::unorc_flush( Reference<XCommandEnvironment> const & xCmdEnv ) buf.append(' '); } buf.append('?'); - buf.append(rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8)); + buf.append(OUStringToOString(*i, RTL_TEXTENCODING_UTF8)); space = true; } buf.append(LF); @@ -1083,9 +1082,9 @@ Reference<XComponentContext> raise_uno_process( { OSL_ASSERT( xContext.is() ); - ::rtl::OUString url( util::theMacroExpander::get(xContext)->expandMacros( "$URE_BIN_DIR/uno" ) ); + OUString url( util::theMacroExpander::get(xContext)->expandMacros( "$URE_BIN_DIR/uno" ) ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "uno:pipe,name=" ); OUString pipeId( generateRandomPipeId() ); buf.append( pipeId ); @@ -1137,11 +1136,11 @@ void extractComponentData( std::vector< css::uno::Reference< css::uno::XInterface > > * factories, css::uno::Reference< css::loader::XImplementationLoader > const & componentLoader, - rtl::OUString const & componentUrl) + OUString const & componentUrl) { OSL_ASSERT( context.is() && registry.is() && data != 0 && componentLoader.is()); - rtl::OUString registryName(registry->getKeyName()); + OUString registryName(registry->getKeyName()); sal_Int32 prefix = registryName.getLength(); if (!registryName.endsWith("/")) { prefix += RTL_CONSTASCII_LENGTH("/"); @@ -1151,7 +1150,7 @@ void extractComponentData( css::uno::Reference< css::lang::XMultiComponentFactory > smgr( context->getServiceManager(), css::uno::UNO_QUERY_THROW); for (sal_Int32 i = 0; i < keys.getLength(); ++i) { - rtl::OUString name(keys[i]->getKeyName().copy(prefix)); + OUString name(keys[i]->getKeyName().copy(prefix)); data->implementationNames.push_back(name); css::uno::Reference< css::registry::XRegistryKey > singletons( keys[i]->openKey("UNO/SINGLETONS")); @@ -1163,14 +1162,14 @@ void extractComponentData( singletonKeys(singletons->openKeys()); for (sal_Int32 j = 0; j < singletonKeys.getLength(); ++j) { data->singletons.push_back( - std::pair< rtl::OUString, rtl::OUString >( + std::pair< OUString, OUString >( singletonKeys[j]->getKeyName().copy(prefix2), name)); } } if (factories != 0) { factories->push_back( componentLoader->activate( - name, rtl::OUString(), componentUrl, keys[i])); + name, OUString(), componentUrl, keys[i])); } } } @@ -1198,7 +1197,7 @@ void BackendImpl::ComponentPackageImpl::getComponentInfo( // .../UNO/LOCATION and .../UNO/ACTIVATOR appear not to be written by // writeRegistryInfo, however, but are known, fixed values here, so // can be passed into extractComponentData - rtl::OUString url(getURL()); + OUString url(getURL()); const Reference<registry::XSimpleRegistry> xMemReg( xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.registry.SimpleRegistry", xContext ), @@ -1228,7 +1227,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion( } catch (const container::ElementExistException &) { OSL_TRACE( "implementation %s already registered", - rtl::OUStringToOString(*i, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(*i, RTL_TEXTENCODING_UTF8).getStr()); } } if (!data.singletons.empty()) { @@ -1237,7 +1236,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion( for (t_stringpairvec::const_iterator i(data.singletons.begin()); i != data.singletons.end(); ++i) { - rtl::OUString name("/singletons/" + i->first); + OUString name("/singletons/" + i->first); //TODO: Update should be atomic: try { cont->removeByName( name + "/arguments"); @@ -1252,7 +1251,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveInsertion( } catch (const container::ElementExistException &) { OSL_TRACE( "singleton %s already registered", - rtl::OUStringToOString( + OUStringToOString( i->first, RTL_TEXTENCODING_UTF8).getStr()); cont->replaceByName(name, css::uno::Any()); } @@ -1282,7 +1281,7 @@ void BackendImpl::ComponentPackageImpl::componentLiveRemoval( for (t_stringpairvec::const_iterator i(data.singletons.begin()); i != data.singletons.end(); ++i) { - rtl::OUString name("/singletons/" + i->first); + OUString name("/singletons/" + i->first); //TODO: Removal should be atomic: try { cont->removeByName(name); @@ -1388,7 +1387,7 @@ void BackendImpl::ComponentPackageImpl::processPackage_( Reference<XCommandEnvironment> const & xCmdEnv ) { BackendImpl * that = getMyBackend(); - rtl::OUString url(getURL()); + OUString url(getURL()); if (doRegisterPackage) { ComponentBackendDb::Data data; css::uno::Reference< css::uno::XComponentContext > context; @@ -1726,7 +1725,7 @@ void BackendImpl::ComponentsPackageImpl::processPackage_( Reference<XCommandEnvironment> const & xCmdEnv ) { BackendImpl * that = getMyBackend(); - rtl::OUString url(getURL()); + OUString url(getURL()); if (doRegisterPackage) { if (!startup) { css::uno::Reference< css::uno::XComponentContext > context( @@ -1742,9 +1741,9 @@ void BackendImpl::ComponentsPackageImpl::processPackage_( // This relies on the root component context's service manager // supporting the extended XSet semantics: css::uno::Sequence< css::beans::NamedValue > args(2); - args[0].Name = rtl::OUString("uri"); + args[0].Name = OUString("uri"); args[0].Value <<= expandUnoRcUrl(url); - args[1].Name = rtl::OUString("component-context"); + args[1].Name = OUString("component-context"); args[1].Value <<= context; css::uno::Reference< css::container::XSet > smgr( that->getRootContext()->getServiceManager(), @@ -1758,7 +1757,7 @@ void BackendImpl::ComponentsPackageImpl::processPackage_( // This relies on the root component context's service manager // supporting the extended XSet semantics: css::uno::Sequence< css::beans::NamedValue > args(1); - args[0].Name = rtl::OUString("uri"); + args[0].Name = OUString("uri"); args[0].Value <<= expandUnoRcUrl(url); css::uno::Reference< css::container::XSet > smgr( that->getRootContext()->getServiceManager(), diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index b17f057d1f89..9254a7c9ef6f 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -53,7 +53,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -222,7 +221,7 @@ BackendImpl::BackendImpl( SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<PersistentMap> pMap; SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OUString aCompatURL( makeURL( getCachePath(), "registered_packages.pmap" ) ); + OUString aCompatURL( makeURL( getCachePath(), "registered_packages.pmap" ) ); // Don't create it if it doesn't exist already if ( ::utl::UCBContentHelper::Exists( expandUnoRcUrl( aCompatURL ) ) ) @@ -235,7 +234,7 @@ BackendImpl::BackendImpl( } catch (const Exception &e) { - rtl::OUStringBuffer aStr( "Exception loading legacy package database: '" ); + OUStringBuffer aStr( "Exception loading legacy package database: '" ); aStr.append( e.Message ); aStr.append( "' - ignoring file, please remove it.\n" ); dp_misc::writeConsole( aStr.getStr() ); @@ -427,7 +426,7 @@ void BackendImpl::configmgrini_flush( if (!m_configmgrini_inited || !m_configmgrini_modified) return; - ::rtl::OStringBuffer buf; + OStringBuffer buf; if (! m_xcs_files.empty()) { t_stringlist::const_iterator iPos( m_xcs_files.begin() ); @@ -435,8 +434,8 @@ void BackendImpl::configmgrini_flush( buf.append( "SCHEMA=" ); while (iPos != iEnd) { // encoded ASCII file-urls: - const ::rtl::OString item( - ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); + const OString item( + OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); buf.append( item ); ++iPos; if (iPos != iEnd) @@ -451,8 +450,8 @@ void BackendImpl::configmgrini_flush( buf.append( "DATA=" ); while (iPos != iEnd) { // encoded ASCII file-urls: - const ::rtl::OString item( - ::rtl::OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); + const OString item( + OUStringToOString( *iPos, RTL_TEXTENCODING_ASCII_US ) ); buf.append( item ); ++iPos; if (iPos != iEnd) @@ -549,7 +548,7 @@ BackendImpl::PackageImpl::isRegistered_( Reference<XCommandEnvironment> const & ) { BackendImpl * that = getMyBackend(); - const rtl::OUString url(getURL()); + const OUString url(getURL()); bool bReg = false; if (that->hasActiveEntry(getURL())) @@ -560,7 +559,7 @@ BackendImpl::PackageImpl::isRegistered_( { // fallback for user extension registered in berkeley DB bReg = that->m_registeredPackages->has( - rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8 )); + OUStringToOString( url, RTL_TEXTENCODING_UTF8 )); } #endif return beans::Optional< beans::Ambiguous<sal_Bool> >( @@ -572,7 +571,7 @@ OUString encodeForXml( OUString const & text ) { // encode conforming xml: sal_Int32 len = text.getLength(); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; for ( sal_Int32 pos = 0; pos < len; ++pos ) { sal_Unicode c = text[ pos ]; @@ -610,7 +609,7 @@ OUString replaceOrigin( ::rtl::ByteSequence filtered( bytes.getLength() * 2, ::rtl::BYTESEQ_NODEFAULT ); bool use_filtered = false; - ::rtl::OString origin; + OString origin; sal_Char const * pBytes = reinterpret_cast<sal_Char const *>( bytes.getConstArray()); sal_Size nBytes = bytes.getLength(); @@ -653,7 +652,7 @@ OUString replaceOrigin( { if (origin.isEmpty()) { // encode only once - origin = ::rtl::OUStringToOString( + origin = OUStringToOString( encodeForXml( url.copy( 0, url.lastIndexOf( '/' ) ) ), // xxx todo: encode always for UTF-8? => lookup doc-header? RTL_TEXTENCODING_UTF8 ); @@ -673,7 +672,7 @@ OUString replaceOrigin( return url; if (write_pos < filtered.getLength()) filtered.realloc( write_pos ); - rtl::OUString newUrl(url); + OUString newUrl(url); if (!destFolder.isEmpty()) { //get the file name of the xcu and add it to the url of the temporary folder @@ -758,8 +757,8 @@ void BackendImpl::PackageImpl::processPackage_( //structur containing the xcu, xcs files from all extensions. Now, //we just add all other xcu/xcs files to the configmgr.ini instead of //rebuilding the directory structure. - rtl::OUString url2( - rtl::OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); + OUString url2( + OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); if (url2 != url) { bool schema = i->second.equalsIgnoreAsciiCase( "vnd.sun.star.configuration-schema"); diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx index 01a7bb8f36d2..47e364e2b754 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/configuration-registry/2010" #define NS_PREFIX "conf" @@ -43,7 +42,7 @@ namespace configuration { ConfigurationBackendDb::ConfigurationBackendDb( Reference<XComponentContext> const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } @@ -69,7 +68,7 @@ OUString ConfigurationBackendDb::getKeyElementName() } -void ConfigurationBackendDb::addEntry(::rtl::OUString const & url, Data const & data) +void ConfigurationBackendDb::addEntry(OUString const & url, Data const & data) { try{ if (!activateEntry(url)) @@ -97,7 +96,7 @@ void ConfigurationBackendDb::addEntry(::rtl::OUString const & url, Data const & ::boost::optional<ConfigurationBackendDb::Data> -ConfigurationBackendDb::getEntry(::rtl::OUString const & url) +ConfigurationBackendDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx index 31435015811c..31a444bea994 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx @@ -42,13 +42,13 @@ namespace configuration { class ConfigurationBackendDb: public dp_registry::backend::BackendDb { protected: - virtual ::rtl::OUString getDbNSName(); + virtual OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); + virtual OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); + virtual OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getKeyElementName(); public: struct Data @@ -56,21 +56,21 @@ public: /* the URL to the folder containing the xcu or xcs files which contained %origin% */ - ::rtl::OUString dataUrl; + OUString dataUrl; /* the URL of the xcu or xcs file which is written in to the configmgr.ini */ - ::rtl::OUString iniEntry; + OUString iniEntry; }; public: ConfigurationBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & url); + OUString const & url); - void addEntry(::rtl::OUString const & url, Data const & data); + void addEntry(OUString const & url, Data const & data); - ::boost::optional<Data> getEntry(::rtl::OUString const & url); - ::std::list< ::rtl::OUString> getAllDataUrls(); + ::boost::optional<Data> getEntry(OUString const & url); + ::std::list< OUString> getAllDataUrls(); }; diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 07cadb6a4f42..8c6cdfaf867e 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -46,7 +46,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index 152a8f025279..927c47dc8070 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_registry { @@ -44,7 +43,7 @@ namespace backend { BackendDb::BackendDb( Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & url): + OUString const & url): m_xContext(xContext) { m_urlDb = dp_misc::expandUnoRcUrl(url); @@ -119,7 +118,7 @@ Reference<css::xml::xpath::XXPathAPI> BackendDb::getXPathAPI() return m_xpathApi; } -void BackendDb::removeElement(::rtl::OUString const & sXPathExpression) +void BackendDb::removeElement(OUString const & sXPathExpression) { try { @@ -152,11 +151,11 @@ void BackendDb::removeElement(::rtl::OUString const & sXPathExpression) } } -void BackendDb::removeEntry(::rtl::OUString const & url) +void BackendDb::removeEntry(OUString const & url) { const OUString sKeyElement = getKeyElementName(); const OUString sPrefix = getNSPrefix(); - ::rtl::OUStringBuffer sExpression(500); + OUStringBuffer sExpression(500); sExpression.append(sPrefix); sExpression.appendAscii(":"); sExpression.append(sKeyElement); @@ -167,7 +166,7 @@ void BackendDb::removeEntry(::rtl::OUString const & url) removeElement(sExpression.makeStringAndClear()); } -void BackendDb::revokeEntry(::rtl::OUString const & url) +void BackendDb::revokeEntry(OUString const & url) { try { @@ -187,7 +186,7 @@ void BackendDb::revokeEntry(::rtl::OUString const & url) } } -bool BackendDb::activateEntry(::rtl::OUString const & url) +bool BackendDb::activateEntry(OUString const & url) { try { @@ -211,7 +210,7 @@ bool BackendDb::activateEntry(::rtl::OUString const & url) } } -bool BackendDb::hasActiveEntry(::rtl::OUString const & url) +bool BackendDb::hasActiveEntry(OUString const & url) { try { @@ -236,13 +235,13 @@ bool BackendDb::hasActiveEntry(::rtl::OUString const & url) } Reference<css::xml::dom::XNode> BackendDb::getKeyElement( - ::rtl::OUString const & url) + OUString const & url) { try { const OUString sPrefix = getNSPrefix(); const OUString sKeyElement = getKeyElementName(); - ::rtl::OUStringBuffer sExpression(500); + OUStringBuffer sExpression(500); sExpression.append(sPrefix); sExpression.appendAscii(":"); sExpression.append(sKeyElement); @@ -266,7 +265,7 @@ Reference<css::xml::dom::XNode> BackendDb::getKeyElement( //Only writes the data if there is at least one entry void BackendDb::writeVectorOfPair( - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > const & vecPairs, + ::std::vector< ::std::pair< OUString, OUString > > const & vecPairs, OUString const & sVectorTagName, OUString const & sPairTagName, OUString const & sFirstTagName, @@ -384,7 +383,7 @@ BackendDb::readVectorOfPair( //Only writes the data if there is at least one entry void BackendDb::writeSimpleList( - ::std::list< ::rtl::OUString> const & list, + ::std::list< OUString> const & list, OUString const & sListTagName, OUString const & sMemberTagName, Reference<css::xml::dom::XNode> const & xParent) @@ -463,7 +462,7 @@ void BackendDb::writeSimpleElement( element. */ Reference<css::xml::dom::XNode> BackendDb::writeKeyElement( - ::rtl::OUString const & url) + OUString const & url) { try { @@ -579,7 +578,7 @@ OUString BackendDb::readSimpleElement( Reference<css::xml::xpath::XXPathAPI> xpathApi = getXPathAPI(); const OUString sPrefix = getNSPrefix(); const OUString sKeyElement = getKeyElementName(); - ::rtl::OUStringBuffer buf(512); + OUStringBuffer buf(512); buf.append(sPrefix); buf.appendAscii(":"); buf.append(sKeyElement); @@ -615,11 +614,11 @@ OUString BackendDb::readSimpleElement( RegisteredDb::RegisteredDb( Reference<XComponentContext> const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } -void RegisteredDb::addEntry(::rtl::OUString const & url) +void RegisteredDb::addEntry(OUString const & url) { try{ if (!activateEntry(url)) @@ -660,7 +659,7 @@ void RegisteredDb::addEntry(::rtl::OUString const & url) } } -bool RegisteredDb::getEntry(::rtl::OUString const & url) +bool RegisteredDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 742b59439a32..fdb3fba23a2a 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -48,7 +48,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { @@ -166,7 +165,7 @@ PackageRegistryImpl::~PackageRegistryImpl() //______________________________________________________________________________ OUString normalizeMediaType( OUString const & mediaType ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 index = 0; for (;;) { buf.append( mediaType.getToken( 0, '/', index ).trim() ); @@ -180,7 +179,7 @@ OUString normalizeMediaType( OUString const & mediaType ) //______________________________________________________________________________ void PackageRegistryImpl::packageRemoved( - ::rtl::OUString const & url, ::rtl::OUString const & mediaType) + OUString const & url, OUString const & mediaType) throw (css::deployment::DeploymentException, css::uno::RuntimeException) { @@ -197,7 +196,7 @@ void PackageRegistryImpl::insertBackend( Reference<deployment::XPackageRegistry> const & xBackend ) { m_allBackends.insert( xBackend ); - typedef ::boost::unordered_set<OUString, ::rtl::OUStringHash> t_stringset; + typedef ::boost::unordered_set<OUString, OUStringHash> t_stringset; t_stringset ambiguousFilters; const Sequence< Reference<deployment::XPackageTypeInfo> > packageTypes( @@ -273,7 +272,7 @@ void PackageRegistryImpl::insertBackend( #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "more than one PackageRegistryBackend for media-type=\"" ); buf.append( mediaType ); buf.appendAscii( "\" => " ); @@ -281,7 +280,7 @@ void PackageRegistryImpl::insertBackend( xBackend, UNO_QUERY_THROW )-> getImplementationName() ); buf.appendAscii( "\"!" ); - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_UTF8).getStr() ); } @@ -394,7 +393,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( that->m_filter2mediaType.begin() ); iPos != that->m_filter2mediaType.end(); ++iPos ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "extension \"" ); buf.append( iPos->first ); buf.appendAscii( "\" maps to media-type \"" ); @@ -413,7 +412,7 @@ Reference<deployment::XPackageRegistry> PackageRegistryImpl::create( that->m_ambiguousBackends.begin() ); iPos != that->m_ambiguousBackends.end(); ++iPos ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( Reference<lang::XServiceInfo>( *iPos, UNO_QUERY_THROW )->getImplementationName() ); diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 131d6ae18c90..b84c95ae5f2a 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace dp_misc; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -75,7 +74,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend friend class ExecutablePackageImpl; typedef ::boost::unordered_map< OUString, Reference<XInterface>, - ::rtl::OUStringHash > t_string2object; + OUStringHash > t_string2object; // PackageRegistryBackend virtual Reference<deployment::XPackage> bindPackage_( diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx index 25988f011f90..fcafcfc390ab 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/executable-registry/2010" #define NS_PREFIX "exe" @@ -38,7 +37,7 @@ namespace executable { ExecutableBackendDb::ExecutableBackendDb( Reference<XComponentContext> const & xContext, - ::rtl::OUString const & url):RegisteredDb(xContext, url) + OUString const & url):RegisteredDb(xContext, url) { } diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx index 496d2765fd74..10d094fbeec3 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.hxx @@ -42,18 +42,18 @@ namespace executable { class ExecutableBackendDb: public dp_registry::backend::RegisteredDb { protected: - virtual ::rtl::OUString getDbNSName(); + virtual OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); + virtual OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); + virtual OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getKeyElementName(); public: ExecutableBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & url); + OUString const & url); }; diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 7510714316f8..00e3ebaced42 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -47,7 +47,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -84,7 +83,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend bool extensionContainsCompiledHelp(); //XPackage - virtual css::beans::Optional< ::rtl::OUString > SAL_CALL getRegistrationDataURL() + virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() throw (deployment::ExtensionRemovedException, css::uno::RuntimeException); }; friend class PackageImpl; @@ -97,8 +96,8 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend void implProcessHelp( PackageImpl * package, bool doRegisterPackage, Reference<ucb::XCommandEnvironment> const & xCmdEnv); - void implCollectXhpFiles( const rtl::OUString& aDir, - std::vector< rtl::OUString >& o_rXhpFileVector ); + void implCollectXhpFiles( const OUString& aDir, + std::vector< OUString >& o_rXhpFileVector ); void addDataToDb(OUString const & url, HelpBackendDb::Data const & data); ::boost::optional<HelpBackendDb::Data> readDataFromDb(OUString const & url); @@ -132,7 +131,7 @@ BackendImpl::BackendImpl( Reference<XComponentContext> const & xComponentContext ) : PackageRegistryBackend( args, xComponentContext ), m_xHelpTypeInfo( new Package::TypeInfo("application/vnd.sun.star.help", - rtl::OUString(), + OUString(), getResourceString(RID_STR_HELP), RID_IMG_HELP ) ), m_typeInfos( 1 ) @@ -276,7 +275,7 @@ BackendImpl * BackendImpl::PackageImpl::getMyBackend() const bool BackendImpl::PackageImpl::extensionContainsCompiledHelp() { bool bCompiled = true; - rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl(getURL()); + OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl(getURL()); ::osl::Directory helpFolder(aExpandedHelpURL); if ( helpFolder.open() == ::osl::File::E_None) @@ -392,27 +391,27 @@ void BackendImpl::implProcessHelp( data.dataUrl = sHelpFolder; Reference< ucb::XSimpleFileAccess3 > xSFA = getFileAccess(); - rtl::OUString aHelpURL = xPackage->getURL(); - rtl::OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL ); + OUString aHelpURL = xPackage->getURL(); + OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL ); if( !xSFA->isFolder( aExpandedHelpURL ) ) { - rtl::OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR ); - aErrStr += rtl::OUString("No help folder" ); + OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR ); + aErrStr += OUString("No help folder" ); OWeakObject* oWeakThis = static_cast<OWeakObject *>(this); - throw deployment::DeploymentException( rtl::OUString(), oWeakThis, + throw deployment::DeploymentException( OUString(), oWeakThis, makeAny( uno::Exception( aErrStr, oWeakThis ) ) ); } // Scan languages - Sequence< rtl::OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true ); + Sequence< OUString > aLanguageFolderSeq = xSFA->getFolderContents( aExpandedHelpURL, true ); sal_Int32 nLangCount = aLanguageFolderSeq.getLength(); - const rtl::OUString* pSeq = aLanguageFolderSeq.getConstArray(); + const OUString* pSeq = aLanguageFolderSeq.getConstArray(); for( sal_Int32 iLang = 0 ; iLang < nLangCount ; ++iLang ) { - rtl::OUString aLangURL = pSeq[iLang]; + OUString aLangURL = pSeq[iLang]; if( xSFA->isFolder( aLangURL ) ) { - std::vector< rtl::OUString > aXhpFileVector; + std::vector< OUString > aXhpFileVector; // calculate jar file URL sal_Int32 indexStartSegment = aLangURL.lastIndexOf('/'); @@ -432,50 +431,50 @@ void BackendImpl::implProcessHelp( const OUString aHelpStr("help"); const OUString aSlash("/"); - rtl::OUString aJarFile( + OUString aJarFile( makeURL(sHelpFolder, langFolderURLSegment + aSlash + aHelpStr + ".jar")); aJarFile = ::dp_misc::expandUnoRcUrl(aJarFile); - rtl::OUString aEncodedJarFilePath = rtl::Uri::encode( + OUString aEncodedJarFilePath = rtl::Uri::encode( aJarFile, rtl_UriCharClassPchar, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); - rtl::OUString aDestBasePath = rtl::OUString("vnd.sun.star.zip://" ); + OUString aDestBasePath = OUString("vnd.sun.star.zip://" ); aDestBasePath += aEncodedJarFilePath; - aDestBasePath += rtl::OUString("/" ); + aDestBasePath += OUString("/" ); sal_Int32 nLenLangFolderURL = aLangURL.getLength() + 1; - Sequence< rtl::OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true ); + Sequence< OUString > aSubLangSeq = xSFA->getFolderContents( aLangURL, true ); sal_Int32 nSubLangCount = aSubLangSeq.getLength(); - const rtl::OUString* pSubLangSeq = aSubLangSeq.getConstArray(); + const OUString* pSubLangSeq = aSubLangSeq.getConstArray(); for( sal_Int32 iSubLang = 0 ; iSubLang < nSubLangCount ; ++iSubLang ) { - rtl::OUString aSubFolderURL = pSubLangSeq[iSubLang]; + OUString aSubFolderURL = pSubLangSeq[iSubLang]; if( !xSFA->isFolder( aSubFolderURL ) ) continue; implCollectXhpFiles( aSubFolderURL, aXhpFileVector ); // Copy to package (later: move?) - rtl::OUString aDestPath = aDestBasePath; - rtl::OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL ); + OUString aDestPath = aDestBasePath; + OUString aPureFolderName = aSubFolderURL.copy( nLenLangFolderURL ); aDestPath += aPureFolderName; xSFA->copy( aSubFolderURL, aDestPath ); } // Call compiler sal_Int32 nXhpFileCount = aXhpFileVector.size(); - rtl::OUString* pXhpFiles = new rtl::OUString[nXhpFileCount]; + OUString* pXhpFiles = new OUString[nXhpFileCount]; for( sal_Int32 iXhp = 0 ; iXhp < nXhpFileCount ; ++iXhp ) { - rtl::OUString aXhpFile = aXhpFileVector[iXhp]; - rtl::OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL ); + OUString aXhpFile = aXhpFileVector[iXhp]; + OUString aXhpRelFile = aXhpFile.copy( nLenLangFolderURL ); pXhpFiles[iXhp] = aXhpRelFile; } - rtl::OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() ); - rtl::OUString aOfficeHelpPathFileURL; + OUString aOfficeHelpPath( SvtPathOptions().GetHelpPath() ); + OUString aOfficeHelpPathFileURL; ::osl::File::getFileURLFromSystemPath( aOfficeHelpPath, aOfficeHelpPathFileURL ); HelpProcessingErrorInfo aErrorInfo; @@ -486,14 +485,14 @@ void BackendImpl::implProcessHelp( if( bSuccess ) { - rtl::OUString aLang; + OUString aLang; sal_Int32 nLastSlash = aLangURL.lastIndexOf( '/' ); if( nLastSlash != -1 ) aLang = aLangURL.copy( nLastSlash + 1 ); else - aLang = rtl::OUString("en" ); + aLang = OUString("en" ); - rtl::OUString aMod("help"); + OUString aMod("help"); HelpIndexer aIndexer(aLang, aMod, langFolderDestExpanded, langFolderDestExpanded); aIndexer.indexDocuments(); @@ -510,13 +509,13 @@ void BackendImpl::implProcessHelp( default: ; }; - rtl::OUString aErrStr; + OUString aErrStr; if( nErrStrId != 0 ) { aErrStr = getResourceString( nErrStrId ); // Remoce CR/LF - rtl::OUString aErrMsg( aErrorInfo.m_aErrorMsg ); + OUString aErrMsg( aErrorInfo.m_aErrorMsg ); sal_Unicode nCR = 13, nLF = 10; sal_Int32 nSearchCR = aErrMsg.indexOf( nCR ); sal_Int32 nSearchLF = aErrMsg.indexOf( nLF ); @@ -535,21 +534,21 @@ void BackendImpl::implProcessHelp( aErrStr += aErrMsg; if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && !aErrorInfo.m_aXMLParsingFile.isEmpty() ) { - aErrStr += rtl::OUString(" in " ); + aErrStr += OUString(" in " ); - rtl::OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile, + OUString aDecodedFile = rtl::Uri::decode( aErrorInfo.m_aXMLParsingFile, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); aErrStr += aDecodedFile; if( aErrorInfo.m_nXMLParsingLine != -1 ) { - aErrStr += rtl::OUString(", line " ); - aErrStr += ::rtl::OUString::valueOf( aErrorInfo.m_nXMLParsingLine ); + aErrStr += OUString(", line " ); + aErrStr += OUString::valueOf( aErrorInfo.m_nXMLParsingLine ); } } } OWeakObject* oWeakThis = static_cast<OWeakObject *>(this); - throw deployment::DeploymentException( rtl::OUString(), oWeakThis, + throw deployment::DeploymentException( OUString(), oWeakThis, makeAny( uno::Exception( aErrStr, oWeakThis ) ) ); } } @@ -569,18 +568,18 @@ void BackendImpl::implProcessHelp( } } -void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir, - std::vector< rtl::OUString >& o_rXhpFileVector ) +void BackendImpl::implCollectXhpFiles( const OUString& aDir, + std::vector< OUString >& o_rXhpFileVector ) { Reference< ucb::XSimpleFileAccess3 > xSFA = getFileAccess(); // Scan xhp files recursively - Sequence< rtl::OUString > aSeq = xSFA->getFolderContents( aDir, true ); + Sequence< OUString > aSeq = xSFA->getFolderContents( aDir, true ); sal_Int32 nCount = aSeq.getLength(); - const rtl::OUString* pSeq = aSeq.getConstArray(); + const OUString* pSeq = aSeq.getConstArray(); for( sal_Int32 i = 0 ; i < nCount ; ++i ) { - rtl::OUString aURL = pSeq[i]; + OUString aURL = pSeq[i]; if( xSFA->isFolder( aURL ) ) { implCollectXhpFiles( aURL, o_rXhpFileVector ); @@ -590,8 +589,8 @@ void BackendImpl::implCollectXhpFiles( const rtl::OUString& aDir, sal_Int32 nLastDot = aURL.lastIndexOf( '.' ); if( nLastDot != -1 ) { - rtl::OUString aExt = aURL.copy( nLastDot + 1 ); - if( aExt.equalsIgnoreAsciiCase( rtl::OUString("xhp" ) ) ) + OUString aExt = aURL.copy( nLastDot + 1 ); + if( aExt.equalsIgnoreAsciiCase( OUString("xhp" ) ) ) o_rXhpFileVector.push_back( aURL ); } } @@ -610,7 +609,7 @@ Reference< ucb::XSimpleFileAccess3 > BackendImpl::getFileAccess( void ) if( !m_xSFA.is() ) { throw RuntimeException( - ::rtl::OUString( + OUString( "dp_registry::backend::help::BackendImpl::getFileAccess(), " "could not instatiate SimpleFileAccess." ), Reference< XInterface >() ); diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx index af82956c4697..4d66fe4dd398 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx @@ -30,7 +30,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/help-registry/2010" #define NS_PREFIX "help" @@ -43,7 +42,7 @@ namespace help { HelpBackendDb::HelpBackendDb( Reference<XComponentContext> const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } @@ -69,7 +68,7 @@ OUString HelpBackendDb::getKeyElementName() } -void HelpBackendDb::addEntry(::rtl::OUString const & url, Data const & data) +void HelpBackendDb::addEntry(OUString const & url, Data const & data) { try{ if (!activateEntry(url)) @@ -95,7 +94,7 @@ void HelpBackendDb::addEntry(::rtl::OUString const & url, Data const & data) ::boost::optional<HelpBackendDb::Data> -HelpBackendDb::getEntry(::rtl::OUString const & url) +HelpBackendDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx index eeda03533db6..e6f6af82914e 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx @@ -41,34 +41,34 @@ namespace help { class HelpBackendDb: public dp_registry::backend::BackendDb { protected: - virtual ::rtl::OUString getDbNSName(); + virtual OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); + virtual OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); + virtual OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getKeyElementName(); public: struct Data { /* the URL to the folder containing the compiled help files, etc. */ - ::rtl::OUString dataUrl; + OUString dataUrl; }; public: HelpBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & url); + OUString const & url); - void addEntry(::rtl::OUString const & url, Data const & data); + void addEntry(OUString const & url, Data const & data); - ::boost::optional<Data> getEntry(::rtl::OUString const & url); + ::boost::optional<Data> getEntry(OUString const & url); //must also return the data urls for entries with @activ="false". That is, //those are currently revoked. - ::std::list< ::rtl::OUString> getAllDataUrls(); + ::std::list< OUString> getAllDataUrls(); }; diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 8522fd9907c2..621320852770 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -62,13 +62,13 @@ class Package : protected ::dp_misc::MutexHolder, public t_PackageBase protected: ::rtl::Reference<PackageRegistryBackend> m_myBackend; - const ::rtl::OUString m_url; - ::rtl::OUString m_name; - ::rtl::OUString m_displayName; + const OUString m_url; + OUString m_name; + OUString m_displayName; const css::uno::Reference<css::deployment::XPackageTypeInfo> m_xPackageType; const bool m_bRemoved; //Only set if m_bRemoved = true; - const ::rtl::OUString m_identifier; + const OUString m_identifier; void check() const; void fireModified(); @@ -94,43 +94,43 @@ protected: virtual ~Package(); Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend, - ::rtl::OUString const & url, - ::rtl::OUString const & name, - ::rtl::OUString const & displayName, + OUString const & url, + OUString const & name, + OUString const & displayName, css::uno::Reference<css::deployment::XPackageTypeInfo> const & xPackageType, bool bRemoved, - ::rtl::OUString const & identifier); + OUString const & identifier); public: class TypeInfo : public ::cppu::WeakImplHelper1<css::deployment::XPackageTypeInfo> { - const ::rtl::OUString m_mediaType; - const ::rtl::OUString m_fileFilter; - const ::rtl::OUString m_shortDescr; + const OUString m_mediaType; + const OUString m_fileFilter; + const OUString m_shortDescr; const sal_uInt16 m_smallIcon; public: virtual ~TypeInfo(); - TypeInfo( ::rtl::OUString const & mediaType, - ::rtl::OUString const & fileFilter, - ::rtl::OUString const & shortDescr, + TypeInfo( OUString const & mediaType, + OUString const & fileFilter, + OUString const & shortDescr, sal_uInt16 smallIcon) : m_mediaType(mediaType), m_fileFilter(fileFilter), m_shortDescr(shortDescr), m_smallIcon(smallIcon) {} // XPackageTypeInfo - virtual ::rtl::OUString SAL_CALL getMediaType() + virtual OUString SAL_CALL getMediaType() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDescription() + virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getShortDescription() + virtual OUString SAL_CALL getShortDescription() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFileFilter() + virtual OUString SAL_CALL getFileFilter() throw (css::uno::RuntimeException); virtual css::uno::Any SAL_CALL getIcon( sal_Bool highContrast, sal_Bool smallIcon ) @@ -212,25 +212,25 @@ public: css::ucb::CommandAbortedException, css::lang::IllegalArgumentException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getName() + virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException); - virtual css::beans::Optional< ::rtl::OUString > SAL_CALL getIdentifier() + virtual css::beans::Optional< OUString > SAL_CALL getIdentifier() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getVersion() + virtual OUString SAL_CALL getVersion() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getURL() + virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDisplayName() + virtual OUString SAL_CALL getDisplayName() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getDescription() + virtual OUString SAL_CALL getDescription() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getLicenseText() + virtual OUString SAL_CALL getLicenseText() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getUpdateInformationURLs() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); @@ -244,16 +244,16 @@ public: virtual css::uno::Reference<css::deployment::XPackageTypeInfo> SAL_CALL getPackageType() throw (css::uno::RuntimeException); virtual void SAL_CALL exportTo( - ::rtl::OUString const & destFolderURL, - ::rtl::OUString const & newTitle, + OUString const & destFolderURL, + OUString const & newTitle, sal_Int32 nameClashAction, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::ExtensionRemovedException, css::ucb::CommandFailedException, css::ucb::CommandAbortedException, css::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getRepositoryName() + virtual OUString SAL_CALL getRepositoryName() throw (css::uno::RuntimeException); - virtual css::beans::Optional< ::rtl::OUString > SAL_CALL getRegistrationDataURL() + virtual css::beans::Optional< OUString > SAL_CALL getRegistrationDataURL() throw (css::deployment::ExtensionRemovedException, css::uno::RuntimeException); virtual sal_Bool SAL_CALL isRemoved() @@ -277,15 +277,15 @@ class PackageRegistryBackend //of bindPackage calls which are costly. Therefore we keep hard references in //the map now. typedef ::boost::unordered_map< - ::rtl::OUString, css::uno::Reference<css::deployment::XPackage>, - ::rtl::OUStringHash > t_string2ref; + OUString, css::uno::Reference<css::deployment::XPackage>, + OUStringHash > t_string2ref; t_string2ref m_bound; protected: - ::rtl::OUString m_cachePath; + OUString m_cachePath; css::uno::Reference<css::uno::XComponentContext> m_xComponentContext; - ::rtl::OUString m_context; + OUString m_context; // currently only for library containers: enum { CONTEXT_UNKNOWN, @@ -301,8 +301,8 @@ protected: // @@@ to be implemented by specific backend: virtual css::uno::Reference<css::deployment::XPackage> bindPackage_( - ::rtl::OUString const & url, ::rtl::OUString const & mediaType, - sal_Bool bRemoved, ::rtl::OUString const & identifier, + OUString const & url, OUString const & mediaType, + sal_Bool bRemoved, OUString const & identifier, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) = 0; @@ -318,8 +318,8 @@ protected: If url is empty then it is created in the backend folder, otherwise at a location relative to that folder specified by url. */ - ::rtl::OUString createFolder( - ::rtl::OUString const & relUrl, + OUString createFolder( + OUString const & relUrl, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv); /* deletes folders and files. @@ -327,15 +327,15 @@ protected: not used are deleted. */ void deleteUnusedFolders( - ::rtl::OUString const & relUrl, - ::std::list< ::rtl::OUString> const & usedFolders); + OUString const & relUrl, + ::std::list< OUString> const & usedFolders); /* deletes one folder with a "temporary" name and the corresponding tmp file, which was used to derive the folder name. */ static void deleteTempFolder( - ::rtl::OUString const & folderUrl); + OUString const & folderUrl); - ::rtl::OUString getSharedRegistrationDataURL( + OUString getSharedRegistrationDataURL( css::uno::Reference<css::deployment::XPackage> const & extension, css::uno::Reference<css::deployment::XPackage> const & item); @@ -344,7 +344,7 @@ protected: This ensure that the backends clean up their registration data when an extension was removed. */ -// virtual void deleteDbEntry( ::rtl::OUString const & url) = 0; +// virtual void deleteDbEntry( OUString const & url) = 0; @@ -357,10 +357,10 @@ public: inline css::uno::Reference<css::uno::XComponentContext> const & getComponentContext() const { return m_xComponentContext; } - inline ::rtl::OUString const & getCachePath() const { return m_cachePath; } + inline OUString const & getCachePath() const { return m_cachePath; } inline bool transientMode() const { return m_cachePath.isEmpty(); } - inline ::rtl::OUString getContext() const {return m_context; } + inline OUString getContext() const {return m_context; } // XEventListener virtual void SAL_CALL disposing( css::lang::EventObject const & evt ) @@ -368,8 +368,8 @@ public: // XPackageRegistry virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL bindPackage( - ::rtl::OUString const & url, ::rtl::OUString const & mediaType, - sal_Bool bRemoved, ::rtl::OUString const & identifier, + OUString const & url, OUString const & mediaType, + sal_Bool bRemoved, OUString const & identifier, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, css::deployment::InvalidRemovedParameterException, @@ -377,7 +377,7 @@ public: css::lang::IllegalArgumentException, css::uno::RuntimeException); // virtual void SAL_CALL packageRemoved( -// ::rtl::OUString const & url, ::rtl::OUString const & mediaType) +// OUString const & url, OUString const & mediaType) // throw (css::deployment::DeploymentException, // css::uno::RuntimeException); diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 53e555c3bf71..09ae83f95fb1 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -52,7 +52,7 @@ private: protected: const css::uno::Reference<css::uno::XComponentContext> m_xContext; - ::rtl::OUString m_urlDb; + OUString m_urlDb; protected: @@ -64,88 +64,88 @@ protected: */ css::uno::Reference<css::xml::xpath::XXPathAPI> getXPathAPI(); void save(); - void removeElement(::rtl::OUString const & sXPathExpression); + void removeElement(OUString const & sXPathExpression); css::uno::Reference<css::xml::dom::XNode> getKeyElement( - ::rtl::OUString const & url); + OUString const & url); void writeSimpleList( - ::std::list< ::rtl::OUString> const & list, - ::rtl::OUString const & sListTagName, - ::rtl::OUString const & sMemberTagName, + ::std::list< OUString> const & list, + OUString const & sListTagName, + OUString const & sMemberTagName, css::uno::Reference<css::xml::dom::XNode> const & xParent); void writeVectorOfPair( - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > const & vecPairs, - ::rtl::OUString const & sVectorTagName, - ::rtl::OUString const & sPairTagName, - ::rtl::OUString const & sFirstTagName, - ::rtl::OUString const & sSecondTagName, + ::std::vector< ::std::pair< OUString, OUString > > const & vecPairs, + OUString const & sVectorTagName, + OUString const & sPairTagName, + OUString const & sFirstTagName, + OUString const & sSecondTagName, css::uno::Reference<css::xml::dom::XNode> const & xParent); void writeSimpleElement( - ::rtl::OUString const & sElementName, ::rtl::OUString const & value, + OUString const & sElementName, OUString const & value, css::uno::Reference<css::xml::dom::XNode> const & xParent); css::uno::Reference<css::xml::dom::XNode> writeKeyElement( - ::rtl::OUString const & url); + OUString const & url); - ::rtl::OUString readSimpleElement( - ::rtl::OUString const & sElementName, + OUString readSimpleElement( + OUString const & sElementName, css::uno::Reference<css::xml::dom::XNode> const & xParent); - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString > > + ::std::vector< ::std::pair< OUString, OUString > > readVectorOfPair( css::uno::Reference<css::xml::dom::XNode> const & parent, - ::rtl::OUString const & sListTagName, - ::rtl::OUString const & sPairTagName, - ::rtl::OUString const & sFirstTagName, - ::rtl::OUString const & sSecondTagName); + OUString const & sListTagName, + OUString const & sPairTagName, + OUString const & sFirstTagName, + OUString const & sSecondTagName); - ::std::list< ::rtl::OUString> readList( + ::std::list< OUString> readList( css::uno::Reference<css::xml::dom::XNode> const & parent, - ::rtl::OUString const & sListTagName, - ::rtl::OUString const & sMemberTagName); + OUString const & sListTagName, + OUString const & sMemberTagName); /* returns the values of one particulary child element of all key elements. */ - ::std::list< ::rtl::OUString> getOneChildFromAllEntries( - ::rtl::OUString const & sElementName); + ::std::list< OUString> getOneChildFromAllEntries( + OUString const & sElementName); /* returns the namespace which is to be written as xmlns attribute into the root element. */ - virtual ::rtl::OUString getDbNSName()=0; + virtual OUString getDbNSName()=0; /* return the namespace prefix which is to be registered with the XPath API. The prefix can then be used in XPath expressions. */ - virtual ::rtl::OUString getNSPrefix()=0; + virtual OUString getNSPrefix()=0; /* returns the name of the root element without any namespace prefix. */ - virtual ::rtl::OUString getRootElementName()=0; + virtual OUString getRootElementName()=0; /* returns the name of xml element for each entry */ - virtual ::rtl::OUString getKeyElementName()=0; + virtual OUString getKeyElementName()=0; public: BackendDb(css::uno::Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & url); + OUString const & url); virtual ~BackendDb() {}; - void removeEntry(::rtl::OUString const & url); + void removeEntry(OUString const & url); /* This is called to write the "revoked" attribute to the entry. This is done when XPackage::revokePackage is called. */ - void revokeEntry(::rtl::OUString const & url); + void revokeEntry(OUString const & url); /* returns false if the entry does not exist yet. */ - bool activateEntry(::rtl::OUString const & url); + bool activateEntry(OUString const & url); - bool hasActiveEntry(::rtl::OUString const & url); + bool hasActiveEntry(OUString const & url); }; @@ -154,12 +154,12 @@ class RegisteredDb: public BackendDb public: RegisteredDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & url); + OUString const & url); virtual ~RegisteredDb() {}; - virtual void addEntry(::rtl::OUString const & url); - virtual bool getEntry(::rtl::OUString const & url); + virtual void addEntry(OUString const & url); + virtual bool getEntry(OUString const & url); }; diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx index 72e08aca0b03..af7353287229 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx @@ -29,7 +29,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/extension-registry/2010" #define NS_PREFIX "ext" @@ -42,7 +41,7 @@ namespace bundle { ExtensionBackendDb::ExtensionBackendDb( Reference<XComponentContext> const & xContext, - ::rtl::OUString const & url):BackendDb(xContext, url) + OUString const & url):BackendDb(xContext, url) { } @@ -67,7 +66,7 @@ OUString ExtensionBackendDb::getKeyElementName() return OUString(KEY_ELEMENT_NAME); } -void ExtensionBackendDb::addEntry(::rtl::OUString const & url, Data const & data) +void ExtensionBackendDb::addEntry(OUString const & url, Data const & data) { try{ //reactive revoked entry if possible. @@ -88,7 +87,7 @@ void ExtensionBackendDb::addEntry(::rtl::OUString const & url, Data const & data } } -ExtensionBackendDb::Data ExtensionBackendDb::getEntry(::rtl::OUString const & url) +ExtensionBackendDb::Data ExtensionBackendDb::getEntry(OUString const & url) { try { diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx index 9cb5b3619da2..da8324219f52 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx @@ -43,10 +43,10 @@ namespace bundle { class ExtensionBackendDb: public dp_registry::backend::BackendDb { protected: - virtual ::rtl::OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getDbNSName(); + virtual OUString getNSPrefix(); + virtual OUString getRootElementName(); + virtual OUString getKeyElementName(); public: struct Data @@ -54,18 +54,18 @@ public: /* every element consists of a pair of the url to the item (jar,rdb, etc) and the media type */ - ::std::vector< ::std::pair< ::rtl::OUString, ::rtl::OUString> > items; + ::std::vector< ::std::pair< OUString, OUString> > items; typedef ::std::vector< - ::std::pair< ::rtl::OUString, ::rtl::OUString> >::const_iterator ITC_ITEMS; + ::std::pair< OUString, OUString> >::const_iterator ITC_ITEMS; }; public: ExtensionBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & url); + OUString const & url); - void addEntry(::rtl::OUString const & url, Data const & data); + void addEntry(OUString const & url, Data const & data); - Data getEntry(::rtl::OUString const & url); + Data getEntry(OUString const & url); }; diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 201147b79965..1aac891b7462 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -71,7 +71,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_registry { namespace backend { @@ -609,7 +608,7 @@ bool BackendImpl::PackageImpl::checkPlatform( else { ret = false; - rtl::OUString msg( + OUString msg( "unsupported platform"); Any e( css::deployment::PlatformException( @@ -636,7 +635,7 @@ bool BackendImpl::PackageImpl::checkDependencies( if (unsatisfied.getLength() == 0) { return true; } else { - rtl::OUString msg( + OUString msg( "unsatisfied dependencies"); Any e( css::deployment::DependencyException( @@ -897,7 +896,7 @@ void BackendImpl::PackageImpl::processPackage_( } catch (const Exception &) { - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); @@ -989,7 +988,7 @@ OUString BackendImpl::PackageImpl::getDescription() } catch ( const css::deployment::DeploymentException& ) { - OSL_FAIL( ::rtl::OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1067,7 +1066,7 @@ void BackendImpl::PackageImpl::exportTo( } erase_path( destURL, xCmdEnv ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "vnd.sun.star.zip://" ); buf.append( ::rtl::Uri::encode( destURL, rtl_UriCharClassRegName, @@ -1119,14 +1118,14 @@ void BackendImpl::PackageImpl::exportTo( } // xxx todo: think about exception specs: catch (const deployment::DeploymentException &) { - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( ::comphelper::anyToString( ::cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (const lang::IllegalArgumentException & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1528,7 +1527,7 @@ void BackendImpl::PackageImpl::scanBundle( { // patch description: ::rtl::ByteSequence bytes( readFile( descrFileContent ) ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if ( bytes.getLength() ) { buf.append( OUString( reinterpret_cast<sal_Char const *>( diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx index b296f29c774f..42d917a3eb78 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.cxx +++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx @@ -35,7 +35,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/script/dp_lib_container.h b/desktop/source/deployment/registry/script/dp_lib_container.h index 53696cf5b11a..57b15f66885c 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.h +++ b/desktop/source/deployment/registry/script/dp_lib_container.h @@ -43,8 +43,8 @@ namespace script { class LibraryContainer { public: - static ::rtl::OUString get_libname( - ::rtl::OUString const & url, + static OUString get_libname( + OUString const & url, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, css::uno::Reference<css::uno::XComponentContext> const & xContext ); }; diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 9007449774a8..6f2db680a8bb 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -39,7 +39,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_registry { namespace backend { diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx index ccf65f104669..df57bb7bc423 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx @@ -28,7 +28,6 @@ using namespace ::com::sun::star::uno; -using ::rtl::OUString; #define EXTENSION_REG_NS "http://openoffice.org/extensionmanager/script-registry/2010" #define NS_PREFIX "script" @@ -41,7 +40,7 @@ namespace script { ScriptBackendDb::ScriptBackendDb( Reference<XComponentContext> const & xContext, - ::rtl::OUString const & url):RegisteredDb(xContext, url) + OUString const & url):RegisteredDb(xContext, url) { } diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx index 37266ef54e71..ab196dbdbe0c 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.hxx @@ -40,19 +40,19 @@ namespace script { class ScriptBackendDb: public dp_registry::backend::RegisteredDb { protected: - virtual ::rtl::OUString getDbNSName(); + virtual OUString getDbNSName(); - virtual ::rtl::OUString getNSPrefix(); + virtual OUString getNSPrefix(); - virtual ::rtl::OUString getRootElementName(); + virtual OUString getRootElementName(); - virtual ::rtl::OUString getKeyElementName(); + virtual OUString getKeyElementName(); public: ScriptBackendDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & url); + OUString const & url); }; diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx index dc09f6e52c1f..6e907f3df4a3 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.cxx @@ -25,7 +25,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_registry { diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 34f9a4d52ffe..f1339b888420 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -40,11 +40,11 @@ class ParcelDescDocHandler : public t_DocHandlerImpl { private: bool m_bIsParsed; - ::rtl::OUString m_sLang; + OUString m_sLang; sal_Int32 skipIndex; public: ParcelDescDocHandler():m_bIsParsed( false ), skipIndex( 0 ){} - ::rtl::OUString getParcelLanguage() { return m_sLang; } + OUString getParcelLanguage() { return m_sLang; } bool isParsed() { return m_bIsParsed; } // XDocumentHandler virtual void SAL_CALL startDocument() @@ -53,22 +53,22 @@ public: virtual void SAL_CALL endDocument() throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, + virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList > & xAttribs ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL endElement( const ::rtl::OUString & aName ) + virtual void SAL_CALL endElement( const OUString & aName ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL characters( const ::rtl::OUString & aChars ) + virtual void SAL_CALL characters( const OUString & aChars ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString & aWhitespaces ) + virtual void SAL_CALL ignorableWhitespace( const OUString & aWhitespaces ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); virtual void SAL_CALL processingInstruction( - const ::rtl::OUString & aTarget, const ::rtl::OUString & aData ) + const OUString & aTarget, const OUString & aData ) throw ( css::xml::sax::SAXException, css::uno::RuntimeException ); virtual void SAL_CALL setDocumentLocator( diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 534face1a1d8..5c8b97d79021 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -38,7 +38,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::script; -using ::rtl::OUString; namespace dp_registry { |