merge the 5 ConstAsciiString duplicate classes together

a) merge them together and move it into comphelper
b) turn it into a POD rather than having vast amounts
of destructors registered into the cxa_atexit chain

Change-Id: I04d3b9d7804f8e233013c916df9d617a0f84f96a

1 files changed, 3 insertions, 40 deletions

diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index b6c3e8fcce79..f74b411d4713 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -31,56 +31,19 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
+#include <comphelper/string.hxx>
 
 //..............................................................................
 namespace frm
 {
-//..............................................................................
-
-    struct ConstAsciiString
-    {
-        const sal_Char* ascii;
-        sal_Int32       length;
-
-        inline  operator       ::rtl::OUString () const;
-        inline  operator const sal_Char*       () const { return ascii; }
-
-        inline ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength);
-        inline ~ConstAsciiString();
-
-    private:
-        mutable ::rtl::OUString*    ustring;
-    };
-
-    //------------------------------------------------------------
-    inline ConstAsciiString::ConstAsciiString(const sal_Char* _pAsciiZeroTerminated, const sal_Int32 _nLength)
-        :ascii(_pAsciiZeroTerminated)
-        ,length(_nLength)
-        ,ustring(NULL)
-    {
-    }
-
-    //------------------------------------------------------------
-    inline ConstAsciiString::~ConstAsciiString()
-    {
-        delete ustring;
-        ustring = NULL;
-    }
-
-    //------------------------------------------------------------
-    inline ConstAsciiString::operator ::rtl::OUString () const
-    {
-        if ( !ustring )
-            ustring = new ::rtl::OUString( ascii, length, RTL_TEXTENCODING_ASCII_US );
-        return *ustring;
-    }
+    using comphelper::string::ConstAsciiString;
 
     #ifndef FORMS_IMPLEMENT_STRINGS
         #define FORMS_CONSTASCII_STRING( ident, string )    \
             extern const ConstAsciiString ident
     #else
         #define FORMS_CONSTASCII_STRING( ident, string )    \
-            extern const ConstAsciiString ident( string, sizeof( string )-1 )
+            extern const ConstAsciiString ident = {RTL_CONSTASCII_STRINGPARAM(string)}
     #endif
 
 //..............................................................................