[Libreoffice-commits] .: sfx2/source

[François Tigeot]

 sfx2/source/bastyp/frmhtmlw.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 6ddd2c935bbc7f95806ad972c99790c2df74d4fe
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Tue Jun 14 23:57:25 2011 +0200

    Remove TOOLS_INETDEF_OS
    
    We don't need yet another unmaintainable platform name macro...

diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 0cded58..2ae9a43 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -55,6 +55,8 @@
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 
+#include <rtl/bootstrap.hxx>
+
 
 // -----------------------------------------------------------------------
 
@@ -145,7 +147,9 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
 
     // Who we are
     String sGenerator( SfxResId( STR_HTML_GENERATOR ) );
-    sGenerator.SearchAndReplaceAscii( "%1", String( DEFINE_CONST_UNICODE( TOOLS_INETDEF_OS ) ) );
+    ::rtl::OUString os( RTL_CONSTASCII_USTRINGPARAM("$_OS") );
+    ::rtl::Bootstrap::expandMacros(os);
+    sGenerator.SearchAndReplaceAscii( "%1", os );
     OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars );
 
     if( i_xDocProps.is() )