diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-14 17:22:33 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-14 17:22:33 +0100 |
| commit | 351f811977224b7ef0cd10256d02f43b1ad19324 (patch) | |
| tree | 0fa15e08d3b2039dfe875e1d2ec68ce7e1de5c2b /desktop/inc | |
| parent | removetooltypes01: #i112600# Remove tool types from binfilter, starmath, svx,... (diff) | |
| download | core-351f811977224b7ef0cd10256d02f43b1ad19324.tar.gz core-351f811977224b7ef0cd10256d02f43b1ad19324.zip | |
removetooltypes01: #i112600# remove tooltypes from desktop
Diffstat (limited to 'desktop/inc')
| -rw-r--r-- | desktop/inc/app.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 8eb4dd3cc25b..e2515187e688 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -89,8 +89,8 @@ class Desktop : public Application virtual void Main( ); virtual void Init(); 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 ); @@ -162,7 +162,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, @@ -201,7 +201,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; |