Cargo cult?

Change-Id: Ib04880eee7ffed621a97ca0f6c6f9896eb54df0d

sw/source/filter/basflt/fltini.cxx

@@ -426,7 +426,7 @@ const CharSetNameMap *GetCharSetNameMap()
 {
     static const CharSetNameMap aMapArr[] =
     {
-#   define IMPLENTRY(X) { RTL_TEXTENCODING_##X, "" #X "" }
+#   define IMPLENTRY(X) { RTL_TEXTENCODING_##X, #X }
         IMPLENTRY(DONTKNOW),
         IMPLENTRY(MS_1252),
         IMPLENTRY(APPLE_ROMAN),

sw/source/filter/ww8/ww8scan.cxx

@@ -60,7 +60,7 @@ using namespace ::com::sun::star::lang;
 //-begin
 namespace SL
 {
-#   define IMPLCONSTSTRINGARRAY(X) const char a##X[] = "" #X ""
+#   define IMPLCONSTSTRINGARRAY(X) const char a##X[] = #X
     IMPLCONSTSTRINGARRAY(ObjectPool);
     IMPLCONSTSTRINGARRAY(1Table);
     IMPLCONSTSTRINGARRAY(0Table);

sw/source/filter/ww8/ww8scan.hxx

@@ -46,7 +46,7 @@
 //Commonly used string literals for stream and storage names in word docs
 namespace SL
 {
-#   define DEFCONSTSTRINGARRAY(X) extern const char a##X[sizeof("" #X "")]
+#   define DEFCONSTSTRINGARRAY(X) extern const char a##X[sizeof(#X)]
     DEFCONSTSTRINGARRAY(ObjectPool);
     DEFCONSTSTRINGARRAY(1Table);
     DEFCONSTSTRINGARRAY(0Table);