diff options
| author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-06-15 00:02:05 +0200 |
|---|---|---|
| committer | Francois Tigeot <ftigeot@wolfpond.org> | 2011-06-15 00:03:26 +0200 |
| commit | bf8030e44efea64cad418c253c6a5c7cf2ab6410 (patch) | |
| tree | ecfd571907dbdc97317fb02b62d70c422c1683bb /unotools | |
| parent | a87eeb9e81eef3425ceb80233d33efd075619061 (diff) | |
Remove TOOLS_INETDEF_OS
We don't need yet another unmaintainable platform name macro...
Diffstat (limited to 'unotools')
| -rw-r--r-- | unotools/source/config/docinfohelper.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
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)' ' ); } |