diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
| commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
| tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /slideshow/test | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'slideshow/test')
| -rw-r--r-- | slideshow/test/demoshow.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx index 154be6c1307f..68cb0893d531 100644 --- a/slideshow/test/demoshow.cxx +++ b/slideshow/test/demoshow.cxx @@ -315,7 +315,7 @@ class DemoApp : public Application { public: virtual void Main(); - virtual USHORT Exception( USHORT nError ); + virtual sal_uInt16 Exception( sal_uInt16 nError ); }; class ChildWindow : public Window @@ -434,7 +434,7 @@ DemoWindow::DemoWindow() : Show(); maUpdateTimer.SetTimeoutHdl(LINK(this, DemoWindow, updateHdl)); - maUpdateTimer.SetTimeout( (ULONG)30 ); + maUpdateTimer.SetTimeout( (sal_uLong)30 ); maUpdateTimer.Start(); } @@ -504,7 +504,7 @@ void DemoWindow::Resize() // TODO } -USHORT DemoApp::Exception( USHORT nError ) +sal_uInt16 DemoApp::Exception( sal_uInt16 nError ) { switch( nError & EXC_MAJORTYPE ) { @@ -519,7 +519,7 @@ void DemoApp::Main() { bool bHelp = false; - for( USHORT i = 0; i < GetCommandLineParamCount(); i++ ) + for( sal_uInt16 i = 0; i < GetCommandLineParamCount(); i++ ) { ::rtl::OUString aParam = GetCommandLineParam( i ); |