diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-01-20 11:35:10 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-01-20 11:35:10 +0100 |
commit | 2fb4d4800c3064c3c7b8573ad39c00d51d9bc41b (patch) | |
tree | 431419e56b4d5851fc57fe472186aa233af2d593 /toolkit/workben | |
parent | a5afd981e8c44de7aa122774a19cfe858c4f671a (diff) |
Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
Diffstat (limited to 'toolkit/workben')
-rw-r--r-- | toolkit/workben/layout/test.cxx | 22 | ||||
-rw-r--r-- | toolkit/workben/layout/uno.hxx | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx index 8d69baccd5f3..071d5c2d1f45 100644 --- a/toolkit/workben/layout/test.cxx +++ b/toolkit/workben/layout/test.cxx @@ -198,22 +198,22 @@ void LayoutTest::ParseCommandLine() for ( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) { OUString aParam = OUString( GetCommandLineParam( i ) ); - if ( aParam.equalsAscii( "-h" ) || aParam.equalsAscii( "--help" ) ) + if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "-h" ) ) || aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--help" ) ) ) usage(); - if ( aParam.equalsAscii( "--inst" ) ) + if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--inst" ) ) ) { if ( i >= GetCommandLineParamCount() - 1) usage(); mInstallDir = GetCommandLineParam( ++i ); setenv( "OOO_INSTALL_PREFIX", OUSTRING_CSTR( mInstallDir ), 1 ); } - else if ( aParam.equalsAscii( "--test" ) ) + else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--test" ) ) ) { mTestDialog = OUString(RTL_CONSTASCII_USTRINGPARAM("zoom")); if (i + 1 < GetCommandLineParamCount()) mTestDialog = GetCommandLineParam( ++i ); } - else if ( aParam.equalsAscii( "--editor" ) ) + else if ( aParam.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "--editor" ) ) ) mEditMode = true; else mFiles.push_back( aParam ); @@ -264,17 +264,17 @@ void TestDialog( OUString const& name ) { if ( 0 ) ; - else if ( name.equalsAscii( "plugin" ) ) + else if ( name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "plugin" ) ) ) { PluginDialog plugin ( 0 ); RunDialog( plugin ); } - else if ( name.equalsAscii( "query" ) ) + else if ( name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "query" ) ) ) { QueryBox query ( 0, "Do you want to do?", "do"); RunDialog( query ); } - else if ( name.equalsAscii( "query-compat" ) ) + else if ( name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "query-compat" ) ) ) { QueryBox query ( 0, WinBits( WB_YES_NO | WB_DEF_YES ), @@ -282,25 +282,25 @@ void TestDialog( OUString const& name ) OUString(RTL_CONSTASCII_USTRINGPARAM ("Do you want to do?"))); RunDialog( query ); } - else if ( name.equalsAscii( "recover" ) ) + else if ( name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "recover" ) ) ) { SvxRecoverDialog recover ( 0 ); RunDialog( recover ); } #if SORT_DLG - else if ( name.equalsAscii( "sort" ) ) + else if ( name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "sort" ) ) ) { LoadSC(); ScSortDlg sort (0, 0); RunDialog( sort ); } #endif /* SORT_DLG */ - else if ( name.equalsAscii( "wordcount" ) ) + else if ( name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "wordcount" ) ) ) { SwWordCountDialog words ( 0 ); RunDialog( words ); } - else if ( name.equalsAscii( "zoom" ) ) + else if ( name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "zoom" ) ) ) { SvxZoomDialog zoom( 0 ); RunDialog( zoom ); diff --git a/toolkit/workben/layout/uno.hxx b/toolkit/workben/layout/uno.hxx index d89024ff8468..94a70e9fdc1e 100644 --- a/toolkit/workben/layout/uno.hxx +++ b/toolkit/workben/layout/uno.hxx @@ -54,7 +54,7 @@ public: virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > SAL_CALL createInstance( const rtl::OUString& aServiceSpecifier ) throw (com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException) { - if ( aServiceSpecifier.equalsAscii( "com.sun.star.awt.Layout" ) ) + if ( aServiceSpecifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.awt.Layout" ) ) ) { fprintf( stderr, "UnoBootstrapLayout: create service '%s'\n", rtl::OUStringToOString (aServiceSpecifier, RTL_TEXTENCODING_UTF8 ).getStr() ); |