[Libreoffice] EasyHack RTL_CONSTASCII_USTRINGPARAM in cui

[Joost Eekhoorn]

MPL 1.1 / GPLv3+ / LGPLv3+

In ./cui/source/tabpages/numpages.cxx (line 2852):
    String sMsg( RTL_CONSTASCII_USTRINGPARAM( "Preview") );

Should that not be RTL_CONSTASCII_STRINGPARAM, because sMsg is a String and
not a OUString?

Joost

diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 469c6ea..e1ddae0 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -2730,9 +2730,9 @@ void OfaSmartTagOptionsTabPage::FillListBox( const SmartTagMgr& rSmartTagMgr )
                 aSmartTagCaption = aSmartTagType;
 
             const rtl::OUString aLBEntry = aSmartTagCaption +
-                                           OUString::createFromAscii(" (") +
+                                           OUString(RTL_CONSTASCII_USTRINGPARAM(" (")) +
                                            aName +
-                                           OUString::createFromAscii(")");
+                                           OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
 
             SvLBoxEntry* pEntry = m_aSmartTagTypesLB.SvTreeListBox::InsertEntry( aLBEntry );
             if ( pEntry )

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 0db81ac..582f34b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -91,7 +91,6 @@ using namespace com::sun::star::text;
 using namespace com::sun::star::container;
 using namespace com::sun::star::style;
 using rtl::OUString;
-#define C2U(cChar) OUString::createFromAscii(cChar)
 
 SV_IMPL_PTRARR(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr);
 
@@ -126,7 +125,7 @@ Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
 {
     Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
     Reference < XInterface > xI = xMSF->createInstance(
-        ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) );
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.DefaultNumberingProvider" )) );
     Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY);
     DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"");
 

_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice