added macro expansion

1 files changed, 11 insertions, 5 deletions

diff --git a/sal/rtl/source/cmdargs.cxx b/sal/rtl/source/cmdargs.cxx
index 4d1098170..ac2322952 100644
--- a/sal/rtl/source/cmdargs.cxx
+++ b/sal/rtl/source/cmdargs.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: cmdargs.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jbu $ $Date: 2001-05-18 15:30:59 $
+ *  last change: $Author: kr $ $Date: 2001-06-15 13:53:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -62,8 +62,11 @@
 #include <rtl/process.h>
 #include <rtl/ustring.hxx>
 
+#include "macro.hxx"
 
-::rtl::OUString *g_pCommandArgs = 0;
+using namespace ::rtl;
+
+OUString *g_pCommandArgs = 0;
 sal_Int32 g_nCommandArgCount = -1;
 
 struct rtl_CmdArgs_ArgHolder
@@ -111,6 +114,7 @@ void impl_rtl_initCommandArgs()
 }
 
 
+
 extern "C"
 {
     oslProcessError SAL_CALL rtl_getAppCommandArg(sal_uInt32 nArg, rtl_uString **strCommandArg)
@@ -121,8 +125,10 @@ extern "C"
         oslProcessError err = osl_Process_E_None;
         if( nArg < g_nCommandArgCount )
         {
-            rtl_uString_assign( strCommandArg, g_pCommandArgs[nArg].pData );
-        }
+            OUString expandedArg = expandMacros(g_pCommandArgs[nArg]);
+
+            rtl_uString_assign( strCommandArg, expandedArg.pData );
+         }
         else
         {
             err = osl_Process_E_NotFound;