oox: kill no longer needed CREATE_OUSTRING

3 files changed, 7 insertions, 13 deletions

diff --git a/oox/inc/oox/core/relations.hxx b/oox/inc/oox/core/relations.hxx
index 94b990858fd4..a28387197568 100644
--- a/oox/inc/oox/core/relations.hxx
+++ b/oox/inc/oox/core/relations.hxx
@@ -33,17 +33,17 @@ namespace core {
 /** Expands to an OUString containing an 'officeDocument' relation type created
     from the passed literal(!) ASCII(!) character array. */
 #define CREATE_OFFICEDOC_RELATION_TYPE( ascii ) \
-    CREATE_OUSTRING( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/" ascii )
+    ( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/" ascii )
 
 /** Expands to an OUString containing a 'package' relation type created from
     the passed literal(!) ASCII(!) character array. */
 #define CREATE_PACKAGE_RELATION_TYPE( ascii ) \
-    CREATE_OUSTRING( "http://schemas.openxmlformats.org/package/2006/relationships/" ascii )
+    ( "http://schemas.openxmlformats.org/package/2006/relationships/" ascii )
 
 /** Expands to an OUString containing an MS Office specific relation type
     created from the passed literal(!) ASCII(!) character array. */
 #define CREATE_MSOFFICE_RELATION_TYPE( ascii ) \
-    CREATE_OUSTRING( "http://schemas.microsoft.com/office/2006/relationships/" ascii )
+    ( "http://schemas.microsoft.com/office/2006/relationships/" ascii )
 
 // ============================================================================
 
diff --git a/oox/inc/oox/dump/dumperbase.hxx b/oox/inc/oox/dump/dumperbase.hxx
index 16562e584312..5a73eb18043f 100644
--- a/oox/inc/oox/dump/dumperbase.hxx
+++ b/oox/inc/oox/dump/dumperbase.hxx
@@ -67,13 +67,12 @@ namespace dump {
 #define OOX_DUMP_UNKNOWN                    "?unknown"
 
 #define OOX_DUMP_ERRASCII( ascii )          "?err:" ascii
-#define OOX_DUMP_ERRSTRING( ascii )         CREATE_OUSTRING( OOX_DUMP_ERRASCII( ascii ) )
 
-#define OOX_DUMP_ERR_NOMAP                  OOX_DUMP_ERRSTRING( "no-map" )
-#define OOX_DUMP_ERR_NONAME                 OOX_DUMP_ERRSTRING( "no-name" )
-#define OOX_DUMP_ERR_STREAM                 OOX_DUMP_ERRSTRING( "stream-error" )
+#define OOX_DUMP_ERR_NOMAP                  "no-map"
+#define OOX_DUMP_ERR_NONAME                 "no-name"
+#define OOX_DUMP_ERR_STREAM                 "stream-error"
 
-#define OOX_DUMP_DUMPEXT                    CREATE_OUSTRING( ".dump" )
+#define OOX_DUMP_DUMPEXT                    ".dump"
 
 const sal_Unicode OOX_DUMP_STRQUOTE         = '\'';
 const sal_Unicode OOX_DUMP_FMLASTRQUOTE     = '"';
diff --git a/oox/inc/oox/helper/helper.hxx b/oox/inc/oox/helper/helper.hxx
index c4507844152a..bfe2796581c3 100644
--- a/oox/inc/oox/helper/helper.hxx
+++ b/oox/inc/oox/helper/helper.hxx
@@ -52,11 +52,6 @@ namespace oox {
 #define CREATE_OSTRING( ascii ) \
     ::rtl::OString( RTL_CONSTASCII_STRINGPARAM( ascii ) )
 
-/** Expands to a temporary ::rtl::OUString, created from a literal(!) ASCII(!)
-    character array. */
-#define CREATE_OUSTRING( ascii ) \
-    ::rtl::OUString::intern( RTL_CONSTASCII_USTRINGPARAM( ascii ) )
-
 /** Convert an OUString to an ASCII C string. Use for debug purposes only. */
 #define OUSTRING_TO_CSTR( str ) \
     ::rtl::OUStringToOString( str, RTL_TEXTENCODING_ASCII_US ).getStr()