diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 12:35:06 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 12:35:06 +0000 |
| commit | 77835bdd2b95b96aea20f05b96ad32608cc0e8ef (patch) | |
| tree | b375d7fa719d1a9caa97e09e40f1b77f0b10b1c3 /desktop/source/app | |
| parent | aaf9b1d348e838e5895b838e2e7173377520261a (diff) | |
INTEGRATION: CWS sb87 (1.26.70); FILE MERGED
2008/06/09 08:29:46 sb 1.26.70.3: resolved conflict against DEV300m17
2008/04/24 13:21:44 sb 1.26.70.2: RESYNC: (1.26-1.28); FILE MERGED
2008/04/09 14:05:49 sb 1.26.70.1: #i87730# in an attempt of consolidation with the new OOO_CWD stuff for Windows, pass the working dir across the pipe between two soffice processes (instead of already making cmd line args absolute at sending side)
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/cmdlineargs.hxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/desktop/source/app/cmdlineargs.hxx b/desktop/source/app/cmdlineargs.hxx index 06444dbf66b9..c4ec2e19aa34 100644 --- a/desktop/source/app/cmdlineargs.hxx +++ b/desktop/source/app/cmdlineargs.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cmdlineargs.hxx,v $ - * $Revision: 1.29 $ + * $Revision: 1.30 $ * * This file is part of OpenOffice.org. * @@ -33,7 +33,7 @@ #include <rtl/ustring.hxx> #include <osl/mutex.hxx> - +#include "boost/optional.hpp" namespace desktop { @@ -113,12 +113,15 @@ class CommandLineArgs }; virtual ~Supplier(); + virtual boost::optional< rtl::OUString > getCwdUrl() = 0; virtual bool next(rtl::OUString * argument) = 0; }; - CommandLineArgs( bool bConvert ); + CommandLineArgs(); CommandLineArgs( Supplier& supplier ); + boost::optional< rtl::OUString > getCwdUrl() const { return m_cwdUrl; } + // generic methods to access parameter void SetBoolParam( BoolParam eParam, sal_Bool bNewValue ); @@ -185,13 +188,14 @@ class CommandLineArgs CommandLineArgs operator=( const CommandLineArgs& ); sal_Bool InterpretCommandLineParameter( const ::rtl::OUString& ); - void ParseCommandLine_Impl( Supplier& supplier, bool convert ); + void ParseCommandLine_Impl( Supplier& supplier ); void ResetParamValues(); sal_Bool CheckGroupMembers( GroupParamId nGroup, BoolParam nExcludeMember ) const; void AddStringListParam_Impl( StringParam eParam, const rtl::OUString& aParam ); void SetBoolParam_Impl( BoolParam eParam, sal_Bool bValue ); + boost::optional< rtl::OUString > m_cwdUrl; sal_Bool m_aBoolParams[ CMD_BOOLPARAM_COUNT ]; // Stores boolean parameters rtl::OUString m_aStrParams[ CMD_STRINGPARAM_COUNT ]; // Stores string parameters sal_Bool m_aStrSetParams[ CMD_STRINGPARAM_COUNT ]; // Stores if string parameters are provided on cmdline |