Remove RTL_CONSTASCII_(U)STRING in forms

Change-Id: I5086a8ba9073e8ef2dfde0ecae55ee6065cb0253

5 files changed, 6 insertions, 6 deletions

diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index b0b71fa35ddb..416453305574 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -93,7 +93,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("com.sun.star.comp.forms.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#ImplName)); }
+        { return ::rtl::OUString("com.sun.star.comp.forms.") + ::rtl::OUString(#ImplName); }
 
     class OControlModel;
 
diff --git a/forms/source/inc/forms_module.hxx b/forms/source/inc/forms_module.hxx
index f172f71ee1ff..2eaada90d15c 100644
--- a/forms/source/inc/forms_module.hxx
+++ b/forms/source/inc/forms_module.hxx
@@ -228,7 +228,7 @@ namespace FORMS_MODULE_NAMESPACE
         } \
         \
         ::rtl::OUString SAL_CALL classname::getImplementationName_Static() \
-        { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.forms."#classname ) ); } \
+        { return ::rtl::OUString( "com.sun.star.comp.forms."#classname ); } \
         \
         Reference< XInterface > SAL_CALL classname::Create( const Reference< XMultiServiceFactory >& _rxFactory ) \
         { return static_cast< XServiceInfo* >( new classname( _rxFactory ) ); } \
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 0ba171fcd1a7..2c2ce38172d7 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -123,7 +123,7 @@ void registerClassInfo(
 //.......................................................................................
 #define REGISTER_CLASS_CORE(classImplName) \
     registerClassInfo( \
-        ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(#classImplName)), \
+        ::rtl::OUString("com.sun.star.form.") + ::rtl::OUString(#classImplName), \
         aServices, \
         frm::classImplName##_CreateInstance)
 
@@ -265,7 +265,7 @@ void ensureClassInfos()
     // = XForms core
 #define REGISTER_XFORMS_CLASS(name) \
     aServices.realloc(1); \
-    aServices.getArray()[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xforms." #name )); \
+    aServices.getArray()[0] = rtl::OUString( "com.sun.star.xforms." #name ); \
     REGISTER_CLASS_CORE(name)
 
     REGISTER_XFORMS_CLASS(Model);
diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx
index 2ea8f2c28810..6b045babb247 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -59,7 +59,7 @@ namespace frm
 
         // defaults
         Font aFont = Application::GetSettings().GetStyleSettings().GetAppFont();
-        aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Times New Roman" ) ) );
+        aFont.SetName( String( "Times New Roman" ) );
         pPool->SetPoolDefaultItem( SvxFontItem( aFont.GetFamily(), aFont.GetName(), String(), aFont.GetPitch(), aFont.GetCharSet(), EE_CHAR_FONTINFO ) );
 
         // 12 pt font size
diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx
index eca642f42c08..c5b2cc40ab61 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -468,7 +468,7 @@ namespace frm
             {
                 m_pViewport->Push( PUSH_FONT );
                 m_pViewport->SetFont( m_pEngine->GetStandardFont(0) );
-                nFontWidth = m_pViewport->GetTextWidth( String( RTL_CONSTASCII_USTRINGPARAM( "x" ) ) );
+                nFontWidth = m_pViewport->GetTextWidth( String( "x" ) );
                 m_pViewport->Pop();
             }
             // ... is the scroll size for the horizontal scrollbar