[Libreoffice-commits] .: desktop/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Dec 30 02:22:25 PST 2012
desktop/source/app/app.cxx | 2
desktop/source/app/cmdlineargs.cxx | 86 ++++++++++++++++-----------------
desktop/source/app/configinit.cxx | 4 -
desktop/source/app/dispatchwatcher.cxx | 69 ++++++++++++--------------
desktop/source/app/langselect.cxx | 26 ++++-----
desktop/source/app/officeipcthread.cxx | 3 -
desktop/source/app/sofficemain.cxx | 5 -
7 files changed, 92 insertions(+), 103 deletions(-)
New commits:
commit d1bab2c27356ae652951bd005d187ab6cddd7539
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Sun Dec 30 11:21:11 2012 +0100
RTL_CONSTASCII_(U)STRINGPARAM removed in desktop/source/app
removed OUSTRING() as well
Change-Id: Ib074d4729370a921b6b51d50360e4fa92f3d5ddf
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 7f87969..f7c6f43 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1156,7 +1156,7 @@ void restartOnMac(bool passArguments) {
for (sal_uInt32 i = 0; i < n; ++i) {
rtl::OUString arg;
OSL_VERIFY(osl_getCommandArg(i, &arg.pData) == osl_Process_E_None);
- if (arg.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("--accept="))) {
+ if (arg.match("--accept=")) {
wait = true;
}
rtl::OString arg8;
diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx
index 2320a18..4a8ddcd 100644
--- a/desktop/source/app/cmdlineargs.cxx
+++ b/desktop/source/app/cmdlineargs.cxx
@@ -161,7 +161,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
if ( aArg.toChar() == '-' )
{
// handle this argument as an option
- if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("-n")))
+ if ( aArg.equalsIgnoreAsciiCase("-n"))
{
// force new documents based on the following documents
bForceNewEvent = true;
@@ -173,7 +173,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bStartEvent = false;
bDisplaySpec = false;
}
- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-o" )))
+ else if ( aArg.equalsIgnoreAsciiCase("-o"))
{
// force open documents regardless if they are templates or not
bForceOpenEvent = true;
@@ -185,7 +185,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bStartEvent = false;
bDisplaySpec = false;
}
- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-pt" )))
+ else if ( aArg.equalsIgnoreAsciiCase("-pt"))
{
// Print to special printer
bPrintToEvent = true;
@@ -198,7 +198,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bDisplaySpec = false;
bForceOpenEvent = false;
}
- else if ( aArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "-p" )))
+ else if ( aArg.equalsIgnoreAsciiCase("-p"))
{
// Print to default printer
bPrintEvent = true;
@@ -210,7 +210,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bStartEvent = false;
bDisplaySpec = false;
}
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "view" )))
+ else if ( oArg.equalsIgnoreAsciiCase("view"))
{
// open in viewmode
bOpenEvent = false;
@@ -222,7 +222,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bStartEvent = false;
bDisplaySpec = false;
}
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM( "show" )))
+ else if ( oArg.equalsIgnoreAsciiCase("show"))
{
// open in viewmode
bOpenEvent = false;
@@ -234,7 +234,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bForceOpenEvent = false;
bDisplaySpec = false;
}
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("display")))
+ else if ( oArg.equalsIgnoreAsciiCase("display"))
{
// set display
bOpenEvent = false;
@@ -246,7 +246,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bStartEvent = false;
bDisplaySpec = true;
}
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("language")))
+ else if ( oArg.equalsIgnoreAsciiCase("language"))
{
bOpenEvent = false;
bPrintEvent = false;
@@ -257,23 +257,23 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bStartEvent = false;
bDisplaySpec = false;
}
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("convert-to")))
+ else if ( oArg.equalsIgnoreAsciiCase("convert-to"))
{
bOpenEvent = false;
bConversionEvent = true;
bConversionParamsEvent = true;
}
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("print-to-file")))
+ else if ( oArg.equalsIgnoreAsciiCase("print-to-file"))
{
bOpenEvent = false;
bBatchPrintEvent = true;
}
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("printer-name")) &&
+ else if ( oArg.equalsIgnoreAsciiCase("printer-name") &&
bBatchPrintEvent )
{
bBatchPrinterNameEvent = true;
}
- else if ( oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("outdir")) &&
+ else if ( oArg.equalsIgnoreAsciiCase("outdir") &&
(bConversionEvent || bBatchPrintEvent) )
{
bConversionOutEvent = true;
@@ -284,15 +284,15 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
// primitive tools that /bin/sh offers, ignore them here
if (
#if defined UNX
- !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("backtrace")) &&
- !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("strace")) &&
- !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("valgrind")) &&
+ !oArg.equalsIgnoreAsciiCase("backtrace") &&
+ !oArg.equalsIgnoreAsciiCase("strace") &&
+ !oArg.equalsIgnoreAsciiCase("valgrind") &&
// for X Session Management, handled in
// vcl/unx/generic/app/sm.cxx:
!oArg.match("session=") &&
#endif
//ignore additional legacy options that don't do anything anymore
- !oArg.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("nocrashreport")) &&
+ !oArg.equalsIgnoreAsciiCase("nocrashreport") &&
m_unknown.isEmpty())
{
m_unknown = aArg;
@@ -381,7 +381,7 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg, ::rtl::OUString& oArg )
{
bool bDeprecated = false;
- if (aArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("--")))
+ if (aArg.matchIgnoreAsciiCase("--"))
{
oArg = ::rtl::OUString(aArg.getStr()+2, aArg.getLength()-2);
}
@@ -396,29 +396,29 @@ bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg
return false;
}
- if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "minimized" )) )
+ if ( oArg == "minimized" )
{
m_minimized = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "invisible" )) )
+ else if ( oArg == "invisible" )
{
m_invisible = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "norestore" )) )
+ else if ( oArg == "norestore" )
{
m_norestore = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "nodefault" )) )
+ else if ( oArg == "nodefault" )
{
m_nodefault = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "headless" )) )
+ else if ( oArg == "headless" )
{
// Headless means also invisibile, so set this parameter to true!
m_headless = true;
m_invisible = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "quickstart" )) )
+ else if ( oArg == "quickstart" )
{
#if defined(ENABLE_QUICKSTART_APPLET)
m_quickstart = true;
@@ -430,63 +430,61 @@ bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg
m_noquickstart = true;
m_quickstart = false;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "terminate_after_init" )) )
+ else if ( oArg == "terminate_after_init" )
{
m_terminateafterinit = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "nofirststartwizard" )) )
+ else if ( oArg == "nofirststartwizard" )
{
m_nofirststartwizard = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "nologo" )) )
+ else if ( oArg == "nologo" )
{
m_nologo = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "nolockcheck" )) )
+ else if ( oArg == "nolockcheck" )
{
m_nolockcheck = true;
// Workaround for automated testing
::svt::DocumentLockFile::AllowInteraction( false );
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "help" ))
- || aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ))
- || aArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-?" )))
+ else if ( oArg == "help" || aArg == "-h" || aArg == "-?" )
{
m_help = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "helpwriter" )) )
+ else if ( oArg == "helpwriter" )
{
m_helpwriter = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "helpcalc" )) )
+ else if ( oArg == "helpcalc" )
{
m_helpcalc = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "helpdraw" )) )
+ else if ( oArg == "helpdraw" )
{
m_helpdraw = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "helpimpress" )) )
+ else if ( oArg == "helpimpress" )
{
m_helpimpress = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "helpbase" )) )
+ else if ( oArg == "helpbase" )
{
m_helpbase = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "helpbasic" )) )
+ else if ( oArg == "helpbasic" )
{
m_helpbasic = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "helpmath" )) )
+ else if ( oArg == "helpmath" )
{
m_helpmath = true;
}
- else if ( oArg.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "version" )) )
+ else if ( oArg == "version" )
{
m_version = true;
}
- else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("splash-pipe=")) )
+ else if ( oArg.matchIgnoreAsciiCase("splash-pipe=") )
{
m_splashpipe = true;
}
@@ -496,25 +494,25 @@ bool CommandLineArgs::InterpretCommandLineParameter( const ::rtl::OUString& aArg
the only platform dependent parameter. Should more appear
we should find a better solution
*/
- else if ( aArg.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("-psn")) )
+ else if ( aArg.match("-psn") )
{
m_psn = true;
return true;
}
#endif
- else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("infilter=")))
+ else if ( oArg.matchIgnoreAsciiCase("infilter="))
{
m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("infilter=")));
}
- else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("accept=")))
+ else if ( oArg.matchIgnoreAsciiCase("accept="))
{
m_accept.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("accept=")));
}
- else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("unaccept=")))
+ else if ( oArg.matchIgnoreAsciiCase("unaccept="))
{
m_unaccept.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("unaccept=")));
}
- else if ( oArg.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("language=")))
+ else if ( oArg.matchIgnoreAsciiCase("language="))
{
m_language = oArg.copy(RTL_CONSTASCII_LENGTH("language="));
}
diff --git a/desktop/source/app/configinit.cxx b/desktop/source/app/configinit.cxx
index 8c46728..8e29b49 100644
--- a/desktop/source/app/configinit.cxx
+++ b/desktop/source/app/configinit.cxx
@@ -42,10 +42,6 @@ using uno::UNO_QUERY;
static char const CONFIG_ERROR_HANDLER[] = "configuration.interaction-handler";
// ----------------------------------------------------------------------------
-#define OUSTRING( constascii ) OUString( RTL_CONSTASCII_USTRINGPARAM( constascii ) )
-
-#define k_ERRORHANDLER OUSTRING( CONFIGURATION_ERROR_HANDLER )
-
// ----------------------------------------------------------------------------
// ConfigurationErrorHandler
// ----------------------------------------------------------------------------
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 0ac65aa..cdec83b 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -169,7 +169,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
DispatchList::const_iterator p;
std::vector< DispatchHolder > aDispatches;
- ::rtl::OUString aAsTemplateArg( RTL_CONSTASCII_USTRINGPARAM( "AsTemplate"));
+ ::rtl::OUString aAsTemplateArg( "AsTemplate" );
sal_Bool bSetInputFilter = sal_False;
::rtl::OUString aForcedInputFilter;
@@ -201,33 +201,33 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
Sequence < PropertyValue > aArgs( nCount );
// mark request as user interaction from outside
- aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
- aArgs[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:OpenEvent"));
+ aArgs[0].Name = "Referer";
+ aArgs[0].Value <<= OUString("private:OpenEvent");
if ( aDispatchRequest.aRequestType == REQUEST_PRINT ||
aDispatchRequest.aRequestType == REQUEST_PRINTTO ||
aDispatchRequest.aRequestType == REQUEST_BATCHPRINT ||
aDispatchRequest.aRequestType == REQUEST_CONVERSION)
{
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
- aArgs[2].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("OpenNewView"));
- aArgs[3].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Hidden"));
- aArgs[4].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Silent"));
+ aArgs[1].Name = "ReadOnly";
+ aArgs[2].Name = "OpenNewView";
+ aArgs[3].Name = "Hidden";
+ aArgs[4].Name = "Silent";
}
else
{
Reference < XInteractionHandler2 > xInteraction(
InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
- aArgs[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "InteractionHandler" ));
+ aArgs[1].Name = "InteractionHandler";
aArgs[1].Value <<= xInteraction;
sal_Int16 nMacroExecMode = ::com::sun::star::document::MacroExecMode::USE_CONFIG;
- aArgs[2].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "MacroExecutionMode" ));
+ aArgs[2].Name = "MacroExecutionMode";
aArgs[2].Value <<= nMacroExecMode;
sal_Int16 nUpdateDoc = ::com::sun::star::document::UpdateDocMode::ACCORDING_TO_CONFIG;
- aArgs[3].Name = OUString(RTL_CONSTASCII_USTRINGPARAM( "UpdateDocMode" ));
+ aArgs[3].Name = "UpdateDocMode";
aArgs[3].Value <<= nUpdateDoc;
}
@@ -238,7 +238,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
}
String aName( GetURL_Impl( aDispatchRequest.aURL, aDispatchRequest.aCwdUrl ) );
- ::rtl::OUString aTarget( RTL_CONSTASCII_USTRINGPARAM("_default") );
+ ::rtl::OUString aTarget("_default");
if ( aDispatchRequest.aRequestType == REQUEST_PRINT ||
aDispatchRequest.aRequestType == REQUEST_PRINTTO ||
@@ -259,7 +259,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
aArgs[4].Value <<= sal_True;
// hidden documents should never be put into open tasks
- aTarget = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_blank") );
+ aTarget = "_blank";
}
// load the document ... if they are loadable!
// Otherwise try to dispatch it ...
@@ -320,7 +320,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
// Otherwise it would be possible to have an office running without an open
// window!!
Sequence < PropertyValue > aArgs2(1);
- aArgs2[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SynchronMode"));
+ aArgs2[0].Name = "SynchronMode";
aArgs2[0].Value <<= sal_True;
Reference < XNotifyingDispatch > xDisp( xDispatcher, UNO_QUERY );
if ( xDisp.is() )
@@ -330,8 +330,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
}
catch (const ::com::sun::star::uno::Exception&)
{
- OUString aMsg = OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Desktop::OpenDefault() IllegalArgumentException while calling XNotifyingDispatch: "));
+ OUString aMsg = "Desktop::OpenDefault() IllegalArgumentException while calling XNotifyingDispatch: ";
OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
}
}
@@ -340,7 +339,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
{
INetURLObject aObj( aName );
if ( aObj.GetProtocol() == INET_PROT_PRIVATE )
- aTarget = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("_default") );
+ aTarget = "_default";
// Set "AsTemplate" argument according to request type
if ( aDispatchRequest.aRequestType == REQUEST_FORCENEW ||
@@ -359,7 +358,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
if(aDispatchRequest.aRequestType == REQUEST_VIEW) {
sal_Int32 nIndex = aArgs.getLength();
aArgs.realloc(nIndex+1);
- aArgs[nIndex].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly"));
+ aArgs[nIndex].Name = "ReadOnly";
aArgs[nIndex].Value <<= sal_True;
}
@@ -367,7 +366,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
if(aDispatchRequest.aRequestType == REQUEST_START) {
sal_Int32 nIndex = aArgs.getLength();
aArgs.realloc(nIndex+1);
- aArgs[nIndex].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("StartPresentation"));
+ aArgs[nIndex].Name = "StartPresentation";
aArgs[nIndex].Value <<= sal_True;
}
@@ -376,7 +375,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
{
sal_Int32 nIndex = aArgs.getLength();
aArgs.realloc(nIndex+1);
- aArgs[nIndex].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("FilterName"));
+ aArgs[nIndex].Name = "FilterName";
aArgs[nIndex].Value <<= aForcedInputFilter;
}
@@ -387,15 +386,13 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
}
catch (const ::com::sun::star::lang::IllegalArgumentException& iae)
{
- OUString aMsg = OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Dispatchwatcher IllegalArgumentException while calling loadComponentFromURL: "))
+ OUString aMsg = "Dispatchwatcher IllegalArgumentException while calling loadComponentFromURL: "
+ iae.Message;
OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
}
catch (const com::sun::star::io::IOException& ioe)
{
- OUString aMsg = OUString(RTL_CONSTASCII_USTRINGPARAM(
- "Dispatchwatcher IOException while calling loadComponentFromURL: "))
+ OUString aMsg = "Dispatchwatcher IOException while calling loadComponentFromURL: "
+ ioe.Message;
OSL_FAIL( OUStringToOString(aMsg, RTL_TEXTENCODING_ASCII_US).getStr());
}
@@ -443,7 +440,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
aOutFilename.SetExtension( aFilterExt );
FileBase::getFileURLFromSystemPath( aFilterOut, aFilterOut );
rtl::OUString aOutFile = aFilterOut+
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ))+
+ "/" +
aOutFilename.getName();
if ( bGuess )
@@ -452,10 +449,10 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
}
Sequence<PropertyValue> conversionProperties( 2 );
- conversionProperties[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Overwrite" ));
+ conversionProperties[0].Name = "Overwrite";
conversionProperties[0].Value <<= sal_True;
- conversionProperties[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "FilterName" ));
+ conversionProperties[1].Name = "FilterName";
conversionProperties[1].Value <<= aFilter;
rtl::OUString aTempName;
@@ -488,10 +485,10 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
aPrinterName=aParam.copy( 0, nPathIndex );
INetURLObject aOutFilename( aObj );
- aOutFilename.SetExtension( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ps")) );
+ aOutFilename.SetExtension( "ps" );
FileBase::getFileURLFromSystemPath( aFilterOut, aFilterOut );
rtl::OUString aOutFile = aFilterOut+
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/" ))+
+ "/" +
aOutFilename.getName();
rtl::OUString aTempName;
@@ -507,16 +504,16 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
Sequence < PropertyValue > aPrinterArgs( 1 );
if( !aPrinterName.isEmpty() )
{
- aPrinterArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ aPrinterArgs[0].Name = "Name";
aPrinterArgs[0].Value <<= aPrinterName;
xDoc->setPrinter( aPrinterArgs );
}
// print ( also without user interaction )
aPrinterArgs.realloc(2);
- aPrinterArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FileName"));
+ aPrinterArgs[0].Name = "FileName";
aPrinterArgs[0].Value <<= aOutFile;
- aPrinterArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
+ aPrinterArgs[1].Name = "Wait";
aPrinterArgs[1].Value <<= ( sal_Bool ) sal_True;
xDoc->print( aPrinterArgs );
} else {
@@ -524,14 +521,14 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
{
// create the printer
Sequence < PropertyValue > aPrinterArgs( 1 );
- aPrinterArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ aPrinterArgs[0].Name = "Name";
aPrinterArgs[0].Value <<= ::rtl::OUString( aDispatchRequest.aPrinterName );
xDoc->setPrinter( aPrinterArgs );
}
// print ( also without user interaction )
Sequence < PropertyValue > aPrinterArgs( 1 );
- aPrinterArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Wait"));
+ aPrinterArgs[0].Name = "Wait";
aPrinterArgs[0].Value <<= ( sal_Bool ) sal_True;
xDoc->print( aPrinterArgs );
}
@@ -568,9 +565,9 @@ 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 = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Referer"));
- aArgs[0].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:OpenEvent"));
- aArgs[1].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SynchronMode"));
+ aArgs[0].Name = "Referer";
+ aArgs[0].Value <<= ::rtl::OUString("private:OpenEvent");
+ aArgs[1].Name = "SynchronMode";
aArgs[1].Value <<= sal_True;
for ( sal_uInt32 n = 0; n < aDispatches.size(); n++ )
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index ab30438..5ac1b09 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -112,7 +112,7 @@ bool LanguageSelection::prepareLanguage()
try
{
Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.System/L10N/", sal_False), UNO_QUERY_THROW);
- Any aWin16SysLocale = xProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("SystemLocale")));
+ Any aWin16SysLocale = xProp->getPropertyValue("SystemLocale");
::rtl::OUString sWin16SysLocale;
aWin16SysLocale >>= sWin16SysLocale;
if( !sWin16SysLocale.isEmpty())
@@ -129,7 +129,7 @@ bool LanguageSelection::prepareLanguage()
OUString usLocale;
Reference< XPropertySet > xLocaleProp(getConfigAccess(
"org.openoffice.System/L10N", sal_True), UNO_QUERY_THROW);
- xLocaleProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("Locale"))) >>= usLocale;
+ xLocaleProp->getPropertyValue("Locale") >>= usLocale;
setDefaultLanguage(usLocale);
}
catch (const Exception&)
@@ -193,7 +193,7 @@ bool LanguageSelection::prepareLanguage()
if ( !bCmdLanguage )
{
// Store language only
- xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale")), makeAny(aLocaleString));
+ xProp->setPropertyValue("ooLocale", makeAny(aLocaleString));
Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
}
@@ -201,14 +201,14 @@ bool LanguageSelection::prepareLanguage()
{
// Store language only
Reference< XPropertySet > xProp2(getConfigAccess("org.openoffice.Office.Linguistic/General/", sal_True), UNO_QUERY_THROW);
- xProp2->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale")), makeAny(aLocaleString));
+ xProp2->setPropertyValue("UILocale", makeAny(aLocaleString));
Reference< XChangesBatch >(xProp2, UNO_QUERY_THROW)->commitChanges();
}
MsLangId::setConfiguredSystemUILanguage( aUILanguageTag.getLanguageType( false) );
OUString sLocale;
- xProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("ooSetupSystemLocale"))) >>= sLocale;
+ xProp->getPropertyValue("ooSetupSystemLocale") >>= sLocale;
if ( !sLocale.isEmpty() )
{
LanguageTag aLocaleLanguageTag(sLocale);
@@ -308,11 +308,11 @@ OUString LanguageSelection::getLanguageString()
}
}
// fallback 1: en-US
- OUString usFB(RTL_CONSTASCII_USTRINGPARAM("en-US"));
+ OUString usFB("en-US");
if (isInstalledLanguage(usFB))
{
bFoundLanguage = sal_True;
- aFoundLanguage = OUString(RTL_CONSTASCII_USTRINGPARAM("en-US"));
+ aFoundLanguage = "en-US";
return aFoundLanguage;
}
@@ -330,9 +330,9 @@ Reference< XNameAccess > LanguageSelection::getConfigAccess(const sal_Char* pPat
try{
OUString sAccessSrvc;
if (bUpdate)
- sAccessSrvc = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationUpdateAccess"));
+ sAccessSrvc = "com.sun.star.configuration.ConfigurationUpdateAccess";
else
- sAccessSrvc = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.configuration.ConfigurationAccess"));
+ sAccessSrvc = "com.sun.star.configuration.ConfigurationAccess";
OUString sConfigURL = OUString::createFromAscii(pPath);
@@ -371,7 +371,7 @@ static Sequence< OUString > _getFallbackLocales(const OUString& aIsoLang)
Sequence< OUString > seqFallbacks;
if ( aIsoLang == "zh-HK" ) {
seqFallbacks = Sequence< OUString >(1);
- seqFallbacks[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("zh-TW"));
+ seqFallbacks[0] = "zh-TW";
}
return seqFallbacks;
}
@@ -442,7 +442,7 @@ OUString LanguageSelection::getUserLanguage()
{
try
{
- xAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale"))) >>= aUserLanguage;
+ xAccess->getByName("UILocale") >>= aUserLanguage;
}
catch ( NoSuchElementException const & )
{
@@ -466,7 +466,7 @@ OUString LanguageSelection::getSystemLanguage()
{
try
{
- xAccess->getByName(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale"))) >>= aUserLanguage;
+ xAccess->getByName("UILocale") >>= aUserLanguage;
}
catch ( NoSuchElementException const & )
{
@@ -488,7 +488,7 @@ void LanguageSelection::resetUserLanguage()
try
{
Reference< XPropertySet > xProp(getConfigAccess("org.openoffice.Office.Linguistic/General", sal_True), UNO_QUERY_THROW);
- xProp->setPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM("UILocale")), makeAny(OUString()));
+ xProp->setPropertyValue("UILocale", makeAny(OUString()));
Reference< XChangesBatch >(xProp, UNO_QUERY_THROW)->commitChanges();
}
catch ( const PropertyVetoException& )
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 8828311..cc9dd37 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -547,8 +547,7 @@ 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(RTL_CONSTASCII_STRINGPARAM(
- ARGUMENT_PREFIX));
+ rtl::OStringBuffer aArguments(ARGUMENT_PREFIX);
rtl::OUString cwdUrl;
if (!(tools::getProcessWorkingDir(cwdUrl) &&
addArgument(aArguments, '1', cwdUrl)))
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 21317cd..ce226c1 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -37,8 +37,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
{
#if defined ANDROID
try {
- rtl::Bootstrap::setIniFilename(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file:///assets/program/lofficerc")));
+ rtl::Bootstrap::setIniFilename("file:///assets/program/lofficerc");
#endif
tools::extendApplicationEnvironment();
@@ -46,7 +45,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
desktop::Desktop aDesktop;
// This string is used during initialization of the Gtk+ VCL module
- aDesktop.SetAppName( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("soffice")) );
+ aDesktop.SetAppName( OUString("soffice") );
#ifdef UNX
// handle --version and --help already here, otherwise they would be handled
// after VCL initialization that might fail if $DISPLAY is not set
More information about the Libreoffice-commits
mailing list