diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-11-07 14:31:41 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-11-07 14:31:41 +0000 |
| commit | b0b43a618f9ce8a95b1646d4001c0821c5aad641 (patch) | |
| tree | 5da896d988ece59a939b302c981c3bb02dc97a3b | |
| parent | 9ae286bc0301403924be5a5bdb7a29628c907469 (diff) | |
INTEGRATION: CWS gtkquickstart2 (1.20.18); FILE MERGED
2006/10/20 13:50:12 mmeeks 1.20.18.2: Issue number: i#70620#
Submitted by: mmeeks
Fix veto'ing and sensitivity of setting in option dialog if not available.
2006/10/19 15:57:05 mmeeks 1.20.18.1: Issue number: i#68657#
Submitted by: mmeeks
Fix various bugs, popup menu position, transparency etc.
| -rw-r--r-- | sfx2/source/appl/shutdownicon.hxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index 1cf7f3b04f9e..a89bbed7a59b 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -78,9 +78,13 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase oslGenericFunction m_pDeInitSystray; ::osl::Module *m_pPlugin; + bool m_bInitialized; void initSystray(); void deInitSystray(); + static bool LoadModule( osl::Module **pModule, + oslGenericFunction *pInit, + oslGenericFunction *pDeInit ); static void EnterModalMode(); static void LeaveModalMode(); static rtl::OUString getShortcutName(); @@ -95,6 +99,7 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase SFX_DECL_XSERVICEINFO static ShutdownIcon* getInstance(); + static ShutdownIcon* createInstance(); static void terminateDesktop(); static void addTerminateListener(); @@ -108,6 +113,8 @@ class SFX2_DLLPUBLIC ShutdownIcon : public ShutdownIconServiceBase static bool GetAutostart(); static bool bModalMode; + void init() throw( ::com::sun::star::uno::Exception ); + static ::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > GetWrapperFactory( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xSMgr ); static ::rtl::OUString GetImplementationName_static(); |