Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


Hello,

Here is a patch for some files

(LGPLv3+ / MPL)

Julien.
commit 492e63b1f62474aaacd6ba08e3a3fac785bc5469
Author: serval <serval2412@yahoo.fr>
Date:   Sun Dec 19 15:45:00 2010 +0100

    RTL_CONSTASCII_USTRINGPARAM

diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx
index 4e5fa6b..3cde7eb 100644
--- a/toolkit/inc/toolkit/helper/macros.hxx
+++ b/toolkit/inc/toolkit/helper/macros.hxx
@@ -292,7 +292,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa
 // -------------------------------------------------------------------------------------
 
 #define DECLIMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \
-    ::rtl::OUString SAL_CALL getImplementationName(  ) 
throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( 
"stardiv.Toolkit." #ImplName ); } \
+    ::rtl::OUString SAL_CALL getImplementationName(  ) 
throw(::com::sun::star::uno::RuntimeException) { return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.Toolkit." #ImplName )); } \
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() 
throw(::com::sun::star::uno::RuntimeException)      \
                             { \
                                 ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = 
BaseClass::getSupportedServiceNames( ); \
@@ -304,7 +304,7 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa
 // -------------------------------------------------------------------------------------
 
 #define DECLIMPL_SERVICEINFO( ImplName, ServiceName ) \
-    ::rtl::OUString SAL_CALL getImplementationName(  ) 
throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( 
"stardiv.Toolkit." #ImplName ); } \
+    ::rtl::OUString SAL_CALL getImplementationName(  ) 
throw(::com::sun::star::uno::RuntimeException) { return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.Toolkit." #ImplName )); } \
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() 
throw(::com::sun::star::uno::RuntimeException)      \
                             { \
                                 ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames( 1 ); \
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index ec3f402..9e82976 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -80,7 +80,7 @@ using ::com::sun::star::uno::Reference;
 using namespace ::toolkit;
 
 #define IMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \
-    ::rtl::OUString SAL_CALL ImplName::getImplementationName(  ) 
throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString::createFromAscii( 
"stardiv.Toolkit." #ImplName ); } \
+    ::rtl::OUString SAL_CALL ImplName::getImplementationName(  ) 
throw(::com::sun::star::uno::RuntimeException) { return 
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "stardiv.Toolkit." #ImplName )); } \
     ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL 
ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException)    \
                             { \
                                 ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = 
BaseClass::getSupportedServiceNames( ); \
diff --git a/unotools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx
index f201a84..02cee3c 100644
--- a/unotools/source/config/regoptions.cxx
+++ b/unotools/source/config/regoptions.cxx
@@ -139,7 +139,7 @@ namespace utl
     #define DECLARE_STATIC_LAZY_USTRING( name )        \
     static const ::rtl::OUString& lcl_get##name##Name()        \
     {  \
-        static const ::rtl::OUString sName = ::rtl::OUString::createFromAscii( #name );        \
+        static const ::rtl::OUString sName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( #name 
));    \
         return sName;  \
     }
 

Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.