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

Code clean up.

Browse Source
This commit is contained in:
Stephan Bergmann 2012-01-20 11:49:53 +01:00
parent 9807566e12
commit b855cd62f6
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cpputools/source/unoexe/unoexe.cxx
View File

@ -160,7 +160,7 @@ static const char arUsingText[] =
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt, static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
sal_Int32 * pnIndex, const OUString & aArg) sal_uInt32 * pnIndex, const OUString & aArg)
throw (RuntimeException) throw (RuntimeException)
{ {
const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-")); const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
@ -178,7 +178,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
++(*pnIndex); ++(*pnIndex);
rtl_getAppCommandArg(*pnIndex, &pValue->pData); rtl_getAppCommandArg(*pnIndex, &pValue->pData);
if (*pnIndex >= (sal_Int32)rtl_getAppCommandArgCount() || pValue->copy(1).equals(dash)) if (*pnIndex >= rtl_getAppCommandArgCount() || pValue->copy(1).equals(dash))
{ {
OUStringBuffer buf( 32 ); OUStringBuffer buf( 32 );
buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("incomplete option \"-") ); buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("incomplete option \"-") );
@ -217,7 +217,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt, static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
sal_Int32 * pnIndex, const OUString & aArg) sal_uInt32 * pnIndex, const OUString & aArg)
{ {
const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--")); const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
OUString aOpt = OUString::createFromAscii(pOpt); OUString aOpt = OUString::createFromAscii(pOpt);
@ -610,9 +610,10 @@ void ODisposingListener::waitFor( const Reference< XComponent > & xComp )
using namespace unoexe; using namespace unoexe;
SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,) SAL_IMPLEMENT_MAIN()
{ {
if (argc <= 1) sal_uInt32 nCount = rtl_getAppCommandArgCount();
if (nCount == 0)
{ {
out( arUsingText ); out( arUsingText );
return 0; return 0;
@ -636,8 +637,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
bool bNewRegistryMimic = false; bool bNewRegistryMimic = false;
OUString aReadWriteRegistry; OUString aReadWriteRegistry;
sal_Int32 nPos = 0; sal_uInt32 nPos = 0;
sal_Int32 nCount = (sal_Int32)rtl_getAppCommandArgCount();
// read up to arguments // read up to arguments
while (nPos < nCount) while (nPos < nCount)
{ {
@ -728,7 +728,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
aParams.realloc( nCount - nPos ); aParams.realloc( nCount - nPos );
OUString * pParams = aParams.getArray(); OUString * pParams = aParams.getArray();
sal_Int32 nOffset = nPos; sal_uInt32 nOffset = nPos;
for ( ; nPos < nCount; ++nPos ) for ( ; nPos < nCount; ++nPos )
{ {
if (rtl_getAppCommandArg( nPos, &pParams[nPos -nOffset].pData ) if (rtl_getAppCommandArg( nPos, &pParams[nPos -nOffset].pData )