Remove RTL_CONST* macros from codemaker - pt1

For more easy review, this is the first part of these changes.

More will come :)

Change-Id: Ic6ab0c7baebf0414dbcccb5dcfad434b3b07964c
Reviewed-on: https://gerrit.libreoffice.org/2595Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>

codemaker/source/codemaker/codemaker.cxx

@@ -41,8 +41,7 @@ namespace {
 
 void checkNoTypeArguments(std::vector< rtl::OString > const & arguments) {
     if (!arguments.empty()) {
-        throw CannotDumpException(
-            rtl::OString(RTL_CONSTASCII_STRINGPARAM("Bad type information")));
+        throw CannotDumpException("Bad type information");
             //TODO
     }
 }
@@ -58,10 +57,7 @@ rtl::OString convertString(rtl::OUString const & string) {
             (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR
              | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR)))
     {
-        throw CannotDumpException(
-            rtl::OString(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "Failure converting string from UTF-16 to UTF-8")));
+        throw CannotDumpException("Failure converting string from UTF-16 to UTF-8");
     }
     return s;
 }
@@ -82,10 +78,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
         sal_Int32 n = 0;
         *name = codemaker::UnoType::decompose(t, &n, arguments);
         if (n > SAL_MAX_INT32 - *rank) {
-            throw CannotDumpException(
-                errorMsg(rtl::OString(
-                    RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                    type));
+            throw CannotDumpException(errorMsg("Bad type information: ", type));
             //TODO
         }
         *rank += n;
@@ -97,10 +90,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
         switch (sort) {
         case codemaker::UnoType::SORT_VOID:
             if (!allowVoid) {
-                throw CannotDumpException(
-                    errorMsg(rtl::OString(
-                        RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                        type));
+                throw CannotDumpException( errorMsg("Bad type information: ", type));
                 //TODO
             }
         default:
@@ -123,10 +113,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
                         || (static_cast< sal_uInt16 >(arguments->size())
                             != reader.getReferenceCount())))
                 {
-                    throw CannotDumpException(
-                        errorMsg(rtl::OString(
-                            RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                            type));
+                    throw CannotDumpException(errorMsg("Bad type information: ", type));
                     //TODO
                 }
                 return sort;
@@ -137,10 +124,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
             case RT_TYPE_SINGLETON:
             case RT_TYPE_CONSTANTS:
                 if (!allowExtraEntities) {
-                    throw CannotDumpException(
-                        errorMsg(rtl::OString(
-                            RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                            type));
+                    throw CannotDumpException(errorMsg("Bad type information: ", type));
                     //TODO
                 }
                 checkNoTypeArguments(*arguments);
@@ -162,10 +146,7 @@ codemaker::UnoType::Sort decomposeAndResolve(
                     }
                 }
             default:
-                throw CannotDumpException(
-                    errorMsg(rtl::OString(
-                        RTL_CONSTASCII_STRINGPARAM("Bad type information: ")),
-                        type));
+                throw CannotDumpException(errorMsg("Bad type information: ", type));
                 //TODO
             }
         }

codemaker/source/commonjava/commonjava.cxx

@@ -55,36 +55,21 @@ OString translateUnoToJavaType(
         }
     } else {
         rtl::OString const javaTypes[codemaker::UnoType::SORT_ANY + 1][2] = {
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("void")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Void")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("boolean")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Boolean")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("byte")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Byte")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("short")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Short")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("short")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Short")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("int")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Integer")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("int")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Integer")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("long")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Long")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("long")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Long")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("float")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Float")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("double")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Double")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("char")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Character")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/String")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/String")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/Type")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/Type")) },
-            { rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Object")),
-              rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Object")) } };
+            { "void", "java/lang/Void" },
+            { "boolean", "java/lang/Boolean" },
+            { "byte", "java/lang/Byte" },
+            { "short", "java/lang/Short" },
+            { "short", "java/lang/Short" },
+            { "int",  "java/lang/Integer" },
+            { "int",  "java/lang/Integer" },
+            { "long", "java/lang/Long" },
+            { "long", "java/lang/Long" },
+            { "float", "java/lang/Float" },
+            { "double", "java/lang/Double" },
+            { "char", "java/lang/Character" },
+            { "java/lang/String", "java/lang/String" },
+            { "com/sun/star/uno/Type", "com/sun/star/uno/Type" },
+            { "java/lang/Object", "java/lang/Object" } };
         buf.append(javaTypes[sort][referenceType]);
     }
     return buf.makeStringAndClear();

codemaker/source/cppumaker/cpputype.cxx

