[Libreoffice-commits] .: binfilter/bf_xmloff

[François Tigeot]

 binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit be95eda65a912a18123e6e13865c6e3b9142d702
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Wed Jun 15 09:27:52 2011 +0200

    Remove some remaining TOOLS_INETDEF_OS usage

diff --git a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx
index 66c5e52..cad8d7d 100644
--- a/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx
+++ b/binfilter/bf_xmloff/source/meta/xmloff_xmlmetae.cxx
@@ -225,6 +225,8 @@ rtl::OUString lcl_GetProductName()
     utl::ConfigManager& rMgr = utl::ConfigManager::GetConfigManager();
     ::rtl::OUString aValue;
     uno::Any aAny = rMgr.GetDirectConfigProperty(utl::ConfigManager::PRODUCTNAME);
+    ::rtl::OUString os( RTL_CONSTASCII_USTRINGPARAM("$_OS") );
+    ::rtl::Bootstrap::expandMacros(os);
     if ( (aAny >>= aValue) && aValue.getLength() )
         aName.append( aValue ).append( (sal_Unicode)' ' );
 
@@ -236,7 +238,7 @@ rtl::OUString lcl_GetProductName()
     if ( (aAny >>= aValue) && aValue.getLength() )
         aName.append( aValue ).append( (sal_Unicode)' ' );
     aName.append( (sal_Unicode)'(' );
-    aName.appendAscii( TOOLS_INETDEF_OS );
+    aResult.append( os );
     aName.append( (sal_Unicode)')' );
 
     return aName.makeStringAndClear();