summaryrefslogtreecommitdiff
path: root/desktop/source/app
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/source/app')
-rw-r--r--desktop/source/app/app.cxx156
-rw-r--r--desktop/source/app/appfirststart.cxx3
-rw-r--r--desktop/source/app/appinit.cxx13
-rw-r--r--desktop/source/app/check_ext_deps.cxx9
-rw-r--r--desktop/source/app/cmdlineargs.cxx51
-rw-r--r--desktop/source/app/cmdlineargs.hxx70
-rw-r--r--desktop/source/app/cmdlinehelp.cxx16
-rw-r--r--desktop/source/app/configinit.cxx1
-rw-r--r--desktop/source/app/desktopcontext.cxx1
-rw-r--r--desktop/source/app/desktopcontext.hxx2
-rw-r--r--desktop/source/app/dispatchwatcher.cxx55
-rw-r--r--desktop/source/app/dispatchwatcher.hxx14
-rw-r--r--desktop/source/app/langselect.cxx5
-rw-r--r--desktop/source/app/langselect.hxx18
-rw-r--r--desktop/source/app/lockfile2.cxx12
-rw-r--r--desktop/source/app/officeipcthread.cxx75
-rw-r--r--desktop/source/app/officeipcthread.hxx36
-rw-r--r--desktop/source/app/sofficemain.cxx2
-rw-r--r--desktop/source/app/userinstall.cxx16
19 files changed, 270 insertions, 285 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 )
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 10:26:44 +0000