[Libreoffice-commits] .: forms/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Dec 22 13:22:17 PST 2010
forms/source/inc/FormComponent.hxx | 2 +-
forms/source/misc/services.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 236c46bc71edf973aa1f8c0c133fee39e5c88b82
Author: serval <serval at ilapharm.com>
Date: Wed Dec 22 21:21:00 2010 +0000
RTL_CONSTASCII_USTRINGPARAM
diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 0beb592..8fcb31d 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -104,7 +104,7 @@ namespace frm
// old macro for quickly implementing XServiceInfo::getImplementationName
#define IMPLEMENTATION_NAME(ImplName) \
virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) \
- { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.") ) + ::rtl::OUString::createFromAscii(#ImplName); }
+ { return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.forms.") ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); }
class OControlModel;
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 844180f..e1beaaf 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -134,7 +134,7 @@ void registerClassInfo(
//.......................................................................................
#define REGISTER_CLASS_CORE(classImplName) \
registerClassInfo( \
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.") ) + ::rtl::OUString::createFromAscii(#classImplName), \
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.") ) + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \
aServices, \
frm::classImplName##_CreateInstance)
@@ -276,7 +276,7 @@ void ensureClassInfos()
// = XForms core
#define REGISTER_XFORMS_CLASS(name) \
aServices.realloc(1); \
- aServices.getArray()[0] = rtl::OUString::createFromAscii( "com.sun.star.xforms." #name ); \
+ aServices.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xforms." #name )); \
REGISTER_CLASS_CORE(name)
REGISTER_XFORMS_CLASS(Model);
More information about the Libreoffice-commits
mailing list