diff options
Diffstat (limited to 'desktop/source')
121 files changed, 1327 insertions, 1389 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 32ec153709ad..8ca7705444f2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -426,9 +426,9 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) // are allowed. Otherwise we will force a "crash inside a crash". // Thats why we have to use a special native message box here which does not use yield :-) //============================================================================= -void FatalError(const ::rtl::OUString& sMessage) +void FatalError(const OUString& sMessage) { - ::rtl::OUString sProductKey = ::utl::Bootstrap::getProductKey(); + OUString sProductKey = ::utl::Bootstrap::getProductKey(); if ( sProductKey.isEmpty()) { osl_getExecutableFile( &sProductKey.pData ); @@ -438,7 +438,7 @@ void FatalError(const ::rtl::OUString& sMessage) sProductKey = sProductKey.copy( nLastIndex+1 ); } - ::rtl::OUStringBuffer sTitle (128); + OUStringBuffer sTitle (128); sTitle.append (sProductKey ); sTitle.appendAscii (" - Fatal Error"); @@ -484,20 +484,20 @@ namespace : public rtl::Static< String, WriterCompatibilityVersionOOo11 > {}; } -rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) +OUString ReplaceStringHookProc( const OUString& rStr ) { - rtl::OUString sRet(rStr); + OUString sRet(rStr); if (sRet.indexOf("%PRODUCT") != -1 || sRet.indexOf("%ABOUTBOX") != -1) { - rtl::OUString sBrandName = BrandName::get(); - rtl::OUString sVersion = Version::get(); - rtl::OUString sBuildId = utl::Bootstrap::getBuildIdData("development"); - rtl::OUString sAboutBoxVersion = AboutBoxVersion::get(); - rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); - rtl::OUString sExtension = Extension::get(); - rtl::OUString sXMLFileFormatName = XMLFileFormatName::get(); - rtl::OUString sXMLFileFormatVersion = XMLFileFormatVersion::get(); + OUString sBrandName = BrandName::get(); + OUString sVersion = Version::get(); + OUString sBuildId = utl::Bootstrap::getBuildIdData("development"); + OUString sAboutBoxVersion = AboutBoxVersion::get(); + OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); + OUString sExtension = Extension::get(); + OUString sXMLFileFormatName = XMLFileFormatName::get(); + OUString sXMLFileFormatVersion = XMLFileFormatVersion::get(); if ( sBrandName.isEmpty() ) { @@ -526,7 +526,7 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) if ( sRet.indexOf( "%OOOVENDOR" ) != -1 ) { - rtl::OUString sOOOVendor = OOOVendor::get(); + OUString sOOOVendor = OOOVendor::get(); if ( sOOOVendor.isEmpty() ) { @@ -538,7 +538,7 @@ rtl::OUString ReplaceStringHookProc( const rtl::OUString& rStr ) if ( sRet.indexOf( "%WRITERCOMPATIBILITYVERSIONOOO11" ) != -1 ) { - rtl::OUString sWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get(); + OUString sWriterCompatibilityVersionOOo11 = WriterCompatibilityVersionOOo11::get(); if ( sWriterCompatibilityVersionOOo11.isEmpty() ) { sWriterCompatibilityVersionOOo11 = @@ -736,8 +736,8 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat { if ( aBootstrapStatus != ::utl::Bootstrap::DATA_OK ) { - ::rtl::OUString aProductKey; - ::rtl::OUString aTemp; + OUString aProductKey; + OUString aTemp; osl_getExecutableFile( &aProductKey.pData ); sal_uInt32 lastIndex = aProductKey.lastIndexOf('/'); @@ -761,9 +761,9 @@ void Desktop::HandleBootstrapPathErrors( ::utl::Bootstrap::Status aBootstrapStat } // Create a error message depending on bootstrap failure code and an optional file url -::rtl::OUString Desktop::CreateErrorMsgString( +OUString Desktop::CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode, - const ::rtl::OUString& aFileURL ) + const OUString& aFileURL ) { OUString aMsg; OUString aFilePath; @@ -1121,10 +1121,10 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave , sal_Bool bCrashed , sal_Bool bExistsRecoveryData) { - static ::rtl::OUString SERVICENAME_RECOVERYUI("com.sun.star.comp.svx.RecoveryUI"); - static ::rtl::OUString COMMAND_EMERGENCYSAVE("vnd.sun.star.autorecovery:/doEmergencySave"); - static ::rtl::OUString COMMAND_RECOVERY("vnd.sun.star.autorecovery:/doAutoRecovery"); - static ::rtl::OUString COMMAND_CRASHREPORT("vnd.sun.star.autorecovery:/doCrashReport"); + static OUString SERVICENAME_RECOVERYUI("com.sun.star.comp.svx.RecoveryUI"); + static OUString COMMAND_EMERGENCYSAVE("vnd.sun.star.autorecovery:/doEmergencySave"); + static OUString COMMAND_RECOVERY("vnd.sun.star.autorecovery:/doAutoRecovery"); + static OUString COMMAND_CRASHREPORT("vnd.sun.star.autorecovery:/doCrashReport"); css::uno::Reference< css::uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -1182,10 +1182,10 @@ void restartOnMac(bool passArguments) { ErrorBox aRestartBox( NULL, WB_OK, aMessage ); aRestartBox.Execute(); #else - rtl::OUString execUrl; + OUString execUrl; OSL_VERIFY(osl_getExecutableFile(&execUrl.pData) == osl_Process_E_None); - rtl::OUString execPath; - rtl::OString execPath8; + OUString execPath; + OString execPath8; if ((osl::FileBase::getSystemPathFromFileURL(execUrl, execPath) != osl::FileBase::E_None) || !execPath.convertToString( @@ -1195,18 +1195,18 @@ void restartOnMac(bool passArguments) { { std::abort(); } - std::vector< rtl::OString > args; + std::vector< OString > args; args.push_back(execPath8); bool wait = false; if (passArguments) { sal_uInt32 n = osl_getCommandArgCount(); for (sal_uInt32 i = 0; i < n; ++i) { - rtl::OUString arg; + OUString arg; OSL_VERIFY(osl_getCommandArg(i, &arg.pData) == osl_Process_E_None); if (arg.match("--accept=")) { wait = true; } - rtl::OString arg8; + OString arg8; if (!arg.convertToString( &arg8, osl_getThreadTextEncoding(), (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | @@ -1218,7 +1218,7 @@ void restartOnMac(bool passArguments) { } } std::vector< char const * > argPtrs; - for (std::vector< rtl::OString >::iterator i(args.begin()); i != args.end(); + for (std::vector< OString >::iterator i(args.begin()); i != args.end(); ++i) { argPtrs.push_back(i->getStr()); @@ -1507,8 +1507,8 @@ int Desktop::Main() #ifdef DBG_UTIL //include buildid in non product builds - ::rtl::OUString aDefault("development"); - aTitle += rtl::OUString(" ["); + OUString aDefault("development"); + aTitle += OUString(" ["); String aVerId( utl::Bootstrap::getBuildIdData(aDefault)); aTitle += aVerId; aTitle += ']'; @@ -1565,7 +1565,7 @@ int Desktop::Main() pExecGlobals->pLanguageOptions.reset( new SvtLanguageOptions(sal_True)); css::document::EventObject aEvent; - aEvent.EventName = ::rtl::OUString("OnStartApp"); + aEvent.EventName = OUString("OnStartApp"); pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent); SetSplashScreenProgress(50); @@ -1771,7 +1771,7 @@ int Desktop::doShutdown() if (pExecGlobals->xGlobalBroadcaster.is()) { css::document::EventObject aEvent; - aEvent.EventName = ::rtl::OUString("OnCloseApp"); + aEvent.EventName = OUString("OnCloseApp"); pExecGlobals->xGlobalBroadcaster->notifyEvent(aEvent); } @@ -2062,15 +2062,15 @@ void Desktop::EnableOleAutomation() RTL_LOGFILE_CONTEXT( aLog, "desktop (jl97489) ::Desktop::EnableOleAutomation" ); #ifdef WNT Reference< XMultiServiceFactory > xSMgr= comphelper::getProcessServiceFactory(); - xSMgr->createInstance(rtl::OUString("com.sun.star.bridge.OleApplicationRegistration")); - xSMgr->createInstance(rtl::OUString("com.sun.star.comp.ole.EmbedServer")); + xSMgr->createInstance(OUString("com.sun.star.bridge.OleApplicationRegistration")); + xSMgr->createInstance(OUString("com.sun.star.comp.ole.EmbedServer")); #endif } void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { Sequence < com::sun::star::beans::PropertyValue > args(1); - args[0].Name = ::rtl::OUString("Hidden"); + args[0].Name = OUString("Hidden"); args[0].Value <<= sal_True; Reference < XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() ); @@ -2078,8 +2078,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( rtl::OUString("private:factory/swriter"), - ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/swriter"), + OUString("_blank"), 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const com::sun::star::uno::Exception& ) @@ -2090,8 +2090,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( rtl::OUString("private:factory/scalc"), - ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/scalc"), + OUString("_blank"), 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const com::sun::star::uno::Exception& ) @@ -2102,8 +2102,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( rtl::OUString("private:factory/sdraw"), - ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/sdraw"), + OUString("_blank"), 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const com::sun::star::uno::Exception& ) @@ -2114,8 +2114,8 @@ void Desktop::PreloadModuleData( const CommandLineArgs& rArgs ) { try { - Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( rtl::OUString("private:factory/simpress"), - ::rtl::OUString("_blank"), 0, args ), UNO_QUERY_THROW ); + Reference < ::com::sun::star::util::XCloseable > xDoc( xDesktop->loadComponentFromURL( OUString("private:factory/simpress"), + OUString("_blank"), 0, args ), UNO_QUERY_THROW ); xDoc->close( sal_False ); } catch ( const com::sun::star::uno::Exception& ) @@ -2129,10 +2129,10 @@ void Desktop::PreloadConfigurationData() Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XNameAccess > xNameAccess = css::frame::UICommandDescription::create(xContext); - rtl::OUString aWriterDoc( "com.sun.star.text.TextDocument" ); - rtl::OUString aCalcDoc( "com.sun.star.sheet.SpreadsheetDocument" ); - rtl::OUString aDrawDoc( "com.sun.star.drawing.DrawingDocument" ); - rtl::OUString aImpressDoc( "com.sun.star.presentation.PresentationDocument" ); + OUString aWriterDoc( "com.sun.star.text.TextDocument" ); + OUString aCalcDoc( "com.sun.star.sheet.SpreadsheetDocument" ); + OUString aDrawDoc( "com.sun.star.drawing.DrawingDocument" ); + OUString aImpressDoc( "com.sun.star.presentation.PresentationDocument" ); // preload commands configuration Any a; @@ -2144,8 +2144,8 @@ void Desktop::PreloadConfigurationData() a >>= xCmdAccess; if ( xCmdAccess.is() ) { - xCmdAccess->getByName( rtl::OUString( ".uno:BasicShapes" )); - xCmdAccess->getByName( rtl::OUString( ".uno:EditGlossary" )); + xCmdAccess->getByName( OUString( ".uno:BasicShapes" )); + xCmdAccess->getByName( OUString( ".uno:EditGlossary" )); } } catch ( const ::com::sun::star::uno::Exception& ) @@ -2157,7 +2157,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aCalcDoc ); a >>= xCmdAccess; if ( xCmdAccess.is() ) - xCmdAccess->getByName( rtl::OUString( ".uno:InsertObjectStarMath" )); + xCmdAccess->getByName( OUString( ".uno:InsertObjectStarMath" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2169,7 +2169,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aDrawDoc ); a >>= xCmdAccess; if ( xCmdAccess.is() ) - xCmdAccess->getByName( rtl::OUString( ".uno:Polygon" )); + xCmdAccess->getByName( OUString( ".uno:Polygon" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2183,7 +2183,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aWriterDoc ); a >>= xWindowAccess; if ( xWindowAccess.is() ) - xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" )); + xWindowAccess->getByName( OUString( "private:resource/toolbar/standardbar" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2193,7 +2193,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aCalcDoc ); a >>= xWindowAccess; if ( xWindowAccess.is() ) - xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" )); + xWindowAccess->getByName( OUString( "private:resource/toolbar/standardbar" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2203,7 +2203,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aDrawDoc ); a >>= xWindowAccess; if ( xWindowAccess.is() ) - xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" )); + xWindowAccess->getByName( OUString( "private:resource/toolbar/standardbar" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2213,7 +2213,7 @@ void Desktop::PreloadConfigurationData() a = xNameAccess->getByName( aImpressDoc ); a >>= xWindowAccess; if ( xWindowAccess.is() ) - xWindowAccess->getByName( rtl::OUString( "private:resource/toolbar/standardbar" )); + xWindowAccess->getByName( OUString( "private:resource/toolbar/standardbar" )); } catch ( const ::com::sun::star::uno::Exception& ) { @@ -2237,7 +2237,7 @@ void Desktop::PreloadConfigurationData() try { xPopupMenuControllerFactory->hasController( - rtl::OUString( ".uno:CharFontName" ), + OUString( ".uno:CharFontName" ), OUString() ); } catch ( const ::com::sun::star::uno::Exception& ) @@ -2289,7 +2289,7 @@ void Desktop::OpenClients() if (!rArgs.IsQuickstart()) { sal_Bool bShowHelp = sal_False; - ::rtl::OUStringBuffer aHelpURLBuffer; + OUStringBuffer aHelpURLBuffer; if (rArgs.IsHelpWriter()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://swriter/start"); @@ -2382,7 +2382,7 @@ void Desktop::OpenClients() Reference< css::util::XURLTransformer > xParser = css::util::URLTransformer::create( ::comphelper::getProcessComponentContext() ); css::util::URL aCmd; - aCmd.Complete = ::rtl::OUString("vnd.sun.star.autorecovery:/disableRecovery"); + aCmd.Complete = OUString("vnd.sun.star.autorecovery:/disableRecovery"); xParser->parseStrict(aCmd); xRecovery->dispatch(aCmd, css::uno::Sequence< css::beans::PropertyValue >()); @@ -2432,7 +2432,7 @@ void Desktop::OpenClients() xSessionListener = SessionListener::createWithOnQuitFlag(::comphelper::getProcessComponentContext(), bAllowUI); -// css::beans::NamedValue aProperty( ::rtl::OUString( "AllowUserInteractionOnQuit" ), +// css::beans::NamedValue aProperty( OUString( "AllowUserInteractionOnQuit" ), // css::uno::makeAny( bAllowUI ) ); // css::uno::Sequence< css::uno::Any > aArgs( 1 ); // aArgs[0] <<= aProperty; @@ -2552,7 +2552,7 @@ void Desktop::OpenDefault() RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::OpenDefault" ); - ::rtl::OUString aName; + OUString aName; SvtModuleOptions aOpt; const CommandLineArgs& rArgs = GetCommandLineArgs(); @@ -2603,7 +2603,7 @@ void Desktop::OpenDefault() String GetURL_Impl( - const String& rName, boost::optional< rtl::OUString > const & cwdUrl ) + const String& rName, boost::optional< OUString > const & cwdUrl ) { // if rName is a vnd.sun.star.script URL do not attempt to parse it // as INetURLObj does not handle handle there URLs @@ -2784,15 +2784,15 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent ) Reference< css::util::XURLTransformer > xParser = css::util::URLTransformer::create(xContext); css::util::URL aCommand; - if( rAppEvent.GetData() == ::rtl::OUString("PREFERENCES") ) - aCommand.Complete = rtl::OUString( ".uno:OptionsTreeDialog" ); - else if( rAppEvent.GetData() == ::rtl::OUString("ABOUT") ) - aCommand.Complete = rtl::OUString( ".uno:About" ); + if( rAppEvent.GetData() == OUString("PREFERENCES") ) + aCommand.Complete = OUString( ".uno:OptionsTreeDialog" ); + else if( rAppEvent.GetData() == OUString("ABOUT") ) + aCommand.Complete = OUString( ".uno:About" ); if( !aCommand.Complete.isEmpty() ) { xParser->parseStrict(aCommand); - css::uno::Reference< css::frame::XDispatch > xDispatch = xDesktop->queryDispatch(aCommand, rtl::OUString(), 0); + css::uno::Reference< css::frame::XDispatch > xDispatch = xDesktop->queryDispatch(aCommand, OUString(), 0); if (xDispatch.is()) xDispatch->dispatch(aCommand, css::uno::Sequence< css::beans::PropertyValue >()); } @@ -2828,21 +2828,21 @@ void Desktop::OpenSplashScreen() // Determine application name from command line parameters OUString aAppName; if ( rCmdLine.IsWriter() ) - aAppName = rtl::OUString( "writer" ); + aAppName = OUString( "writer" ); else if ( rCmdLine.IsCalc() ) - aAppName = rtl::OUString( "calc" ); + aAppName = OUString( "calc" ); else if ( rCmdLine.IsDraw() ) - aAppName = rtl::OUString( "draw" ); + aAppName = OUString( "draw" ); else if ( rCmdLine.IsImpress() ) - aAppName = rtl::OUString( "impress" ); + aAppName = OUString( "impress" ); else if ( rCmdLine.IsBase() ) - aAppName = rtl::OUString( "base" ); + aAppName = OUString( "base" ); else if ( rCmdLine.IsGlobal() ) - aAppName = rtl::OUString( "global" ); + aAppName = OUString( "global" ); else if ( rCmdLine.IsMath() ) - aAppName = rtl::OUString( "math" ); + aAppName = OUString( "math" ); else if ( rCmdLine.IsWeb() ) - aAppName = rtl::OUString( "web" ); + aAppName = OUString( "web" ); // Which splash to use OUString aSplashService( "com.sun.star.office.SplashScreen" ); @@ -2872,7 +2872,7 @@ void Desktop::SetSplashScreenProgress(sal_Int32 iProgress) } } -void Desktop::SetSplashScreenText( const ::rtl::OUString& rText ) +void Desktop::SetSplashScreenText( const OUString& rText ) { if( m_rSplashScreen.is() ) { @@ -2895,7 +2895,7 @@ void Desktop::DoFirstRunInitializations() try { Reference< XJobExecutor > xExecutor = JobExecutor::create( ::comphelper::getProcessComponentContext() ); - xExecutor->trigger( ::rtl::OUString("onFirstRunInitialization") ); + xExecutor->trigger( OUString("onFirstRunInitialization") ); } catch(const ::com::sun::star::uno::Exception&) { diff --git a/desktop/source/app/appfirststart.cxx b/desktop/source/app/appfirststart.cxx index 471f77bca391..af9eb0516bdc 100644 --- a/desktop/source/app/appfirststart.cxx +++ b/desktop/source/app/appfirststart.cxx @@ -30,7 +30,6 @@ #include "app.hxx" -using ::rtl::OUString; using namespace ::desktop; using namespace ::com::sun::star; using namespace ::com::sun::star::beans; @@ -47,7 +46,7 @@ static Reference< XPropertySet > impl_getConfigurationAccess( const OUString& rP NamedValue aValue( OUString( "nodepath" ), makeAny( rPath ) ); aArgs[0] <<= aValue; return Reference< XPropertySet >( - xConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), aArgs ), UNO_QUERY_THROW ); + xConfigProvider->createInstanceWithArguments( OUString(aAccessSrvc), aArgs ), UNO_QUERY_THROW ); } void Desktop::DoRestartActionsIfNecessary( sal_Bool bQuickStart ) diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index c8d78cbf66ab..42f2b6b72205 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -63,7 +63,6 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::registry; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace desktop { @@ -104,7 +103,7 @@ void Desktop::InitApplicationServiceManager() RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createApplicationServiceManager" ); Reference<XMultiServiceFactory> sm; #ifdef ANDROID - rtl::OUString aUnoRc( OUString( "file:///assets/program/unorc" ) ); + OUString aUnoRc( OUString( "file:///assets/program/unorc" ) ); sm.set( cppu::defaultBootstrap_InitialComponentContext( aUnoRc )->getServiceManager(), UNO_QUERY_THROW); @@ -137,8 +136,8 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context) createAcceptor(conDcpCfg); } - std::vector< ::rtl::OUString > const & conDcp = rCmdLine.GetAccept(); - for (std::vector< ::rtl::OUString >::const_iterator i(conDcp.begin()); + std::vector< OUString > const & conDcp = rCmdLine.GetAccept(); + for (std::vector< OUString >::const_iterator i(conDcp.begin()); i != conDcp.end(); ++i) { createAcceptor(*i); @@ -255,7 +254,7 @@ void Desktop::CreateTemporaryDirectory() { RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::createTemporaryDirectory" ); - ::rtl::OUString aTempBaseURL; + OUString aTempBaseURL; try { SvtPathOptions aOpt; @@ -281,8 +280,8 @@ void Desktop::CreateTemporaryDirectory() if ( aTempBaseURL.matchAsciiL( "/", 1, nLength-1 ) ) aTempBaseURL = aTempBaseURL.copy( 0, nLength - 1 ); - ::rtl::OUString aRet; - ::rtl::OUString aTempPath( aTempBaseURL ); + OUString aRet; + OUString aTempPath( aTempBaseURL ); // create new current temporary directory ::utl::LocalFileHelper::ConvertURLToPhysicalName( aTempBaseURL, aRet ); diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index f01e3e835583..2ea7f84dc85a 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -55,7 +55,6 @@ #include "../deployment/inc/dp_misc.h" -using rtl::OUString; using namespace desktop; using namespace com::sun::star; @@ -217,7 +216,7 @@ static const char aAccessSrvc[] = "com.sun.star.configuration.ConfigurationUpdat static sal_Int16 impl_showExtensionDialog( uno::Reference< uno::XComponentContext > &xContext ) { - rtl::OUString sServiceName = "com.sun.star.deployment.ui.UpdateRequiredDialog"; + OUString sServiceName = "com.sun.star.deployment.ui.UpdateRequiredDialog"; uno::Reference< uno::XInterface > xService; sal_Int16 nRet = 0; @@ -291,7 +290,7 @@ static bool impl_checkDependencies( const uno::Reference< uno::XComponentContext catch ( const uno::RuntimeException & ) { throw; } catch (const uno::Exception & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } if ( bRegistered ) @@ -327,7 +326,7 @@ static void impl_setNeedsCompatCheck() makeAny( OUString("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >( - theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); + theConfigProvider->createInstanceWithArguments( OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); Any value = makeAny( OUString("never") ); @@ -358,7 +357,7 @@ static bool impl_needsCompatCheck() makeAny( OUString("org.openoffice.Setup/Office") ) ); theArgs[0] <<= v; Reference< beans::XPropertySet > pset = Reference< beans::XPropertySet >( - theConfigProvider->createInstanceWithArguments( rtl::OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); + theConfigProvider->createInstanceWithArguments( OUString(aAccessSrvc), theArgs ), UNO_QUERY_THROW ); Any result = pset->getPropertyValue( OUString("LastCompatibilityCheckID") ); diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 061bd0ea79b5..ca92a8dd1d5d 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -36,7 +36,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::uri; using namespace com::sun::star::uno; -using ::rtl::OUString; namespace desktop { @@ -69,7 +68,7 @@ public: m_count(rtl_getAppCommandArgCount()), m_index(0) { - rtl::OUString url; + OUString url; if (tools::getProcessWorkingDir(url)) { m_cwdUrl.reset(url); } @@ -77,9 +76,9 @@ public: virtual ~ExtCommandLineSupplier() {} - virtual boost::optional< rtl::OUString > getCwdUrl() { return m_cwdUrl; } + virtual boost::optional< OUString > getCwdUrl() { return m_cwdUrl; } - virtual bool next(rtl::OUString * argument) { + virtual bool next(OUString * argument) { OSL_ASSERT(argument != NULL); if (m_index < m_count) { rtl_getAppCommandArg(m_index++, &argument->pData); @@ -90,7 +89,7 @@ public: } private: - boost::optional< rtl::OUString > m_cwdUrl; + boost::optional< OUString > m_cwdUrl; sal_uInt32 m_count; sal_uInt32 m_index; }; @@ -148,7 +147,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) for (;;) { - ::rtl::OUString aArg; + OUString aArg; if ( !supplier.next( &aArg ) ) { break; @@ -157,7 +156,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) if ( !aArg.isEmpty() ) { m_bEmpty = false; - ::rtl::OUString oArg; + OUString oArg; if ( !InterpretCommandLineParameter( aArg, oArg )) { if ( aArg.toChar() == '-' ) @@ -380,18 +379,18 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) m_bDocumentArgs = true; } -bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg, ::rtl::OUString& oArg ) +bool CommandLineArgs::InterpretCommandLineParameter( const OUString& aArg, OUString& oArg ) { bool bDeprecated = false; if (aArg.matchIgnoreAsciiCase("--")) { - oArg = ::rtl::OUString(aArg.getStr()+2, aArg.getLength()-2); + oArg = OUString(aArg.getStr()+2, aArg.getLength()-2); } else if (aArg.toChar() == '-') { if ( aArg.getLength() > 2 ) // -h, -o, -n, -? are still valid bDeprecated = true; - oArg = ::rtl::OUString(aArg.getStr()+1, aArg.getLength()-1); + oArg = OUString(aArg.getStr()+1, aArg.getLength()-1); } else { @@ -578,7 +577,7 @@ bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg if (bDeprecated) { - rtl::OString sArg(rtl::OUStringToOString(aArg, osl_getThreadTextEncoding())); + OString sArg(OUStringToOString(aArg, osl_getThreadTextEncoding())); fprintf(stderr, "Warning: %s is deprecated. Use -%s instead.\n", sArg.getStr(), sArg.getStr()); } return true; @@ -773,76 +772,76 @@ bool CommandLineArgs::HasSplashPipe() const return m_splashpipe; } -std::vector< rtl::OUString > const & CommandLineArgs::GetAccept() const +std::vector< OUString > const & CommandLineArgs::GetAccept() const { return m_accept; } -std::vector< rtl::OUString > const & CommandLineArgs::GetUnaccept() const +std::vector< OUString > const & CommandLineArgs::GetUnaccept() const { return m_unaccept; } -std::vector< rtl::OUString > CommandLineArgs::GetOpenList() const +std::vector< OUString > CommandLineArgs::GetOpenList() const { return translateExternalUris(m_openlist); } -std::vector< rtl::OUString > CommandLineArgs::GetViewList() const +std::vector< OUString > CommandLineArgs::GetViewList() const { return translateExternalUris(m_viewlist); } -std::vector< rtl::OUString > CommandLineArgs::GetStartList() const +std::vector< OUString > CommandLineArgs::GetStartList() const { return translateExternalUris(m_startlist); } -std::vector< rtl::OUString > CommandLineArgs::GetForceOpenList() const +std::vector< OUString > CommandLineArgs::GetForceOpenList() const { return translateExternalUris(m_forceopenlist); } -std::vector< rtl::OUString > CommandLineArgs::GetForceNewList() const +std::vector< OUString > CommandLineArgs::GetForceNewList() const { return translateExternalUris(m_forcenewlist); } -std::vector< rtl::OUString > CommandLineArgs::GetPrintList() const +std::vector< OUString > CommandLineArgs::GetPrintList() const { return translateExternalUris(m_printlist); } -std::vector< rtl::OUString > CommandLineArgs::GetPrintToList() const +std::vector< OUString > CommandLineArgs::GetPrintToList() const { return translateExternalUris(m_printtolist); } -rtl::OUString CommandLineArgs::GetPrinterName() const +OUString CommandLineArgs::GetPrinterName() const { return m_printername; } -rtl::OUString CommandLineArgs::GetLanguage() const +OUString CommandLineArgs::GetLanguage() const { return m_language; } -std::vector< rtl::OUString > const & CommandLineArgs::GetInFilter() const +std::vector< OUString > const & CommandLineArgs::GetInFilter() const { return m_infilter; } -std::vector< rtl::OUString > CommandLineArgs::GetConversionList() const +std::vector< OUString > CommandLineArgs::GetConversionList() const { return translateExternalUris(m_conversionlist); } -rtl::OUString CommandLineArgs::GetConversionParams() const +OUString CommandLineArgs::GetConversionParams() const { return m_conversionparams; } -rtl::OUString CommandLineArgs::GetConversionOut() const +OUString CommandLineArgs::GetConversionOut() const { return translateExternalUris(m_conversionout); } diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index 4ea5e0dbd4c7..6a5bdf1878f0 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -46,14 +46,14 @@ class CommandLineArgs: private boost::noncopyable }; virtual ~Supplier(); - virtual boost::optional< rtl::OUString > getCwdUrl() = 0; - virtual bool next(rtl::OUString * argument) = 0; + virtual boost::optional< OUString > getCwdUrl() = 0; + virtual bool next(OUString * argument) = 0; }; CommandLineArgs(); CommandLineArgs( Supplier& supplier ); - boost::optional< rtl::OUString > getCwdUrl() const { return m_cwdUrl; } + boost::optional< OUString > getCwdUrl() const { return m_cwdUrl; } // Access to bool parameters bool IsMinimized() const; @@ -90,32 +90,32 @@ class CommandLineArgs: private boost::noncopyable // Access to string parameters bool HasSplashPipe() const; - std::vector< rtl::OUString > const & GetAccept() const; - std::vector< rtl::OUString > const & GetUnaccept() const; - std::vector< rtl::OUString > GetOpenList() const; - std::vector< rtl::OUString > GetViewList() const; - std::vector< rtl::OUString > GetStartList() const; - std::vector< rtl::OUString > GetForceOpenList() const; - std::vector< rtl::OUString > GetForceNewList() const; - std::vector< rtl::OUString > GetPrintList() const; - std::vector< rtl::OUString > GetPrintToList() const; - rtl::OUString GetPrinterName() const; - rtl::OUString GetLanguage() const; - std::vector< rtl::OUString > const & GetInFilter() const; - std::vector< rtl::OUString > GetConversionList() const; - rtl::OUString GetConversionParams() const; - rtl::OUString GetConversionOut() const; + std::vector< OUString > const & GetAccept() const; + std::vector< OUString > const & GetUnaccept() const; + std::vector< OUString > GetOpenList() const; + std::vector< OUString > GetViewList() const; + std::vector< OUString > GetStartList() const; + std::vector< OUString > GetForceOpenList() const; + std::vector< OUString > GetForceNewList() const; + std::vector< OUString > GetPrintList() const; + std::vector< OUString > GetPrintToList() const; + OUString GetPrinterName() const; + OUString GetLanguage() const; + std::vector< OUString > const & GetInFilter() const; + std::vector< OUString > GetConversionList() const; + OUString GetConversionParams() const; + OUString GetConversionOut() const; OUString GetPidfileName() const; // Special analyzed states (does not match directly to a command line parameter!) bool IsEmpty() const; private: - bool InterpretCommandLineParameter( const ::rtl::OUString&, ::rtl::OUString& ); + bool InterpretCommandLineParameter( const OUString&, OUString& ); void ParseCommandLine_Impl( Supplier& supplier ); void InitParamValues(); - boost::optional< rtl::OUString > m_cwdUrl; + boost::optional< OUString > m_cwdUrl; bool m_minimized; bool m_invisible; @@ -152,21 +152,21 @@ class CommandLineArgs: private boost::noncopyable bool m_bEmpty; // No Args at all bool m_bDocumentArgs; // A document creation/open/load arg is used - std::vector< rtl::OUString > m_accept; - std::vector< rtl::OUString > m_unaccept; - std::vector< rtl::OUString > m_openlist; // contains external URIs - std::vector< rtl::OUString > m_viewlist; // contains external URIs - std::vector< rtl::OUString > m_startlist; // contains external URIs - std::vector< rtl::OUString > m_forceopenlist; // contains external URIs - std::vector< rtl::OUString > m_forcenewlist; // contains external URIs - std::vector< rtl::OUString > m_printlist; // contains external URIs - std::vector< rtl::OUString > m_printtolist; // contains external URIs - rtl::OUString m_printername; - std::vector< rtl::OUString > m_conversionlist; // contains external URIs - rtl::OUString m_conversionparams; - rtl::OUString m_conversionout; // contains external URIs - std::vector< rtl::OUString > m_infilter; - rtl::OUString m_language; + std::vector< OUString > m_accept; + std::vector< OUString > m_unaccept; + std::vector< OUString > m_openlist; // contains external URIs + std::vector< OUString > m_viewlist; // contains external URIs + std::vector< OUString > m_startlist; // contains external URIs + std::vector< OUString > m_forceopenlist; // contains external URIs + std::vector< OUString > m_forcenewlist; // contains external URIs + std::vector< OUString > m_printlist; // contains external URIs + std::vector< OUString > m_printtolist; // contains external URIs + OUString m_printername; + std::vector< OUString > m_conversionlist; // contains external URIs + OUString m_conversionparams; + OUString m_conversionout; // contains external URIs + std::vector< OUString > m_infilter; + OUString m_language; OUString m_pidfile; }; diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index e40dcd099238..41a9f300e9ba 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -127,7 +127,7 @@ namespace desktop " Store soffice.bin pid to file.\n"\ "\nRemaining arguments will be treated as filenames or URLs of documents to open.\n\n"; - rtl::OUString ReplaceStringHookProc(const rtl::OUString& rStr); + OUString ReplaceStringHookProc(const OUString& rStr); void displayCmdlineHelp(OUString const & unknown) { @@ -148,13 +148,13 @@ namespace desktop #ifdef UNX // on unix use console for output fprintf(stdout, "%s%s", - rtl::OUStringToOString(aHelpMessage_version, RTL_TEXTENCODING_ASCII_US).getStr(), - rtl::OUStringToOString(aHelpMessage_head, RTL_TEXTENCODING_ASCII_US).getStr()); + OUStringToOString(aHelpMessage_version, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(aHelpMessage_head, RTL_TEXTENCODING_ASCII_US).getStr()); // merge left and right column sal_Int32 n = comphelper::string::getTokenCount(aHelpMessage_left, '\n'); - rtl::OString bsLeft(rtl::OUStringToOString(aHelpMessage_left, + OString bsLeft(OUStringToOString(aHelpMessage_left, RTL_TEXTENCODING_ASCII_US)); - rtl::OString bsRight(rtl::OUStringToOString(aHelpMessage_right, + OString bsRight(OUStringToOString(aHelpMessage_right, RTL_TEXTENCODING_ASCII_US)); for ( sal_Int32 i = 0; i < n; ++i ) { @@ -162,7 +162,7 @@ namespace desktop fprintf(stdout, "%s", getToken(bsLeft, i, '\n').getStr()); fprintf(stdout, "%s\n", getToken(bsRight, i, '\n').getStr()); } - fprintf(stdout, "%s", rtl::OUStringToOString(aHelpMessage_bottom, + fprintf(stdout, "%s", OUStringToOString(aHelpMessage_bottom, RTL_TEXTENCODING_ASCII_US).getStr()); #else // rest gets a dialog box @@ -179,10 +179,10 @@ namespace desktop void displayVersion() { - rtl::OUString aVersionMsg(aCmdLineHelp_version); + OUString aVersionMsg(aCmdLineHelp_version); aVersionMsg = ReplaceStringHookProc(aVersionMsg); #ifdef UNX - fprintf(stdout, "%s", rtl::OUStringToOString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).getStr()); + fprintf(stdout, "%s", OUStringToOString(aVersionMsg, RTL_TEXTENCODING_ASCII_US).getStr()); #else // Just re-use the help dialog for now. CmdlineHelpDialog aDlg; diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx index 8e29b49b81cf..11ee1f858f1b 100644 --- a/desktop/source/app/configinit.cxx +++ b/desktop/source/app/configinit.cxx @@ -33,7 +33,6 @@ namespace uno = ::com::sun::star::uno; namespace lang = ::com::sun::star::lang; -using rtl::OUString; using uno::UNO_QUERY; // ---------------------------------------------------------------------------- diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx index 26cd03bcd5e8..63ff6e1acd85 100644 --- a/desktop/source/app/desktopcontext.cxx +++ b/desktop/source/app/desktopcontext.cxx @@ -25,7 +25,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::task; -using ::rtl::OUString; namespace desktop { diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx index 8195e9487ad2..252a2c7b57b5 100644 --- a/desktop/source/app/desktopcontext.hxx +++ b/desktop/source/app/desktopcontext.hxx @@ -31,7 +31,7 @@ namespace desktop DesktopContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx); // XCurrentContext - virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name ) + virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name ) throw (com::sun::star::uno::RuntimeException); private: diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index cdec83b7e97f..4afa35992f95 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -55,7 +55,6 @@ #include <osl/thread.hxx> #include <rtl/instance.hxx> -using ::rtl::OUString; using namespace ::osl; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; @@ -70,7 +69,7 @@ namespace desktop { String GetURL_Impl( - const String& rName, boost::optional< rtl::OUString > const & cwdUrl ); + const String& rName, boost::optional< OUString > const & cwdUrl ); struct DispatchHolder { @@ -78,7 +77,7 @@ struct DispatchHolder aURL( rURL ), xDispatch( rDispatch ) {} URL aURL; - rtl::OUString cwdUrl; + OUString cwdUrl; Reference< XDispatch > xDispatch; }; @@ -169,9 +168,9 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch DispatchList::const_iterator p; std::vector< DispatchHolder > aDispatches; - ::rtl::OUString aAsTemplateArg( "AsTemplate" ); + OUString aAsTemplateArg( "AsTemplate" ); sal_Bool bSetInputFilter = sal_False; - ::rtl::OUString aForcedInputFilter; + OUString aForcedInputFilter; for ( p = aDispatchRequestsList.begin(); p != aDispatchRequestsList.end(); ++p ) { @@ -238,7 +237,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch } String aName( GetURL_Impl( aDispatchRequest.aURL, aDispatchRequest.aCwdUrl ) ); - ::rtl::OUString aTarget("_default"); + OUString aTarget("_default"); if ( aDispatchRequest.aRequestType == REQUEST_PRINT || aDispatchRequest.aRequestType == REQUEST_PRINTTO || @@ -282,7 +281,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch if( xParser.is() == sal_True ) xParser->parseStrict( aURL ); - xDispatcher = xDesktop->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDispatcher = xDesktop->queryDispatch( aURL, OUString(), 0 ); if( xDispatcher.is() == sal_True ) { @@ -310,7 +309,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch if( xParser.is() == sal_True ) xParser->parseStrict( aURL ); - xDispatcher = xDesktop->queryDispatch( aURL, ::rtl::OUString(), 0 ); + xDispatcher = xDesktop->queryDispatch( aURL, OUString(), 0 ); if( xDispatcher.is() == sal_True ) { @@ -415,14 +414,14 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch if ( aDispatchRequest.aRequestType == REQUEST_CONVERSION ) { Reference< XStorable > xStorable( xDoc, UNO_QUERY ); if ( xStorable.is() ) { - rtl::OUString aParam = aDispatchRequest.aPrinterName; + OUString aParam = aDispatchRequest.aPrinterName; sal_Int32 nPathIndex = aParam.lastIndexOf( ';' ); sal_Int32 nFilterIndex = aParam.indexOf( ':' ); if( nPathIndex < nFilterIndex ) nFilterIndex = -1; - rtl::OUString aFilterOut=aParam.copy( nPathIndex+1 ); - rtl::OUString aFilter; - rtl::OUString aFilterExt; + OUString aFilterOut=aParam.copy( nPathIndex+1 ); + OUString aFilter; + OUString aFilterExt; sal_Bool bGuess = sal_False; if( nFilterIndex >= 0 ) @@ -439,7 +438,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch INetURLObject aOutFilename( aObj ); aOutFilename.SetExtension( aFilterExt ); FileBase::getFileURLFromSystemPath( aFilterOut, aFilterOut ); - rtl::OUString aOutFile = aFilterOut+ + OUString aOutFile = aFilterOut+ "/" + aOutFilename.getName(); @@ -455,15 +454,15 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch conversionProperties[1].Name = "FilterName"; conversionProperties[1].Value <<= aFilter; - rtl::OUString aTempName; + OUString aTempName; FileBase::getSystemPathFromFileURL( aName, aTempName ); - rtl::OString aSource8 = ::rtl::OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 ); + OString aSource8 = OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 ); FileBase::getSystemPathFromFileURL( aOutFile, aTempName ); - rtl::OString aTargetURL8 = ::rtl::OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 ); + OString aTargetURL8 = OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 ); printf("convert %s -> %s using %s\n", aSource8.getStr(), aTargetURL8.getStr(), - ::rtl::OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr()); + OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr()); if( FStatHelper::IsDocument(aOutFile) ) - printf("Overwriting: %s\n",::rtl::OUStringToOString( aTempName, RTL_TEXTENCODING_UTF8 ).getStr() ); + printf("Overwriting: %s\n",OUStringToOString( aTempName, RTL_TEXTENCODING_UTF8 ).getStr() ); try { xStorable->storeToURL( aOutFile, conversionProperties ); @@ -474,11 +473,11 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch } } } else if ( aDispatchRequest.aRequestType == REQUEST_BATCHPRINT ) { - rtl::OUString aParam = aDispatchRequest.aPrinterName; + OUString aParam = aDispatchRequest.aPrinterName; sal_Int32 nPathIndex = aParam.lastIndexOf( ';' ); - rtl::OUString aFilterOut; - rtl::OUString aPrinterName; + OUString aFilterOut; + OUString aPrinterName; if( nPathIndex != -1 ) aFilterOut=aParam.copy( nPathIndex+1 ); if( nPathIndex != 0 ) @@ -487,18 +486,18 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch INetURLObject aOutFilename( aObj ); aOutFilename.SetExtension( "ps" ); FileBase::getFileURLFromSystemPath( aFilterOut, aFilterOut ); - rtl::OUString aOutFile = aFilterOut+ + OUString aOutFile = aFilterOut+ "/" + aOutFilename.getName(); - rtl::OUString aTempName; + OUString aTempName; FileBase::getSystemPathFromFileURL( aName, aTempName ); - rtl::OString aSource8 = ::rtl::OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 ); + OString aSource8 = OUStringToOString ( aTempName, RTL_TEXTENCODING_UTF8 ); FileBase::getSystemPathFromFileURL( aOutFile, aTempName ); - rtl::OString aTargetURL8 = ::rtl::OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 ); + OString aTargetURL8 = OUStringToOString(aTempName, RTL_TEXTENCODING_UTF8 ); printf("print %s -> %s using %s\n", aSource8.getStr(), aTargetURL8.getStr(), aPrinterName.isEmpty() ? - "<default_printer>" : ::rtl::OUStringToOString( aPrinterName, RTL_TEXTENCODING_UTF8 ).getStr() ); + "<default_printer>" : OUStringToOString( aPrinterName, RTL_TEXTENCODING_UTF8 ).getStr() ); // create the custom printer, if given Sequence < PropertyValue > aPrinterArgs( 1 ); @@ -522,7 +521,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch // create the printer Sequence < PropertyValue > aPrinterArgs( 1 ); aPrinterArgs[0].Name = "Name"; - aPrinterArgs[0].Value <<= ::rtl::OUString( aDispatchRequest.aPrinterName ); + aPrinterArgs[0].Value <<= OUString( aDispatchRequest.aPrinterName ); xDoc->setPrinter( aPrinterArgs ); } @@ -566,7 +565,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch // Execute all asynchronous dispatches now after we placed them into our request container! Sequence < PropertyValue > aArgs( 2 ); aArgs[0].Name = "Referer"; - aArgs[0].Value <<= ::rtl::OUString("private:OpenEvent"); + aArgs[0].Value <<= OUString("private:OpenEvent"); aArgs[1].Name = "SynchronMode"; aArgs[1].Value <<= sal_True; diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index ac7a9c04fab1..2a0c86983f17 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -41,13 +41,13 @@ namespace desktop struct OUStringHashCode { - size_t operator()( const ::rtl::OUString& sString ) const + size_t operator()( const OUString& sString ) const { return sString.hashCode(); } }; -class DispatchWatcherHashMap : public ::boost::unordered_map< ::rtl::OUString, sal_Int32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > +class DispatchWatcherHashMap : public ::boost::unordered_map< OUString, sal_Int32, OUStringHashCode, ::std::equal_to< OUString > > { public: inline void free() @@ -75,14 +75,14 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame: struct DispatchRequest { - DispatchRequest( RequestType aType, const ::rtl::OUString& aFile, boost::optional< rtl::OUString > const & cwdUrl, const ::rtl::OUString& aPrinter, const ::rtl::OUString& aFact ) : + DispatchRequest( RequestType aType, const OUString& aFile, boost::optional< OUString > const & cwdUrl, const OUString& aPrinter, const OUString& aFact ) : aRequestType( aType ), aURL( aFile ), aCwdUrl( cwdUrl ), aPrinterName( aPrinter ), aPreselectedFactory( aFact ) {} RequestType aRequestType; - rtl::OUString aURL; - boost::optional< rtl::OUString > aCwdUrl; - rtl::OUString aPrinterName; // also conversion params - rtl::OUString aPreselectedFactory; + OUString aURL; + boost::optional< OUString > aCwdUrl; + OUString aPrinterName; // also conversion params + OUString aPreselectedFactory; }; typedef std::vector< DispatchRequest > DispatchList; diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 09f0ef901497..d89174e36ae5 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -50,9 +50,6 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; using namespace com::sun::star::util; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; -using ::rtl::OString; namespace desktop { @@ -113,7 +110,7 @@ bool LanguageSelection::prepareLanguage() { Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.System/L10N/", sal_False), UNO_QUERY_THROW); Any aWin16SysLocale = xProp->getPropertyValue("SystemLocale"); - ::rtl::OUString sWin16SysLocale; + OUString sWin16SysLocale; aWin16SysLocale >>= sWin16SysLocale; if( !sWin16SysLocale.isEmpty()) setDefaultLanguage(sWin16SysLocale); diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index b6ded29741ac..f84566c6c96b 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -39,25 +39,25 @@ public: LS_STATUS_CONFIGURATIONACCESS_BROKEN }; - static rtl::OUString getLanguageString(); + static OUString getLanguageString(); static bool prepareLanguage(); static LanguageSelectionStatus getStatus(); private: - static rtl::OUString aFoundLanguage; + static OUString aFoundLanguage; static sal_Bool bFoundLanguage; static LanguageSelectionStatus m_eStatus; static com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > getConfigAccess(const sal_Char* pPath, sal_Bool bUpdate=sal_False); - static com::sun::star::uno::Sequence< rtl::OUString > getInstalledLanguages(); - static sal_Bool isInstalledLanguage(rtl::OUString& usLocale, sal_Bool bExact=sal_False); - static rtl::OUString getFirstInstalledLanguage(); - static rtl::OUString getUserUILanguage(); - static rtl::OUString getUserLanguage(); - static rtl::OUString getSystemLanguage(); + static com::sun::star::uno::Sequence< OUString > getInstalledLanguages(); + static sal_Bool isInstalledLanguage(OUString& usLocale, sal_Bool bExact=sal_False); + static OUString getFirstInstalledLanguage(); + static OUString getUserUILanguage(); + static OUString getUserLanguage(); + static OUString getSystemLanguage(); static void resetUserLanguage(); - static void setDefaultLanguage(const rtl::OUString&); + static void setDefaultLanguage(const OUString&); }; } //namespace desktop diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx index f56bda17988b..d338281d9d13 100644 --- a/desktop/source/app/lockfile2.cxx +++ b/desktop/source/app/lockfile2.cxx @@ -33,9 +33,9 @@ bool Lockfile_execWarning( Lockfile * that ) String aLockname = that->m_aLockname; Config aConfig(aLockname); aConfig.SetGroup( LOCKFILE_GROUP ); - rtl::OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ); - rtl::OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); - rtl::OString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY ); + OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ); + OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); + OString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY ); // display warning and return response QueryBox aBox( NULL, DesktopResId( QBX_USERDATALOCKED ) ); @@ -45,11 +45,11 @@ bool Lockfile_execWarning( Lockfile * that ) // insert values... String aMsgText = aBox.GetMessText( ); aMsgText.SearchAndReplaceAscii( - "$u", rtl::OStringToOUString( aUser, RTL_TEXTENCODING_ASCII_US) ); + "$u", OStringToOUString( aUser, RTL_TEXTENCODING_ASCII_US) ); aMsgText.SearchAndReplaceAscii( - "$h", rtl::OStringToOUString( aHost, RTL_TEXTENCODING_ASCII_US) ); + "$h", OStringToOUString( aHost, RTL_TEXTENCODING_ASCII_US) ); aMsgText.SearchAndReplaceAscii( - "$t", rtl::OStringToOUString( aTime, RTL_TEXTENCODING_ASCII_US) ); + "$t", OStringToOUString( aTime, RTL_TEXTENCODING_ASCII_US) ); aBox.SetMessText(aMsgText); // do it return aBox.Execute( ) == RET_YES; diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index bcade3172b1f..db8a4079583d 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -49,9 +49,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; -using ::rtl::OString; -using ::rtl::OUString; -using ::rtl::OUStringBuffer; const char *OfficeIPCThread::sc_aShowSequence = "-tofront"; const int OfficeIPCThread::sc_nShSeqLength = 5; @@ -110,7 +107,7 @@ namespace { class Parser: public CommandLineArgs::Supplier { public: - explicit Parser(rtl::OString const & input): m_input(input) { + explicit Parser(OString const & input): m_input(input) { if (!m_input.match(ARGUMENT_PREFIX) || m_input.getLength() == RTL_CONSTASCII_LENGTH(ARGUMENT_PREFIX)) { @@ -122,7 +119,7 @@ public: break; case '1': { - rtl::OUString url; + OUString url; if (!next(&url, false)) { throw CommandLineArgs::Supplier::Exception(); } @@ -131,11 +128,11 @@ public: } case '2': { - rtl::OUString path; + OUString path; if (!next(&path, false)) { throw CommandLineArgs::Supplier::Exception(); } - rtl::OUString url; + OUString url; if (osl::FileBase::getFileURLFromSystemPath(path, url) == osl::FileBase::E_None) { @@ -150,12 +147,12 @@ public: virtual ~Parser() {} - virtual boost::optional< rtl::OUString > getCwdUrl() { return m_cwdUrl; } + virtual boost::optional< OUString > getCwdUrl() { return m_cwdUrl; } - virtual bool next(rtl::OUString * argument) { return next(argument, true); } + virtual bool next(OUString * argument) { return next(argument, true); } private: - virtual bool next(rtl::OUString * argument, bool prefix) { + virtual bool next(OUString * argument, bool prefix) { OSL_ASSERT(argument != NULL); if (m_index < m_input.getLength()) { if (prefix) { @@ -164,7 +161,7 @@ private: } ++m_index; } - rtl::OStringBuffer b; + OStringBuffer b; while (m_index < m_input.getLength()) { char c = m_input[m_index]; if (c == ',') { @@ -190,7 +187,7 @@ private: } b.append(c); } - rtl::OString b2(b.makeStringAndClear()); + OString b2(b.makeStringAndClear()); if (!rtl_convertStringToUString( &argument->pData, b2.getStr(), b2.getLength(), RTL_TEXTENCODING_UTF8, @@ -206,15 +203,15 @@ private: } } - boost::optional< rtl::OUString > m_cwdUrl; - rtl::OString m_input; + boost::optional< OUString > m_cwdUrl; + OString m_input; sal_Int32 m_index; }; -bool addArgument(rtl::OStringBuffer &rArguments, char prefix, - const rtl::OUString &rArgument) +bool addArgument(OStringBuffer &rArguments, char prefix, + const OUString &rArgument) { - rtl::OString utf8; + OString utf8; if (!rArgument.convertToString( &utf8, RTL_TEXTENCODING_UTF8, (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR | @@ -256,7 +253,7 @@ String CreateMD5FromString( const OUString& aMsg ) { #if (OSL_DEBUG_LEVEL > 2) fprintf( stderr, "create md5 from '%s'\n", - rtl::OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8).getStr() ); + OUStringToOString (aMsg, RTL_TEXTENCODING_UTF8).getStr() ); #endif rtlDigest handle = rtl_digest_create( rtl_Digest_AlgorithmMD5 ); @@ -421,7 +418,7 @@ void OfficeIPCThread::EnableRequests( bool i_bEnable ) if( i_bEnable ) { // hit the compiler over the head - ProcessDocumentsRequest aEmptyReq = ProcessDocumentsRequest( boost::optional< rtl::OUString >() ); + ProcessDocumentsRequest aEmptyReq = ProcessDocumentsRequest( boost::optional< OUString >() ); // trigger already queued requests OfficeIPCThread::ExecuteCmdLineRequests( aEmptyReq ); } @@ -458,8 +455,8 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() if( pGlobalOfficeIPCThread.is() ) return IPC_STATUS_OK; - ::rtl::OUString aUserInstallPath; - ::rtl::OUString aDummy; + OUString aUserInstallPath; + OUString aDummy; rtl::Reference< OfficeIPCThread > pThread(new OfficeIPCThread); @@ -574,8 +571,8 @@ OfficeIPCThread::Status OfficeIPCThread::EnableOfficeIPCThread() // Seems another office is running. Pipe arguments to it and self terminate osl::StreamPipe aStreamPipe(pThread->maPipe.getHandle()); - rtl::OStringBuffer aArguments(ARGUMENT_PREFIX); - rtl::OUString cwdUrl; + OStringBuffer aArguments(ARGUMENT_PREFIX); + OUString cwdUrl; if (!(tools::getProcessWorkingDir(cwdUrl) && addArgument(aArguments, '1', cwdUrl))) { @@ -710,7 +707,7 @@ void OfficeIPCThread::execute() continue; } - rtl::OString aArguments = readStringFromPipe(aStreamPipe); + OString aArguments = readStringFromPipe(aStreamPipe); // Is this a lookup message from another application? if so, ignore if (aArguments.isEmpty()) @@ -758,9 +755,9 @@ void OfficeIPCThread::execute() } // handle request for acceptor - std::vector< rtl::OUString > const & accept = aCmdLineArgs-> + std::vector< OUString > const & accept = aCmdLineArgs-> GetAccept(); - for (std::vector< rtl::OUString >::const_iterator i(accept.begin()); + for (std::vector< OUString >::const_iterator i(accept.begin()); i != accept.end(); ++i) { ApplicationEvent* pAppEvent = new ApplicationEvent( @@ -768,9 +765,9 @@ void OfficeIPCThread::execute() ImplPostForeignAppEvent( pAppEvent ); } // handle acceptor removal - std::vector< rtl::OUString > const & unaccept = aCmdLineArgs-> + std::vector< OUString > const & unaccept = aCmdLineArgs-> GetUnaccept(); - for (std::vector< rtl::OUString >::const_iterator i( + for (std::vector< OUString >::const_iterator i( unaccept.begin()); i != unaccept.end(); ++i) { @@ -844,7 +841,7 @@ void OfficeIPCThread::execute() if ( !aCmdLineArgs->IsQuickstart() ) { sal_Bool bShowHelp = sal_False; - rtl::OUStringBuffer aHelpURLBuffer; + OUStringBuffer aHelpURLBuffer; if (aCmdLineArgs->IsHelpWriter()) { bShowHelp = sal_True; aHelpURLBuffer.appendAscii("vnd.sun.star.help://swriter/start"); @@ -957,13 +954,13 @@ void OfficeIPCThread::execute() static void AddToDispatchList( DispatchWatcher::DispatchList& rDispatchList, - boost::optional< rtl::OUString > const & cwdUrl, - std::vector< rtl::OUString > const & aRequestList, + boost::optional< OUString > const & cwdUrl, + std::vector< OUString > const & aRequestList, DispatchWatcher::RequestType nType, const OUString& aParam, const OUString& aFactory ) { - for (std::vector< rtl::OUString >::const_iterator i(aRequestList.begin()); + for (std::vector< OUString >::const_iterator i(aRequestList.begin()); i != aRequestList.end(); ++i) { rDispatchList.push_back( @@ -973,8 +970,8 @@ static void AddToDispatchList( static void AddConversionsToDispatchList( DispatchWatcher::DispatchList& rDispatchList, - boost::optional< rtl::OUString > const & cwdUrl, - std::vector< rtl::OUString > const & rRequestList, + boost::optional< OUString > const & cwdUrl, + std::vector< OUString > const & rRequestList, const OUString& rParam, const OUString& rPrinterName, const OUString& rFactory, @@ -995,7 +992,7 @@ static void AddConversionsToDispatchList( } OUString aOutDir( rParamOut.trim() ); - ::rtl::OUString aPWD; + OUString aPWD; ::tools::getProcessWorkingDir( aPWD ); if( !::osl::FileBase::getAbsoluteFileURL( aPWD, rParamOut, aOutDir ) ) @@ -1003,16 +1000,16 @@ static void AddConversionsToDispatchList( if( !rParamOut.trim().isEmpty() ) { - aParam += ::rtl::OUString(";"); + aParam += OUString(";"); aParam += aOutDir; } else { ::osl::FileBase::getSystemPathFromFileURL( aPWD, aPWD ); - aParam += ::rtl::OUString(";" ) + aPWD; + aParam += OUString(";" ) + aPWD; } - for (std::vector< rtl::OUString >::const_iterator i(rRequestList.begin()); + for (std::vector< OUString >::const_iterator i(rRequestList.begin()); i != rRequestList.end(); ++i) { rDispatchList.push_back( @@ -1028,7 +1025,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequ static DispatchWatcher::DispatchList aDispatchList; - rtl::OUString aEmpty; + OUString aEmpty; // Create dispatch list for dispatch watcher AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aInFilter, DispatchWatcher::REQUEST_INFILTER, aEmpty, aRequest.aModule ); AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aOpenList, DispatchWatcher::REQUEST_OPEN, aEmpty, aRequest.aModule ); diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index f60084d4dd00..a17e11681722 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -45,23 +45,23 @@ oslSignalAction SAL_CALL SalMainPipeExchangeSignal_impl(void* /*pData*/, oslSign // that was given by command line or by IPC pipe communication. struct ProcessDocumentsRequest { - ProcessDocumentsRequest(boost::optional< rtl::OUString > const & cwdUrl): + ProcessDocumentsRequest(boost::optional< OUString > const & cwdUrl): aCwdUrl(cwdUrl), pcProcessed( NULL ) {} - boost::optional< ::rtl::OUString > aCwdUrl; - ::rtl::OUString aModule; - std::vector< rtl::OUString > aOpenList; // Documents that should be opened in the default way - std::vector< rtl::OUString > aViewList; // Documents that should be opened in viewmode - std::vector< rtl::OUString > aStartList; // Documents/Presentations that should be started - std::vector< rtl::OUString > aPrintList; // Documents that should be printed on default printer - std::vector< rtl::OUString > aForceOpenList; // Documents that should be forced to open for editing (even templates) - std::vector< rtl::OUString > aForceNewList; // Documents that should be forced to create a new document - ::rtl::OUString aPrinterName; // The printer name that should be used for printing - std::vector< rtl::OUString > aPrintToList; // Documents that should be printed on the given printer - std::vector< rtl::OUString > aConversionList; - ::rtl::OUString aConversionParams; - ::rtl::OUString aConversionOut; - std::vector< rtl::OUString > aInFilter; + boost::optional< OUString > aCwdUrl; + OUString aModule; + std::vector< OUString > aOpenList; // Documents that should be opened in the default way + std::vector< OUString > aViewList; // Documents that should be opened in viewmode + std::vector< OUString > aStartList; // Documents/Presentations that should be started + std::vector< OUString > aPrintList; // Documents that should be printed on default printer + std::vector< OUString > aForceOpenList; // Documents that should be forced to open for editing (even templates) + std::vector< OUString > aForceNewList; // Documents that should be forced to create a new document + OUString aPrinterName; // The printer name that should be used for printing + std::vector< OUString > aPrintToList; // Documents that should be printed on the given printer + std::vector< OUString > aConversionList; + OUString aConversionParams; + OUString aConversionOut; + std::vector< OUString > aInFilter; ::osl::Condition *pcProcessed; // pointer condition to be set when the request has been processed }; @@ -139,11 +139,11 @@ class OfficeIPCThreadController : public ::cppu::WeakImplHelper2< virtual ~OfficeIPCThreadController() {} // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw ( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( ::com::sun::star::uno::RuntimeException ); // XEventListener diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index f1ca8027233a..6f92ba221175 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -83,7 +83,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main() #if defined ANDROID } catch (const ::com::sun::star::uno::Exception &e) { LOGI("Unhandled UNO exception: '%s'", - rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8).getStr()); throw; // to get exception type printed } #endif diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index 4a5bb4ed9490..a901a761b04e 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -47,8 +47,6 @@ #include "app.hxx" -using rtl::OString; -using rtl::OUString; using namespace osl; using namespace utl; using namespace com::sun::star::container; @@ -119,7 +117,7 @@ namespace desktop { } #if HAVE_FEATURE_DESKTOP - static osl::FileBase::RC copy_recursive( const rtl::OUString& srcUnqPath, const rtl::OUString& dstUnqPath) + static osl::FileBase::RC copy_recursive( const OUString& srcUnqPath, const OUString& dstUnqPath) { FileBase::RC err; DirectoryItem aDirItem; @@ -145,12 +143,12 @@ namespace desktop { { aDirItem.getFileStatus(aFileStatus); // generate new src/dst pair and make recursive call - rtl::OUString newSrcUnqPath = aFileStatus.getFileURL(); - rtl::OUString newDstUnqPath = dstUnqPath; - rtl::OUString itemname = aFileStatus.getFileName(); + OUString newSrcUnqPath = aFileStatus.getFileURL(); + OUString newDstUnqPath = dstUnqPath; + OUString itemname = aFileStatus.getFileName(); // append trailing '/' if needed if (newDstUnqPath.lastIndexOf(sal_Unicode('/')) != newDstUnqPath.getLength()-1) - newDstUnqPath += rtl::OUString("/"); + newDstUnqPath += OUString("/"); newDstUnqPath += itemname; // recursion err = copy_recursive(newSrcUnqPath, newDstUnqPath); @@ -193,8 +191,8 @@ namespace desktop { // Copy data from shared data directory of base installation: rc = copy_recursive( - aBasePath + rtl::OUString("/presets"), - aUserPath + rtl::OUString("/user")); + aBasePath + OUString("/presets"), + aUserPath + OUString("/user")); if ((rc != FileBase::E_None) && (rc != FileBase::E_EXIST)) { if ( rc == FileBase::E_NOSPC ) diff --git a/desktop/source/deployment/dp_persmap.cxx b/desktop/source/deployment/dp_persmap.cxx index aab763165982..637d0b996f86 100644 --- a/desktop/source/deployment/dp_persmap.cxx +++ b/desktop/source/deployment/dp_persmap.cxx @@ -329,7 +329,7 @@ bool PersistentMap::importFromBDB() return false; // get the name of its BDB counterpart - rtl::OUString aDBName = m_MapFileName; + OUString aDBName = m_MapFileName; if( !aDBName.endsWith( ".pmap" )) return false; aDBName = aDBName.replaceAt( aDBName.getLength()-5, 5, ".db"); diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx index f566d9458473..9fd60fc67d0b 100644 --- a/desktop/source/deployment/dp_xml.cxx +++ b/desktop/source/deployment/dp_xml.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_misc { diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 571bd2806bfb..33a71c6b2275 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -37,7 +37,7 @@ class Window; using dp_gui::DependencyDialog; DependencyDialog::DependencyDialog( - Window * parent, std::vector< rtl::OUString > const & dependencies): + Window * parent, std::vector< OUString > const & dependencies): ModalDialog(parent, DpGuiResId(RID_DLG_DEPENDENCIES) ), m_text(this, DpGuiResId(RID_DLG_DEPENDENCIES_TEXT)), m_list(this, DpGuiResId(RID_DLG_DEPENDENCIES_LIST)), @@ -49,7 +49,7 @@ DependencyDialog::DependencyDialog( FreeResource(); SetMinOutputSizePixel(GetOutputSizePixel()); m_list.SetReadOnly(); - for (std::vector< rtl::OUString >::const_iterator i(dependencies.begin()); + for (std::vector< OUString >::const_iterator i(dependencies.begin()); i != dependencies.end(); ++i) { m_list.InsertEntry(*i); diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index fe38515272d3..c0d8172a8aa3 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -37,7 +37,7 @@ namespace dp_gui { class DependencyDialog: public ModalDialog { public: DependencyDialog( - Window * parent, std::vector< rtl::OUString > const & dependencies); + Window * parent, std::vector< OUString > const & dependencies); ~DependencyDialog(); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 63154e7931f1..2a439da9900d 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -76,7 +76,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::system; -using ::rtl::OUString; namespace dp_gui { @@ -494,7 +493,7 @@ IMPL_LINK_NOARG(ExtBoxWithBtns_Impl, HandleOptionsBtn) if ( pFact ) { OUString sExtensionId = GetEntryData( nActive )->m_xPackage->getIdentifier().Value; - VclAbstractDialog* pDlg = pFact->CreateOptionsDialog( this, sExtensionId, rtl::OUString() ); + VclAbstractDialog* pDlg = pFact->CreateOptionsDialog( this, sExtensionId, OUString() ); pDlg->Execute(); @@ -749,7 +748,7 @@ ExtMgrDialog::~ExtMgrDialog() } //------------------------------------------------------------------------------ -void ExtMgrDialog::setGetExtensionsURL( const ::rtl::OUString &rURL ) +void ExtMgrDialog::setGetExtensionsURL( const OUString &rURL ) { m_pGetExtensions->SetURL( rURL ); } @@ -914,7 +913,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() title2filter.insert( t_string2string::value_type( title, filter ) ) ); if ( ! insertion.second ) { // already existing, append extensions: - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( insertion.first->second ); buf.append( static_cast<sal_Unicode>(';') ); buf.append( filter ); @@ -935,7 +934,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() xFilePicker->appendFilter( iPos->first, iPos->second ); } catch (const lang::IllegalArgumentException & exc) { - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); (void) exc; } @@ -1550,7 +1549,7 @@ void UpdateRequiredDialog::Resize() Rectangle aControlRegion( Point( 0, 0 ), m_aProgressBar.GetSizePixel() ); Rectangle aNativeControlRegion, aNativeContentRegion; if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) != sal_False ) { nProgressHeight = aNativeControlRegion.GetHeight(); @@ -1636,7 +1635,7 @@ bool UpdateRequiredDialog::isEnabled( const uno::Reference< deployment::XPackage catch ( const uno::RuntimeException & ) { throw; } catch (const uno::Exception & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); bRegistered = false; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 490ac061153f..b5a5aa430483 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -63,13 +63,13 @@ public: Dialog *pWindow ); virtual ~DialogHelper(); - void openWebBrowser( const ::rtl::OUString & sURL, const ::rtl::OUString & sTitle ) const; + void openWebBrowser( const OUString & sURL, const OUString & sTitle ) const; Dialog* getWindow() const { return m_pVCLWindow; }; void PostUserEvent( const Link& rLink, void* pCaller ); void clearEventID() { m_nEventID = 0; } virtual void showProgress( bool bStart ) = 0; - virtual void updateProgress( const ::rtl::OUString &rText, + virtual void updateProgress( const OUString &rText, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel) = 0; virtual void updateProgress( const long nProgress ) = 0; @@ -90,7 +90,7 @@ public: void setBusy( const bool bBusy ) { m_bIsBusy = bBusy; } bool isBusy() const { return m_bIsBusy; } - bool installExtensionWarn( const ::rtl::OUString &rExtensionURL ) const; + bool installExtensionWarn( const OUString &rExtensionURL ) const; bool installForAllUsers( bool &bInstallForAll ) const; }; @@ -126,7 +126,7 @@ class ExtMgrDialog : public ModelessDialog, ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > m_xAbortChannel; - bool removeExtensionWarn( const ::rtl::OUString &rExtensionTitle ) const; + bool removeExtensionWarn( const OUString &rExtensionTitle ) const; DECL_DLLPRIVATE_LINK( HandleAddBtn, void * ); DECL_DLLPRIVATE_LINK( HandleUpdateBtn, void * ); @@ -145,13 +145,13 @@ public: virtual sal_Bool Close(); virtual void showProgress( bool bStart ); - virtual void updateProgress( const ::rtl::OUString &rText, + virtual void updateProgress( const OUString &rText, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel); virtual void updateProgress( const long nProgress ); virtual void updatePackageInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage ); - void setGetExtensionsURL( const ::rtl::OUString &rURL ); + void setGetExtensionsURL( const OUString &rURL ); virtual long addPackageToList( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &, bool bLicenseMissing = false ); bool enablePackage(const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &xPackage, @@ -165,7 +165,7 @@ public: virtual void prepareChecking(); virtual void checkEntries(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > raiseAddPicker(); + ::com::sun::star::uno::Sequence< OUString > raiseAddPicker(); }; //============================================================================== @@ -219,7 +219,7 @@ public: virtual sal_Bool Close(); virtual void showProgress( bool bStart ); - virtual void updateProgress( const ::rtl::OUString &rText, + virtual void updateProgress( const OUString &rText, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XAbortChannel > &xAbortChannel); virtual void updateProgress( const long nProgress ); @@ -233,10 +233,10 @@ public: virtual void prepareChecking(); virtual void checkEntries(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > raiseAddPicker(); + ::com::sun::star::uno::Sequence< OUString > raiseAddPicker(); bool installForAllUsers( bool &bInstallForAll ) const; - bool installExtensionWarn( const ::rtl::OUString &rExtensionURL ) const; + bool installExtensionWarn( const OUString &rExtensionURL ) const; }; //============================================================================== @@ -258,14 +258,14 @@ class UpdateRequiredDialogService : public ::cppu::WeakImplHelper1< ::com::sun:: { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const m_xComponentContext; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xParent; - ::rtl::OUString m_sInitialTitle; + OUString m_sInitialTitle; public: UpdateRequiredDialogService( ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > const & args, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xComponentContext ); // XExecutableDialog - virtual void SAL_CALL setTitle( rtl::OUString const & title ) throw ( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL setTitle( OUString const & title ) throw ( ::com::sun::star::uno::RuntimeException ); virtual sal_Int16 SAL_CALL execute() throw ( ::com::sun::star::uno::RuntimeException ); }; diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 9b4ba5b39095..df0e4175813e 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -100,7 +100,6 @@ using namespace ::com::sun::star; -using ::rtl::OUString; namespace { @@ -405,7 +404,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } else if (request >>= depExc) { - std::vector< rtl::OUString > deps; + std::vector< OUString > deps; for (sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i) { @@ -620,8 +619,8 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper, } //------------------------------------------------------------------------------ -void ExtensionCmdQueue::Thread::addExtension( const ::rtl::OUString &rExtensionURL, - const ::rtl::OUString &rRepository, +void ExtensionCmdQueue::Thread::addExtension( const OUString &rExtensionURL, + const OUString &rRepository, const bool bWarnUser ) { if ( !rExtensionURL.isEmpty() ) @@ -921,7 +920,7 @@ void ExtensionCmdQueue::Thread::_removeExtension( ::rtl::Reference< ProgressCmdE {} // Check, if there are still updates to be notified via menu bar icon - uno::Sequence< uno::Sequence< rtl::OUString > > aItemList; + uno::Sequence< uno::Sequence< OUString > > aItemList; UpdateDialog::createNotifyJob( false, aItemList ); } @@ -1077,8 +1076,8 @@ ExtensionCmdQueue::~ExtensionCmdQueue() { stop(); } -void ExtensionCmdQueue::addExtension( const ::rtl::OUString & extensionURL, - const ::rtl::OUString & repository, +void ExtensionCmdQueue::addExtension( const OUString & extensionURL, + const OUString & repository, const bool bWarnUser ) { m_thread->addExtension( extensionURL, repository, bWarnUser ); diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx index 955c66888136..69a109caa237 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.hxx @@ -69,8 +69,8 @@ public: /** */ - void addExtension( const ::rtl::OUString &rExtensionURL, - const ::rtl::OUString &rRepository, + void addExtension( const OUString &rExtensionURL, + const OUString &rRepository, const bool bWarnUser ); void removeExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &rPackage ); void enableExtension( const ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > &rPackage, diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 7b61ac925f36..19d274956ca8 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -141,7 +141,7 @@ void Entry_Impl::checkDependencies() deployment::DependencyException depExc; if ( e.Cause >>= depExc ) { - rtl::OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); + OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i ) { aMissingDep += "\n"; @@ -316,7 +316,7 @@ void ExtensionBox_Impl::checkIndex( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -324,7 +324,7 @@ rtl::OUString ExtensionBox_Impl::getItemName( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -332,7 +332,7 @@ rtl::OUString ExtensionBox_Impl::getItemVersion( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -340,7 +340,7 @@ rtl::OUString ExtensionBox_Impl::getItemDescription( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -348,7 +348,7 @@ rtl::OUString ExtensionBox_Impl::getItemPublisher( sal_Int32 nIndex ) const } //------------------------------------------------------------------------------ -rtl::OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const +OUString ExtensionBox_Impl::getItemPublisherLink( sal_Int32 nIndex ) const { const ::osl::MutexGuard aGuard( m_entriesMutex ); checkIndex( nIndex ); @@ -364,7 +364,7 @@ void ExtensionBox_Impl::select( sal_Int32 nIndex ) } //------------------------------------------------------------------------------ -void ExtensionBox_Impl::select( const rtl::OUString & sName ) +void ExtensionBox_Impl::select( const OUString & sName ) { const ::osl::MutexGuard aGuard( m_entriesMutex ); typedef ::std::vector< TEntry_Impl >::const_iterator It; @@ -403,7 +403,7 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos ) aSize.Width() -= ICON_OFFSET; aSize.Height() = 10000; - rtl::OUString aText( m_vEntries[ nPos ]->m_sErrorText ); + OUString aText( m_vEntries[ nPos ]->m_sErrorText ); if ( !aText.isEmpty() ) aText += "\n"; aText += m_vEntries[ nPos ]->m_sDescription; @@ -621,7 +621,7 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr aTextHeight = nIconHeight; // draw description - ::rtl::OUString sDescription; + OUString sDescription; if ( pEntry->m_sErrorText.Len() ) { if ( pEntry->m_bActive ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index b0fda41add21..12cae91a0f0b 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -228,27 +228,27 @@ public: /** @return The item name of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemName( sal_Int32 index ) const; + virtual OUString getItemName( sal_Int32 index ) const; /** @return The version string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemVersion( sal_Int32 index ) const; + virtual OUString getItemVersion( sal_Int32 index ) const; /** @return The description string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemDescription( sal_Int32 index ) const; + virtual OUString getItemDescription( sal_Int32 index ) const; /** @return The publisher string of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemPublisher( sal_Int32 index ) const; + virtual OUString getItemPublisher( sal_Int32 index ) const; /** @return The link behind the publisher text of the entry with the given index The index starts with 0. Throws an com::sun::star::lang::IllegalArgumentException, when the position is invalid. */ - virtual ::rtl::OUString getItemPublisherLink( sal_Int32 index ) const; + virtual OUString getItemPublisherLink( sal_Int32 index ) const; /** The entry at the given position will be selected Index starts with 0. @@ -262,7 +262,7 @@ public: 1. the name is not unique 2. one extension can be installed as user and shared extension. */ - virtual void select( const ::rtl::OUString & sName ); + virtual void select( const OUString & sName ); }; } diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 38abdb675e65..39cc7ae24e66 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -44,7 +44,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_gui { @@ -102,17 +101,17 @@ namespace : public rtl::Static< String, Extension > {}; } -rtl::OUString ReplaceProductNameHookProc( const rtl::OUString& rStr ) +OUString ReplaceProductNameHookProc( const OUString& rStr ) { if (rStr.indexOf( "%PRODUCT" ) == -1) return rStr; - rtl::OUString sProductName = ProductName::get(); - rtl::OUString sVersion = Version::get(); - rtl::OUString sAboutBoxVersion = AboutBoxVersion::get(); - rtl::OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); - rtl::OUString sExtension = Extension::get(); - rtl::OUString sOOOVendor = OOOVendor::get(); + OUString sProductName = ProductName::get(); + OUString sVersion = Version::get(); + OUString sAboutBoxVersion = AboutBoxVersion::get(); + OUString sAboutBoxVersionSuffix = AboutBoxVersionSuffix::get(); + OUString sExtension = Extension::get(); + OUString sOOOVendor = OOOVendor::get(); if ( sProductName.isEmpty() ) { @@ -127,7 +126,7 @@ rtl::OUString ReplaceProductNameHookProc( const rtl::OUString& rStr ) } } - rtl::OUString sRet = rStr.replaceAll( "%PRODUCTNAME", sProductName ); + OUString sRet = rStr.replaceAll( "%PRODUCTNAME", sProductName ); sRet = sRet.replaceAll( "%PRODUCTVERSION", sVersion ); sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSIONSUFFIX", sAboutBoxVersionSuffix ); sRet = sRet.replaceAll( "%ABOUTBOXPRODUCTVERSION", sAboutBoxVersion ); @@ -242,7 +241,7 @@ void ServiceImpl::startExecuteModal( app->SetSettings( as ); app->SetDisplayName( utl::ConfigManager::getProductName() + - rtl::OUString(" ") + + OUString(" ") + utl::ConfigManager::getProductVersion()); ExtensionCmdQueue::syncRepositories( m_xComponentContext ); } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index b0d1350955eb..af1576460532 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -38,7 +38,6 @@ #define SHARED_PACKAGE_MANAGER OUString("shared") using namespace ::com::sun::star; -using ::rtl::OUString; namespace dp_gui { @@ -138,7 +137,7 @@ void TheExtensionManager::Show() } //------------------------------------------------------------------------------ -void TheExtensionManager::SetText( const ::rtl::OUString &rTitle ) +void TheExtensionManager::SetText( const OUString &rTitle ) { const SolarMutexGuard guard; @@ -341,7 +340,7 @@ PackageState TheExtensionManager::getPackageState( const uno::Reference< deploym } catch (const uno::Exception & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); return NOT_AVAILABLE; } } diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index ec2734e80cee..df90ac4553d5 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -58,7 +58,7 @@ private: UpdateRequiredDialog *m_pUpdReqDialog; ExtensionCmdQueue *m_pExecuteCmdQueue; - ::rtl::OUString m_sGetExtensionsURL; + OUString m_sGetExtensionsURL; public: static ::rtl::Reference<TheExtensionManager> s_ExtMgr; @@ -74,7 +74,7 @@ public: DialogHelper* getDialogHelper() { return m_pExtMgrDialog ? (DialogHelper*) m_pExtMgrDialog : (DialogHelper*) m_pUpdReqDialog; } ExtensionCmdQueue* getCmdQueue() const { return m_pExecuteCmdQueue; } - void SetText( const ::rtl::OUString &rTitle ); + void SetText( const OUString &rTitle ); void Show(); void ToTop( sal_uInt16 nFlags ); bool Close(); @@ -82,7 +82,7 @@ public: //----------------- bool checkUpdates( bool showUpdateOnly, bool parentVisible ); - bool installPackage( const ::rtl::OUString &rPackageURL, bool bWarnUser = false ); + bool installPackage( const OUString &rPackageURL, bool bWarnUser = false ); void createPackageList(); bool queryTermination(); @@ -99,7 +99,7 @@ public: static ::rtl::Reference<TheExtensionManager> get( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xContext, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> const & xParent = 0, - ::rtl::OUString const & view = ::rtl::OUString() ); + OUString const & view = OUString() ); // XEventListener virtual void SAL_CALL disposing( ::com::sun::star::lang::EventObject const & evt ) diff --git a/desktop/source/deployment/gui/dp_gui_updatedata.hxx b/desktop/source/deployment/gui/dp_gui_updatedata.hxx index d61194751f9f..fa688960573b 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedata.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedata.hxx @@ -52,7 +52,7 @@ struct UpdateData ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > aInstalledPackage; //The version of the update - ::rtl::OUString updateVersion; + OUString updateVersion; //For online update // ====================== @@ -62,9 +62,9 @@ struct UpdateData ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo; //The URL of the locally downloaded extension. It will only be set if there were no errors //during the download - ::rtl::OUString sLocalURL; + OUString sLocalURL; //The URL of the website wher the download can be obtained. - ::rtl::OUString sWebsiteURL; + OUString sWebsiteURL; //For local update //===================== diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index cc9da4d783a4..84fccdf0bffe 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -138,7 +138,7 @@ static const sal_uInt16 CMD_IGNORE_ALL_UPDATES = 3; enum Kind { ENABLED_UPDATE, DISABLED_UPDATE, SPECIFIC_ERROR }; -rtl::OUString confineToParagraph(rtl::OUString const & text) { +OUString confineToParagraph(OUString const & text) { // Confine arbitrary text to a single paragraph in a dp_gui::AutoScrollEdit. // This assumes that U+000A and U+000D are the only paragraph separators in // a dp_gui::AutoScrollEdit, and that replacing them with a single space @@ -148,30 +148,30 @@ rtl::OUString confineToParagraph(rtl::OUString const & text) { } struct UpdateDialog::DisabledUpdate { - rtl::OUString name; - uno::Sequence< rtl::OUString > unsatisfiedDependencies; + OUString name; + uno::Sequence< OUString > unsatisfiedDependencies; // We also want to show release notes and publisher for disabled updates ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > aUpdateInfo; sal_uInt16 m_nID; }; struct UpdateDialog::SpecificError { - rtl::OUString name; - rtl::OUString message; + OUString name; + OUString message; sal_uInt16 m_nID; }; //------------------------------------------------------------------------------ struct UpdateDialog::IgnoredUpdate { - rtl::OUString sExtensionID; - rtl::OUString sVersion; + OUString sExtensionID; + OUString sVersion; bool bRemoved; - IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion ); + IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ); }; //------------------------------------------------------------------------------ -UpdateDialog::IgnoredUpdate::IgnoredUpdate( const rtl::OUString &rExtensionID, const rtl::OUString &rVersion ): +UpdateDialog::IgnoredUpdate::IgnoredUpdate( const OUString &rExtensionID, const OUString &rVersion ): sExtensionID( rExtensionID ), sVersion( rVersion ), bRemoved( false ) @@ -184,13 +184,13 @@ struct UpdateDialog::Index bool m_bIgnored; sal_uInt16 m_nID; sal_uInt16 m_nIndex; - rtl::OUString m_aName; + OUString m_aName; - Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName ); + Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ); }; //------------------------------------------------------------------------------ -UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const rtl::OUString &rName ): +UpdateDialog::Index::Index( Kind theKind, sal_uInt16 nID, sal_uInt16 nIndex, const OUString &rName ): m_eKind( theKind ), m_bIgnored( false ), m_nID( nID ), @@ -222,11 +222,11 @@ private: uno::Sequence< uno::Reference< xml::dom::XElement > > getUpdateInformation( uno::Reference< deployment::XPackage > const & package, - uno::Sequence< rtl::OUString > const & urls, - rtl::OUString const & identifier) const; + uno::Sequence< OUString > const & urls, + OUString const & identifier) const; - ::rtl::OUString getUpdateDisplayString( - dp_gui::UpdateData const & data, ::rtl::OUString const & version = ::rtl::OUString()) const; + OUString getUpdateDisplayString( + dp_gui::UpdateData const & data, OUString const & version = OUString()) const; void prepareUpdateData( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & updateInfo, @@ -318,12 +318,12 @@ void UpdateDialog::Thread::execute() prepareUpdateData(info.info, disableUpdate, updateData); //determine if the update is installed in the user or shared repository - rtl::OUString sOnlineVersion; + OUString sOnlineVersion; if (info.info.is()) sOnlineVersion = info.version; - rtl::OUString sVersionUser; - rtl::OUString sVersionShared; - rtl::OUString sVersionBundled; + OUString sVersionUser; + OUString sVersionShared; + OUString sVersionBundled; uno::Sequence< uno::Reference< deployment::XPackage> > extensions; try { extensions = extMgr->getExtensionsWithSameIdentifier( @@ -406,11 +406,11 @@ void UpdateDialog::Thread::handleSpecificError( } } -::rtl::OUString UpdateDialog::Thread::getUpdateDisplayString( - dp_gui::UpdateData const & data, ::rtl::OUString const & version) const +OUString UpdateDialog::Thread::getUpdateDisplayString( + dp_gui::UpdateData const & data, OUString const & version) const { OSL_ASSERT(data.aInstalledPackage.is()); - rtl::OUStringBuffer b(data.aInstalledPackage->getDisplayName()); + OUStringBuffer b(data.aInstalledPackage->getDisplayName()); b.append(static_cast< sal_Unicode >(' ')); { SolarMutexGuard g; @@ -455,7 +455,7 @@ void UpdateDialog::Thread::prepareUpdateData( out_du.unsatisfiedDependencies[i] = dp_misc::Dependencies::getErrorText(ds[i]); } - const ::boost::optional< ::rtl::OUString> updateWebsiteURL(infoset.getLocalizedUpdateWebsiteURL()); + const ::boost::optional< OUString> updateWebsiteURL(infoset.getLocalizedUpdateWebsiteURL()); out_du.name = getUpdateDisplayString(out_data, infoset.getVersion()); @@ -724,7 +724,7 @@ void UpdateDialog::addAdditional( UpdateDialog::Index * index, SvLBoxButtonKind } //------------------------------------------------------------------------------ -void UpdateDialog::addEnabledUpdate( rtl::OUString const & name, +void UpdateDialog::addEnabledUpdate( OUString const & name, dp_gui::UpdateData & data ) { sal_uInt16 nIndex = sal::static_int_cast< sal_uInt16 >( m_enabledUpdates.size() ); @@ -808,7 +808,7 @@ void UpdateDialog::enableOk() { // ********************************************************************************* void UpdateDialog::createNotifyJob( bool bPrepareOnly, - uno::Sequence< uno::Sequence< rtl::OUString > > &rItemList ) + uno::Sequence< uno::Sequence< OUString > > &rItemList ) { if ( !dp_misc::office_is_running() ) return; @@ -843,7 +843,7 @@ void UpdateDialog::createNotifyJob( bool bPrepareOnly, uno::Reference < frame::XDesktop2 > xDesktop = frame::Desktop::create( xContext ); uno::Reference< frame::XDispatchProvider > xDispatchProvider( xDesktop->getCurrentFrame(), uno::UNO_QUERY_THROW ); - uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, rtl::OUString(), 0); + uno::Reference< frame::XDispatch > xDispatch = xDispatchProvider->queryDispatch(aURL, OUString(), 0); if( xDispatch.is() ) { @@ -871,14 +871,14 @@ void UpdateDialog::notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ) if ( !dp_misc::office_is_running() ) return; - uno::Sequence< uno::Sequence< rtl::OUString > > aItemList; + uno::Sequence< uno::Sequence< OUString > > aItemList; if ( ! bRecheckOnly ) { sal_Int32 nCount = 0; for ( sal_Int16 i = 0; i < m_updates.getItemCount(); ++i ) { - uno::Sequence< rtl::OUString > aItem(2); + uno::Sequence< OUString > aItem(2); UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >(m_updates.GetEntryData(i)); @@ -988,11 +988,11 @@ bool UpdateDialog::showDescription(uno::Reference< deployment::XPackage > const ""); } -bool UpdateDialog::showDescription(std::pair< rtl::OUString, rtl::OUString > const & pairPublisher, - rtl::OUString const & sReleaseNotes) +bool UpdateDialog::showDescription(std::pair< OUString, OUString > const & pairPublisher, + OUString const & sReleaseNotes) { - rtl::OUString sPub = pairPublisher.first; - rtl::OUString sURL = pairPublisher.second; + OUString sPub = pairPublisher.first; + OUString sURL = pairPublisher.second; if ( sPub.isEmpty() && sURL.isEmpty() && sReleaseNotes.isEmpty() ) // nothing to show @@ -1056,12 +1056,12 @@ void UpdateDialog::getIgnoredUpdates() args[0] <<= aValue; uno::Reference< container::XNameAccess > xNameAccess( xConfig->createInstanceWithArguments( "com.sun.star.configuration.ConfigurationAccess", args), uno::UNO_QUERY_THROW ); - uno::Sequence< rtl::OUString > aElementNames = xNameAccess->getElementNames(); + uno::Sequence< OUString > aElementNames = xNameAccess->getElementNames(); for ( sal_Int32 i = 0; i < aElementNames.getLength(); i++ ) { - ::rtl::OUString aIdentifier = aElementNames[i]; - ::rtl::OUString aVersion; + OUString aIdentifier = aElementNames[i]; + OUString aVersion; uno::Any aPropValue( uno::Reference< beans::XPropertySet >( xNameAccess->getByName( aIdentifier ), uno::UNO_QUERY_THROW )->getPropertyValue( PROPERTY_VERSION ) ); aPropValue >>= aVersion; @@ -1116,8 +1116,8 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) if (! m_ignoredUpdates.empty() ) { - rtl::OUString aExtensionID; - rtl::OUString aVersion; + OUString aExtensionID; + OUString aVersion; if ( index->m_eKind == ENABLED_UPDATE ) { @@ -1129,7 +1129,7 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) { DisabledUpdate &rData = m_disabledUpdates[ index->m_nIndex ]; dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo ); - ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() ); + ::boost::optional< OUString > aID( aInfoset.getIdentifier() ); if ( aID ) aExtensionID = *aID; aVersion = aInfoset.getVersion(); @@ -1157,8 +1157,8 @@ bool UpdateDialog::isIgnoredUpdate( UpdateDialog::Index * index ) //------------------------------------------------------------------------------ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll ) { - rtl::OUString aExtensionID; - rtl::OUString aVersion; + OUString aExtensionID; + OUString aVersion; m_bModified = true; @@ -1173,7 +1173,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, { DisabledUpdate &rData = m_disabledUpdates[ pIndex->m_nIndex ]; dp_misc::DescriptionInfoset aInfoset( m_context, rData.aUpdateInfo ); - ::boost::optional< ::rtl::OUString > aID( aInfoset.getIdentifier() ); + ::boost::optional< OUString > aID( aInfoset.getIdentifier() ); if ( aID ) aExtensionID = *aID; if ( !bIgnoreAll ) @@ -1205,7 +1205,7 @@ void UpdateDialog::setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, IMPL_LINK_NOARG(UpdateDialog, selectionHandler) { - rtl::OUStringBuffer b; + OUStringBuffer b; bool bInserted = false; UpdateDialog::Index const * p = static_cast< UpdateDialog::Index const * >( m_updates.GetEntryData(m_updates.GetSelectEntryPos())); @@ -1244,8 +1244,8 @@ IMPL_LINK_NOARG(UpdateDialog, selectionHandler) if (data.unsatisfiedDependencies.getLength() != 0) { // create error string for version mismatch - ::rtl::OUString sVersion( "%VERSION" ); - ::rtl::OUString sProductName( "%PRODUCTNAME" ); + OUString sVersion( "%VERSION" ); + OUString sProductName( "%PRODUCTNAME" ); sal_Int32 nPos = m_noDependencyCurVer.indexOf( sVersion ); if ( nPos >= 0 ) { @@ -1380,9 +1380,9 @@ IMPL_LINK_NOARG(UpdateDialog, closeHandler) { IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink*, pHyperlink ) { - ::rtl::OUString sURL; + OUString sURL; if ( pHyperlink ) - sURL = ::rtl::OUString( pHyperlink->GetURL() ); + sURL = OUString( pHyperlink->GetURL() ); if ( sURL.isEmpty() ) return 0; @@ -1391,7 +1391,7 @@ IMPL_LINK( UpdateDialog, hyperlink_clicked, FixedHyperlink*, pHyperlink ) uno::Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute( com::sun::star::system::SystemShellExecute::create(m_context) ); //throws lang::IllegalArgumentException, system::SystemShellExecuteException - xSystemShellExecute->execute( sURL, ::rtl::OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); + xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY); } catch ( const uno::Exception& ) { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index ca6ffa53fddb..e83df3cba7b1 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -94,7 +94,7 @@ public: void notifyMenubar( bool bPrepareOnly, bool bRecheckOnly ); static void createNotifyJob( bool bPrepareOnly, - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< rtl::OUString > > &rItemList ); + com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< OUString > > &rItemList ); private: UpdateDialog(UpdateDialog &); // not defined @@ -128,9 +128,9 @@ private: void handlePopupMenu( const Point &rPos ); - rtl::OUString m_ignoreUpdate; - rtl::OUString m_ignoreAllUpdates; - rtl::OUString m_enableUpdate; + OUString m_ignoreUpdate; + OUString m_ignoreAllUpdates; + OUString m_enableUpdate; UpdateDialog & m_dialog; }; @@ -142,7 +142,7 @@ private: bool isIgnoredUpdate( UpdateDialog::Index *pIndex ); void setIgnoredUpdate( UpdateDialog::Index *pIndex, bool bIgnore, bool bIgnoreAll ); - void addEnabledUpdate( rtl::OUString const & name, dp_gui::UpdateData & data ); + void addEnabledUpdate( OUString const & name, dp_gui::UpdateData & data ); void addDisabledUpdate( UpdateDialog::DisabledUpdate & data ); void addSpecificError( UpdateDialog::SpecificError & data ); @@ -157,8 +157,8 @@ private: void clearDescription(); bool showDescription(::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > const & aExtension); - bool showDescription(std::pair< rtl::OUString, rtl::OUString > const & pairPublisher, - rtl::OUString const & sReleaseNotes); + bool showDescription(std::pair< OUString, OUString > const & pairPublisher, + OUString const & sReleaseNotes); bool showDescription( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & aUpdateInfo); bool showDescription( const String& rDescription, bool bWithPublisher ); @@ -187,18 +187,18 @@ private: HelpButton m_help; PushButton m_ok; PushButton m_close; - rtl::OUString m_error; - rtl::OUString m_none; - rtl::OUString m_noInstallable; - rtl::OUString m_failure; - rtl::OUString m_unknownError; - rtl::OUString m_noDescription; - rtl::OUString m_noInstall; - rtl::OUString m_noDependency; - rtl::OUString m_noDependencyCurVer; - rtl::OUString m_browserbased; - rtl::OUString m_version; - rtl::OUString m_ignoredUpdate; + OUString m_error; + OUString m_none; + OUString m_noInstallable; + OUString m_failure; + OUString m_unknownError; + OUString m_noDescription; + OUString m_noInstall; + OUString m_noDependency; + OUString m_noDependencyCurVer; + OUString m_browserbased; + OUString m_version; + OUString m_ignoredUpdate; std::vector< dp_gui::UpdateData > m_enabledUpdates; std::vector< UpdateDialog::DisabledUpdate > m_disabledUpdates; std::vector< UpdateDialog::SpecificError > m_specificErrors; diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index b464af532774..774f302972ab 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -77,7 +77,6 @@ class Window; namespace cssu = ::com::sun::star::uno; using dp_misc::StrTitle; -using ::rtl::OUString; namespace dp_gui { @@ -96,7 +95,7 @@ private: virtual void execute(); void downloadExtensions(); - void download(::rtl::OUString const & aUrls, UpdateData & aUpdatData); + void download(OUString const & aUrls, UpdateData & aUpdatData); void installExtensions(); void removeTempDownloads(); @@ -111,7 +110,7 @@ private: ::rtl::Reference<UpdateCommandEnv> m_updateCmdEnv; //A folder which is created in the temp directory in which then the updates are downloaded - ::rtl::OUString m_sDownloadFolder; + OUString m_sDownloadFolder; bool m_stop; @@ -272,7 +271,7 @@ void UpdateInstallDialog::updateDone() } // make sure the solar mutex is locked before calling //sets an error message in the text area -void UpdateInstallDialog::setError(INSTALL_ERROR err, ::rtl::OUString const & sExtension, +void UpdateInstallDialog::setError(INSTALL_ERROR err, OUString const & sExtension, OUString const & exceptionMessage) { String sError; @@ -409,7 +408,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() if (curData.sLocalURL.isEmpty()) { //Construct a string of all messages contained in the exceptions plus the respective download URLs - ::rtl::OUStringBuffer buf(256); + OUStringBuffer buf(256); typedef ::std::vector< ::std::pair<OUString, cssu::Exception > >::const_iterator CIT; for (CIT j = vecExceptions.begin(); j != vecExceptions.end(); ++j) { diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index c0d24b22b791..4ff60064b5af 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -84,8 +84,8 @@ private: ERROR_INSTALLATION, ERROR_LICENSE_DECLINED }; - void setError(INSTALL_ERROR err, ::rtl::OUString const & sExtension, ::rtl::OUString const & exceptionMessage); - void setError(::rtl::OUString const & exceptionMessage); + void setError(INSTALL_ERROR err, OUString const & sExtension, OUString const & exceptionMessage); + void setError(OUString const & exceptionMessage); ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XExtensionManager > getExtensionManager() const { return m_xExtensionManager; } @@ -97,14 +97,14 @@ private: bool m_bNoEntry; bool m_bActivated; - ::rtl::OUString m_sInstalling; - ::rtl::OUString m_sFinished; - ::rtl::OUString m_sNoErrors; - ::rtl::OUString m_sErrorDownload; - ::rtl::OUString m_sErrorInstallation; - ::rtl::OUString m_sErrorLicenseDeclined; - ::rtl::OUString m_sNoInstall; - ::rtl::OUString m_sThisErrorOccurred; + OUString m_sInstalling; + OUString m_sFinished; + OUString m_sNoErrors; + OUString m_sErrorDownload; + OUString m_sErrorInstallation; + OUString m_sErrorLicenseDeclined; + OUString m_sNoInstall; + OUString m_sThisErrorOccurred; FixedText m_ft_action; ProgressBar m_statusbar; diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index ccd57d20e1d5..46c653bc2bb7 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -46,7 +46,6 @@ using namespace ::dp_misc; namespace cssu = ::com::sun::star::uno; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_gui { @@ -106,8 +105,8 @@ struct LicenseDialogImpl : public ModalDialog LicenseDialogImpl( Window * pParent, css::uno::Reference< css::uno::XComponentContext > const & xContext, - const ::rtl::OUString & sExtensionName, - const ::rtl::OUString & sLicenseText); + const OUString & sExtensionName, + const OUString & sLicenseText); virtual void Activate(); @@ -184,8 +183,8 @@ void LicenseView::Notify( SfxBroadcaster&, const SfxHint& rHint ) LicenseDialogImpl::LicenseDialogImpl( Window * pParent, cssu::Reference< cssu::XComponentContext > const & xContext, - const ::rtl::OUString & sExtensionName, - const ::rtl::OUString & sLicenseText): + const OUString & sExtensionName, + const OUString & sLicenseText): ModalDialog(pParent, DpGuiResId(RID_DLG_LICENSE)) ,m_xComponentContext(xContext) ,m_ftHead(this, DpGuiResId(FT_LICENSE_HEADER)) diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index 7fb26c46b66e..8dc0f2c908bc 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.hxx @@ -30,7 +30,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_gui { diff --git a/desktop/source/deployment/inc/dp_dependencies.hxx b/desktop/source/deployment/inc/dp_dependencies.hxx index de5f604c139d..63f77cb79303 100644 --- a/desktop/source/deployment/inc/dp_dependencies.hxx +++ b/desktop/source/deployment/inc/dp_dependencies.hxx @@ -64,7 +64,7 @@ namespace Dependencies { the name of the dependency; will never be empty, as a localized “unknown” is substituted for an empty/missing name */ - DESKTOP_DEPLOYMENTMISC_DLLPUBLIC rtl::OUString getErrorText( + DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getErrorText( com::sun::star::uno::Reference< com::sun::star::xml::dom::XElement > const & dependency); } diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx index 1e4817fff17d..8cb7321c44d3 100644 --- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx +++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx @@ -46,7 +46,7 @@ namespace dp_misc { struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC SimpleLicenseAttributes { - ::rtl::OUString acceptBy; + OUString acceptBy; //Attribute suppress-on-update. Default is false. bool suppressOnUpdate; //Attribute suppress-if-required. Default is false. @@ -86,7 +86,7 @@ public: @return the identifier, or an empty <code>optional</code> if none is specified */ - ::boost::optional< ::rtl::OUString > getIdentifier() const; + ::boost::optional< OUString > getIdentifier() const; /** Return the textual version representation. @@ -94,7 +94,7 @@ public: @return textual version representation */ - ::rtl::OUString getVersion() const; + OUString getVersion() const; /** Returns a list of supported platforms. @@ -111,27 +111,27 @@ public: The value attribute can contain various platform tokens. They must be separated by commas.Each token will be stripped from leading and trailing white space (trim()). */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedPlaforms() const; + ::com::sun::star::uno::Sequence< OUString > getSupportedPlaforms() const; /** Returns the localized publisher name and the corresponding URL. In case there is no publisher element then a pair of two empty strings is returned. */ - ::std::pair< ::rtl::OUString, ::rtl::OUString > getLocalizedPublisherNameAndURL() const; + ::std::pair< OUString, OUString > getLocalizedPublisherNameAndURL() const; /** Returns the URL for the release notes corresponding to the office's locale. In case there is no release-notes element then an empty string is returned. */ - ::rtl::OUString getLocalizedReleaseNotesURL() const; + OUString getLocalizedReleaseNotesURL() const; /** returns the relative path to the license file. In case there is no simple-license element then an empty string is returned. */ - ::rtl::OUString getLocalizedLicenseURL() const; + OUString getLocalizedLicenseURL() const; /** returns the attributes of the simple-license element @@ -144,7 +144,7 @@ public: In case there is no localized display-name then an empty string is returned. */ - ::rtl::OUString getLocalizedDisplayName() const; + OUString getLocalizedDisplayName() const; /** returns the download website URL from the update information. @@ -165,13 +165,13 @@ public: the download website URL, or an empty <code>optional</code> if none is specified */ - ::boost::optional< ::rtl::OUString > getLocalizedUpdateWebsiteURL() const; + ::boost::optional< OUString > getLocalizedUpdateWebsiteURL() const; /** returns the relative URL to the description. The URL is relative to the root directory of the extensions. */ - ::rtl::OUString getLocalizedDescriptionURL() const; + OUString getLocalizedDescriptionURL() const; /** Return the dependencies. @@ -187,7 +187,7 @@ public: @return update information URLs */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getUpdateInformationUrls() const; /** @@ -200,22 +200,22 @@ public: @return download URLs */ - ::com::sun::star::uno::Sequence< ::rtl::OUString > + ::com::sun::star::uno::Sequence< OUString > getUpdateDownloadUrls() const; /** Returns the URL for the icon image. */ - ::rtl::OUString getIconURL( sal_Bool bHighContrast ) const; + OUString getIconURL( sal_Bool bHighContrast ) const; bool hasDescription() const; private: - SAL_DLLPRIVATE ::boost::optional< ::rtl::OUString > getOptionalValue( - ::rtl::OUString const & expression) const; + SAL_DLLPRIVATE ::boost::optional< OUString > getOptionalValue( + OUString const & expression) const; - SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > getUrls( - ::rtl::OUString const & expression) const; + SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< OUString > getUrls( + OUString const & expression) const; /** Retrieves a child element which as lang attribute which matches the office locale. @@ -227,7 +227,7 @@ private: Then a null reference is returned. */ SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > - getLocalizedChild( ::rtl::OUString const & sParent) const; + getLocalizedChild( OUString const & sParent) const; SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode> matchLanguageTag( ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > const & xParent, @@ -247,15 +247,15 @@ private: @param out_bParentExists indicates if the element node specified in sXPathParent exists. */ - SAL_DLLPRIVATE ::rtl::OUString getLocalizedHREFAttrFromChild( - ::rtl::OUString const & sXPathParent, bool * out_bParentExists) const; + SAL_DLLPRIVATE OUString getLocalizedHREFAttrFromChild( + OUString const & sXPathParent, bool * out_bParentExists) const; /** Gets the node value for a given expression. The expression is used in m_xpath-selectSingleNode. The value of the returned node is return value of this function. */ - SAL_DLLPRIVATE ::rtl::OUString - getNodeValueFromExpression(::rtl::OUString const & expression) const; + SAL_DLLPRIVATE OUString + getNodeValueFromExpression(OUString const & expression) const; /** Check the extensions blacklist if additional extension meta data (e.g. dependencies) are defined for this extension and have to be taken into account. @@ -266,8 +266,8 @@ private: /** Helper method to compare the versions with the current version */ SAL_DLLPRIVATE bool - checkBlacklistVersion(::rtl::OUString currentversion, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & versions) const; + checkBlacklistVersion(OUString currentversion, + ::com::sun::star::uno::Sequence< OUString > const & versions) const; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_context; @@ -288,7 +288,7 @@ inline bool DescriptionInfoset::hasDescription() const the description.xml. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -DescriptionInfoset getDescriptionInfoset(::rtl::OUString const & sExtensionFolderURL); +DescriptionInfoset getDescriptionInfoset(OUString const & sExtensionFolderURL); } #endif diff --git a/desktop/source/deployment/inc/dp_identifier.hxx b/desktop/source/deployment/inc/dp_identifier.hxx index 14aa41286001..0d897aa6f824 100644 --- a/desktop/source/deployment/inc/dp_identifier.hxx +++ b/desktop/source/deployment/inc/dp_identifier.hxx @@ -47,9 +47,9 @@ namespace dp_misc { the given optional identifier if present, otherwise a legacy identifier based on the given file name */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString generateIdentifier( - ::boost::optional< ::rtl::OUString > const & optional, - ::rtl::OUString const & fileName); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateIdentifier( + ::boost::optional< OUString > const & optional, + OUString const & fileName); /** Gets the identifier of a package. @@ -63,7 +63,7 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString generateIdentifier( @throws com::sun::star::uno::RuntimeException */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString getIdentifier( +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getIdentifier( ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage > const & package); @@ -76,8 +76,8 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString getIdentifier( @return a legacy identifier based on the given file name */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString generateLegacyIdentifier( - ::rtl::OUString const & fileName); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateLegacyIdentifier( + OUString const & fileName); } diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index 9d3a105fd786..67bf480176fb 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -31,7 +31,7 @@ namespace dp_misc { inline void progressUpdate( - ::rtl::OUString const & status, + OUString const & status, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) { if (xCmdEnv.is()) { @@ -52,16 +52,16 @@ public: inline ~ProgressLevel(); inline ProgressLevel( css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, - ::rtl::OUString const & status ); + OUString const & status ); - inline void update( ::rtl::OUString const & status ) const; + inline void update( OUString const & status ) const; inline void update( css::uno::Any const & status ) const; }; //______________________________________________________________________________ inline ProgressLevel::ProgressLevel( css::uno::Reference< css::ucb::XCommandEnvironment > const & xCmdEnv, - ::rtl::OUString const & status ) + OUString const & status ) { if (xCmdEnv.is()) m_xProgressHandler = xCmdEnv->getProgressHandler(); @@ -77,7 +77,7 @@ inline ProgressLevel::~ProgressLevel() } //______________________________________________________________________________ -inline void ProgressLevel::update( ::rtl::OUString const & status ) const +inline void ProgressLevel::update( OUString const & status ) const { if (m_xProgressHandler.is()) m_xProgressHandler->update( css::uno::makeAny(status) ); diff --git a/desktop/source/deployment/inc/dp_misc.h b/desktop/source/deployment/inc/dp_misc.h index 70f5cbb471ad..4ec4c6e34989 100644 --- a/desktop/source/deployment/inc/dp_misc.h +++ b/desktop/source/deployment/inc/dp_misc.h @@ -59,14 +59,14 @@ inline void try_dispose( ::com::sun::star::uno::Reference< ::com::sun::star::uno //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString expandUnoRcTerm( ::rtl::OUString const & term ); +OUString expandUnoRcTerm( OUString const & term ); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString makeRcTerm( ::rtl::OUString const & url ); +OUString makeRcTerm( OUString const & url ); //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString expandUnoRcUrl( ::rtl::OUString const & url ); +OUString expandUnoRcUrl( OUString const & url ); //============================================================================== @@ -76,8 +76,8 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC If the URL starts with vnd.sun.star.expand then the relative path will be again encoded for use in an "expand" URL. */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString makeURL( - ::rtl::OUString const & baseURL, ::rtl::OUString const & relPath ); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString makeURL( + OUString const & baseURL, OUString const & relPath ); /** appends a relative path to a url. @@ -85,17 +85,17 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString makeURL( This is the same as makeURL, but the relative Path must me a segment of an system path. */ -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString makeURLAppendSysPathSegment( - ::rtl::OUString const & baseURL, ::rtl::OUString const & relPath ); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString makeURLAppendSysPathSegment( + OUString const & baseURL, OUString const & relPath ); //============================================================================== -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString generateRandomPipeId(); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString generateRandomPipeId(); class AbortChannel; //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> resolveUnoURL( - ::rtl::OUString const & connectString, + OUString const & connectString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> const & xLocalContext, AbortChannel * abortChannel = 0 ); @@ -104,8 +104,8 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool office_is_running(); //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -oslProcess raiseProcess( ::rtl::OUString const & appURL, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & args ); +oslProcess raiseProcess( OUString const & appURL, + ::com::sun::star::uno::Sequence< OUString > const & args ); //============================================================================== @@ -116,13 +116,13 @@ oslProcess raiseProcess( ::rtl::OUString const & appURL, WriteConsoleW. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -void writeConsole(::rtl::OUString const & sText); +void writeConsole(OUString const & sText); /** writes the argument to the console using the error stream. Otherwise the same as writeConsole. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -void writeConsoleError(::rtl::OUString const & sText); +void writeConsoleError(OUString const & sText); /** reads from the console. @@ -131,14 +131,14 @@ void writeConsoleError(::rtl::OUString const & sText); size of 1024 and does NOT include leading and trailing white space(applied OUString::trim()) */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString readConsole(); +OUString readConsole(); /** print the text to the console in a debug build. The argument is forwarded to writeConsole. The function does not add new line. The code is only executed if OSL_DEBUG_LEVEL > 1 */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -void TRACE(::rtl::OUString const & sText); +void TRACE(OUString const & sText); /** registers or revokes shared or bundled extensions which have been recently added or removed. diff --git a/desktop/source/deployment/inc/dp_persmap.h b/desktop/source/deployment/inc/dp_persmap.h index a0fb96e3619d..efc5c24145dd 100644 --- a/desktop/source/deployment/inc/dp_persmap.h +++ b/desktop/source/deployment/inc/dp_persmap.h @@ -28,7 +28,7 @@ namespace dp_misc { typedef ::boost::unordered_map< - ::rtl::OString, ::rtl::OString, ::rtl::OStringHash > t_string2string_map; + OString, OString, OStringHash > t_string2string_map; // Class to read obsolete registered extensions // should be removed for LibreOffice 4.0 @@ -43,25 +43,25 @@ class PersistentMap public: ~PersistentMap(); - PersistentMap( ::rtl::OUString const & url, bool readOnly ); + PersistentMap( OUString const & url, bool readOnly ); /** in mem db */ PersistentMap(); - bool has( ::rtl::OString const & key ) const; - bool get( ::rtl::OString * value, ::rtl::OString const & key ) const; + bool has( OString const & key ) const; + bool get( OString * value, OString const & key ) const; t_string2string_map getEntries() const; - void put( ::rtl::OString const & key, ::rtl::OString const & value ); - bool erase( ::rtl::OString const & key, bool flush_immediately = true ); + void put( OString const & key, OString const & value ); + bool erase( OString const & key, bool flush_immediately = true ); protected: bool open(); bool readAll(); - void add( ::rtl::OString const & key, ::rtl::OString const & value ); + void add( OString const & key, OString const & value ); void flush(); #ifndef DISABLE_BDB2PMAP bool importFromBDB( void); - ::rtl::OUString m_MapFileName; + OUString m_MapFileName; #endif }; diff --git a/desktop/source/deployment/inc/dp_platform.hxx b/desktop/source/deployment/inc/dp_platform.hxx index 044762e761f8..18ca77efda50 100644 --- a/desktop/source/deployment/inc/dp_platform.hxx +++ b/desktop/source/deployment/inc/dp_platform.hxx @@ -30,16 +30,16 @@ namespace dp_misc { -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC ::rtl::OUString const & getPlatformString(); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString const & getPlatformString(); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC - bool platform_fits( ::rtl::OUString const & platform_string ); + bool platform_fits( OUString const & platform_string ); /** determines if the current platform corresponds to one of the platform strings. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -bool hasValidPlatform( ::com::sun::star::uno::Sequence< ::rtl::OUString > const & platformStrings); +bool hasValidPlatform( ::com::sun::star::uno::Sequence< OUString > const & platformStrings); } diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index 78bf42624b8e..04dc52c82889 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -37,8 +37,8 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC String getResourceString( sal_uInt16 id ); template <typename Unique, sal_uInt16 id> struct StaticResourceString : - public ::rtl::StaticWithInit< ::rtl::OUString, Unique > { - const ::rtl::OUString operator () () { return getResourceString(id); } + public ::rtl::StaticWithInit< OUString, Unique > { + const OUString operator () () { return getResourceString(id); } }; //============================================================================== diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h index 7da43b7f64c8..824d32d367dd 100644 --- a/desktop/source/deployment/inc/dp_ucb.h +++ b/desktop/source/deployment/inc/dp_ucb.h @@ -37,16 +37,16 @@ namespace dp_misc { struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle { - static css::uno::Sequence< rtl::OUString > getTitleSequence() + static css::uno::Sequence< OUString > getTitleSequence() { - css::uno::Sequence< rtl::OUString > aSeq( 1 ); + css::uno::Sequence< OUString > aSeq( 1 ); aSeq[ 0 ] = "Title"; return aSeq; } - static rtl::OUString getTitle( ::ucbhelper::Content &rContent ) + static OUString getTitle( ::ucbhelper::Content &rContent ) { - return rtl::OUString( rContent.getPropertyValue( - rtl::OUString::createFromAscii( "Title" ) ).get<rtl::OUString>() ); + return OUString( rContent.getPropertyValue( + OUString::createFromAscii( "Title" ) ).get<OUString>() ); } // just return titles - the ucbhelper should have a simpler API for this [!] static css::uno::Reference< css::sdbc::XResultSet > @@ -61,7 +61,7 @@ struct DESKTOP_DEPLOYMENTMISC_DLLPUBLIC StrTitle //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool create_ucb_content( ::ucbhelper::Content * ucb_content, - ::rtl::OUString const & url, + OUString const & url, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, bool throw_exc = true ); @@ -70,13 +70,13 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool create_ucb_content( */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool create_folder( ::ucbhelper::Content * ucb_content, - ::rtl::OUString const & url, + OUString const & url, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, bool throw_exc = true ); //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC bool erase_path( - ::rtl::OUString const & url, + OUString const & url, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, bool throw_exc = true ); @@ -86,11 +86,11 @@ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC //============================================================================== DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -bool readLine( ::rtl::OUString * res, ::rtl::OUString const & startingWith, +bool readLine( OUString * res, OUString const & startingWith, ::ucbhelper::Content & ucb_content, rtl_TextEncoding textenc ); DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> > & out_result, +bool readProperties( ::std::list< ::std::pair< OUString, OUString> > & out_result, ::ucbhelper::Content & ucb_content); diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx index cbad0bab7fe4..4f50d5c34812 100644 --- a/desktop/source/deployment/inc/dp_update.hxx +++ b/desktop/source/deployment/inc/dp_update.hxx @@ -39,7 +39,7 @@ namespace dp_misc { is used when an extension does not provide its own URL. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString getExtensionDefaultUpdateURL(); +OUString getExtensionDefaultUpdateURL(); enum UPDATE_SOURCE { @@ -59,10 +59,10 @@ enum UPDATE_SOURCE DESKTOP_DEPLOYMENTMISC_DLLPUBLIC UPDATE_SOURCE isUpdateUserExtension( bool bReadOnlyShared, - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion); + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion); /* determine if an update is available which is installed in the shared repository. @@ -74,9 +74,9 @@ UPDATE_SOURCE isUpdateUserExtension( DESKTOP_DEPLOYMENTMISC_DLLPUBLIC UPDATE_SOURCE isUpdateSharedExtension( bool bReadOnlyShared, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion); + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion); /* determines the extension with the highest identifier and returns it @@ -95,11 +95,11 @@ struct UpdateInfo ::com::sun::star::uno::Reference< ::com::sun::star::deployment::XPackage> extension; //version of the update - ::rtl::OUString version; + OUString version; ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XNode > info; }; -typedef std::map< ::rtl::OUString, UpdateInfo > UpdateInfoMap; +typedef std::map< OUString, UpdateInfo > UpdateInfoMap; /* @param extensionList @@ -128,11 +128,11 @@ UpdateInfoMap getOnlineUpdateInfos( /* retunrs the highest version from the provided arguments. */ DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -::rtl::OUString getHighestVersion( - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion); +OUString getHighestVersion( + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion); } diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx index be88cb084d03..0e110e7132b3 100644 --- a/desktop/source/deployment/inc/dp_version.hxx +++ b/desktop/source/deployment/inc/dp_version.hxx @@ -31,7 +31,7 @@ namespace dp_misc { enum Order { LESS, EQUAL, GREATER }; DESKTOP_DEPLOYMENTMISC_DLLPUBLIC Order compareVersions( - ::rtl::OUString const & version1, ::rtl::OUString const & version2); + OUString const & version1, OUString const & version2); } #endif diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx index 647ba2f8610d..1e041244a281 100644 --- a/desktop/source/deployment/inc/lockfile.hxx +++ b/desktop/source/deployment/inc/lockfile.hxx @@ -38,13 +38,13 @@ #include "dp_misc_api.hxx" -#define LOCKFILE_SUFFIX rtl::OUString( "/.lock" ) -#define LOCKFILE_GROUP rtl::OString( "Lockdata" ) -#define LOCKFILE_USERKEY rtl::OString( "User" ) -#define LOCKFILE_HOSTKEY rtl::OString( "Host" ) -#define LOCKFILE_STAMPKEY rtl::OString( "Stamp" ) -#define LOCKFILE_TIMEKEY rtl::OString( "Time" ) -#define LOCKFILE_IPCKEY rtl::OString( "IPCServer" ) +#define LOCKFILE_SUFFIX OUString( "/.lock" ) +#define LOCKFILE_GROUP OString( "Lockdata" ) +#define LOCKFILE_USERKEY OString( "User" ) +#define LOCKFILE_HOSTKEY OString( "Host" ) +#define LOCKFILE_STAMPKEY OString( "Stamp" ) +#define LOCKFILE_TIMEKEY OString( "Time" ) +#define LOCKFILE_IPCKEY OString( "IPCServer" ) namespace desktop { @@ -71,13 +71,13 @@ namespace desktop { private: bool m_bIPCserver; // full qualified name (file://-url) of the lockfile - rtl::OUString m_aLockname; + OUString m_aLockname; // flag whether the d'tor should delete the lock sal_Bool m_bRemove; sal_Bool m_bIsLocked; // ID - rtl::OUString m_aId; - rtl::OUString m_aDate; + OUString m_aId; + OUString m_aDate; // access to data in file void syncToFile(void) const; sal_Bool isStale(void) const; diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index 1eaeb09d70f5..99e376945799 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -51,59 +51,59 @@ namespace { static char const separator = static_cast< char >( static_cast< unsigned char >(0xFF)); -::rtl::OString oldKey(::rtl::OUString const & fileName) { - return ::rtl::OUStringToOString(fileName, RTL_TEXTENCODING_UTF8); +OString oldKey(OUString const & fileName) { + return OUStringToOString(fileName, RTL_TEXTENCODING_UTF8); } -::rtl::OString newKey(::rtl::OUString const & id) { - ::rtl::OStringBuffer b; +OString newKey(OUString const & id) { + OStringBuffer b; b.append(separator); - b.append(::rtl::OUStringToOString(id, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(id, RTL_TEXTENCODING_UTF8)); return b.makeStringAndClear(); } ::dp_manager::ActivePackages::Data decodeOldData( - ::rtl::OUString const & fileName, ::rtl::OString const & value) + OUString const & fileName, OString const & value) { ::dp_manager::ActivePackages::Data d; sal_Int32 i = value.indexOf(';'); OSL_ASSERT(i >= 0); - d.temporaryName = ::rtl::OUString(value.getStr(), i, RTL_TEXTENCODING_UTF8); + d.temporaryName = OUString(value.getStr(), i, RTL_TEXTENCODING_UTF8); d.fileName = fileName; - d.mediaType = ::rtl::OUString( + d.mediaType = OUString( value.getStr() + i + 1, value.getLength() - i - 1, RTL_TEXTENCODING_UTF8); return d; } -::dp_manager::ActivePackages::Data decodeNewData(::rtl::OString const & value) { +::dp_manager::ActivePackages::Data decodeNewData(OString const & value) { ::dp_manager::ActivePackages::Data d; sal_Int32 i1 = value.indexOf(separator); OSL_ASSERT(i1 >= 0); - d.temporaryName = ::rtl::OUString( + d.temporaryName = OUString( value.getStr(), i1, RTL_TEXTENCODING_UTF8); sal_Int32 i2 = value.indexOf(separator, i1 + 1); OSL_ASSERT(i2 >= 0); - d.fileName = ::rtl::OUString( + d.fileName = OUString( value.getStr() + i1 + 1, i2 - i1 - 1, RTL_TEXTENCODING_UTF8); sal_Int32 i3 = value.indexOf(separator, i2 + 1); if (i3 < 0) { //Before ActivePackages::Data::version was added - d.mediaType = ::rtl::OUString( + d.mediaType = OUString( value.getStr() + i2 + 1, value.getLength() - i2 - 1, RTL_TEXTENCODING_UTF8); } else { sal_Int32 i4 = value.indexOf(separator, i3 + 1); - d.mediaType = ::rtl::OUString( + d.mediaType = OUString( value.getStr() + i2 + 1, i3 - i2 -1, RTL_TEXTENCODING_UTF8); - d.version = ::rtl::OUString( + d.version = OUString( value.getStr() + i3 + 1, i4 - i3 - 1, RTL_TEXTENCODING_UTF8); - d.failedPrerequisites = ::rtl::OUString( + d.failedPrerequisites = OUString( value.getStr() + i4 + 1, value.getLength() - i4 - 1, RTL_TEXTENCODING_UTF8); } @@ -117,7 +117,7 @@ namespace dp_manager { ActivePackages::ActivePackages() {} -ActivePackages::ActivePackages(::rtl::OUString const & url, bool readOnly) +ActivePackages::ActivePackages(OUString const & url, bool readOnly) #if HAVE_FEATURE_EXTENSIONS : m_map(url, readOnly) #endif @@ -129,17 +129,17 @@ ActivePackages::ActivePackages(::rtl::OUString const & url, bool readOnly) ActivePackages::~ActivePackages() {} bool ActivePackages::has( - ::rtl::OUString const & id, ::rtl::OUString const & fileName) const + OUString const & id, OUString const & fileName) const { return get(NULL, id, fileName); } bool ActivePackages::get( - Data * data, ::rtl::OUString const & id, ::rtl::OUString const & fileName) + Data * data, OUString const & id, OUString const & fileName) const { #if HAVE_FEATURE_EXTENSIONS - ::rtl::OString v; + OString v; if (m_map.get(&v, newKey(id))) { if (data != NULL) { *data = decodeNewData(v); @@ -171,13 +171,13 @@ ActivePackages::Entries ActivePackages::getEntries() const { if (!i->first.isEmpty() && i->first[0] == separator) { es.push_back( ::std::make_pair( - ::rtl::OUString( + OUString( i->first.getStr() + 1, i->first.getLength() - 1, RTL_TEXTENCODING_UTF8), decodeNewData(i->second))); } else { - ::rtl::OUString fn( - ::rtl::OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); + OUString fn( + OStringToOUString(i->first, RTL_TEXTENCODING_UTF8)); es.push_back( ::std::make_pair( ::dp_misc::generateLegacyIdentifier(fn), @@ -188,19 +188,19 @@ ActivePackages::Entries ActivePackages::getEntries() const { return es; } -void ActivePackages::put(::rtl::OUString const & id, Data const & data) { +void ActivePackages::put(OUString const & id, Data const & data) { #if HAVE_FEATURE_EXTENSIONS - ::rtl::OStringBuffer b; + OStringBuffer b; b.append( - ::rtl::OUStringToOString(data.temporaryName, RTL_TEXTENCODING_UTF8)); + OUStringToOString(data.temporaryName, RTL_TEXTENCODING_UTF8)); b.append(separator); - b.append(::rtl::OUStringToOString(data.fileName, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(data.fileName, RTL_TEXTENCODING_UTF8)); b.append(separator); - b.append(::rtl::OUStringToOString(data.mediaType, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(data.mediaType, RTL_TEXTENCODING_UTF8)); b.append(separator); - b.append(::rtl::OUStringToOString(data.version, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(data.version, RTL_TEXTENCODING_UTF8)); b.append(separator); - b.append(::rtl::OUStringToOString(data.failedPrerequisites, RTL_TEXTENCODING_UTF8)); + b.append(OUStringToOString(data.failedPrerequisites, RTL_TEXTENCODING_UTF8)); m_map.put(newKey(id), b.makeStringAndClear()); #else (void) id; @@ -209,7 +209,7 @@ void ActivePackages::put(::rtl::OUString const & id, Data const & data) { } void ActivePackages::erase( - ::rtl::OUString const & id, ::rtl::OUString const & fileName) + OUString const & id, OUString const & fileName) { #if HAVE_FEATURE_EXTENSIONS m_map.erase(newKey(id), true) || m_map.erase(oldKey(fileName), true); diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx index 940b6aa2a01e..10fe365b1cfa 100644 --- a/desktop/source/deployment/manager/dp_activepackages.hxx +++ b/desktop/source/deployment/manager/dp_activepackages.hxx @@ -38,50 +38,50 @@ namespace dp_manager { class ActivePackages { public: struct Data { - Data(): failedPrerequisites(::rtl::OUString::valueOf((sal_Int32)0)) + Data(): failedPrerequisites(OUString::valueOf((sal_Int32)0)) {} /* name of the temporary file (shared, user extension) or the name of the folder of the bundled extension. It does not contain the trailing '_' of the folder. UTF-8 encoded */ - ::rtl::OUString temporaryName; + OUString temporaryName; /* The file name (shared, user) or the folder name (bundled) If the key is the file name, then file name is not encoded. If the key is the idendifier then the file name is UTF-8 encoded. */ - ::rtl::OUString fileName; - ::rtl::OUString mediaType; - ::rtl::OUString version; + OUString fileName; + OUString mediaType; + OUString version; /* If this string contains the value according to com::sun::star::deployment::Prerequisites or "0". That is, if the value is > 0 then the call to XPackage::checkPrerequisites failed. In this case the extension must not be registered. */ - ::rtl::OUString failedPrerequisites; + OUString failedPrerequisites; }; - typedef ::std::vector< ::std::pair< ::rtl::OUString, Data > > Entries; + typedef ::std::vector< ::std::pair< OUString, Data > > Entries; ActivePackages(); - ActivePackages(::rtl::OUString const & url, bool readOnly); + ActivePackages(OUString const & url, bool readOnly); ~ActivePackages(); - bool has(::rtl::OUString const & id, ::rtl::OUString const & fileName) + bool has(OUString const & id, OUString const & fileName) const; bool get( - Data * data, ::rtl::OUString const & id, - ::rtl::OUString const & fileName) const; + Data * data, OUString const & id, + OUString const & fileName) const; Entries getEntries() const; - void put(::rtl::OUString const & id, Data const & value); + void put(OUString const & id, Data const & value); - void erase(::rtl::OUString const & id, ::rtl::OUString const & fileName); + void erase(OUString const & id, OUString const & fileName); private: ActivePackages(ActivePackages &); // not defined diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index 56fc23e8c748..a57c531d82c6 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -36,7 +36,6 @@ namespace ucb = com::sun::star::ucb; namespace uno = com::sun::star::uno; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace dp_manager { diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index 93d1626e26a3..0780dfab3382 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -86,14 +86,14 @@ public: class LicenseCommandEnv : public BaseCommandEnv { private: - ::rtl::OUString m_repository; + OUString m_repository; bool m_bSuppressLicense; public: LicenseCommandEnv() : m_bSuppressLicense(false) {}; LicenseCommandEnv( css::uno::Reference< css::task::XInteractionHandler> const & handler, bool bSuppressLicense, - ::rtl::OUString const & repository); + OUString const & repository); // XInteractionHandler virtual void SAL_CALL handle( diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 9add42544d8a..ef539bcdeba8 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -68,7 +68,6 @@ namespace beans = com::sun::star::beans; namespace util = com::sun::star::util; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; namespace { @@ -110,7 +109,7 @@ void writeLastModified(OUString & url, Reference<ucb::XCommandEnvironment> const ::rtl::Bootstrap::expandMacros(url); ::ucbhelper::Content ucbStamp(url, xCmdEnv, xContext); dp_misc::erase_path( url, xCmdEnv ); - ::rtl::OString stamp("1" ); + OString stamp("1" ); Reference<css::io::XInputStream> xData( ::xmlscript::createInputStream( ::rtl::ByteSequence( @@ -151,7 +150,7 @@ ExtensionRemoveGuard::~ExtensionRemoveGuard() OSL_ASSERT(!(m_extension.is() && !m_xPackageManager.is())); if (m_xPackageManager.is() && m_extension.is()) m_xPackageManager->removePackage( - dp_misc::getIdentifier(m_extension), ::rtl::OUString(), + dp_misc::getIdentifier(m_extension), OUString(), css::uno::Reference<css::task::XAbortChannel>(), css::uno::Reference<css::ucb::XCommandEnvironment>()); } catch (...) { @@ -212,7 +211,7 @@ Reference<task::XAbortChannel> ExtensionManager::createAbortChannel() } css::uno::Reference<css::deployment::XPackageManager> -ExtensionManager::getPackageManager(::rtl::OUString const & repository) +ExtensionManager::getPackageManager(OUString const & repository) throw (css::lang::IllegalArgumentException) { Reference<deploy::XPackageManager> xPackageManager; @@ -1445,7 +1444,7 @@ ExtensionManager::getExtensionsWithUnacceptedLicenses( return xPackageManager->getExtensionsWithUnacceptedLicenses(xCmdEnv); } -sal_Bool ExtensionManager::isReadOnlyRepository(::rtl::OUString const & repository) +sal_Bool ExtensionManager::isReadOnlyRepository(OUString const & repository) throw (uno::RuntimeException) { return getPackageManager(repository)->isReadOnly(); diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index b57a155f15e4..db11f129765f 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -36,9 +36,9 @@ namespace dp_manager { typedef ::boost::unordered_map< - ::rtl::OUString, + OUString, ::std::vector<css::uno::Reference<css::deployment::XPackage> >, - ::rtl::OUStringHash > id2extensions; + OUStringHash > id2extensions; class ExtensionManager : private ::dp_misc::MutexHolder, public ::cppu::WeakComponentImplHelper1< css::deployment::XExtensionManager > @@ -47,8 +47,8 @@ public: ExtensionManager( css::uno::Reference< css::uno::XComponentContext >const& xContext); virtual ~ExtensionManager(); - static css::uno::Sequence< ::rtl::OUString > getServiceNames(); - static ::rtl::OUString getImplName(); + static css::uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); void check(); void fireModified(); @@ -73,9 +73,9 @@ public: createAbortChannel() throw (css::uno::RuntimeException); virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addExtension( - ::rtl::OUString const & url, + OUString const & url, css::uno::Sequence<css::beans::NamedValue> const & properties, - ::rtl::OUString const & repository, + OUString const & repository, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -85,9 +85,9 @@ public: css::uno::RuntimeException); virtual void SAL_CALL removeExtension( - ::rtl::OUString const & identifier, - ::rtl::OUString const & filename, - ::rtl::OUString const & repository, + OUString const & identifier, + OUString const & filename, + OUString const & repository, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -128,7 +128,7 @@ public: virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackage> > SAL_CALL getDeployedExtensions( - ::rtl::OUString const & repository, + OUString const & repository, css::uno::Reference<css::task::XAbortChannel> const &, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -139,9 +139,9 @@ public: virtual css::uno::Reference< css::deployment::XPackage> SAL_CALL getDeployedExtension( - ::rtl::OUString const & repository, - ::rtl::OUString const & identifier, - ::rtl::OUString const & filename, + OUString const & repository, + OUString const & identifier, + OUString const & filename, css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) throw ( css::deployment::DeploymentException, @@ -151,8 +151,8 @@ public: virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL getExtensionsWithSameIdentifier( - ::rtl::OUString const & identifier, - ::rtl::OUString const & filename, + OUString const & identifier, + OUString const & filename, css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) throw ( css::deployment::DeploymentException, @@ -171,7 +171,7 @@ public: css::uno::RuntimeException); virtual void SAL_CALL reinstallDeployedExtensions( - sal_Bool force, ::rtl::OUString const & repository, + sal_Bool force, OUString const & repository, css::uno::Reference< css::task::XAbortChannel> const & xAbortChannel, css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv ) throw ( @@ -192,12 +192,12 @@ public: virtual css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > SAL_CALL getExtensionsWithUnacceptedLicenses( - ::rtl::OUString const & repository, + OUString const & repository, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv) throw (css::deployment::DeploymentException, css::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnlyRepository(::rtl::OUString const & repository) + virtual sal_Bool SAL_CALL isReadOnlyRepository(OUString const & repository) throw (css::uno::RuntimeException); private: @@ -207,10 +207,10 @@ private: struct ExtensionInfos { - ::rtl::OUString identifier; - ::rtl::OUString fileName; - ::rtl::OUString displayName; - ::rtl::OUString version; + OUString identifier; + OUString fileName; + OUString displayName; + OUString version; }; css::uno::Reference< css::uno::XComponentContext> m_xContext; @@ -222,7 +222,7 @@ private: priority. That is, the first element is "user" follod by "shared" and then "bundled" */ - ::std::list< ::rtl::OUString > m_repositoryNames; + ::std::list< OUString > m_repositoryNames; css::uno::Reference<css::deployment::XPackageManager> getUserRepository(); css::uno::Reference<css::deployment::XPackageManager> getSharedRepository(); @@ -230,15 +230,15 @@ private: css::uno::Reference<css::deployment::XPackageManager> getTmpRepository(); css::uno::Reference<css::deployment::XPackageManager> getBakRepository(); - bool isUserDisabled(::rtl::OUString const & identifier, - ::rtl::OUString const & filename); + bool isUserDisabled(OUString const & identifier, + OUString const & filename); bool isUserDisabled( css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > const & seqExtSameId); void activateExtension( - ::rtl::OUString const & identifier, - ::rtl::OUString const & fileName, + OUString const & identifier, + OUString const & fileName, bool bUserDisabled, bool bStartup, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv); @@ -250,33 +250,33 @@ private: css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ); ::std::list<css::uno::Reference<css::deployment::XPackage> > - getExtensionsWithSameId(::rtl::OUString const & identifier, - ::rtl::OUString const & fileName, + getExtensionsWithSameId(OUString const & identifier, + OUString const & fileName, css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv = css::uno::Reference< css::ucb::XCommandEnvironment>()); css::uno::Reference<css::deployment::XPackage> backupExtension( - ::rtl::OUString const & identifier, ::rtl::OUString const & fileName, + OUString const & identifier, OUString const & fileName, css::uno::Reference<css::deployment::XPackageManager> const & xPackageManager, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv); void checkInstall( - ::rtl::OUString const & displayName, + OUString const & displayName, css::uno::Reference<css::ucb::XCommandEnvironment> const & cmdEnv); void checkUpdate( - ::rtl::OUString const & newVersion, - ::rtl::OUString const & newDisplayName, + OUString const & newVersion, + OUString const & newDisplayName, css::uno::Reference<css::deployment::XPackage> const & oldExtension, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv); void addExtensionsToMap( id2extensions & mapExt, css::uno::Sequence<css::uno::Reference<css::deployment::XPackage> > const & seqExt, - ::rtl::OUString const & repository); + OUString const & repository); css::uno::Reference<css::deployment::XPackageManager> - getPackageManager(::rtl::OUString const & repository) + getPackageManager(OUString const & repository) throw (css::lang::IllegalArgumentException); bool doChecksForAddExtension( diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 33fa0748f37c..d6846de4d5ea 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -64,23 +64,23 @@ class PackageInformationProvider : PackageInformationProvider( uno::Reference< uno::XComponentContext >const& xContext); virtual ~PackageInformationProvider(); - static uno::Sequence< rtl::OUString > getServiceNames(); - static rtl::OUString getImplName(); + static uno::Sequence< OUString > getServiceNames(); + static OUString getImplName(); // XPackageInformationProvider - virtual rtl::OUString SAL_CALL getPackageLocation( const rtl::OUString& extensionId ) + virtual OUString SAL_CALL getPackageLocation( const OUString& extensionId ) throw ( uno::RuntimeException ); - virtual uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL isUpdateAvailable( const rtl::OUString& extensionId ) + virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL isUpdateAvailable( const OUString& extensionId ) throw ( uno::RuntimeException ); - virtual uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL getExtensionList() + virtual uno::Sequence< uno::Sequence< OUString > > SAL_CALL getExtensionList() throw ( uno::RuntimeException ); //--------- private: uno::Reference< uno::XComponentContext> mxContext; - rtl::OUString getPackageLocation( const rtl::OUString& repository, - const rtl::OUString& _sExtensionId ); + OUString getPackageLocation( const OUString& repository, + const OUString& _sExtensionId ); uno::Reference< deployment::XUpdateInformationProvider > mxUpdateInformation; }; @@ -100,11 +100,11 @@ PackageInformationProvider::~PackageInformationProvider() } //------------------------------------------------------------------------------ -rtl::OUString PackageInformationProvider::getPackageLocation( - const rtl::OUString & repository, - const rtl::OUString& _rExtensionId ) +OUString PackageInformationProvider::getPackageLocation( + const OUString & repository, + const OUString& _rExtensionId ) { - rtl::OUString aLocationURL; + OUString aLocationURL; uno::Reference<deployment::XExtensionManager> xManager = deployment::ExtensionManager::get(mxContext); @@ -120,7 +120,7 @@ rtl::OUString PackageInformationProvider::getPackageLocation( { try { - const beans::Optional< rtl::OUString > aID = packages[ pos ]->getIdentifier(); + const beans::Optional< OUString > aID = packages[ pos ]->getIdentifier(); if ( aID.IsPresent && (aID.Value == _rExtensionId ) ) { aLocationURL = packages[ pos ]->getURL(); @@ -136,19 +136,19 @@ rtl::OUString PackageInformationProvider::getPackageLocation( //------------------------------------------------------------------------------ -rtl::OUString SAL_CALL -PackageInformationProvider::getPackageLocation( const rtl::OUString& _sExtensionId ) +OUString SAL_CALL +PackageInformationProvider::getPackageLocation( const OUString& _sExtensionId ) throw ( uno::RuntimeException ) { - rtl::OUString aLocationURL = getPackageLocation( rtl::OUString("user"), _sExtensionId ); + OUString aLocationURL = getPackageLocation( OUString("user"), _sExtensionId ); if ( aLocationURL.isEmpty() ) { - aLocationURL = getPackageLocation( rtl::OUString("shared"), _sExtensionId ); + aLocationURL = getPackageLocation( OUString("shared"), _sExtensionId ); } if ( aLocationURL.isEmpty() ) { - aLocationURL = getPackageLocation( rtl::OUString("bundled"), _sExtensionId ); + aLocationURL = getPackageLocation( OUString("bundled"), _sExtensionId ); } if ( !aLocationURL.isEmpty() ) { @@ -160,11 +160,11 @@ PackageInformationProvider::getPackageLocation( const rtl::OUString& _sExtension //------------------------------------------------------------------------------ -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL -PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionId ) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL +PackageInformationProvider::isUpdateAvailable( const OUString& _sExtensionId ) throw ( uno::RuntimeException ) { - uno::Sequence< uno::Sequence< rtl::OUString > > aList; + uno::Sequence< uno::Sequence< OUString > > aList; uno::Reference<deployment::XExtensionManager> extMgr = deployment::ExtensionManager::get(mxContext); @@ -205,7 +205,7 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI { dp_misc::UpdateInfo const & info = i->second; - rtl::OUString sOnlineVersion; + OUString sOnlineVersion; if (info.info.is()) { // check, if there are unsatisfied dependencies and ignore this online update @@ -216,9 +216,9 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI sOnlineVersion = info.version; } - rtl::OUString sVersionUser; - rtl::OUString sVersionShared; - rtl::OUString sVersionBundled; + OUString sVersionUser; + OUString sVersionShared; + OUString sVersionBundled; uno::Sequence< uno::Reference< deployment::XPackage> > extensions; try { extensions = extMgr->getExtensionsWithSameIdentifier( @@ -242,15 +242,15 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI dp_misc::UPDATE_SOURCE sourceShared = dp_misc::isUpdateSharedExtension( bSharedReadOnly, sVersionShared, sVersionBundled, sOnlineVersion); - rtl::OUString updateVersionUser; - rtl::OUString updateVersionShared; + OUString updateVersionUser; + OUString updateVersionShared; if (sourceUser != dp_misc::UPDATE_SOURCE_NONE) updateVersionUser = dp_misc::getHighestVersion( - rtl::OUString(), sVersionShared, sVersionBundled, sOnlineVersion); + OUString(), sVersionShared, sVersionBundled, sOnlineVersion); if (sourceShared != dp_misc::UPDATE_SOURCE_NONE) updateVersionShared = dp_misc::getHighestVersion( - rtl::OUString(), rtl::OUString(), sVersionBundled, sOnlineVersion); - rtl::OUString updateVersion; + OUString(), OUString(), sVersionBundled, sOnlineVersion); + OUString updateVersion; if (dp_misc::compareVersions(updateVersionUser, updateVersionShared) == dp_misc::GREATER) updateVersion = updateVersionUser; else @@ -258,32 +258,32 @@ PackageInformationProvider::isUpdateAvailable( const rtl::OUString& _sExtensionI if (!updateVersion.isEmpty()) { - rtl::OUString aNewEntry[2]; + OUString aNewEntry[2]; aNewEntry[0] = i->first; aNewEntry[1] = updateVersion; aList.realloc( ++nCount ); - aList[ nCount-1 ] = ::uno::Sequence< rtl::OUString >( aNewEntry, 2 ); + aList[ nCount-1 ] = ::uno::Sequence< OUString >( aNewEntry, 2 ); } } return aList; } //------------------------------------------------------------------------------ -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL PackageInformationProvider::getExtensionList() +uno::Sequence< uno::Sequence< OUString > > SAL_CALL PackageInformationProvider::getExtensionList() throw ( uno::RuntimeException ) { const uno::Reference<deployment::XExtensionManager> mgr = deployment::ExtensionManager::get(mxContext); if (!mgr.is()) - return uno::Sequence< uno::Sequence< rtl::OUString > >(); + return uno::Sequence< uno::Sequence< OUString > >(); const uno::Sequence< uno::Sequence< uno::Reference<deployment::XPackage > > > allExt = mgr->getAllExtensions( uno::Reference< task::XAbortChannel >(), uno::Reference< css_ucb::XCommandEnvironment > () ); - uno::Sequence< uno::Sequence< rtl::OUString > > retList; + uno::Sequence< uno::Sequence< OUString > > retList; sal_Int32 cAllIds = allExt.getLength(); retList.realloc(cAllIds); @@ -303,10 +303,10 @@ uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL PackageInformationProvi uno::Reference< deployment::XPackage > const & xExtension( seqExtension[j] ); if (xExtension.is()) { - rtl::OUString aNewEntry[2]; + OUString aNewEntry[2]; aNewEntry[0] = dp_misc::getIdentifier(xExtension); aNewEntry[1] = xExtension->getVersion(); - retList[i] = ::uno::Sequence< rtl::OUString >( aNewEntry, 2 ); + retList[i] = ::uno::Sequence< OUString >( aNewEntry, 2 ); break; } } diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 87c107c08855..5bf0c91279f1 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -64,7 +64,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_log { extern comphelper::service_decl::ServiceDecl const serviceDecl; @@ -257,9 +256,9 @@ void PackageManagerImpl::initActivationLayer( ucbhelper::Content remFileContent( url + "removed", Reference<XCommandEnvironment>(), m_xComponentContext); ::rtl::ByteSequence data = dp_misc::readFile(remFileContent); - ::rtl::OString osData(reinterpret_cast<const sal_Char*>(data.getConstArray()), + OString osData(reinterpret_cast<const sal_Char*>(data.getConstArray()), data.getLength()); - OUString sData = ::rtl::OStringToOUString( + OUString sData = OStringToOUString( osData, RTL_TEXTENCODING_UTF8); if (!sData.equals(aUserName)) continue; @@ -295,7 +294,7 @@ void PackageManagerImpl::initRegistryBackends() // as to whether a directory is truly read-only or not static bool isMacroURLReadOnly( const OUString &rMacro ) { - rtl::OUString aDirURL( rMacro ); + OUString aDirURL( rMacro ); ::rtl::Bootstrap::expandMacros( aDirURL ); ::osl::FileBase::RC aErr = ::osl::Directory::create( aDirURL ); @@ -306,7 +305,7 @@ static bool isMacroURLReadOnly( const OUString &rMacro ) bool bError; sal_uInt64 nWritten = 0; - rtl::OUString aFileURL( aDirURL + "/stamp.sys" ); + OUString aFileURL( aDirURL + "/stamp.sys" ); ::osl::File aFile( aFileURL ); bError = aFile.open( osl_File_OpenFlag_Read | @@ -572,7 +571,7 @@ OUString PackageManagerImpl::detectMediaType( if (throw_exc) throw; (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -606,7 +605,7 @@ OUString PackageManagerImpl::insertToActivationLayer( mediaType.matchIgnoreAsciiCase("application/vnd.sun.star.legacy-package-bundle")) { // inflate content: - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (!sourceContent.isFolder()) { buf.appendAscii( "vnd.sun.star.zip://" ); @@ -848,7 +847,7 @@ void PackageManagerImpl::deletePackageFromCache( } //______________________________________________________________________________ void PackageManagerImpl::removePackage( - OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, Reference<task::XAbortChannel> const & /*xAbortChannel*/, Reference<XCommandEnvironment> const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, @@ -894,7 +893,7 @@ void PackageManagerImpl::removePackage( ::osl::Security aSecurity; aSecurity.getUserName( aUserName ); - ::rtl::OString stamp = ::rtl::OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8); + OString stamp = OUStringToOString(aUserName, RTL_TEXTENCODING_UTF8); Reference<css::io::XInputStream> xData( ::xmlscript::createInputStream( ::rtl::ByteSequence( @@ -937,7 +936,7 @@ void PackageManagerImpl::removePackage( //______________________________________________________________________________ OUString PackageManagerImpl::getDeployPath( ActivePackages::Data const & data ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( data.temporaryName ); //The bundled extensions are not contained in an additional folder //with a unique name. data.temporaryName contains already the @@ -979,7 +978,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( if (INetContentTypes::parse( data.mediaType, type, subType, ¶ms )) { INetContentTypeParameter const * param = params.find( - rtl::OString("platform") ); + OString("platform") ); if (param != 0 && !platform_fits( param->m_sValue )) throw lang::IllegalArgumentException( getResourceString(RID_STR_NO_SUCH_PACKAGE) + id, @@ -1028,13 +1027,13 @@ PackageManagerImpl::getDeployedPackages_( catch (const lang::IllegalArgumentException & exc) { // ignore (void) exc; // avoid warnings - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } catch (const deployment::DeploymentException& exc) { // ignore (void) exc; // avoid warnings - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() ); } } @@ -1043,7 +1042,7 @@ PackageManagerImpl::getDeployedPackages_( //______________________________________________________________________________ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage( - OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, Reference<XCommandEnvironment> const & xCmdEnv_ ) throw (deployment::DeploymentException, CommandFailedException, lang::IllegalArgumentException, RuntimeException) diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index facc82b07dbc..91802135c83a 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -42,14 +42,14 @@ typedef ::cppu::WeakComponentImplHelper1< class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper { css::uno::Reference<css::uno::XComponentContext> m_xComponentContext; - ::rtl::OUString m_context; - ::rtl::OUString m_registrationData; - ::rtl::OUString m_registrationData_expanded; - ::rtl::OUString m_registryCache; + OUString m_context; + OUString m_registrationData; + OUString m_registrationData_expanded; + OUString m_registryCache; bool m_readOnly; - ::rtl::OUString m_activePackages; - ::rtl::OUString m_activePackages_expanded; + OUString m_activePackages; + OUString m_activePackages_expanded; ::std::auto_ptr< ActivePackages > m_activePackagesDB; //This mutex is only used for synchronization in addPackage ::osl::Mutex m_addMutex; @@ -62,19 +62,19 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper void initRegistryBackends(); void initActivationLayer( css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ); - ::rtl::OUString detectMediaType( + OUString detectMediaType( ::ucbhelper::Content const & ucbContent, bool throw_exc = true ); - ::rtl::OUString insertToActivationLayer( + OUString insertToActivationLayer( css::uno::Sequence<css::beans::NamedValue> const & properties, - ::rtl::OUString const & mediaType, + OUString const & mediaType, ::ucbhelper::Content const & sourceContent, - ::rtl::OUString const & title, ActivePackages::Data * dbData ); + OUString const & title, ActivePackages::Data * dbData ); void insertToActivationLayerDB( - ::rtl::OUString const & id, ActivePackages::Data const & dbData ); + OUString const & id, ActivePackages::Data const & dbData ); void deletePackageFromCache( css::uno::Reference<css::deployment::XPackage> const & xPackage, - ::rtl::OUString const & destFolder ); + OUString const & destFolder ); bool isInstalled( css::uno::Reference<css::deployment::XPackage> const & package); @@ -124,7 +124,7 @@ protected: virtual ~PackageManagerImpl(); inline PackageManagerImpl( css::uno::Reference<css::uno::XComponentContext> - const & xComponentContext, ::rtl::OUString const & context ) + const & xComponentContext, OUString const & context ) : t_pm_helper( getMutex() ), m_xComponentContext( xComponentContext ), m_context( context ), @@ -134,7 +134,7 @@ protected: public: static css::uno::Reference<css::deployment::XPackageManager> create( css::uno::Reference<css::uno::XComponentContext> - const & xComponentContext, ::rtl::OUString const & context ); + const & xComponentContext, OUString const & context ); // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException); @@ -154,7 +154,7 @@ public: throw (css::uno::RuntimeException); // XPackageManager - virtual ::rtl::OUString SAL_CALL getContext() + virtual OUString SAL_CALL getContext() throw (css::uno::RuntimeException); virtual css::uno::Sequence< css::uno::Reference<css::deployment::XPackageTypeInfo> > SAL_CALL @@ -164,9 +164,9 @@ public: createAbortChannel() throw (css::uno::RuntimeException); virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL addPackage( - ::rtl::OUString const & url, + OUString const & url, css::uno::Sequence<css::beans::NamedValue> const & properties, - ::rtl::OUString const & mediaType, + OUString const & mediaType, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -186,7 +186,7 @@ public: css::uno::RuntimeException); virtual void SAL_CALL removePackage( - ::rtl::OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, @@ -195,17 +195,17 @@ public: css::lang::IllegalArgumentException, css::uno::RuntimeException); - ::rtl::OUString getDeployPath( ActivePackages::Data const & data ); + OUString getDeployPath( ActivePackages::Data const & data ); css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage_( - ::rtl::OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ); css::uno::Reference<css::deployment::XPackage> getDeployedPackage_( - ::rtl::OUString const & id, ActivePackages::Data const & data, + OUString const & id, ActivePackages::Data const & data, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, bool ignoreAlienPlatforms = false ); virtual css::uno::Reference<css::deployment::XPackage> SAL_CALL getDeployedPackage( - ::rtl::OUString const & id, ::rtl::OUString const & fileName, + OUString const & id, OUString const & fileName, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) throw (css::deployment::DeploymentException, css::ucb::CommandFailedException, diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 33b4968e8e40..e2d1259fd3cc 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -29,7 +29,6 @@ using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_manager { namespace factory { @@ -49,7 +48,7 @@ class PackageManagerFactoryImpl : private MutexHolder, public t_pmfac_helper Reference<deployment::XPackageManager> m_xBakMgr; typedef ::boost::unordered_map< OUString, WeakReference<deployment::XPackageManager>, - ::rtl::OUStringHash > t_string2weakref; + OUStringHash > t_string2weakref; t_string2weakref m_managers; protected: diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx index 0259df6441f7..f45f42f7011f 100644 --- a/desktop/source/deployment/manager/dp_properties.cxx +++ b/desktop/source/deployment/manager/dp_properties.cxx @@ -34,7 +34,6 @@ namespace uno = com::sun::star::uno; using ::com::sun::star::uno::Reference; -using ::rtl::OUString; #define PROP_SUPPRESS_LICENSE "SUPPRESS_LICENSE" #define PROP_EXTENSION_UPDATE "EXTENSION_UPDATE" @@ -107,7 +106,7 @@ OUString ExtensionProperties::getPropertyValue(css::beans::NamedValue const & v) void ExtensionProperties::write() { ::ucbhelper::Content contentProps(m_propFileUrl, m_xCmdEnv, m_xContext); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (m_prop_suppress_license) { @@ -116,7 +115,7 @@ void ExtensionProperties::write() buf.append(*m_prop_suppress_license); } - ::rtl::OString stamp = ::rtl::OUStringToOString( + OString stamp = OUStringToOString( buf.makeStringAndClear(), RTL_TEXTENCODING_UTF8); Reference<css::io::XInputStream> xData( ::xmlscript::createInputStream( diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx index 34d8ebe56194..983ddfc6075c 100644 --- a/desktop/source/deployment/manager/dp_properties.hxx +++ b/desktop/source/deployment/manager/dp_properties.hxx @@ -37,21 +37,21 @@ namespace dp_manager { class ExtensionProperties { protected: - ::rtl::OUString m_propFileUrl; + OUString m_propFileUrl; const css::uno::Reference<css::ucb::XCommandEnvironment> m_xCmdEnv; const css::uno::Reference<css::uno::XComponentContext> m_xContext; - ::boost::optional< ::rtl::OUString> m_prop_suppress_license; - ::boost::optional< ::rtl::OUString> m_prop_extension_update; + ::boost::optional< OUString> m_prop_suppress_license; + ::boost::optional< OUString> m_prop_extension_update; - ::rtl::OUString getPropertyValue(css::beans::NamedValue const & v); + OUString getPropertyValue(css::beans::NamedValue const & v); public: virtual ~ExtensionProperties() {}; - ExtensionProperties(::rtl::OUString const & urlExtension, + ExtensionProperties(OUString const & urlExtension, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, css::uno::Reference<css::uno::XComponentContext> const & xContext); - ExtensionProperties(::rtl::OUString const & urlExtension, + ExtensionProperties(OUString const & urlExtension, css::uno::Sequence<css::beans::NamedValue> const & properties, css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv, css::uno::Reference<css::uno::XComponentContext> const & xContext); diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 23df4a271b7c..4b50f844f7c2 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -54,12 +54,12 @@ static char const minimalVersionOpenOfficeOrg[] = static char const maximalVersionOpenOfficeOrg[] = "OpenOffice.org-maximal-version"; -rtl::OUString getLibreOfficeMajorMinorMicro() { +OUString getLibreOfficeMajorMinorMicro() { return utl::ConfigManager::getAboutBoxProductVersion(); } -rtl::OUString getReferenceOpenOfficeOrgMajorMinor() { - rtl::OUString v( +OUString getReferenceOpenOfficeOrgMajorMinor() { + OUString v( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:ReferenceOOoMajorMinor}"); rtl::Bootstrap::expandMacros(v); //TODO: check for failure @@ -67,19 +67,19 @@ rtl::OUString getReferenceOpenOfficeOrgMajorMinor() { } bool satisfiesMinimalVersion( - rtl::OUString const & actual, rtl::OUString const & specified) + OUString const & actual, OUString const & specified) { return dp_misc::compareVersions(actual, specified) != dp_misc::LESS; } bool satisfiesMaximalVersion( - rtl::OUString const & actual, rtl::OUString const & specified) + OUString const & actual, OUString const & specified) { return dp_misc::compareVersions(actual, specified) != dp_misc::GREATER; } -rtl::OUString produceErrorText( - rtl::OUString const & reason, rtl::OUString const & version) +OUString produceErrorText( + OUString const & reason, OUString const & version) { return reason.replaceFirst("%VERSION", (version.isEmpty() @@ -136,7 +136,7 @@ check(dp_misc::DescriptionInfoset const & infoset) { return unsatisfied; } -rtl::OUString getErrorText( +OUString getErrorText( css::uno::Reference< css::xml::dom::XElement > const & dependency) { OSL_ASSERT(dependency.is()); diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 8daef83d3918..08e78fbc988a 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -56,7 +56,6 @@ namespace { using css::uno::Reference; -using ::rtl::OUString; class EmptyNodeList: public ::cppu::WeakImplHelper1< css::xml::dom::XNodeList > { @@ -90,7 +89,7 @@ css::uno::Reference< css::xml::dom::XNode > EmptyNodeList::item(::sal_Int32) static_cast< ::cppu::OWeakObject * >(this)); } -::rtl::OUString getNodeValue( +OUString getNodeValue( css::uno::Reference< css::xml::dom::XNode > const & node) { OSL_ASSERT(node.is()); @@ -122,7 +121,7 @@ public: */ ExtensionDescription( const css::uno::Reference<css::uno::XComponentContext>& xContext, - const ::rtl::OUString& installDir, + const OUString& installDir, const css::uno::Reference< css::ucb::XCommandEnvironment >& xCmdEnv); ~ExtensionDescription(); @@ -132,7 +131,7 @@ public: return m_xRoot; } - ::rtl::OUString getExtensionRootUrl() const + OUString getExtensionRootUrl() const { return m_sExtensionRootUrl; } @@ -140,7 +139,7 @@ public: private: css::uno::Reference<css::xml::dom::XNode> m_xRoot; - ::rtl::OUString m_sExtensionRootUrl; + OUString m_sExtensionRootUrl; }; class NoDescriptionException @@ -357,11 +356,11 @@ DescriptionInfoset::DescriptionInfoset( DescriptionInfoset::~DescriptionInfoset() {} -::boost::optional< ::rtl::OUString > DescriptionInfoset::getIdentifier() const { +::boost::optional< OUString > DescriptionInfoset::getIdentifier() const { return getOptionalValue("desc:identifier/@value"); } -::rtl::OUString DescriptionInfoset::getNodeValueFromExpression(::rtl::OUString const & expression) const +OUString DescriptionInfoset::getNodeValueFromExpression(OUString const & expression) const { css::uno::Reference< css::xml::dom::XNode > n; if (m_element.is()) { @@ -371,7 +370,7 @@ DescriptionInfoset::~DescriptionInfoset() {} // ignore } } - return n.is() ? getNodeValue(n) : ::rtl::OUString(); + return n.is() ? getNodeValue(n) : OUString(); } void DescriptionInfoset::checkBlacklist() const @@ -392,8 +391,8 @@ void DescriptionInfoset::checkBlacklist() const css::uno::Sequence< css::uno::Any > args = css::uno::Sequence< css::uno::Any >(1); css::beans::PropertyValue prop; - prop.Name = ::rtl::OUString("nodepath"); - prop.Value <<= ::rtl::OUString("/org.openoffice.Office.ExtensionDependencies/Extensions"); + prop.Name = OUString("nodepath"); + prop.Value <<= OUString("/org.openoffice.Office.ExtensionDependencies/Extensions"); args[0] <<= prop; css::uno::Reference< css::container::XNameAccess > blacklist( @@ -407,19 +406,19 @@ void DescriptionInfoset::checkBlacklist() const css::uno::Any anyValue = extProps->getPropertyValue("Versions"); - css::uno::Sequence< ::rtl::OUString > blversions; + css::uno::Sequence< OUString > blversions; anyValue >>= blversions; // check if the current version requires further dependency checks from the blacklist if (checkBlacklistVersion(currentversion, blversions)) { anyValue = extProps->getPropertyValue("Dependencies"); - ::rtl::OUString udeps; + OUString udeps; anyValue >>= udeps; if (udeps.getLength() == 0) return; // nothing todo - ::rtl::OString xmlDependencies = ::rtl::OUStringToOString(udeps, RTL_TEXTENCODING_UNICODE); + OString xmlDependencies = OUStringToOString(udeps, RTL_TEXTENCODING_UNICODE); css::uno::Reference< css::xml::dom::XDocumentBuilder> docbuilder( manager->createInstanceWithContext("com.sun.star.xml.dom.DocumentBuilder", m_context), @@ -467,8 +466,8 @@ void DescriptionInfoset::checkBlacklist() const } bool DescriptionInfoset::checkBlacklistVersion( - ::rtl::OUString currentversion, - ::com::sun::star::uno::Sequence< ::rtl::OUString > const & versions) const + OUString currentversion, + ::com::sun::star::uno::Sequence< OUString > const & versions) const { sal_Int32 nLen = versions.getLength(); for (sal_Int32 i=0; i<nLen; i++) { @@ -479,12 +478,12 @@ bool DescriptionInfoset::checkBlacklistVersion( return false; } -::rtl::OUString DescriptionInfoset::getVersion() const +OUString DescriptionInfoset::getVersion() const { return getNodeValueFromExpression( "desc:version/@value" ); } -css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getSupportedPlaforms() const +css::uno::Sequence< OUString > DescriptionInfoset::getSupportedPlaforms() const { //When there is no description.xml then we assume that we support all platforms if (! m_element.is()) @@ -501,13 +500,13 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getSupportedPlaforms() } //There is a platform element. - const ::rtl::OUString value = getNodeValueFromExpression("desc:platform/@value"); + const OUString value = getNodeValueFromExpression("desc:platform/@value"); //parse the string, it can contained multiple strings separated by commas - ::std::vector< ::rtl::OUString> vec; + ::std::vector< OUString> vec; sal_Int32 nIndex = 0; do { - ::rtl::OUString aToken = value.getToken( 0, ',', nIndex ); + OUString aToken = value.getToken( 0, ',', nIndex ); aToken = aToken.trim(); if (!aToken.isEmpty()) vec.push_back(aToken); @@ -533,21 +532,21 @@ DescriptionInfoset::getDependencies() const { return new EmptyNodeList; } -css::uno::Sequence< ::rtl::OUString > +css::uno::Sequence< OUString > DescriptionInfoset::getUpdateInformationUrls() const { return getUrls("desc:update-information/desc:src/@xlink:href"); } -css::uno::Sequence< ::rtl::OUString > +css::uno::Sequence< OUString > DescriptionInfoset::getUpdateDownloadUrls() const { return getUrls("desc:update-download/desc:src/@xlink:href"); } -::rtl::OUString DescriptionInfoset::getIconURL( sal_Bool bHighContrast ) const +OUString DescriptionInfoset::getIconURL( sal_Bool bHighContrast ) const { - css::uno::Sequence< ::rtl::OUString > aStrList = getUrls( "desc:icon/desc:default/@xlink:href" ); - css::uno::Sequence< ::rtl::OUString > aStrListHC = getUrls( "desc:icon/desc:high-contrast/@xlink:href" ); + css::uno::Sequence< OUString > aStrList = getUrls( "desc:icon/desc:default/@xlink:href" ); + css::uno::Sequence< OUString > aStrListHC = getUrls( "desc:icon/desc:high-contrast/@xlink:href" ); if ( bHighContrast && aStrListHC.hasElements() && !aStrListHC[0].isEmpty() ) return aStrListHC[0]; @@ -555,24 +554,24 @@ DescriptionInfoset::getUpdateDownloadUrls() const if ( aStrList.hasElements() && !aStrList[0].isEmpty() ) return aStrList[0]; - return ::rtl::OUString(); + return OUString(); } -::boost::optional< ::rtl::OUString > DescriptionInfoset::getLocalizedUpdateWebsiteURL() +::boost::optional< OUString > DescriptionInfoset::getLocalizedUpdateWebsiteURL() const { bool bParentExists = false; - const ::rtl::OUString sURL (getLocalizedHREFAttrFromChild("/desc:description/desc:update-website", &bParentExists )); + const OUString sURL (getLocalizedHREFAttrFromChild("/desc:description/desc:update-website", &bParentExists )); if (!sURL.isEmpty()) - return ::boost::optional< ::rtl::OUString >(sURL); + return ::boost::optional< OUString >(sURL); else - return bParentExists ? ::boost::optional< ::rtl::OUString >(::rtl::OUString()) : - ::boost::optional< ::rtl::OUString >(); + return bParentExists ? ::boost::optional< OUString >(OUString()) : + ::boost::optional< OUString >(); } -::boost::optional< ::rtl::OUString > DescriptionInfoset::getOptionalValue( - ::rtl::OUString const & expression) const +::boost::optional< OUString > DescriptionInfoset::getOptionalValue( + OUString const & expression) const { css::uno::Reference< css::xml::dom::XNode > n; if (m_element.is()) { @@ -583,12 +582,12 @@ DescriptionInfoset::getUpdateDownloadUrls() const } } return n.is() - ? ::boost::optional< ::rtl::OUString >(getNodeValue(n)) - : ::boost::optional< ::rtl::OUString >(); + ? ::boost::optional< OUString >(getNodeValue(n)) + : ::boost::optional< OUString >(); } -css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( - ::rtl::OUString const & expression) const +css::uno::Sequence< OUString > DescriptionInfoset::getUrls( + OUString const & expression) const { css::uno::Reference< css::xml::dom::XNodeList > ns; if (m_element.is()) { @@ -598,23 +597,23 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( // ignore } } - css::uno::Sequence< ::rtl::OUString > urls(ns.is() ? ns->getLength() : 0); + css::uno::Sequence< OUString > urls(ns.is() ? ns->getLength() : 0); for (::sal_Int32 i = 0; i < urls.getLength(); ++i) { urls[i] = getNodeValue(ns->item(i)); } return urls; } -::std::pair< ::rtl::OUString, ::rtl::OUString > DescriptionInfoset::getLocalizedPublisherNameAndURL() const +::std::pair< OUString, OUString > DescriptionInfoset::getLocalizedPublisherNameAndURL() const { css::uno::Reference< css::xml::dom::XNode > node = getLocalizedChild("desc:publisher"); - ::rtl::OUString sPublisherName; - ::rtl::OUString sURL; + OUString sPublisherName; + OUString sURL; if (node.is()) { - const ::rtl::OUString exp1("text()"); + const OUString exp1("text()"); css::uno::Reference< css::xml::dom::XNode > xPathName; try { xPathName = m_xpath->selectSingleNode(node, exp1); @@ -625,7 +624,7 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( if (xPathName.is()) sPublisherName = xPathName->getNodeValue(); - const ::rtl::OUString exp2("@xlink:href"); + const OUString exp2("@xlink:href"); css::uno::Reference< css::xml::dom::XNode > xURL; try { xURL = m_xpath->selectSingleNode(node, exp2); @@ -639,18 +638,18 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( return ::std::make_pair(sPublisherName, sURL); } -::rtl::OUString DescriptionInfoset::getLocalizedReleaseNotesURL() const +OUString DescriptionInfoset::getLocalizedReleaseNotesURL() const { return getLocalizedHREFAttrFromChild("/desc:description/desc:release-notes", NULL); } -::rtl::OUString DescriptionInfoset::getLocalizedDisplayName() const +OUString DescriptionInfoset::getLocalizedDisplayName() const { css::uno::Reference< css::xml::dom::XNode > node = getLocalizedChild("desc:display-name"); if (node.is()) { - const ::rtl::OUString exp("text()"); + const OUString exp("text()"); css::uno::Reference< css::xml::dom::XNode > xtext; try { xtext = m_xpath->selectSingleNode(node, exp); @@ -660,10 +659,10 @@ css::uno::Sequence< ::rtl::OUString > DescriptionInfoset::getUrls( if (xtext.is()) return xtext->getNodeValue(); } - return ::rtl::OUString(); + return OUString(); } -::rtl::OUString DescriptionInfoset::getLocalizedLicenseURL() const +OUString DescriptionInfoset::getLocalizedLicenseURL() const { return getLocalizedHREFAttrFromChild("/desc:description/desc:registration/desc:simple-license", NULL); @@ -686,13 +685,13 @@ DescriptionInfoset::getSimpleLicenseAttributes() const attributes.acceptBy = getNodeValueFromExpression("/desc:description/desc:registration/desc:simple-license/@accept-by"); - ::boost::optional< ::rtl::OUString > suppressOnUpdate = getOptionalValue("/desc:description/desc:registration/desc:simple-license/@suppress-on-update"); + ::boost::optional< OUString > suppressOnUpdate = getOptionalValue("/desc:description/desc:registration/desc:simple-license/@suppress-on-update"); if (suppressOnUpdate) attributes.suppressOnUpdate = (*suppressOnUpdate).trim().equalsIgnoreAsciiCase("true"); else attributes.suppressOnUpdate = false; - ::boost::optional< ::rtl::OUString > suppressIfRequired = getOptionalValue("/desc:description/desc:registration/desc:simple-license/@suppress-if-required"); + ::boost::optional< OUString > suppressIfRequired = getOptionalValue("/desc:description/desc:registration/desc:simple-license/@suppress-if-required"); if (suppressIfRequired) attributes.suppressIfRequired = (*suppressIfRequired).trim().equalsIgnoreAsciiCase("true"); else @@ -704,13 +703,13 @@ DescriptionInfoset::getSimpleLicenseAttributes() const return ::boost::optional<SimpleLicenseAttributes>(); } -::rtl::OUString DescriptionInfoset::getLocalizedDescriptionURL() const +OUString DescriptionInfoset::getLocalizedDescriptionURL() const { return getLocalizedHREFAttrFromChild("/desc:description/desc:extension-description", NULL); } css::uno::Reference< css::xml::dom::XNode > -DescriptionInfoset::getLocalizedChild( const ::rtl::OUString & sParent) const +DescriptionInfoset::getLocalizedChild( const OUString & sParent) const { if ( ! m_element.is() || sParent.isEmpty()) return css::uno::Reference< css::xml::dom::XNode > (); @@ -756,7 +755,7 @@ DescriptionInfoset::matchLanguageTag( css::uno::Reference<css::xml::dom::XNode> nodeMatch; //first try exact match for lang - const ::rtl::OUString exp1("*[@lang=\"" + rTag + "\"]"); + const OUString exp1("*[@lang=\"" + rTag + "\"]"); try { nodeMatch = m_xpath->selectSingleNode(xParent, exp1); } catch (const css::xml::xpath::XPathException &) { @@ -767,7 +766,7 @@ DescriptionInfoset::matchLanguageTag( //example en matches in en-US-montana, en-US, en-montana if (!nodeMatch.is()) { - const ::rtl::OUString exp2( + const OUString exp2( "*[starts-with(@lang,\"" + rTag + "-\")]"); try { nodeMatch = m_xpath->selectSingleNode(xParent, exp2); @@ -794,7 +793,7 @@ DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom if (nodeDefault.is()) { //The old way - const ::rtl::OUString exp1("desc:license-text[@license-id = \"" + const OUString exp1("desc:license-text[@license-id = \"" + nodeDefault->getNodeValue() + "\"]"); try { @@ -805,7 +804,7 @@ DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom } } - const ::rtl::OUString exp2("*[1]"); + const OUString exp2("*[1]"); try { return m_xpath->selectSingleNode(xParent, exp2); } catch (const css::xml::xpath::XPathException &) { @@ -814,19 +813,19 @@ DescriptionInfoset::getChildWithDefaultLocale(css::uno::Reference< css::xml::dom } } -::rtl::OUString DescriptionInfoset::getLocalizedHREFAttrFromChild( - ::rtl::OUString const & sXPathParent, bool * out_bParentExists) +OUString DescriptionInfoset::getLocalizedHREFAttrFromChild( + OUString const & sXPathParent, bool * out_bParentExists) const { css::uno::Reference< css::xml::dom::XNode > node = getLocalizedChild(sXPathParent); - ::rtl::OUString sURL; + OUString sURL; if (node.is()) { if (out_bParentExists) *out_bParentExists = true; - const ::rtl::OUString exp("@xlink:href"); + const OUString exp("@xlink:href"); css::uno::Reference< css::xml::dom::XNode > xURL; try { xURL = m_xpath->selectSingleNode(node, exp); diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx index 165a0975a5b0..a8fb964e03fc 100644 --- a/desktop/source/deployment/misc/dp_identifier.cxx +++ b/desktop/source/deployment/misc/dp_identifier.cxx @@ -33,24 +33,24 @@ namespace dp_misc { -::rtl::OUString generateIdentifier( - ::boost::optional< ::rtl::OUString > const & optional, - ::rtl::OUString const & fileName) +OUString generateIdentifier( + ::boost::optional< OUString > const & optional, + OUString const & fileName) { return optional ? *optional : generateLegacyIdentifier(fileName); } -::rtl::OUString getIdentifier( +OUString getIdentifier( css::uno::Reference< css::deployment::XPackage > const & package) { OSL_ASSERT(package.is()); - css::beans::Optional< ::rtl::OUString > id(package->getIdentifier()); + css::beans::Optional< OUString > id(package->getIdentifier()); return id.IsPresent ? id.Value : generateLegacyIdentifier(package->getName()); } -::rtl::OUString generateLegacyIdentifier(::rtl::OUString const & fileName) { - rtl::OUStringBuffer b; +OUString generateLegacyIdentifier(OUString const & fileName) { + OUStringBuffer b; b.appendAscii("org.openoffice.legacy."); b.append(fileName); return b.makeStringAndClear(); diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 8462363d0ae1..4d9f40df91b0 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -27,7 +27,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_misc { namespace { diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 27ef710a112b..5a1bd22eb275 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -51,8 +51,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OString; #if defined WNT #define SOFFICE1 "soffice.exe" @@ -113,7 +111,7 @@ const OUString OfficePipeId::operator () () // create hex-value string from the MD5 value to keep // the string size minimal - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "SingleOfficeIPC_" ); for ( sal_uInt32 i = 0; i < md5_key_len; ++i ) { buf.append( static_cast<sal_Int32>(md5_buf[ i ]), 0x10 ); @@ -239,7 +237,7 @@ namespace { inline OUString encodeForRcFile( OUString const & str ) { // escape $\{} (=> rtl bootstrap files) - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 pos = 0; const sal_Int32 len = str.getLength(); for ( ; pos < len; ++pos ) { @@ -261,7 +259,7 @@ inline OUString encodeForRcFile( OUString const & str ) //============================================================================== OUString makeURL( OUString const & baseURL, OUString const & relPath_ ) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; if (baseURL.getLength() > 1 && baseURL[ baseURL.getLength() - 1 ] == '/') buf.append( baseURL.copy( 0, baseURL.getLength() - 1 ) ); else @@ -429,7 +427,7 @@ OUString generateRandomPipeId() s_hPool, bytes, ARLEN(bytes) ) != rtl_Random_E_None) { throw RuntimeException( "random pool error!?", 0 ); } - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; for ( sal_uInt32 i = 0; i < ARLEN(bytes); ++i ) { buf.append( static_cast<sal_Int32>(bytes[ i ]), 0x10 ); } @@ -462,14 +460,14 @@ Reference<XInterface> resolveUnoURL( } #ifdef WNT -void writeConsoleWithStream(::rtl::OUString const & sText, HANDLE stream) +void writeConsoleWithStream(OUString const & sText, HANDLE stream) { DWORD nWrittenChars = 0; WriteFile(stream, sText.getStr(), sText.getLength() * 2, &nWrittenChars, NULL); } #else -void writeConsoleWithStream(::rtl::OUString const & sText, FILE * stream) +void writeConsoleWithStream(OUString const & sText, FILE * stream) { OString s = OUStringToOString(sText, osl_getThreadTextEncoding()); fprintf(stream, "%s", s.getStr()); @@ -477,7 +475,7 @@ void writeConsoleWithStream(::rtl::OUString const & sText, FILE * stream) } #endif -void writeConsole(::rtl::OUString const & sText) +void writeConsole(OUString const & sText) { #ifdef WNT writeConsoleWithStream(sText, GetStdHandle(STD_OUTPUT_HANDLE)); @@ -486,7 +484,7 @@ void writeConsole(::rtl::OUString const & sText) #endif } -void writeConsoleError(::rtl::OUString const & sText) +void writeConsoleError(OUString const & sText) { #ifdef WNT writeConsoleWithStream(sText, GetStdHandle(STD_ERROR_HANDLE)); @@ -513,14 +511,14 @@ OUString readConsole() // read one char less so that the last char in buf is always zero if (fgets(buf, 1024, stdin) != NULL) { - OUString value = ::rtl::OStringToOUString(::rtl::OString(buf), osl_getThreadTextEncoding()); + OUString value = OStringToOUString(OString(buf), osl_getThreadTextEncoding()); return value.trim(); } #endif return OUString(); } -void TRACE(::rtl::OUString const & sText) +void TRACE(OUString const & sText) { (void) sText; #if OSL_DEBUG_LEVEL > 1 diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index d75733dbbfcc..de8ea6630eaa 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -64,7 +64,6 @@ #define PLATFORM_AIX_POWERPC "aix_powerpc" -using ::rtl::OUString; namespace dp_misc { @@ -92,7 +91,7 @@ namespace struct StrPlatform : public rtl::StaticWithInit< OUString, StrPlatform> { const OUString operator () () { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.append( StrOperatingSystem::get() ); buf.append( static_cast<sal_Unicode>('_') ); buf.append( StrCPU::get() ); diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index 0100632c36a5..802e37f3d0c4 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; namespace dp_misc { namespace { diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 96db856ce036..2fff496c5a1a 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; -using ::rtl::OUString; namespace dp_misc { @@ -210,7 +209,7 @@ bool readLine( OUString * res, OUString const & startingWith, { if (file.match( startingWith, pos )) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 start = pos; pos += startingWith.getLength(); for (;;) @@ -254,7 +253,7 @@ bool readLine( OUString * res, OUString const & startingWith, return false; } -bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> > & out_result, +bool readProperties( ::std::list< ::std::pair< OUString, OUString> > & out_result, ::ucbhelper::Content & ucb_content ) { // read whole file: @@ -266,7 +265,7 @@ bool readProperties( ::std::list< ::std::pair< ::rtl::OUString, ::rtl::OUString> for (;;) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; sal_Int32 start = pos; bool bEOF = false; diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index f92b3c033adf..0a078fd3e499 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -26,18 +26,16 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; -using ::rtl::OUString; -using ::rtl::OString; namespace dp_misc { namespace { int determineHighestVersion( - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion) + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion) { int index = 0; OUString greatest = userVersion; @@ -134,7 +132,7 @@ void getDefaultUpdateInfos( UpdateInfoMap& inout_map, std::vector<std::pair<Reference<deployment::XPackage>, uno::Any> > & out_errors) { - const rtl::OUString sDefaultURL(dp_misc::getExtensionDefaultUpdateURL()); + const OUString sDefaultURL(dp_misc::getExtensionDefaultUpdateURL()); OSL_ASSERT(!sDefaultURL.isEmpty()); Any anyError; @@ -216,7 +214,7 @@ bool onlyBundledExtensions( OUString getExtensionDefaultUpdateURL() { - ::rtl::OUString sUrl( + OUString sUrl( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:ExtensionUpdateURL}"); ::rtl::Bootstrap::expandMacros(sUrl); @@ -228,10 +226,10 @@ OUString getExtensionDefaultUpdateURL() */ UPDATE_SOURCE isUpdateUserExtension( bool bReadOnlyShared, - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion) + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion) { UPDATE_SOURCE retVal = UPDATE_SOURCE_NONE; if (bReadOnlyShared) @@ -278,9 +276,9 @@ UPDATE_SOURCE isUpdateUserExtension( UPDATE_SOURCE isUpdateSharedExtension( bool bReadOnlyShared, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion) + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion) { if (bReadOnlyShared) return UPDATE_SOURCE_NONE; @@ -389,10 +387,10 @@ UpdateInfoMap getOnlineUpdateInfos( return infoMap; } OUString getHighestVersion( - ::rtl::OUString const & userVersion, - ::rtl::OUString const & sharedVersion, - ::rtl::OUString const & bundledVersion, - ::rtl::OUString const & onlineVersion) + OUString const & userVersion, + OUString const & sharedVersion, + OUString const & bundledVersion, + OUString const & onlineVersion) { int index = determineHighestVersion(userVersion, sharedVersion, bundledVersion, onlineVersion); switch (index) diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx index 04b835515e3d..b6595a4466d2 100644 --- a/desktop/source/deployment/misc/dp_version.cxx +++ b/desktop/source/deployment/misc/dp_version.cxx @@ -27,7 +27,7 @@ namespace { -::rtl::OUString getElement(::rtl::OUString const & version, ::sal_Int32 * index) +OUString getElement(OUString const & version, ::sal_Int32 * index) { while (*index < version.getLength() && version[*index] == '0') { ++*index; @@ -40,11 +40,11 @@ namespace { namespace dp_misc { ::dp_misc::Order compareVersions( - ::rtl::OUString const & version1, ::rtl::OUString const & version2) + OUString const & version1, OUString const & version2) { for (::sal_Int32 i1 = 0, i2 = 0; i1 >= 0 || i2 >= 0;) { - ::rtl::OUString e1(getElement(version1, &i1)); - ::rtl::OUString e2(getElement(version2, &i2)); + OUString e1(getElement(version1, &i1)); + OUString e2(getElement(version2, &i2)); if (e1.getLength() < e2.getLength()) { return ::dp_misc::LESS; } else if (e1.getLength() > e2.getLength()) { diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx index 6bb7bb73c3cb..97202ecda67c 100644 --- a/desktop/source/deployment/misc/lockfile.cxx +++ b/desktop/source/deployment/misc/lockfile.cxx @@ -40,9 +40,9 @@ using namespace ::rtl; using namespace ::utl; -static rtl::OString impl_getHostname() +static OString impl_getHostname() { - rtl::OString aHost; + OString aHost; #ifdef WNT /* prevent windows from connecting to the net to get it's own @@ -152,21 +152,21 @@ namespace desktop { String aLockname = m_aLockname; Config aConfig(aLockname); aConfig.SetGroup(LOCKFILE_GROUP); - rtl::OString aIPCserver = aConfig.ReadKey( LOCKFILE_IPCKEY ); - if (!aIPCserver.equalsIgnoreAsciiCase(rtl::OString("true"))) + OString aIPCserver = aConfig.ReadKey( LOCKFILE_IPCKEY ); + if (!aIPCserver.equalsIgnoreAsciiCase(OString("true"))) return false; - rtl::OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ); - rtl::OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); + OString aHost = aConfig.ReadKey( LOCKFILE_HOSTKEY ); + OString aUser = aConfig.ReadKey( LOCKFILE_USERKEY ); // lockfile from same host? - rtl::OString myHost( impl_getHostname() ); + OString myHost( impl_getHostname() ); if (aHost == myHost) { // lockfile by same UID OUString myUserName; Security aSecurity; aSecurity.getUserName( myUserName ); - rtl::OString myUser(rtl::OUStringToOString(myUserName, RTL_TEXTENCODING_ASCII_US)); + OString myUser(OUStringToOString(myUserName, RTL_TEXTENCODING_ASCII_US)); if (aUser == myUser) return sal_True; } @@ -180,13 +180,13 @@ namespace desktop { aConfig.SetGroup(LOCKFILE_GROUP); // get information - rtl::OString aHost( impl_getHostname() ); + OString aHost( impl_getHostname() ); OUString aUserName; Security aSecurity; aSecurity.getUserName( aUserName ); - rtl::OString aUser = OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ); - rtl::OString aTime = OUStringToOString( m_aDate, RTL_TEXTENCODING_ASCII_US ); - rtl::OString aStamp = OUStringToOString( m_aId, RTL_TEXTENCODING_ASCII_US ); + OString aUser = OUStringToOString( aUserName, RTL_TEXTENCODING_ASCII_US ); + OString aTime = OUStringToOString( m_aDate, RTL_TEXTENCODING_ASCII_US ); + OString aStamp = OUStringToOString( m_aId, RTL_TEXTENCODING_ASCII_US ); // write information aConfig.WriteKey( LOCKFILE_USERKEY, aUser ); @@ -195,7 +195,7 @@ namespace desktop { aConfig.WriteKey( LOCKFILE_TIMEKEY, aTime ); aConfig.WriteKey( LOCKFILE_IPCKEY, - m_bIPCserver ? rtl::OString("true") : rtl::OString("false") ); + m_bIPCserver ? OString("true") : OString("false") ); aConfig.Flush( ); } 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 { diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 919d81f81682..d564c8c8e2ae 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -87,7 +87,7 @@ aBasicErrorFunc( const OUString &rErr, const OUString &rAction ) } static void -initialize_uno( const rtl::OUString &aAppURL ) +initialize_uno( const OUString &aAppURL ) { rtl::Bootstrap::setIniFilename( aAppURL + "/fundamentalrc" ); @@ -108,7 +108,7 @@ initialize_uno( const rtl::OUString &aAppURL ) // set UserInstallation to user profile dir in test/user-template // rtl::Bootstrap aDefaultVars; -// aDefaultVars.set(rtl::OUString("UserInstallation"), aAppURL + "../registry" ); +// aDefaultVars.set(OUString("UserInstallation"), aAppURL + "../registry" ); // configmgr setup ? } diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index cc4eb29f9463..9e9ba16d04a6 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -70,8 +70,6 @@ using namespace com::sun::star::container; using com::sun::star::uno::Exception; using namespace com::sun::star; -using ::rtl::OUString; -using ::rtl::OString; namespace desktop { @@ -79,9 +77,9 @@ static const char ITEM_DESCRIPTOR_COMMANDURL[] = "CommandURL"; static const char ITEM_DESCRIPTOR_CONTAINER[] = "ItemDescriptorContainer"; static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; -::rtl::OUString retrieveLabelFromCommand(const ::rtl::OUString& sCommand, const ::rtl::OUString& sModuleIdentifier) +OUString retrieveLabelFromCommand(const OUString& sCommand, const OUString& sModuleIdentifier) { - ::rtl::OUString sLabel; + OUString sLabel; uno::Reference< container::XNameAccess > xUICommands; uno::Reference< container::XNameAccess > const xNameAccess( @@ -92,7 +90,7 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; { if ( !sCommand.isEmpty() ) { - rtl::OUString aStr; + OUString aStr; ::uno::Sequence< beans::PropertyValue > aPropSeq; try { @@ -125,9 +123,9 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; return sLabel; } -::rtl::OUString mapModuleShortNameToIdentifier(const ::rtl::OUString& sShortName) +OUString mapModuleShortNameToIdentifier(const OUString& sShortName) { - ::rtl::OUString sIdentifier; + OUString sIdentifier; if ( sShortName == "StartModule" ) sIdentifier = "com.sun.star.frame.StartModule"; @@ -173,13 +171,13 @@ static const char ITEM_DESCRIPTOR_LABEL[] = "Label"; bool MigrationImpl::alreadyMigrated() { - rtl::OUString MIGRATION_STAMP_NAME("/MIGRATED4"); - rtl::OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME; + OUString MIGRATION_STAMP_NAME("/MIGRATED4"); + OUString aStr = m_aInfo.userdata + MIGRATION_STAMP_NAME; File aFile(aStr); // create migration stamp, and/or check its existence bool bRet = aFile.open (osl_File_OpenFlag_Write | osl_File_OpenFlag_Create | osl_File_OpenFlag_NoLock) == FileBase::E_EXIST; OSL_TRACE( "File '%s' exists? %d\n", - rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US).getStr(), + OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US).getStr(), bRet ); return bRet; } @@ -252,16 +250,16 @@ sal_Bool MigrationImpl::doMigration() copyFiles(); - const ::rtl::OUString sMenubarResourceURL("private:resource/menubar/menubar"); - const ::rtl::OUString sToolbarResourcePre("private:resource/toolbar/"); + const OUString sMenubarResourceURL("private:resource/menubar/menubar"); + const OUString sToolbarResourcePre("private:resource/toolbar/"); for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i) { - ::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName); + OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName); if (sModuleIdentifier.isEmpty()) continue; uno::Sequence< uno::Any > lArgs(2); - ::rtl::OUString aOldCfgDataPath = m_aInfo.userdata + ::rtl::OUString("/user/config/soffice.cfg/modules/"); + OUString aOldCfgDataPath = m_aInfo.userdata + OUString("/user/config/soffice.cfg/modules/"); lArgs[0] <<= aOldCfgDataPath + vModulesInfo[i].sModuleShortName; lArgs[1] <<= embed::ElementModes::READ; @@ -282,7 +280,7 @@ sal_Bool MigrationImpl::doMigration() { uno::Reference< container::XIndexContainer > xOldVersionMenuSettings = uno::Reference< container::XIndexContainer >(xOldCfgManager->getSettings(sMenubarResourceURL, sal_True), uno::UNO_QUERY); uno::Reference< container::XIndexContainer > xNewVersionMenuSettings = aNewVersionUIInfo.getNewMenubarSettings(vModulesInfo[i].sModuleShortName); - ::rtl::OUString sParent; + OUString sParent; compareOldAndNewConfig(sParent, xOldVersionMenuSettings, xNewVersionMenuSettings, sMenubarResourceURL); mergeOldToNewVersion(xCfgManager, xNewVersionMenuSettings, sModuleIdentifier, sMenubarResourceURL); } @@ -292,12 +290,12 @@ sal_Bool MigrationImpl::doMigration() { for (sal_Int32 j=0; j<nToolbars; ++j) { - ::rtl::OUString sToolbarName = vModulesInfo[i].m_vToolbars[j]; - ::rtl::OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName; + OUString sToolbarName = vModulesInfo[i].m_vToolbars[j]; + OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName; uno::Reference< container::XIndexContainer > xOldVersionToolbarSettings = uno::Reference< container::XIndexContainer >(xOldCfgManager->getSettings(sToolbarResourceURL, sal_True), uno::UNO_QUERY); uno::Reference< container::XIndexContainer > xNewVersionToolbarSettings = aNewVersionUIInfo.getNewToolbarSettings(vModulesInfo[i].sModuleShortName, sToolbarName); - ::rtl::OUString sParent; + OUString sParent; compareOldAndNewConfig(sParent, xOldVersionToolbarSettings, xNewVersionToolbarSettings, sToolbarResourceURL); mergeOldToNewVersion(xCfgManager, xNewVersionToolbarSettings, sModuleIdentifier, sToolbarResourceURL); } @@ -418,13 +416,13 @@ bool MigrationImpl::readAvailableMigrations(migrations_available& rAvailableMigr aSupportedMigration.supported_versions.push_back(seqVersions[j].trim()); insertSorted( rAvailableMigrations, aSupportedMigration ); OSL_TRACE( " available migration '%s'\n", - rtl::OUStringToOString( aSupportedMigration.name, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OUStringToOString( aSupportedMigration.name, RTL_TEXTENCODING_ASCII_US ).getStr() ); } return true; } -migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigrationName) +migrations_vr MigrationImpl::readMigrationSteps(const OUString& rMigrationName) { // get migration access uno::Reference< XNameAccess > aMigrationAccess(getConfigAccess("org.openoffice.Setup/Migration/SupportedVersions"), uno::UNO_QUERY_THROW); @@ -447,7 +445,7 @@ migrations_vr MigrationImpl::readMigrationSteps(const ::rtl::OUString& rMigratio tmpStep.name = seqMigrations[i]; // read included files from current step description - ::rtl::OUString aSeqEntry; + OUString aSeqEntry; if (tmpAccess->getByName("IncludedFiles") >>= tmpSeq) { for (sal_Int32 j=0; j<tmpSeq.getLength(); j++) @@ -551,10 +549,10 @@ OUString MigrationImpl::preXDGConfigDir(const OUString& rConfigDir) void MigrationImpl::setInstallInfoIfExist( install_info& aInfo, - const ::rtl::OUString& rConfigDir, - const ::rtl::OUString& rVersion) + const OUString& rConfigDir, + const OUString& rVersion) { - rtl::OUString url(INetURLObject(rConfigDir).GetMainURL(INetURLObject::NO_DECODE)); + OUString url(INetURLObject(rConfigDir).GetMainURL(INetURLObject::NO_DECODE)); osl::DirectoryItem item; osl::FileStatus stat(osl_FileStatus_Mask_Type); @@ -583,7 +581,7 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions) strings_v::const_iterator i_ver = rVersions.begin(); while (i_ver != rVersions.end()) { - ::rtl::OUString aVersion, aProfileName; + OUString aVersion, aProfileName; sal_Int32 nSeparatorIndex = (*i_ver).indexOf('='); if ( nSeparatorIndex != -1 ) { @@ -629,9 +627,9 @@ sal_Int32 MigrationImpl::findPreferedMigrationProcess(const migrations_available } OSL_TRACE( " preferred migration is from product '%s'\n", - rtl::OUStringToOString( m_aInfo.productname, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OUStringToOString( m_aInfo.productname, RTL_TEXTENCODING_ASCII_US ).getStr() ); OSL_TRACE( " and settings directory '%s'\n", - rtl::OUStringToOString( m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US ).getStr() ); + OUStringToOString( m_aInfo.userdata, RTL_TEXTENCODING_ASCII_US ).getStr() ); return nIndex; } @@ -744,19 +742,19 @@ strings_vr MigrationImpl::compileFileList() namespace { struct componentParts { - std::set< rtl::OUString > includedPaths; - std::set< rtl::OUString > excludedPaths; + std::set< OUString > includedPaths; + std::set< OUString > excludedPaths; }; -typedef std::map< rtl::OUString, componentParts > Components; +typedef std::map< OUString, componentParts > Components; -bool getComponent(rtl::OUString const & path, rtl::OUString * component) { +bool getComponent(OUString const & path, OUString * component) { OSL_ASSERT(component != 0); if (path.isEmpty() || path[0] != '/') { OSL_TRACE( ("configuration migration in/exclude path %s ignored (does not" " start with slash)"), - rtl::OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr()); + OUStringToOString(path, RTL_TEXTENCODING_UTF8).getStr()); return false; } sal_Int32 i = path.indexOf('/', 1); @@ -764,14 +762,14 @@ bool getComponent(rtl::OUString const & path, rtl::OUString * component) { return true; } -uno::Sequence< rtl::OUString > setToSeq(std::set< rtl::OUString > const & set) { - std::set< rtl::OUString >::size_type n = set.size(); +uno::Sequence< OUString > setToSeq(std::set< OUString > const & set) { + std::set< OUString >::size_type n = set.size(); if (n > SAL_MAX_INT32) { throw std::bad_alloc(); } - uno::Sequence< rtl::OUString > seq(static_cast< sal_Int32 >(n)); + uno::Sequence< OUString > seq(static_cast< sal_Int32 >(n)); sal_Int32 i = 0; - for (std::set< rtl::OUString >::const_iterator j(set.begin()); + for (std::set< OUString >::const_iterator j(set.begin()); j != set.end(); ++j) { seq[i++] = *j; @@ -789,7 +787,7 @@ void MigrationImpl::copyConfig() { for (strings_v::const_iterator j(i->includeConfig.begin()); j != i->includeConfig.end(); ++j) { - rtl::OUString comp; + OUString comp; if (getComponent(*j, &comp)) { comps[comp].includedPaths.insert(*j); } @@ -797,7 +795,7 @@ void MigrationImpl::copyConfig() { for (strings_v::const_iterator j(i->excludeConfig.begin()); j != i->excludeConfig.end(); ++j) { - rtl::OUString comp; + OUString comp; if (getComponent(*j, &comp)) { comps[comp].excludedPaths.insert(*j); } @@ -806,7 +804,7 @@ void MigrationImpl::copyConfig() { // check if the shared registrymodifications.xcu file exists bool bRegistryModificationsXcuExists = false; - rtl::OUString regFilePath(m_aInfo.userdata); + OUString regFilePath(m_aInfo.userdata); regFilePath += "/user/registrymodifications.xcu"; File regFile(regFilePath); ::osl::FileBase::RC nError = regFile.open(osl_File_OpenFlag_Read); @@ -821,12 +819,12 @@ void MigrationImpl::copyConfig() { // shared registrymodifications.xcu does not exists // the configuration is split in many registry files // determine the file names from the first element in included paths - rtl::OUStringBuffer buf(m_aInfo.userdata); + OUStringBuffer buf(m_aInfo.userdata); buf.appendAscii("/user/registry/data"); sal_Int32 n = 0; do { - rtl::OUString seg(i->first.getToken(0, '.', n)); - rtl::OUString enc( + OUString seg(i->first.getToken(0, '.', n)); + OUString enc( rtl::Uri::encode( seg, rtl_UriCharClassPchar, rtl_UriEncodeStrict, RTL_TEXTENCODING_UTF8)); @@ -834,7 +832,7 @@ void MigrationImpl::copyConfig() { OSL_TRACE( ("configuration migration component %s ignored (cannot" " be encoded as file path)"), - rtl::OUStringToOString( + OUStringToOString( i->first, RTL_TEXTENCODING_UTF8).getStr()); goto next; } @@ -853,7 +851,7 @@ void MigrationImpl::copyConfig() { OSL_TRACE( ("configuration migration component %s ignored (only excludes," " no includes)"), - rtl::OUStringToOString( + OUStringToOString( i->first, RTL_TEXTENCODING_UTF8).getStr()); } next:; @@ -959,10 +957,10 @@ void MigrationImpl::runServices() try { // set black list for extension migration - uno::Sequence< rtl::OUString > seqExtBlackList; + uno::Sequence< OUString > seqExtBlackList; sal_uInt32 nSize = i_mig->excludeExtensions.size(); if ( nSize > 0 ) - seqExtBlackList = comphelper::arrayToSequence< ::rtl::OUString >( + seqExtBlackList = comphelper::arrayToSequence< OUString >( &i_mig->excludeExtensions[0], nSize ); seqArguments[2] = uno::makeAny(NamedValue("ExtensionBlackList", uno::makeAny( seqExtBlackList ))); @@ -998,8 +996,8 @@ void MigrationImpl::runServices() ::std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules() const { ::std::vector< MigrationModuleInfo > vModulesInfo; - const ::rtl::OUString MENUBAR("menubar"); - const ::rtl::OUString TOOLBAR("toolbar"); + const OUString MENUBAR("menubar"); + const OUString TOOLBAR("toolbar"); uno::Sequence< uno::Any > lArgs(2); lArgs[0] <<= m_aInfo.userdata + "/user/config/soffice.cfg/modules"; @@ -1014,11 +1012,11 @@ void MigrationImpl::runServices() return vModulesInfo; uno::Reference< container::XNameAccess > xAccess = uno::Reference< container::XNameAccess >(xModules, uno::UNO_QUERY); - uno::Sequence< ::rtl::OUString > lNames = xAccess->getElementNames(); + uno::Sequence< OUString > lNames = xAccess->getElementNames(); sal_Int32 nLength = lNames.getLength(); for (sal_Int32 i=0; i<nLength; ++i) { - ::rtl::OUString sModuleShortName = lNames[i]; + OUString sModuleShortName = lNames[i]; uno::Reference< embed::XStorage > xModule = xModules->openStorageElement(sModuleShortName, embed::ElementModes::READ); if (xModule.is()) { @@ -1038,14 +1036,14 @@ void MigrationImpl::runServices() uno::Reference< embed::XStorage > xToolbar = xModule->openStorageElement(TOOLBAR, embed::ElementModes::READ); if (xToolbar.is()) { - const ::rtl::OUString RESOURCEURL_CUSTOM_ELEMENT("custom_"); + const OUString RESOURCEURL_CUSTOM_ELEMENT("custom_"); sal_Int32 nCustomLen = 7; uno::Reference< container::XNameAccess > xNameAccess = uno::Reference< container::XNameAccess >(xToolbar, uno::UNO_QUERY); - ::uno::Sequence< ::rtl::OUString > lToolbars = xNameAccess->getElementNames(); + ::uno::Sequence< OUString > lToolbars = xNameAccess->getElementNames(); for (sal_Int32 j=0; j<lToolbars.getLength(); ++j) { - ::rtl::OUString sToolbarName = lToolbars[j]; + OUString sToolbarName = lToolbars[j]; if (sToolbarName.getLength()>=nCustomLen && sToolbarName.copy(0, nCustomLen).equals(RESOURCEURL_CUSTOM_ELEMENT)) continue; @@ -1054,8 +1052,8 @@ void MigrationImpl::runServices() sal_Int32 nIndex = sToolbarName.lastIndexOf('.'); if (nIndex > 0) { - ::rtl::OUString sExtension(sToolbarName.copy(nIndex)); - ::rtl::OUString sToolbarResourceName(sToolbarName.copy(0, nIndex)); + OUString sExtension(sToolbarName.copy(nIndex)); + OUString sToolbarResourceName(sToolbarName.copy(0, nIndex)); if (!sToolbarResourceName.isEmpty() && sExtension.equalsAsciiL(".xml", 4)) aModuleInfo.m_vToolbars.push_back(sToolbarResourceName); } @@ -1070,12 +1068,12 @@ void MigrationImpl::runServices() return vModulesInfo; } -void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, +void MigrationImpl::compareOldAndNewConfig(const OUString& sParent, const uno::Reference< container::XIndexContainer >& xIndexOld, const uno::Reference< container::XIndexContainer >& xIndexNew, - const ::rtl::OUString& sResourceURL) + const OUString& sResourceURL) { - const ::rtl::OUString MENU_SEPERATOR(" | "); + const OUString MENU_SEPERATOR(" | "); ::std::vector< MigrationItem > vOldItems; ::std::vector< MigrationItem > vNewItems; @@ -1121,13 +1119,13 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, ::std::vector< MigrationItem >::iterator it; - ::rtl::OUString sSibling; + OUString sSibling; for (it = vOldItems.begin(); it!=vOldItems.end(); ++it) { ::std::vector< MigrationItem >::iterator pFound = ::std::find(vNewItems.begin(), vNewItems.end(), *it); if (pFound != vNewItems.end() && it->m_xPopupMenu.is()) { - ::rtl::OUString sName; + OUString sName; if (!sParent.isEmpty()) sName = sParent + MENU_SEPERATOR + it->m_sCommandURL; else @@ -1159,7 +1157,7 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, ::std::vector< MigrationItem >::iterator pFound = ::std::find(vOldItems.begin(), vOldItems.end(), *it); if (pFound != vOldItems.end() && it->m_xPopupMenu.is()) { - ::rtl::OUString sName; + OUString sName; if (!sParent.isEmpty()) sName = sParent + MENU_SEPERATOR + it->m_sCommandURL; else @@ -1186,8 +1184,8 @@ void MigrationImpl::compareOldAndNewConfig(const ::rtl::OUString& sParent, void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurationManager >& xCfgManager, const uno::Reference< container::XIndexContainer>& xIndexContainer, - const ::rtl::OUString& sModuleIdentifier, - const ::rtl::OUString& sResourceURL) + const OUString& sModuleIdentifier, + const OUString& sResourceURL) { MigrationHashMap::iterator pFound = m_aOldVersionItemsHashMap.find(sResourceURL); if (pFound==m_aOldVersionItemsHashMap.end()) @@ -1198,26 +1196,26 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat { uno::Reference< container::XIndexContainer > xTemp = xIndexContainer; - ::rtl::OUString sParentNodeName = it->m_sParentNodeName; + OUString sParentNodeName = it->m_sParentNodeName; sal_Int32 nIndex = 0; do { - ::rtl::OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim(); + OUString sToken = sParentNodeName.getToken(0, '|', nIndex).trim(); if (sToken.isEmpty()) break; sal_Int32 nCount = xTemp->getCount(); for (sal_Int32 i=0; i<nCount; ++i) { - ::rtl::OUString sCommandURL; - ::rtl::OUString sLabel; + OUString sCommandURL; + OUString sLabel; uno::Reference< container::XIndexContainer > xChild; uno::Sequence< beans::PropertyValue > aPropSeq; xTemp->getByIndex(i) >>= aPropSeq; for (sal_Int32 j=0; j<aPropSeq.getLength(); ++j) { - ::rtl::OUString sPropName = aPropSeq[j].Name; + OUString sPropName = aPropSeq[j].Name; if ( sPropName == ITEM_DESCRIPTOR_COMMANDURL ) aPropSeq[j].Value >>= sCommandURL; else if ( sPropName == ITEM_DESCRIPTOR_LABEL ) @@ -1239,11 +1237,11 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat { uno::Sequence< beans::PropertyValue > aPropSeq(3); - aPropSeq[0].Name = rtl::OUString(ITEM_DESCRIPTOR_COMMANDURL); + aPropSeq[0].Name = OUString(ITEM_DESCRIPTOR_COMMANDURL); aPropSeq[0].Value <<= it->m_sCommandURL; - aPropSeq[1].Name = rtl::OUString(ITEM_DESCRIPTOR_LABEL); + aPropSeq[1].Name = OUString(ITEM_DESCRIPTOR_LABEL); aPropSeq[1].Value <<= retrieveLabelFromCommand(it->m_sCommandURL, sModuleIdentifier); - aPropSeq[2].Name = rtl::OUString(ITEM_DESCRIPTOR_CONTAINER); + aPropSeq[2].Name = OUString(ITEM_DESCRIPTOR_CONTAINER); aPropSeq[2].Value <<= it->m_xPopupMenu; if (it->m_sPrevSibling.isEmpty()) @@ -1254,7 +1252,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat sal_Int32 i = 0; for (; i<nCount; ++i) { - ::rtl::OUString sCmd; + OUString sCmd; uno::Sequence< beans::PropertyValue > aTempPropSeq; xTemp->getByIndex(i) >>= aTempPropSeq; for (sal_Int32 j=0; j<aTempPropSeq.getLength(); ++j) @@ -1284,7 +1282,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat xUIConfigurationPersistence->store(); } -uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const ::rtl::OUString& sModuleShortName) const +uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager(const OUString& sModuleShortName) const { uno::Reference< ui::XUIConfigurationManager > xCfgManager; @@ -1300,7 +1298,7 @@ uno::Reference< ui::XUIConfigurationManager > NewVersionUIInfo::getConfigManager return xCfgManager; } -uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const +uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSettings(const OUString& sModuleShortName) const { uno::Reference< container::XIndexContainer > xNewMenuSettings; @@ -1316,7 +1314,7 @@ uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewMenubarSett return xNewMenuSettings; } -uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const +uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSettings(const OUString& sModuleShortName, const OUString& sToolbarName) const { uno::Reference< container::XIndexContainer > xNewToolbarSettings; @@ -1348,14 +1346,14 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules m_lNewVersionMenubarSettingsSeq.realloc(vModulesInfo.size()); m_lNewVersionToolbarSettingsSeq.realloc(vModulesInfo.size()); - const ::rtl::OUString sMenubarResourceURL("private:resource/menubar/menubar"); - const ::rtl::OUString sToolbarResourcePre("private:resource/toolbar/"); + const OUString sMenubarResourceURL("private:resource/menubar/menubar"); + const OUString sToolbarResourcePre("private:resource/toolbar/"); uno::Reference< ui::XModuleUIConfigurationManagerSupplier > xModuleCfgSupplier = ui::ModuleUIConfigurationManagerSupplier::create( ::comphelper::getProcessComponentContext() ); for (sal_uInt32 i=0; i<vModulesInfo.size(); ++i) { - ::rtl::OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName); + OUString sModuleIdentifier = mapModuleShortNameToIdentifier(vModulesInfo[i].sModuleShortName); if (!sModuleIdentifier.isEmpty()) { uno::Reference< ui::XUIConfigurationManager > xCfgManager = xModuleCfgSupplier->getUIConfigurationManager(sModuleIdentifier); @@ -1374,8 +1372,8 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules uno::Sequence< beans::PropertyValue > lPropSeq(nToolbars); for (sal_Int32 j=0; j<nToolbars; ++j) { - ::rtl::OUString sToolbarName = vModulesInfo[i].m_vToolbars[j]; - ::rtl::OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName; + OUString sToolbarName = vModulesInfo[i].m_vToolbars[j]; + OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName; lPropSeq[j].Name = sToolbarName; lPropSeq[j].Value <<= xCfgManager->getSettings(sToolbarResourceURL, sal_True); diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index 714a7e485ce5..a92de8546f02 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -46,28 +46,28 @@ namespace desktop struct install_info { - rtl::OUString productname; // human readeable product name - rtl::OUString userdata; // file: url for user installation + OUString productname; // human readeable product name + OUString userdata; // file: url for user installation }; -typedef std::vector< rtl::OUString > strings_v; +typedef std::vector< OUString > strings_v; typedef std::auto_ptr< strings_v > strings_vr; struct migration_step { - rtl::OUString name; + OUString name; strings_v includeFiles; strings_v excludeFiles; strings_v includeConfig; strings_v excludeConfig; strings_v includeExtensions; strings_v excludeExtensions; - rtl::OUString service; + OUString service; }; struct supported_migration { - rtl::OUString name; + OUString name; sal_Int32 nPriority; strings_v supported_versions; }; @@ -83,9 +83,9 @@ typedef std::vector< supported_migration > migrations_available; */ struct MigrationItem { - ::rtl::OUString m_sParentNodeName; - ::rtl::OUString m_sPrevSibling; - ::rtl::OUString m_sCommandURL; + OUString m_sParentNodeName; + OUString m_sPrevSibling; + OUString m_sCommandURL; css::uno::Reference< css::container::XIndexContainer > m_xPopupMenu; MigrationItem() @@ -93,9 +93,9 @@ struct MigrationItem { } - MigrationItem(const ::rtl::OUString& sParentNodeName, - const ::rtl::OUString& sPrevSibling, - const ::rtl::OUString& sCommandURL, + MigrationItem(const OUString& sParentNodeName, + const OUString& sPrevSibling, + const OUString& sCommandURL, const css::uno::Reference< css::container::XIndexContainer > xPopupMenu) { m_sParentNodeName = sParentNodeName; @@ -122,22 +122,22 @@ struct MigrationItem aMigrationItem.m_xPopupMenu.is() == m_xPopupMenu.is() ); } - ::rtl::OUString GetPrevSibling() const { return m_sPrevSibling; } + OUString GetPrevSibling() const { return m_sPrevSibling; } }; -typedef ::boost::unordered_map< ::rtl::OUString, +typedef ::boost::unordered_map< OUString, ::std::vector< MigrationItem >, - ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > MigrationHashMap; + OUStringHash, + ::std::equal_to< OUString > > MigrationHashMap; struct MigrationItemInfo { - ::rtl::OUString m_sResourceURL; + OUString m_sResourceURL; MigrationItem m_aMigrationItem; MigrationItemInfo(){} - MigrationItemInfo(const ::rtl::OUString& sResourceURL, const MigrationItem& aMigrationItem) + MigrationItemInfo(const OUString& sResourceURL, const MigrationItem& aMigrationItem) : m_sResourceURL(sResourceURL), m_aMigrationItem(aMigrationItem) { } @@ -149,9 +149,9 @@ struct MigrationItemInfo */ struct MigrationModuleInfo { - ::rtl::OUString sModuleShortName; + OUString sModuleShortName; sal_Bool bHasMenubar; - ::std::vector< ::rtl::OUString > m_vToolbars; + ::std::vector< OUString > m_vToolbars; MigrationModuleInfo():bHasMenubar(sal_False){}; }; @@ -164,9 +164,9 @@ class NewVersionUIInfo { public: - css::uno::Reference< css::ui::XUIConfigurationManager > getConfigManager(const ::rtl::OUString& sModuleShortName) const; - css::uno::Reference< css::container::XIndexContainer > getNewMenubarSettings(const ::rtl::OUString& sModuleShortName) const; - css::uno::Reference< css::container::XIndexContainer > getNewToolbarSettings(const ::rtl::OUString& sModuleShortName, const ::rtl::OUString& sToolbarName) const; + css::uno::Reference< css::ui::XUIConfigurationManager > getConfigManager(const OUString& sModuleShortName) const; + css::uno::Reference< css::container::XIndexContainer > getNewMenubarSettings(const OUString& sModuleShortName) const; + css::uno::Reference< css::container::XIndexContainer > getNewToolbarSettings(const OUString& sModuleShortName, const OUString& sToolbarName) const; void init(const ::std::vector< MigrationModuleInfo >& vModulesInfo); private: @@ -188,12 +188,12 @@ private: strings_vr m_vrFileList; // final list of files to be copied MigrationHashMap m_aOldVersionItemsHashMap; MigrationHashMap m_aNewVersionItemsHashMap; - ::rtl::OUString m_sModuleIdentifier; + OUString m_sModuleIdentifier; // functions to control the migration process bool readAvailableMigrations(migrations_available&); bool alreadyMigrated(); - migrations_vr readMigrationSteps(const ::rtl::OUString& rMigrationName); + migrations_vr readMigrationSteps(const OUString& rMigrationName); sal_Int32 findPreferedMigrationProcess(const migrations_available&); #if defined UNX && ! defined MACOSX OUString preXDGConfigDir(const OUString& rConfigDir); @@ -203,19 +203,19 @@ private: strings_vr compileFileList(); // helpers - strings_vr getAllFiles(const rtl::OUString& baseURL) const; + strings_vr getAllFiles(const OUString& baseURL) const; strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const; css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, sal_Bool rw=sal_False); ::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const; - void compareOldAndNewConfig(const ::rtl::OUString& sParentNodeName, + void compareOldAndNewConfig(const OUString& sParentNodeName, const css::uno::Reference< css::container::XIndexContainer >& xOldIndexContainer, const css::uno::Reference< css::container::XIndexContainer >& xNewIndexContainer, - const ::rtl::OUString& sToolbarName); + const OUString& sToolbarName); void mergeOldToNewVersion(const css::uno::Reference< css::ui::XUIConfigurationManager >& xCfgManager, const css::uno::Reference< css::container::XIndexContainer>& xIndexContainer, - const ::rtl::OUString& sModuleIdentifier, - const ::rtl::OUString& sResourceURL); + const OUString& sModuleIdentifier, + const OUString& sResourceURL); // actual processing function that perform the migration steps void copyFiles(); @@ -231,7 +231,7 @@ public: ~MigrationImpl(); bool initializeMigration(); sal_Bool doMigration(); - rtl::OUString getOldVersionName(); + OUString getOldVersionName(); }; } diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 99bbe7687da0..c35a167e8a94 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -33,23 +33,23 @@ namespace migration //......................................................................... - #define sSourceUserBasic ::rtl::OUString( "/user/basic" ) - #define sTargetUserBasic ::rtl::OUString( "/user/__basic_80" ) + #define sSourceUserBasic OUString( "/user/basic" ) + #define sTargetUserBasic OUString( "/user/__basic_80" ) // ============================================================================= // component operations // ============================================================================= - ::rtl::OUString BasicMigration_getImplementationName() + OUString BasicMigration_getImplementationName() { - return ::rtl::OUString("com.sun.star.comp.desktop.migration.Basic"); + return OUString("com.sun.star.comp.desktop.migration.Basic"); } // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > BasicMigration_getSupportedServiceNames() + Sequence< OUString > BasicMigration_getSupportedServiceNames() { - Sequence< ::rtl::OUString > aNames(1); + Sequence< OUString > aNames(1); aNames.getArray()[0] = "com.sun.star.migration.Basic"; return aNames; } @@ -70,7 +70,7 @@ namespace migration // ----------------------------------------------------------------------------- - TStringVectorPtr BasicMigration::getFiles( const ::rtl::OUString& rBaseURL ) const + TStringVectorPtr BasicMigration::getFiles( const OUString& rBaseURL ) const { TStringVectorPtr aResult( new TStringVector ); ::osl::Directory aDir( rBaseURL); @@ -127,7 +127,7 @@ namespace migration void BasicMigration::copyFiles() { - ::rtl::OUString sTargetDir; + OUString sTargetDir; ::utl::Bootstrap::PathStatus aStatus = ::utl::Bootstrap::locateUserInstallation( sTargetDir ); if ( aStatus == ::utl::Bootstrap::PATH_EXISTS ) { @@ -136,17 +136,17 @@ namespace migration TStringVector::const_iterator aI = aFileList->begin(); while ( aI != aFileList->end() ) { - ::rtl::OUString sLocalName = aI->copy( m_sSourceDir.getLength() ); - ::rtl::OUString sTargetName = sTargetDir + sLocalName; + OUString sLocalName = aI->copy( m_sSourceDir.getLength() ); + OUString sTargetName = sTargetDir + sLocalName; INetURLObject aURL( sTargetName ); aURL.removeSegment(); checkAndCreateDirectory( aURL ); ::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName ); if ( aResult != ::osl::FileBase::E_None ) { - ::rtl::OString aMsg( "BasicMigration::copyFiles: cannot copy " ); - aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " - + ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); + OString aMsg( "BasicMigration::copyFiles: cannot copy " ); + aMsg += OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " + + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aMsg.getStr() ); } ++aI; @@ -162,7 +162,7 @@ namespace migration // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString BasicMigration::getImplementationName() throw (RuntimeException) + OUString BasicMigration::getImplementationName() throw (RuntimeException) { return BasicMigration_getImplementationName(); } @@ -177,7 +177,7 @@ namespace migration // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > BasicMigration::getSupportedServiceNames() throw (RuntimeException) { return BasicMigration_getSupportedServiceNames(); } diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index cf7e4ddf1985..56f3c7130008 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -38,8 +38,8 @@ namespace migration { //......................................................................... - ::rtl::OUString SAL_CALL BasicMigration_getImplementationName(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL BasicMigration_getSupportedServiceNames(); + OUString SAL_CALL BasicMigration_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL BasicMigration_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL BasicMigration_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext ) SAL_THROW( (::com::sun::star::uno::Exception) ); @@ -58,9 +58,9 @@ namespace migration { private: ::osl::Mutex m_aMutex; - ::rtl::OUString m_sSourceDir; + OUString m_sSourceDir; - TStringVectorPtr getFiles( const ::rtl::OUString& rBaseURL ) const; + TStringVectorPtr getFiles( const OUString& rBaseURL ) const; ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL ); void copyFiles(); @@ -69,11 +69,11 @@ namespace migration virtual ~BasicMigration(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XInitialization diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index 0cab008bf575..d45012a76742 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -42,7 +42,6 @@ #include <stdio.h> #include "osl/thread.hxx" -using ::rtl::OUString; #define SERVICE_NAME "com.sun.star.migration.Java" #define IMPL_NAME "com.sun.star.comp.desktop.migration.Java" @@ -119,7 +118,7 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL overrideNode( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes, sal_Bool bClear) throw( @@ -127,14 +126,14 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addOrReplaceNode( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addOrReplaceNodeFromTemplate( - const rtl::OUString& aName, + const OUString& aName, const ::com::sun::star::configuration::backend::TemplateIdentifier& aTemplate, sal_Int16 aAttributes ) throw( @@ -147,13 +146,13 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL dropNode( - const rtl::OUString& aName ) + const OUString& aName ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL overrideProperty( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes, const css::uno::Type& aType, sal_Bool bClear ) @@ -169,7 +168,7 @@ public: virtual void SAL_CALL setPropertyValueForLocale( const css::uno::Any& aValue, - const rtl::OUString& aLocale ) + const OUString& aLocale ) throw( ::com::sun::star::configuration::backend::MalformedDataException, ::com::sun::star::lang::WrappedTargetException ); @@ -180,7 +179,7 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addProperty( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes, const css::uno::Type& aType ) throw( @@ -188,7 +187,7 @@ public: ::com::sun::star::lang::WrappedTargetException ); virtual void SAL_CALL addPropertyWithValue( - const rtl::OUString& aName, + const OUString& aName, sal_Int16 aAttributes, const css::uno::Any& aValue ) throw( @@ -205,7 +204,7 @@ private: css::uno::Reference< css::configuration::backend::XLayer> m_xLayer; void migrateJavarc(); - typedef ::std::pair< ::rtl::OUString, sal_Int16> TElementType; + typedef ::std::pair< OUString, sal_Int16> TElementType; typedef ::std::stack< TElementType > TElementStack; TElementStack m_aStack; @@ -352,7 +351,7 @@ void SAL_CALL JavaMigration::endLayer() // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::overrideNode( - const ::rtl::OUString&, + const OUString&, sal_Int16, sal_Bool) throw( @@ -365,7 +364,7 @@ void SAL_CALL JavaMigration::overrideNode( // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::addOrReplaceNode( - const ::rtl::OUString&, + const OUString&, sal_Int16) throw( MalformedDataException, @@ -382,7 +381,7 @@ void SAL_CALL JavaMigration::endNode() // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::dropNode( - const ::rtl::OUString& ) + const OUString& ) throw( MalformedDataException, WrappedTargetException ) @@ -391,7 +390,7 @@ void SAL_CALL JavaMigration::dropNode( // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::overrideProperty( - const ::rtl::OUString& aName, + const OUString& aName, sal_Int16, const Type&, sal_Bool ) @@ -453,7 +452,7 @@ void SAL_CALL JavaMigration::setPropertyValue( void SAL_CALL JavaMigration::setPropertyValueForLocale( const Any&, - const ::rtl::OUString& ) + const OUString& ) throw( MalformedDataException, WrappedTargetException ) @@ -472,7 +471,7 @@ void SAL_CALL JavaMigration::endProperty() // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::addProperty( - const rtl::OUString&, + const OUString&, sal_Int16, const Type& ) throw( @@ -483,7 +482,7 @@ void SAL_CALL JavaMigration::addProperty( // ----------------------------------------------------------------------------- void SAL_CALL JavaMigration::addPropertyWithValue( - const rtl::OUString&, + const OUString&, sal_Int16, const Any& ) throw( @@ -493,7 +492,7 @@ void SAL_CALL JavaMigration::addPropertyWithValue( } void SAL_CALL JavaMigration::addOrReplaceNodeFromTemplate( - const rtl::OUString&, + const OUString&, const TemplateIdentifier&, sal_Int16 ) throw( diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx index 0cd512e539e5..752d9b3f7264 100644 --- a/desktop/source/migration/services/jvmfwk.hxx +++ b/desktop/source/migration/services/jvmfwk.hxx @@ -32,9 +32,9 @@ namespace migration { -rtl::OUString jvmfwk_getImplementationName(); +OUString jvmfwk_getImplementationName(); -css::uno::Sequence< rtl::OUString > jvmfwk_getSupportedServiceNames(); +css::uno::Sequence< OUString > jvmfwk_getSupportedServiceNames(); } //end blind namespace diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx index e538fc3000e4..af69cb969981 100644 --- a/desktop/source/migration/services/misc.hxx +++ b/desktop/source/migration/services/misc.hxx @@ -30,7 +30,7 @@ namespace migration { //......................................................................... - typedef ::std::vector< ::rtl::OUString > TStringVector; + typedef ::std::vector< OUString > TStringVector; typedef ::std::auto_ptr< TStringVector > TStringVectorPtr; //......................................................................... diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 4448ac389da0..75590a806f81 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -49,24 +49,24 @@ using namespace ::com::sun::star::uno; namespace migration { -static ::rtl::OUString sExtensionSubDir( "/user/uno_packages/" ); -static ::rtl::OUString sSubDirName( "cache" ); -static ::rtl::OUString sDescriptionXmlFile( "/description.xml" ); -static ::rtl::OUString sExtensionRootSubDirName( "/uno_packages" ); +static OUString sExtensionSubDir( "/user/uno_packages/" ); +static OUString sSubDirName( "cache" ); +static OUString sDescriptionXmlFile( "/description.xml" ); +static OUString sExtensionRootSubDirName( "/uno_packages" ); // ============================================================================= // component operations // ============================================================================= -::rtl::OUString OO3ExtensionMigration_getImplementationName() +OUString OO3ExtensionMigration_getImplementationName() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "com.sun.star.comp.desktop.migration.OOo3Extensions" ); + static OUString aImplName( "com.sun.star.comp.desktop.migration.OOo3Extensions" ); pImplName = &aImplName; } } @@ -75,15 +75,15 @@ static ::rtl::OUString sExtensionRootSubDirName( "/uno_packages" ); // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > OO3ExtensionMigration_getSupportedServiceNames() +Sequence< OUString > OO3ExtensionMigration_getSupportedServiceNames() { - static Sequence< ::rtl::OUString >* pNames = 0; + static Sequence< OUString >* pNames = 0; if ( !pNames ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pNames ) { - static Sequence< ::rtl::OUString > aNames(1); + static Sequence< OUString > aNames(1); aNames.getArray()[0] = "com.sun.star.migration.Extensions"; pNames = &aNames; } @@ -122,7 +122,7 @@ OO3ExtensionMigration::~OO3ExtensionMigration() } } -void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions ) +void OO3ExtensionMigration::scanUserExtensions( const OUString& sSourceDir, TStringVector& aMigrateExtensions ) { osl::Directory aScanRootDir( sSourceDir ); osl::FileStatus fs(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileURL); @@ -137,7 +137,7 @@ void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDi ( fs.getFileType() == osl::FileStatus::Directory )) { //Check next folder as the "real" extension folder is below a temp folder! - ::rtl::OUString sExtensionFolderURL = fs.getFileURL(); + OUString sExtensionFolderURL = fs.getFileURL(); osl::Directory aExtensionRootDir( sExtensionFolderURL ); @@ -165,7 +165,7 @@ void OO3ExtensionMigration::scanUserExtensions( const ::rtl::OUString& sSourceDi } } -OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( const ::rtl::OUString& sExtFolder ) +OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( const OUString& sExtFolder ) { ScanResult aResult = SCANRESULT_NOTFOUND; osl::Directory aDir(sExtFolder); @@ -182,7 +182,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co { if (item.getFileStatus(fs) == osl::FileBase::E_None) { - ::rtl::OUString aDirEntryURL; + OUString aDirEntryURL; if (fs.getFileType() == osl::FileStatus::Directory) aDirectories.push_back( fs.getFileURL() ); else @@ -204,7 +204,7 @@ OO3ExtensionMigration::ScanResult OO3ExtensionMigration::scanExtensionFolder( co return aResult; } -bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlURL ) +bool OO3ExtensionMigration::scanDescriptionXml( const OUString& sDescriptionXmlURL ) { if ( !m_xDocBuilder.is() ) { @@ -216,7 +216,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript m_xSimpleFileAccess = ucb::SimpleFileAccess::create(m_ctx); } - ::rtl::OUString aExtIdentifier; + OUString aExtIdentifier; try { uno::Reference< io::XInputStream > xIn = @@ -297,7 +297,7 @@ bool OO3ExtensionMigration::scanDescriptionXml( const ::rtl::OUString& sDescript return true; } -void OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir ) +void OO3ExtensionMigration::migrateExtension( const OUString& sSourceDir ) { css::uno::Reference< css::deployment::XExtensionManager > extMgr( deployment::ExtensionManager::get( m_ctx ) ); @@ -326,7 +326,7 @@ void OO3ExtensionMigration::migrateExtension( const ::rtl::OUString& sSourceDir // XServiceInfo // ----------------------------------------------------------------------------- -::rtl::OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException) +OUString OO3ExtensionMigration::getImplementationName() throw (RuntimeException) { return OO3ExtensionMigration_getImplementationName(); } @@ -341,7 +341,7 @@ sal_Bool OO3ExtensionMigration::supportsService(OUString const & ServiceName) // ----------------------------------------------------------------------------- -Sequence< ::rtl::OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException) +Sequence< OUString > OO3ExtensionMigration::getSupportedServiceNames() throw (RuntimeException) { return OO3ExtensionMigration_getSupportedServiceNames(); } @@ -369,11 +369,11 @@ void OO3ExtensionMigration::initialize( const Sequence< Any >& aArguments ) thro } else if ( aValue.Name == "ExtensionBlackList" ) { - Sequence< ::rtl::OUString > aBlackList; + Sequence< OUString > aBlackList; if ( (aValue.Value >>= aBlackList ) && ( aBlackList.getLength() > 0 )) { m_aBlackList.resize( aBlackList.getLength() ); - ::comphelper::sequenceToArray< ::rtl::OUString >( &m_aBlackList[0], aBlackList ); + ::comphelper::sequenceToArray< OUString >( &m_aBlackList[0], aBlackList ); } } } @@ -388,7 +388,7 @@ Any OO3ExtensionMigration::execute( const Sequence< beans::NamedValue >& ) if ( aStatus == ::utl::Bootstrap::PATH_EXISTS ) { // copy all extensions - ::rtl::OUString sSourceDir( m_sSourceDir ); + OUString sSourceDir( m_sSourceDir ); sSourceDir += sExtensionSubDir; sSourceDir += sSubDirName; sSourceDir += sExtensionRootSubDirName; diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index 96a8b2290443..bcbc90638cf4 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -47,8 +47,8 @@ class INetURLObject; namespace migration { - ::rtl::OUString SAL_CALL OO3ExtensionMigration_getImplementationName(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames(); + OUString SAL_CALL OO3ExtensionMigration_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL OO3ExtensionMigration_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OO3ExtensionMigration_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext ) SAL_THROW( (::com::sun::star::uno::Exception) ); @@ -70,8 +70,8 @@ namespace migration ::com::sun::star::uno::Reference< ::com::sun::star::xml::dom::XDocumentBuilder > m_xDocBuilder; ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess3 > m_xSimpleFileAccess; ::osl::Mutex m_aMutex; - ::rtl::OUString m_sSourceDir; - ::rtl::OUString m_sTargetDir; + OUString m_sSourceDir; + OUString m_sTargetDir; TStringVector m_aBlackList; enum ScanResult @@ -82,10 +82,10 @@ namespace migration }; ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL ); - ScanResult scanExtensionFolder( const ::rtl::OUString& sExtFolder ); - void scanUserExtensions( const ::rtl::OUString& sSourceDir, TStringVector& aMigrateExtensions ); - bool scanDescriptionXml( const ::rtl::OUString& sDescriptionXmlFilePath ); - void migrateExtension( const ::rtl::OUString& sSourceDir ); + ScanResult scanExtensionFolder( const OUString& sExtFolder ); + void scanUserExtensions( const OUString& sSourceDir, TStringVector& aMigrateExtensions ); + bool scanDescriptionXml( const OUString& sDescriptionXmlFilePath ); + void migrateExtension( const OUString& sSourceDir ); public: OO3ExtensionMigration(::com::sun::star::uno::Reference< @@ -93,11 +93,11 @@ namespace migration virtual ~OO3ExtensionMigration(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XInitialization diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 717d6ac257e6..fd3a33511a68 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -33,23 +33,23 @@ namespace migration //......................................................................... - static ::rtl::OUString sSourceSubDir( "/user/wordbook" ); - static ::rtl::OUString sTargetSubDir( "/user/wordbook" ); + static OUString sSourceSubDir( "/user/wordbook" ); + static OUString sTargetSubDir( "/user/wordbook" ); // ============================================================================= // component operations // ============================================================================= - ::rtl::OUString WordbookMigration_getImplementationName() + OUString WordbookMigration_getImplementationName() { - static ::rtl::OUString* pImplName = 0; + static OUString* pImplName = 0; if ( !pImplName ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pImplName ) { - static ::rtl::OUString aImplName( "com.sun.star.comp.desktop.migration.Wordbooks" ); + static OUString aImplName( "com.sun.star.comp.desktop.migration.Wordbooks" ); pImplName = &aImplName; } } @@ -58,16 +58,16 @@ namespace migration // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > WordbookMigration_getSupportedServiceNames() + Sequence< OUString > WordbookMigration_getSupportedServiceNames() { - static Sequence< ::rtl::OUString >* pNames = 0; + static Sequence< OUString >* pNames = 0; if ( !pNames ) { ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); if ( !pNames ) { - static Sequence< ::rtl::OUString > aNames(1); - aNames.getArray()[0] = ::rtl::OUString( "com.sun.star.migration.Wordbooks" ); + static Sequence< OUString > aNames(1); + aNames.getArray()[0] = OUString( "com.sun.star.migration.Wordbooks" ); pNames = &aNames; } } @@ -90,7 +90,7 @@ namespace migration // ----------------------------------------------------------------------------- - TStringVectorPtr WordbookMigration::getFiles( const ::rtl::OUString& rBaseURL ) const + TStringVectorPtr WordbookMigration::getFiles( const OUString& rBaseURL ) const { TStringVectorPtr aResult( new TStringVector ); ::osl::Directory aDir( rBaseURL); @@ -144,7 +144,7 @@ namespace migration } #define MAX_HEADER_LENGTH 16 -bool IsUserWordbook( const ::rtl::OUString& rFile ) +bool IsUserWordbook( const OUString& rFile ) { static const sal_Char* pVerStr2 = "WBSWG2"; static const sal_Char* pVerStr5 = "WBSWG5"; @@ -190,7 +190,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) void WordbookMigration::copyFiles() { - ::rtl::OUString sTargetDir; + OUString sTargetDir; ::utl::Bootstrap::PathStatus aStatus = ::utl::Bootstrap::locateUserInstallation( sTargetDir ); if ( aStatus == ::utl::Bootstrap::PATH_EXISTS ) { @@ -201,17 +201,17 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) { if (IsUserWordbook(*aI) ) { - ::rtl::OUString sSourceLocalName = aI->copy( m_sSourceDir.getLength() ); - ::rtl::OUString sTargetName = sTargetDir + sSourceLocalName; + OUString sSourceLocalName = aI->copy( m_sSourceDir.getLength() ); + OUString sTargetName = sTargetDir + sSourceLocalName; INetURLObject aURL( sTargetName ); aURL.removeSegment(); checkAndCreateDirectory( aURL ); ::osl::FileBase::RC aResult = ::osl::File::copy( *aI, sTargetName ); if ( aResult != ::osl::FileBase::E_None ) { - ::rtl::OString aMsg( "WordbookMigration::copyFiles: cannot copy " ); - aMsg += ::rtl::OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " - + ::rtl::OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); + OString aMsg( "WordbookMigration::copyFiles: cannot copy " ); + aMsg += OUStringToOString( *aI, RTL_TEXTENCODING_UTF8 ) + " to " + + OUStringToOString( sTargetName, RTL_TEXTENCODING_UTF8 ); OSL_FAIL( aMsg.getStr() ); } } @@ -228,7 +228,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) // XServiceInfo // ----------------------------------------------------------------------------- - ::rtl::OUString WordbookMigration::getImplementationName() throw (RuntimeException) + OUString WordbookMigration::getImplementationName() throw (RuntimeException) { return WordbookMigration_getImplementationName(); } @@ -243,7 +243,7 @@ bool IsUserWordbook( const ::rtl::OUString& rFile ) // ----------------------------------------------------------------------------- - Sequence< ::rtl::OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException) + Sequence< OUString > WordbookMigration::getSupportedServiceNames() throw (RuntimeException) { return WordbookMigration_getSupportedServiceNames(); } diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index 9a150c980183..140800931ed8 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -38,8 +38,8 @@ namespace migration { //......................................................................... - ::rtl::OUString SAL_CALL WordbookMigration_getImplementationName(); - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WordbookMigration_getSupportedServiceNames(); + OUString SAL_CALL WordbookMigration_getImplementationName(); + ::com::sun::star::uno::Sequence< OUString > SAL_CALL WordbookMigration_getSupportedServiceNames(); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL WordbookMigration_create( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext ) SAL_THROW( (::com::sun::star::uno::Exception) ); @@ -58,9 +58,9 @@ namespace migration { private: ::osl::Mutex m_aMutex; - ::rtl::OUString m_sSourceDir; + OUString m_sSourceDir; - TStringVectorPtr getFiles( const ::rtl::OUString& rBaseURL ) const; + TStringVectorPtr getFiles( const OUString& rBaseURL ) const; ::osl::FileBase::RC checkAndCreateDirectory( INetURLObject& rDirURL ); void copyFiles(); @@ -69,11 +69,11 @@ namespace migration virtual ~WordbookMigration(); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() + virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& rServiceName ) + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // XInitialization diff --git a/desktop/source/offacc/acceptor.cxx b/desktop/source/offacc/acceptor.cxx index 2402a889746a..56471ca3aa8c 100644 --- a/desktop/source/offacc/acceptor.cxx +++ b/desktop/source/offacc/acceptor.cxx @@ -47,7 +47,7 @@ Acceptor::Acceptor( const Reference< XMultiServiceFactory >& rFactory ) // get component context m_rContext = comphelper::getComponentContext(m_rSMgr); m_rAcceptor = Reference< XAcceptor > (m_rSMgr->createInstance( - rtl::OUString("com.sun.star.connection.Acceptor" )), + OUString("com.sun.star.connection.Acceptor" )), UNO_QUERY ); m_rBridgeFactory = BridgeFactory::create(m_rContext); } @@ -114,7 +114,7 @@ void SAL_CALL Acceptor::run() // thus preventing the bridge from being disposed. When the remote end releases // the bridge, it will be destructed. Reference< XBridge > rBridge = m_rBridgeFactory->createBridge( - rtl::OUString() ,m_aProtocol ,rConnection ,rInstanceProvider ); + OUString() ,m_aProtocol ,rConnection ,rInstanceProvider ); osl::MutexGuard g(m_aMutex); m_bridges.add(rBridge); } catch (const Exception& e) { diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 6747419d5368..2cc191bf88d2 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -49,7 +49,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::unopkg; -using ::rtl::OUString; namespace { struct ExtensionName diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 3368f75300bf..430401fc3bc6 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -47,7 +47,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; using namespace ::unopkg; -using ::rtl::OUString; namespace { @@ -130,7 +129,7 @@ CommandEnvironmentImpl::~CommandEnvironmentImpl() } catch (const RuntimeException & exc) { (void) exc; - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( exc.Message, osl_getThreadTextEncoding() ).getStr() ); } } @@ -348,7 +347,7 @@ void CommandEnvironmentImpl::update_( Any const & Status ) return; } else { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "WARNING: " ); deployment::DeploymentException dp_exc; if (Status >>= dp_exc) { diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 81388092cc59..0133d7d54621 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -40,8 +40,6 @@ #include "comphelper/sequence.hxx" #include <stdio.h> -using ::rtl::OUString; -using ::rtl::OString; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; @@ -50,10 +48,10 @@ namespace unopkg { bool getLockFilePath(OUString & out); -::rtl::OUString toString( OptionInfo const * info ) +OUString toString( OptionInfo const * info ) { OSL_ASSERT( info != 0 ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii("--"); buf.appendAscii(info->m_name); if (info->m_short_option != '\0') @@ -93,7 +91,7 @@ OptionInfo const * getOptionInfo( } } } - OSL_FAIL( ::rtl::OUStringToOString( + OSL_FAIL( OUStringToOString( opt, osl_getThreadTextEncoding() ).getStr() ); return 0; } @@ -224,7 +222,7 @@ OUString makeAbsoluteFileUrl( base_url.pData, file_url.pData, &abs.pData ) != osl_File_E_None) { if (throw_exc) { - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "making absolute file url failed: \"" ); buf.append( base_url ); buf.appendAscii( "\" (base-url) and \"" ); @@ -381,7 +379,7 @@ Reference<XComponentContext> connectToOffice( args[ 1 ] = "--nodefault"; OUString pipeId( ::dp_misc::generateRandomPipeId() ); - ::rtl::OUStringBuffer buf; + OUStringBuffer buf; buf.appendAscii( "--accept=pipe,name=" ); buf.append( pipeId ); buf.appendAscii( ";urp;" ); @@ -446,8 +444,8 @@ Reference<XComponentContext> getUNO( // do not create any user data (for the root user) in --shared mode: if (shared) { rtl::Bootstrap::set( - rtl::OUString("CFG_CacheUrl"), - rtl::OUString()); + OUString("CFG_CacheUrl"), + OUString()); } // hold lock during process runtime: diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index f063cf6c1e92..e12a9655b5ae 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -49,24 +49,24 @@ struct OptionInfo struct LockFileException : public css::uno::Exception { - LockFileException(::rtl::OUString const & sMessage) : + LockFileException(OUString const & sMessage) : css::uno::Exception(sMessage, css::uno::Reference< css::uno::XInterface > ()) {} }; //============================================================================== -::rtl::OUString toString( OptionInfo const * info ); +OUString toString( OptionInfo const * info ); //============================================================================== OptionInfo const * getOptionInfo( OptionInfo const * list, - ::rtl::OUString const & opt, sal_Unicode copt = '\0' ); + OUString const & opt, sal_Unicode copt = '\0' ); //============================================================================== bool isOption( OptionInfo const * option_info, sal_uInt32 * pIndex ); //============================================================================== bool readArgument( - ::rtl::OUString * pValue, OptionInfo const * option_info, + OUString * pValue, OptionInfo const * option_info, sal_uInt32 * pIndex ); //============================================================================== @@ -87,14 +87,14 @@ inline bool readOption( */ bool isBootstrapVariable(sal_uInt32 * pIndex); //============================================================================== -::rtl::OUString const & getExecutableDir(); +OUString const & getExecutableDir(); //============================================================================== -::rtl::OUString const & getProcessWorkingDir(); +OUString const & getProcessWorkingDir(); //============================================================================== -::rtl::OUString makeAbsoluteFileUrl( - ::rtl::OUString const & sys_path, ::rtl::OUString const & base_url, +OUString makeAbsoluteFileUrl( + OUString const & sys_path, OUString const & base_url, bool throw_exc = true ); //############################################################################## @@ -102,7 +102,7 @@ bool isBootstrapVariable(sal_uInt32 * pIndex); //============================================================================== css::uno::Reference<css::ucb::XCommandEnvironment> createCmdEnv( css::uno::Reference<css::uno::XComponentContext> const & xContext, - ::rtl::OUString const & logFile, + OUString const & logFile, bool option_force_overwrite, bool option_verbose, bool option_suppressLicense); diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index f14ee311d489..ac92ea813ef1 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -580,7 +580,7 @@ void SplashScreen::Paint( const Rectangle&) Rectangle aNativeControlRegion, aNativeContentRegion; if( GetNativeControlRegion( CTRL_INTROPROGRESS, PART_ENTIRE_CONTROL, aDrawRect, - CTRL_STATE_ENABLED, aValue, rtl::OUString(), + CTRL_STATE_ENABLED, aValue, OUString(), aNativeControlRegion, aNativeContentRegion ) ) { long nProgressHeight = aNativeControlRegion.GetHeight(); @@ -633,13 +633,13 @@ css::uno::Reference< css::uno::XInterface > desktop::splash::create( return static_cast< cppu::OWeakObject * >(new SplashScreen); } -rtl::OUString desktop::splash::getImplementationName() { - return rtl::OUString("com.sun.star.office.comp.SplashScreen"); +OUString desktop::splash::getImplementationName() { + return OUString("com.sun.star.office.comp.SplashScreen"); } -css::uno::Sequence< rtl::OUString > desktop::splash::getSupportedServiceNames() { - rtl::OUString name("com.sun.star.office.SplashScreen"); - return css::uno::Sequence< rtl::OUString >(&name, 1); +css::uno::Sequence< OUString > desktop::splash::getSupportedServiceNames() { + OUString name("com.sun.star.office.SplashScreen"); + return css::uno::Sequence< OUString >(&name, 1); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 191f8d955c67..0d64f080805e 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -41,9 +41,9 @@ create( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const &); -rtl::OUString SAL_CALL getImplementationName(); +OUString SAL_CALL getImplementationName(); -com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL +com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(); } } |