mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use startsWith rest parameter

Browse Source 
Change-Id: I5ec5f68c13ceb93b4e2cea83ec757b9427b8608d
This commit is contained in:
Stephan Bergmann
2013-11-19 15:43:37 +01:00
parent 72c8db4987
commit 87e407f688
1 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
desktop/source/app/cmdlineargs.cxx
View File

@@ -163,18 +163,11 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
{ {
m_bEmpty = false; m_bEmpty = false;
OUString oArg; OUString oArg;
bool bDeprecated = false; bool bDeprecated = !aArg.startsWith("--", &oArg)
if (aArg.startsWith("--")) && aArg.startsWith("-", &oArg) && aArg.getLength() > 2;
{ // -h, -?, -n, -o, -p are still valid
oArg = OUString(aArg.getStr()+2, aArg.getLength()-2);
}
else if (aArg.startsWith("-"))
{
if ( aArg.getLength() > 2 ) // -h, -o, -n, -? are still valid
bDeprecated = true;
oArg = OUString(aArg.getStr()+1, aArg.getLength()-1);
}
OUString rest;
if ( oArg == "minimized" ) if ( oArg == "minimized" )
{ {
m_minimized = true; m_minimized = true;
@@ -294,25 +287,25 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier )
bDeprecated = false; bDeprecated = false;
} }
#endif #endif
else if ( oArg.startsWith("infilter=")) else if ( oArg.startsWith("infilter=", &rest))
{ {
m_infilter.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("infilter="))); m_infilter.push_back(rest);
} }
else if ( oArg.startsWith("accept=")) else if ( oArg.startsWith("accept=", &rest))
{ {
m_accept.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("accept="))); m_accept.push_back(rest);
} }
else if ( oArg.startsWith("unaccept=")) else if ( oArg.startsWith("unaccept=", &rest))
{ {
m_unaccept.push_back(oArg.copy(RTL_CONSTASCII_LENGTH("unaccept="))); m_unaccept.push_back(rest);
} }
else if ( oArg.startsWith("language=")) else if ( oArg.startsWith("language=", &rest))
{ {
m_language = oArg.copy(RTL_CONSTASCII_LENGTH("language=")); m_language = rest;
} }
else if ( oArg.startsWith("pidfile=")) else if ( oArg.startsWith("pidfile=", &rest))
{ {
m_pidfile = oArg.copy(RTL_CONSTASCII_LENGTH("pidfile=")); m_pidfile = rest;
} }
else if ( oArg == "writer" ) else if ( oArg == "writer" )
{ {