@@ -170,8 +170,7 @@ CppuType::~CppuType()
 void CppuType::addGetCppuTypeIncludes(codemaker::cppumaker::Includes & includes)
     const
 {
-    if (m_typeName.equals("com/sun/star/uno/XInterface")
-        || m_typeName.equals("com/sun/star/uno/Exception"))
+    if (m_typeName == "com/sun/star/uno/XInterface" || m_typeName == "com/sun/star/uno/Exception")
     {
         includes.addType();
         includes.addCppuUnotypeHxx();
@@ -514,10 +513,8 @@ void CppuType::dumpHFileContent(
         out << "\n";
     }
     dumpDeclaration(out);
-    if (!(m_typeName.equalsL(
-              RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/XInterface")) ||
-          m_typeName.equalsL(
-              RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/Exception")) ||
+    if (!(m_typeName == "com/sun/star/uno/XInterface" ||
+          m_typeName == "com/sun/star/uno/Exception" ||
           isPolymorphic()))
     {
         out << "\n" << indent()

codemaker/source/javamaker/classfile.cxx

@@ -73,10 +73,8 @@ void appendStream(
 }
 
 void write(FileStream & file, void const * buffer, sal_uInt64 size) {
-    if (!file.write(buffer, size)) {
-        throw CannotDumpException(
-            rtl::OString(RTL_CONSTASCII_STRINGPARAM("Error writing file")));
-    }
+    if (!file.write(buffer, size))
+        throw CannotDumpException("Error writing file");
 }
 
 void writeU2(FileStream & file, sal_uInt16 data) {
@@ -237,10 +235,7 @@ void ClassFile::Code::instrLookupswitch(
     // <match--offset pairs...>:
     std::list< std::pair< sal_Int32, Code * > >::size_type size = blocks.size();
     if (size > SAL_MAX_INT32) {
-        throw CannotDumpException(
-            rtl::OString(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "Lookup-switch too large for Java class file format")));
+        throw CannotDumpException("Lookup-switch too large for Java class file format");
     }
     Position pos1 = m_code.size();
     appendU1(m_code, 0xAB);
@@ -420,10 +415,7 @@ void ClassFile::Code::addException(
 {
     OSL_ASSERT(start < end && end <= m_code.size() && handler <= m_code.size());
     if (m_exceptionTableLength == SAL_MAX_UINT16) {
-        throw CannotDumpException(
-            rtl::OString(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "Too many exception handlers for Java class file format")));
+        throw CannotDumpException("Too many exception handlers for Java class file format");
     }
     ++m_exceptionTableLength;
     appendU2(m_exceptionTable, static_cast< sal_uInt16 >(start));
@@ -567,10 +559,7 @@ sal_uInt16 ClassFile::addDoubleInfo(double value) {
 
 void ClassFile::addInterface(rtl::OString const & interface) {
     if (m_interfacesCount == SAL_MAX_UINT16) {
-        throw CannotDumpException(
-            rtl::OString(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "Too many interfaces for Java class file format")));
+        throw CannotDumpException("Too many interfaces for Java class file format");
     }
     ++m_interfacesCount;
     appendU2(m_interfaces, addClassInfo(interface));
@@ -582,10 +571,7 @@ void ClassFile::addField(
     rtl::OString const & signature)
 {
     if (m_fieldsCount == SAL_MAX_UINT16) {
-        throw CannotDumpException(
-            rtl::OString(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "Too many fields for Java class file format")));
+        throw CannotDumpException("Too many fields for Java class file format");
     }
     ++m_fieldsCount;
     appendU2(m_fields, static_cast< sal_uInt16 >(accessFlags));
@@ -613,10 +599,7 @@ void ClassFile::addMethod(
     rtl::OString const & signature)
 {
     if (m_methodsCount == SAL_MAX_UINT16) {
-        throw CannotDumpException(
-            rtl::OString(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "Too many methods for Java class file format")));
+        throw CannotDumpException("Too many methods for Java class file format");
     }
     ++m_methodsCount;
     appendU2(m_methods, static_cast< sal_uInt16 >(accessFlags));
@@ -624,11 +607,7 @@ void ClassFile::addMethod(
     appendU2(m_methods, addUtf8Info(descriptor));
     std::vector< rtl::OString >::size_type excs = exceptions.size();
     if (excs > SAL_MAX_UINT16) {
-        throw CannotDumpException(
-            rtl::OString(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "Too many exception specifications for Java class file"
-                    " format")));
+        throw CannotDumpException("Too many exception specifications for Java class file format");
     }
     appendU2(
         m_methods,
@@ -643,10 +622,7 @@ void ClassFile::addMethod(
                 > (SAL_MAX_UINT32 - (2 + 2 + 4 + 2 + 2)
                    - static_cast< sal_uInt32 >(codeSize))))
         {
-            throw CannotDumpException(
-                rtl::OString(
-                    RTL_CONSTASCII_STRINGPARAM(
-                        "Code block is too big for Java class file format")));
+            throw CannotDumpException("Code block is too big for Java class file format");
         }
         appendU2(
             m_methods,
@@ -703,11 +679,7 @@ void ClassFile::write(FileStream & file) const {
 sal_uInt16 ClassFile::nextConstantPoolIndex(sal_uInt16 width) {
     OSL_ASSERT(width == 1 || width == 2);
     if (m_constantPoolCount > SAL_MAX_UINT16 - width) {
-        throw CannotDumpException(
-            rtl::OString(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "Too many constant pool items for Java class file"
-                    " format")));
+        throw CannotDumpException("Too many constant pool items for Java class file format");
     }
     sal_uInt16 index = m_constantPoolCount;
     m_constantPoolCount = m_constantPoolCount + width;
@@ -720,10 +692,7 @@ sal_uInt16 ClassFile::addUtf8Info(rtl::OString const & value) {
         return i->second;
     }
     if (value.getLength() > SAL_MAX_UINT16) {
-        throw CannotDumpException(
-            rtl::OString(
-                RTL_CONSTASCII_STRINGPARAM(
-                    "UTF-8 string too long for Java class file format")));
+        throw CannotDumpException("UTF-8 string too long for Java class file format");
     }
     sal_uInt16 index = nextConstantPoolIndex(1);
     appendU1(m_constantPool, 1);