diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 12:00:27 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 12:00:27 +0000 |
| commit | 9c7cc219748bc13e50bc5b72d099fc50892b0952 (patch) | |
| tree | a64cd72d27546bb7071687ac0d2f474eb1f8b689 /desktop/source/app | |
| parent | 80f6745742c9446c961cfc47f25b034e372d2d62 (diff) | |
INTEGRATION: CWS sb87 (1.9.356); FILE MERGED
2008/04/24 13:21:51 sb 1.9.356.2: RESYNC: (1.9-1.10); FILE MERGED
2008/04/09 14:05:49 sb 1.9.356.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/dispatchwatcher.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index 26b0d3aa8e..4eca139905 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dispatchwatcher.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.11 $ * * This file is part of OpenOffice.org. * @@ -83,11 +83,12 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame: struct DispatchRequest { - DispatchRequest( RequestType aType, const ::rtl::OUString& aFile, const ::rtl::OUString& aPrinter, const ::rtl::OUString& aFact ) : - aRequestType( aType ), aURL( aFile ), aPrinterName( aPrinter ), aPreselectedFactory( aFact ) {} + DispatchRequest( RequestType aType, const ::rtl::OUString& aFile, boost::optional< rtl::OUString > const & cwdUrl, const ::rtl::OUString& aPrinter, const ::rtl::OUString& aFact ) : + aRequestType( aType ), aURL( aFile ), aCwdUrl( cwdUrl ), aPrinterName( aPrinter ), aPreselectedFactory( aFact ) {} RequestType aRequestType; rtl::OUString aURL; + boost::optional< rtl::OUString > aCwdUrl; rtl::OUString aPrinterName; rtl::OUString aPreselectedFactory; }; |