summaryrefslogtreecommitdiff
path: root/desktop/inc/app.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/inc/app.hxx')
-rwxr-xr-x[-rw-r--r--]desktop/inc/app.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index a525a2960440..3a4f5253c537 100644..100755
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -63,6 +63,8 @@ class Desktop : public Application
{
friend class UserInstall;
+ void doShutdown();
+
public:
enum BootstrapError
{
@@ -88,8 +90,8 @@ class Desktop : public Application
virtual void Init();
virtual void InitFinished();
virtual void DeInit();
- virtual BOOL QueryExit();
- virtual USHORT Exception(USHORT nError);
+ virtual sal_Bool QueryExit();
+ virtual sal_uInt16 Exception(sal_uInt16 nError);
virtual void SystemSettingsChanging( AllSettings& rSettings, Window* pFrame );
virtual void AppEvent( const ApplicationEvent& rAppEvent );
@@ -161,7 +163,7 @@ class Desktop : public Application
void StartSetup( const ::rtl::OUString& aParameters );
// Get a resource message string securely e.g. if resource cannot be retrieved return aFaultBackMsg
- ::rtl::OUString GetMsgString( USHORT nId, const ::rtl::OUString& aFaultBackMsg );
+ ::rtl::OUString GetMsgString( sal_uInt16 nId, const ::rtl::OUString& aFaultBackMsg );
// Create a error message depending on bootstrap failure code and an optional file url
::rtl::OUString CreateErrorMsgString( utl::Bootstrap::FailureCode nFailureCode,
@@ -200,7 +202,7 @@ class Desktop : public Application
sal_Bool m_bMinimized;
sal_Bool m_bInvisible;
bool m_bServicesRegistered;
- USHORT m_nAppEvents;
+ sal_uInt16 m_nAppEvents;
BootstrapError m_aBootstrapError;
BootstrapStatus m_aBootstrapStatus;