[Libreoffice-commits] .: framework/inc sfx2/inc xmlhelp/source

[David Tardon]

 framework/inc/dispatchcommands.h                 |    8 ++++----
 sfx2/inc/sfx2/sfxuno.hxx                         |    4 ++--
 xmlhelp/source/cxxhelp/inc/util/Decompressor.hxx |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit cd27e2a5108e0e9acf24758424e654e06f35dbaa
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Wed Dec 15 07:50:23 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM

diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h
index d470ba3..7ddb4fc 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 7f180c0..683fa0c 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 de29a77..8e0e41c 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;
             }