diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:40:35 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:40:35 +0100 |
| commit | a0c13ffcceea4978bf95b8559bff4a71aa55aa88 (patch) | |
| tree | 2adb4d620b027141c5578565d860434657ba0b3c /slideshow/test | |
| parent | adea34547d7bc43e9795032c7761e293a28c1df7 (diff) | |
| parent | 19232495c4985faf1423075bf8814e786da6ddcd (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
sd/source/ui/func/fuinsfil.cxx
sd/source/ui/func/fuprobjs.cxx
sd/source/ui/slideshow/slideshowimpl.cxx
sd/source/ui/slidesorter/view/SlsPageObjectViewObjectContact.cxx
sd/source/ui/toolpanel/ToolPanelViewShell.cxx
sd/source/ui/view/drawview.cxx
sd/source/ui/view/drtxtob.cxx
sd/source/ui/view/outlnvsh.cxx
sd/source/ui/view/outlview.cxx
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 ac07995061d3..e9f99967241c 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 ); |