diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2010-12-15 07:50:23 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2010-12-15 07:50:23 +0100 |
| commit | bdf4f2f0d062c9f8db4fc8881c86d52a5a99cd17 (patch) | |
| tree | ba28901855f798e066042a5284cafcefe26f89af | |
| parent | c058db95aeb9b62b1c1e1696d488a918b427247e (diff) | |
RTL_CONSTASCII_USTRINGPARAM
| -rw-r--r-- | framework/inc/dispatchcommands.h | 8 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/sfxuno.hxx | 4 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h index d086a863ea4f..512cd0148801 100644 --- a/framework/inc/dispatchcommands.h +++ b/framework/inc/dispatchcommands.h @@ -43,10 +43,10 @@ namespace framework{ //_________________________________________________________________________________________________________________ -static ::rtl::OUString CMD_UNO_SHOWSTARTMODULE = ::rtl::OUString::createFromAscii(".uno:ShowStartModule"); -static ::rtl::OUString CMD_UNO_CLOSEDOC = ::rtl::OUString::createFromAscii(".uno:CloseDoc" ); -static ::rtl::OUString CMD_UNO_CLOSEWIN = ::rtl::OUString::createFromAscii(".uno:CloseWin" ); -static ::rtl::OUString CMD_UNO_CLOSEFRAME = ::rtl::OUString::createFromAscii(".uno:CloseFrame" ); +static ::rtl::OUString CMD_UNO_SHOWSTARTMODULE(RTL_CONSTASCII_USTRINGPARAM(".uno:ShowStartModule")); +static ::rtl::OUString CMD_UNO_CLOSEDOC(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseDoc")); +static ::rtl::OUString CMD_UNO_CLOSEWIN(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseWin")); +static ::rtl::OUString CMD_UNO_CLOSEFRAME(RTL_CONSTASCII_USTRINGPARAM(".uno:CloseFrame")); } // namespace framework diff --git a/sfx2/inc/sfx2/sfxuno.hxx b/sfx2/inc/sfx2/sfxuno.hxx index 34ddb3689bd2..1933626ab1e3 100644 --- a/sfx2/inc/sfx2/sfxuno.hxx +++ b/sfx2/inc/sfx2/sfxuno.hxx @@ -603,9 +603,9 @@ sal_Bool GetPasswd_Impl( const SfxItemSet* pSet, ::rtl::OUString& rPasswd ); if ( xKey.is () ) \ { \ /* Build new keyname */ \ - sKeyName = UNOOUSTRING::createFromAscii( "/" ) ; \ + sKeyName = UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "/" )) ; \ sKeyName += CLASS::impl_getStaticImplementationName() ; \ - sKeyName += UNOOUSTRING::createFromAscii( "/UNO/SERVICES" ); \ + sKeyName += UNOOUSTRING(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )); \ \ /* Create new key with new name. */ \ xNewKey = xKey->createKey( sKeyName ); \ diff --git a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx index 7f6335c9904f..aaa7244bb674 100644 --- a/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx @@ -120,7 +120,7 @@ namespace xmlsearch { { if( arrayL_ <= index_ ) throw xmlsearch::excep::XmlSearchException( - rtl::OUString::createFromAscii( "ByteArrayDecompressor->getNextByte()" ) ); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ByteArrayDecompressor->getNextByte()" )) ); return array_[index_++] & 0xFF; } |