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

rtl string api changes

Browse Source
This commit is contained in:
Philipp Lohmann
2001-05-11 07:30:13 +00:00
parent 9a9bf45a9f
commit e52d3244d6
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,9 +2,9 @@
* *
* $RCSfile: unoexe.cxx,v $ * $RCSfile: unoexe.cxx,v $
* *
* $Revision: 1.10 $ * $Revision: 1.11 $
* *
* last change: $Author: dbo $ $Date: 2001-05-10 13:05:49 $ * last change: $Author: pl $ $Date: 2001-05-11 08:30:13 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -147,7 +147,7 @@ static sal_Bool readOption( OUString * pValue, sal_Char const * pOpt,
if (aArg.getLength() < aOpt.getLength()) if (aArg.getLength() < aOpt.getLength())
return sal_False; return sal_False;
if (aArg.getLength() == aOpt.getLength() && aOpt.equalsIgnoreCase( aArg )) if (aArg.getLength() == aOpt.getLength() && aOpt.equalsIgnoreAsciiCase( aArg ))
{ {
// take next argument // take next argument
++(*pnIndex); ++(*pnIndex);
@@ -172,7 +172,7 @@ static sal_Bool readOption( OUString * pValue, sal_Char const * pOpt,
return sal_True; return sal_True;
} }
} }
else if (aOpt.equalsIgnoreCase( aArg.copy( 0, aOpt.getLength() ) )) else if (aOpt.equalsIgnoreAsciiCase( aArg.copy( 0, aOpt.getLength() ) ))
{ {
*pValue = OUString::createFromAscii( pArg + 1 + aOpt.getLength() ); *pValue = OUString::createFromAscii( pArg + 1 + aOpt.getLength() );
#ifdef DEBUG #ifdef DEBUG
@@ -191,7 +191,7 @@ static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
sal_Int32 * pnIndex, const sal_Char * argv[], sal_Int32 argc ) sal_Int32 * pnIndex, const sal_Char * argv[], sal_Int32 argc )
{ {
const sal_Char * pArg = argv[ *pnIndex ]; const sal_Char * pArg = argv[ *pnIndex ];
if (pArg[0] == '-' && pArg[1] == '-' && rtl_str_equalsIgnoreCase( pArg+2, pOpt )) if (pArg[0] == '-' && pArg[1] == '-' && rtl_str_compareIgnoreAsciiCase( pArg+2, pOpt ) == 0 )
{ {
++(*pnIndex); ++(*pnIndex);
*pbOpt = sal_True; *pbOpt = sal_True;
@@ -703,13 +703,16 @@ extern "C" int SAL_CALL main( int argc, const char * argv[] )
if (aUnoUrl.getLength()) // accepting connections if (aUnoUrl.getLength()) // accepting connections
{ {
if (aUnoUrl.getTokenCount( ';' ) != 3 || aUnoUrl.getLength() < 10 || sal_Int32 nIndex = 0, nTokens = 0;
!aUnoUrl.copy( 0, 4 ).equalsIgnoreCase( OUString( RTL_CONSTASCII_USTRINGPARAM("uno:") ) )) do { aUnoUrl.getToken( 0, ';', nIndex ); nTokens++; } while( nIndex != -1 );
if (nTokens != 3 || aUnoUrl.getLength() < 10 ||
!aUnoUrl.copy( 0, 4 ).equalsIgnoreAsciiCase( OUString( RTL_CONSTASCII_USTRINGPARAM("uno:") ) ))
{ {
throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal uno url given!" ) ), Reference< XInterface >() ); throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("illegal uno url given!" ) ), Reference< XInterface >() );
} }
OUString aConnectDescr( aUnoUrl.getToken( 0 ).copy( 4 ) ); // uno:CONNECTDESCR;iiop;InstanceName nIndex = 0;
OUString aInstanceName( aUnoUrl.getToken( 2 ) ); OUString aConnectDescr( aUnoUrl.getToken( 0, ';', nIndex ).copy( 4 ) ); // uno:CONNECTDESCR;iiop;InstanceName
OUString aInstanceName( aUnoUrl.getToken( 1, ';', nIndex ) );
Reference< XAcceptor > xAcceptor; Reference< XAcceptor > xAcceptor;
createInstance( createInstance(
@@ -730,6 +733,8 @@ extern "C" int SAL_CALL main( int argc, const char * argv[] )
xContext, aImplName, aLocation, aServiceName, aInitParams, xContext, aImplName, aLocation, aServiceName, aInitParams,
bSingleInstance, aInstanceName ) ); bSingleInstance, aInstanceName ) );
nIndex = 0;
OUString aUnoUrlToken( aUnoUrl.getToken( 1, ';', nIndex ) );
for (;;) for (;;)
{ {
// accepting // accepting
@@ -746,7 +751,7 @@ extern "C" int SAL_CALL main( int argc, const char * argv[] )
// bridge // bridge
Reference< XBridge > xBridge( xBridgeFactory->createBridge( Reference< XBridge > xBridge( xBridgeFactory->createBridge(
OUString(), aUnoUrl.getToken(1), OUString(), aUnoUrlToken,
xConnection, xInstanceProvider ) ); xConnection, xInstanceProvider ) );
if (bSingleAccept) if (bSingleAccept)