diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 13:15:07 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 13:15:07 +0100 |
| commit | 100ea21fc36490d1c620f2b88cdcb676caa90e97 (patch) | |
| tree | 25c70ae0c860566f9a6694438cfcc5faa297c7e7 | |
| parent | 5a86941e3398ce714765a1e29b973a0dafc55e41 (diff) | |
| parent | 47e57a62dd7d7c747f0fe50b22bbd277b23ace05 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/libs-gui
| -rw-r--r-- | toolkit/inc/toolkit/helper/macros.hxx | 4 | ||||
| -rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 2 | ||||
| -rw-r--r-- | unotools/source/config/regoptions.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx index 243ab8e4563d..f3f96824e079 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 cde41f613683..39a384dfd591 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 aad9dc205c3a..4328ed3ebcfe 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_CONSTASCII_USTRINGPARAM( #name )); \ return sName; \ } |