RTL_CONSTASCII_(U)STRINGPARAM removed in comphelper

Change-Id: Ib068c06956bc9f04bb7c468375aacd2e6e9db77d

4 files changed, 47 insertions, 48 deletions

diff --git a/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx
index 7d211036f140..1f8dbd2f14ef 100644
--- a/comphelper/inc/comphelper/documentconstants.hxx
+++ b/comphelper/inc/comphelper/documentconstants.hxx
@@ -32,26 +32,26 @@
 #define MIMETYPE_VND_SUN_XML_MATH_ASCII                 "application/vnd.sun.xml.math"
 #define MIMETYPE_VND_SUN_XML_BASE_ASCII                 "application/vnd.sun.xml.base"
 
-#define MIMETYPE_VND_SUN_XML_WRITER                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_WRITER_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_WRITER_WEB                 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_WRITER_GLOBAL              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_DRAW                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_DRAW_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_IMPRESS                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_CALC                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_CALC_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_CHART                      ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_CHART_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_MATH                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_MATH_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_BASE                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_BASE_ASCII ) )
+#define MIMETYPE_VND_SUN_XML_WRITER                     ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER_WEB                 ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_WEB_ASCII )
+#define MIMETYPE_VND_SUN_XML_WRITER_GLOBAL              ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_GLOBAL_ASCII )
+#define MIMETYPE_VND_SUN_XML_DRAW                       ::rtl::OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
+#define MIMETYPE_VND_SUN_XML_IMPRESS                    ::rtl::OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
+#define MIMETYPE_VND_SUN_XML_CALC                       ::rtl::OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
+#define MIMETYPE_VND_SUN_XML_CHART                      ::rtl::OUString( MIMETYPE_VND_SUN_XML_CHART_ASCII )
+#define MIMETYPE_VND_SUN_XML_MATH                       ::rtl::OUString( MIMETYPE_VND_SUN_XML_MATH_ASCII )
+#define MIMETYPE_VND_SUN_XML_BASE                       ::rtl::OUString( MIMETYPE_VND_SUN_XML_BASE_ASCII )
 
 // template formats of SO6/7
-#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII               "application/vnd.sun.xml.writer.template"
-#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII                 "application/vnd.sun.xml.draw.template"
-#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII              "application/vnd.sun.xml.impress.template"
-#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII                 "application/vnd.sun.xml.calc.template"
+#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE_ASCII      "application/vnd.sun.xml.writer.template"
+#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE_ASCII        "application/vnd.sun.xml.draw.template"
+#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE_ASCII     "application/vnd.sun.xml.impress.template"
+#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE_ASCII        "application/vnd.sun.xml.calc.template"
 
-#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE                     ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_WRITER_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_DRAW_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII ) )
-#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE                       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VND_SUN_XML_CALC_ASCII ) )
+#define MIMETYPE_VND_SUN_XML_WRITER_TEMPLATE            ::rtl::OUString( MIMETYPE_VND_SUN_XML_WRITER_ASCII )
+#define MIMETYPE_VND_SUN_XML_DRAW_TEMPLATE              ::rtl::OUString( MIMETYPE_VND_SUN_XML_DRAW_ASCII )
+#define MIMETYPE_VND_SUN_XML_IMPRESS_TEMPLATE           ::rtl::OUString( MIMETYPE_VND_SUN_XML_IMPRESS_ASCII )
+#define MIMETYPE_VND_SUN_XML_CALC_TEMPLATE              ::rtl::OUString( MIMETYPE_VND_SUN_XML_CALC_ASCII )
 
 // formats of SO8
 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII          "application/vnd.oasis.opendocument.text"
@@ -66,17 +66,17 @@
 #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII        "application/vnd.sun.xml.report"
 #define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII  "application/vnd.sun.xml.report.chart"
 
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_CHART               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT              ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII ) )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT                ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB            ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_WEB_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL         ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_GLOBAL_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING             ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION        ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET         ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_CHART               ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA             ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_DATABASE            ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT              ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART        ::rtl::OUString( MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART_ASCII )
 
 // template formats of SO8
 #define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII          "application/vnd.oasis.opendocument.text-template"
@@ -86,21 +86,21 @@
 #define MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII         "application/vnd.oasis.opendocument.chart-template"
 #define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII       "application/vnd.oasis.opendocument.formula-template"
 
