diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-25 22:58:19 +0100 |
---|---|---|
committer | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-25 22:58:19 +0100 |
commit | ced73bee6811bb68734d9c95ca110820a1758dd2 (patch) | |
tree | 4737bd8437e84a3e63d4cad1853393b0c18dd0c0 | |
parent | 6708ef04536191114eda027011e17037feb40e18 (diff) |
RTL_CONSTASCII_USTRINGPARAM in libs-gui 22
-rw-r--r-- | toolkit/source/controls/unocontrol.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/helper/accessibilityclient.cxx | 4 | ||||
-rw-r--r-- | toolkit/source/layout/core/import.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/layout/core/proplist.cxx | 2 | ||||
-rw-r--r-- | toolkit/workben/layout/sortdlg.cxx | 4 | ||||
-rw-r--r-- | toolkit/workben/layout/test.cxx | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx index c6d309659a4f..40a8dd456516 100644 --- a/toolkit/source/controls/unocontrol.cxx +++ b/toolkit/source/controls/unocontrol.cxx @@ -1428,7 +1428,7 @@ void UnoControl::setDesignMode( sal_Bool bOn ) throw(RuntimeException) disposeAccessibleContext(); aModeChangeEvent.Source = *this; - aModeChangeEvent.NewMode = ::rtl::OUString::createFromAscii( mbDesignMode ? "design" : "alive" ); + aModeChangeEvent.NewMode = mbDesignMode ? ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("design")) : ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("alive" )); } // ajust the visibility of our window diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index c0d0b3006c81..0848e5a2df08 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -205,8 +205,8 @@ namespace toolkit // load the library implementing the factory if ( !s_pFactory.get() ) { - const ::rtl::OUString sModuleName = ::rtl::OUString::createFromAscii( - SVLIBRARY( "acc" ) + const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM( + SVLIBRARY( "acc" )) ); s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 ); if ( s_hAccessibleImplementationModule != NULL ) diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx index a35e70711e62..94291b54a18f 100644 --- a/toolkit/source/layout/core/import.cxx +++ b/toolkit/source/layout/core/import.cxx @@ -129,7 +129,7 @@ SAL_THROW (()) if ( xRadio.is() ) { if (!bSetRadioGroup) - aRadioGroup = OUString::createFromAscii ("default"); + aRadioGroup = OUString(RTL_CONSTASCII_USTRINGPARAM ("default")); pImport->mxRadioGroups.addItem( aRadioGroup, xRadio ); } } diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx index 24c9bc471833..f04350d01362 100644 --- a/toolkit/source/layout/core/proplist.cxx +++ b/toolkit/source/layout/core/proplist.cxx @@ -376,7 +376,7 @@ findAndRemove( const char *pAttr, PropList &rProps, OUString &rValue ) for ( it = rProps.begin(); it != rProps.end(); it++ ) { if ( it->first.equalsIgnoreAsciiCase( aName ) - || it->first.equalsIgnoreAsciiCase( OUString::createFromAscii ("_") + aName ) ) + || it->first.equalsIgnoreAsciiCase( OUString(RTL_CONSTASCII_USTRINGPARAM ("_")) + aName ) ) { rValue = it->second; rProps.erase( it ); diff --git a/toolkit/workben/layout/sortdlg.cxx b/toolkit/workben/layout/sortdlg.cxx index 84b42f5a2656..51fadaa7959f 100644 --- a/toolkit/workben/layout/sortdlg.cxx +++ b/toolkit/workben/layout/sortdlg.cxx @@ -57,9 +57,9 @@ ScSortDlg::ScSortDlg( Window* pParent, AddTabPage( TP_FIELDS, ScTabPageSortFields::Create, 0 ); AddTabPage( TP_OPTIONS, ScTabPageSortOptions::Create, 0 ); #else /* !LAYOUT_SFX_TABDIALOG_BROKEN */ - String fields = rtl::OUString::createFromAscii ("fields"); + String fields(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("fields"))); AddTabPage( TP_FIELDS, fields, ScTabPageSortFields::Create, 0, FALSE, TAB_APPEND); - String options = rtl::OUString::createFromAscii ("options"); + String options(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ("options"))); AddTabPage( TP_OPTIONS, options, ScTabPageSortOptions::Create, 0, FALSE, TAB_APPEND); #endif /* !LAYOUT_SFX_TABDIALOG_BROKEN */ FreeResource(); diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx index f7992d02ae52..ba782a4eca18 100644 --- a/toolkit/workben/layout/test.cxx +++ b/toolkit/workben/layout/test.cxx @@ -147,9 +147,9 @@ void LayoutTest::InitUCB() OUString aEmpty; Sequence< Any > aArgs( 6 ); aArgs[0] - <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL ); + <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL )); aArgs[1] - <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE ); + <<= OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE )); aArgs[2] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("PIPE")); aArgs[3] <<= aEmpty; aArgs[4] <<= OUString(RTL_CONSTASCII_USTRINGPARAM("PORTAL")); @@ -279,7 +279,7 @@ void TestDialog( OUString const& name ) QueryBox query ( 0, WinBits( WB_YES_NO | WB_DEF_YES ), // WinBits( WB_ABORT_RETRY_IGNORE ), - OUString::createFromAscii ("Do you want to do?")); + OUString(RTL_CONSTASCII_USTRINGPARAM ("Do you want to do?"))); RunDialog( query ); } else if ( name.equalsAscii( "recover" ) ) |