From bf8030e44efea64cad418c253c6a5c7cf2ab6410 Mon Sep 17 00:00:00 2001
From: Francois Tigeot <ftigeot@wolfpond.org>
Date: Wed, 15 Jun 2011 00:02:05 +0200
Subject: Remove TOOLS_INETDEF_OS

We don't need yet another unmaintainable platform name macro...
---
 unotools/source/config/docinfohelper.cxx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'unotools')

diff --git a/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx
index beb381c51d37..462ab33ca162 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.cxx
@@ -34,6 +34,7 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/bootstrap.hxx>
 #include <unotools/docinfohelper.hxx>
+#include <rtl/bootstrap.hxx>
 
 using namespace ::com::sun::star;
 
@@ -71,10 +72,14 @@ namespace utl
             }
         }
 
+        ::rtl::OUString os( RTL_CONSTASCII_USTRINGPARAM("$_OS") );
+        ::rtl::OUString arch( RTL_CONSTASCII_USTRINGPARAM("$_ARCH") );
+        ::rtl::Bootstrap::expandMacros(os);
+        ::rtl::Bootstrap::expandMacros(arch);
         aResult.append( (sal_Unicode)'$' );
-        aResult.append( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
-                                TOOLS_INETDEF_OS )).replace( ' ', '_' ) );
-
+        aResult.append( os );
+        aResult.append( (sal_Unicode)'_' );
+        aResult.append( arch );
         aResult.append( (sal_Unicode)' ' );
     }
 
-- 
cgit v1.2.3