-#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE         ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE               ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII ) )
-#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE             ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII ) )
+#define MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE                OUString( MIMETYPE_OASIS_OPENDOCUMENT_TEXT_TEMPLATE_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE             OUString( MIMETYPE_OASIS_OPENDOCUMENT_DRAWING_TEMPLATE_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE        OUString( MIMETYPE_OASIS_OPENDOCUMENT_PRESENTATION_TEMPLATE_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE         OUString( MIMETYPE_OASIS_OPENDOCUMENT_SPREADSHEET_TEMPLATE_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE               OUString( MIMETYPE_OASIS_OPENDOCUMENT_CHART_TEMPLATE_ASCII )
+#define MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE             OUString( MIMETYPE_OASIS_OPENDOCUMENT_FORMULA_TEMPLATE_ASCII )
 
 // ODF versions
 #define ODFVER_010_TEXT_ASCII   "1.0"
 #define ODFVER_011_TEXT_ASCII   "1.1"
 #define ODFVER_012_TEXT_ASCII   "1.2"
 
-#define ODFVER_010_TEXT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ODFVER_010_TEXT_ASCII ) )
-#define ODFVER_011_TEXT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ODFVER_011_TEXT_ASCII ) )
-#define ODFVER_012_TEXT ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ODFVER_012_TEXT_ASCII ) )
+#define ODFVER_010_TEXT ::rtl::OUString( ODFVER_010_TEXT_ASCII )
+#define ODFVER_011_TEXT ::rtl::OUString( ODFVER_011_TEXT_ASCII )
+#define ODFVER_012_TEXT ::rtl::OUString( ODFVER_012_TEXT_ASCII )
 #endif
 
 // filter flags
diff --git a/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx
index 88c757315c3e..4f4ceb70501a 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/comphelper/inc/comphelper/sequenceasvector.hxx
@@ -163,7 +163,7 @@ class SequenceAsVector : public ::std::vector< TElementType >
             ::com::sun::star::uno::Sequence< TElementType > lSource;
             if (!(aSource >>= lSource))
                 throw ::com::sun::star::beans::IllegalTypeException(
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SequenceAsVector operator<<(Any) was called with an unsupported Any type.")),
+                        OUString("SequenceAsVector operator<<(Any) was called with an unsupported Any type."),
                         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >());
 
             (*this) << lSource;
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index 2c0a45518b02..5bbbebe2ae19 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.hxx
@@ -28,13 +28,13 @@
 #include "comphelper/comphelperdllapi.h"
 
 
-#define PACKAGE_STORAGE_FORMAT_STRING   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageFormat" ) )
-#define ZIP_STORAGE_FORMAT_STRING       ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ZipFormat" ) )
-#define OFOPXML_STORAGE_FORMAT_STRING   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OFOPXMLFormat" ) )
+#define PACKAGE_STORAGE_FORMAT_STRING   ::rtl::OUString( "PackageFormat" )
+#define ZIP_STORAGE_FORMAT_STRING       ::rtl::OUString( "ZipFormat" )
+#define OFOPXML_STORAGE_FORMAT_STRING   ::rtl::OUString( "OFOPXMLFormat" )
 
-#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA256UTF8EncryptionKey" ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8   ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1UTF8EncryptionKey" ) )
-#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PackageSHA1MS1252EncryptionKey" ) )
+#define PACKAGE_ENCRYPTIONDATA_SHA256UTF8 ::rtl::OUString( "PackageSHA256UTF8EncryptionKey" )
+#define PACKAGE_ENCRYPTIONDATA_SHA1UTF8   ::rtl::OUString( "PackageSHA1UTF8EncryptionKey" )
+#define PACKAGE_ENCRYPTIONDATA_SHA1MS1252 ::rtl::OUString( "PackageSHA1MS1252EncryptionKey" )
 
 namespace com { namespace sun { namespace star {
     namespace beans { struct NamedValue; }
diff --git a/comphelper/inc/comphelper/unwrapargs.hxx b/comphelper/inc/comphelper/unwrapargs.hxx
index bdd8d769de4a..ca4681b8992c 100644
--- a/comphelper/inc/comphelper/unwrapargs.hxx
+++ b/comphelper/inc/comphelper/unwrapargs.hxx
@@ -47,15 +47,14 @@ inline void extract(
 {
     if (nArg >= seq.getLength()) {
         throw ::com::sun::star::lang::IllegalArgumentException(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
-                                 "No such argument available!") ),
+            OUString( "No such argument available!"),
             xErrorContext, static_cast<sal_Int16>(nArg) );
     }
     if (! (seq[nArg] >>= v)) {
         ::rtl::OUStringBuffer buf;
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM("Cannot extract ANY { ") );
+        buf.append( "Cannot extract ANY { " );
         buf.append( seq[nArg].getValueType().getTypeName() );
-        buf.appendAscii( RTL_CONSTASCII_STRINGPARAM(" } to ") );
+        buf.append( " } to " );
         buf.append( ::cppu::UnoType<T>::get().getTypeName() );
         buf.append( static_cast<sal_Unicode>('!') );
         throw ::com::sun::star::lang::IllegalArgumentException(