diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-25 12:52:54 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-03-25 12:52:54 +0000 |
| commit | 036ed05fe35044e49a91e12b6a8e5f36a5b9c4c2 (patch) | |
| tree | 548f94ab4475b5abbcdaef7bb6705858ce0c17e9 /desktop/source/app/officeipcthread.hxx | |
| parent | 945abd8ce8e081e524ac5d34a63d37ad2b654a45 (diff) | |
MWS_SRX644: migrate branch mws_srx644 -> HEAD
Diffstat (limited to 'desktop/source/app/officeipcthread.hxx')
| -rw-r--r-- | desktop/source/app/officeipcthread.hxx | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 3ea8735b0830..9c8b1cf770cd 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -2,9 +2,9 @@ * * $RCSfile: officeipcthread.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: lo $ $Date: 2002-10-17 10:46:33 $ + * last change: $Author: hr $ $Date: 2003-03-25 13:51:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,11 +72,9 @@ #ifndef _VOS_PIPE_HXX_ #include <vos/pipe.hxx> #endif -#ifndef SOLARIS #ifndef _VOS_SECURITY_HXX_ #include <vos/security.hxx> #endif -#endif #ifndef _VOS_THREAD_HXX_ #include <vos/thread.hxx> #endif @@ -106,14 +104,13 @@ class SalMainPipeExchangeSignalHandler : public vos::OSignalHandler struct ProcessDocumentsRequest { ::rtl::OUString aOpenList; // Documents that should be opened in the default way - ::rtl::OUString aViewList; // Documents that should be opened in viewmode + ::rtl::OUString aViewList; // Documents that should be opened in viewmode ::rtl::OUString aPrintList; // Documents that should be printed on default printer ::rtl::OUString aForceOpenList; // Documents that should be forced to open for editing (even templates) ::rtl::OUString aForceNewList; // Documents that should be forced to create a new document ::rtl::OUString aPrinterName; // The printer name that should be used for printing ::rtl::OUString aPrintToList; // Documents that should be printed on the given printer ::osl::Condition cProcessed; // condition to be set when the request has been processed - }; class DispatchWatcher; @@ -125,9 +122,7 @@ class OfficeIPCThread : public vos::OThread vos::OPipe maPipe; vos::OStreamPipe maStreamPipe; -#ifndef SOLARIS static vos::OSecurity maSecurity; -#endif rtl::OUString maPipeIdent; sal_Bool mbBlockRequests; int mnPendingRequests; @@ -135,7 +130,6 @@ class OfficeIPCThread : public vos::OThread sal_Bool mbShutdownInProgress; static ::osl::Mutex& GetMutex(); - static const char *sc_aTerminationSequence; static const int sc_nTSeqLength; static const char *sc_aShowSequence; @@ -167,12 +161,7 @@ class OfficeIPCThread : public vos::OThread static void ExecuteCmdLineRequests( ProcessDocumentsRequest& ); // return FALSE if second office -#ifdef SOLARIS - static Status EnableOfficeIPCThread( - sal_Bool useParent = sal_True ); -#else static Status EnableOfficeIPCThread(); -#endif static void DisableOfficeIPCThread(); }; |