summaryrefslogtreecommitdiff
path: root/slideshow/test/demoshow.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow/test/demoshow.cxx')
-rw-r--r--slideshow/test/demoshow.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index 2fb84f1f9d83..6f72fc1a5d11 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -308,7 +308,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
@@ -427,7 +427,7 @@ DemoWindow::DemoWindow() :
Show();
maUpdateTimer.SetTimeoutHdl(LINK(this, DemoWindow, updateHdl));
- maUpdateTimer.SetTimeout( (ULONG)30 );
+ maUpdateTimer.SetTimeout( (sal_uLong)30 );
maUpdateTimer.Start();
}
@@ -495,7 +495,7 @@ void DemoWindow::Resize()
// TODO
}
-USHORT DemoApp::Exception( USHORT nError )
+sal_uInt16 DemoApp::Exception( sal_uInt16 nError )
{
switch( nError & EXC_MAJORTYPE )
{
@@ -510,7 +510,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 );