diff options
Diffstat (limited to 'sd/source/ui/slidesorter/inc/controller')
5 files changed, 20 insertions, 20 deletions
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 9b7b1f5ec2d3..1bf5b8eae177 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -87,25 +87,25 @@ public: const AcceptDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND ); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND ); sal_Int8 ExecuteDrop ( const ExecuteDropEvent& rEvt, DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow = NULL, - USHORT nPage = SDRPAGE_NOTFOUND, - USHORT nLayer = SDRPAGE_NOTFOUND); + sal_uInt16 nPage = SDRPAGE_NOTFOUND, + sal_uInt16 nLayer = SDRPAGE_NOTFOUND); void Abort (void); protected: - virtual USHORT DetermineInsertPosition ( + virtual sal_uInt16 DetermineInsertPosition ( const SdTransferable& rTransferable); - virtual USHORT InsertSlides ( + virtual sal_uInt16 InsertSlides ( const SdTransferable& rTransferable, - USHORT nInsertPosition); + sal_uInt16 nInsertPosition); private: SlideSorter& mrSlideSorter; @@ -126,7 +126,7 @@ private: /** When pages are moved or copied then the selection of the slide sorter has to be updated. This flag is used to remember whether the - selection has to be updated or can stay as it is (FALSE). + selection has to be updated or can stay as it is (sal_False). */ bool mbUpdateSelectionPending; @@ -137,7 +137,7 @@ private: ::boost::scoped_ptr<UndoContext> mpUndoContext; ::boost::scoped_ptr<SelectionObserver::Context> mpSelectionObserverContext; - ULONG mnDragFinishedUserEventId; + sal_uLong mnDragFinishedUserEventId; void CreateSlideTransferable ( ::Window* pWindow, @@ -218,8 +218,8 @@ private: const void* pDropEvent , DropTargetHelper& rTargetHelper, ::sd::Window* pTargetWindow, - USHORT nPage, - USHORT nLayer); + sal_uInt16 nPage, + sal_uInt16 nLayer); /** Asynchronous part of DragFinished. The argument is the sal_Int8 nDropAction, disguised as void*. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx index 9dcd0abb646c..f3963ae04255 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx @@ -62,10 +62,10 @@ public: static FunctionReference Create( SlideSorter& rSlideSorter, SfxRequest& rRequest ); // Mouse- & Key-Events - virtual BOOL KeyInput(const KeyEvent& rKEvt); - virtual BOOL MouseMove(const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp(const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown(const MouseEvent& rMEvt); + virtual sal_Bool KeyInput(const KeyEvent& rKEvt); + virtual sal_Bool MouseMove(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp(const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown(const MouseEvent& rMEvt); virtual void Activate(); virtual void Deactivate(); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx index 5b8c7d9a08b6..f149365f710a 100755 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlideFunction.hxx @@ -50,9 +50,9 @@ class SlideFunction public: TYPEINFO(); - virtual BOOL MouseMove (const MouseEvent& rMEvt); - virtual BOOL MouseButtonUp (const MouseEvent& rMEvt); - virtual BOOL MouseButtonDown (const MouseEvent& rMEvt); + virtual sal_Bool MouseMove (const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonUp (const MouseEvent& rMEvt); + virtual sal_Bool MouseButtonDown (const MouseEvent& rMEvt); /** Called from ForceScroll() before the actual scrolling. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx index d2c9f7481624..4a678dcbfd06 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsSlotManager.hxx @@ -103,7 +103,7 @@ private: */ void RenameSlide (void); DECL_LINK(RenameSlideHdl, AbstractSvxNameDialog*); - bool RenameSlideFromDrawViewShell( USHORT nPageId, const String& rName); + bool RenameSlideFromDrawViewShell( sal_uInt16 nPageId, const String& rName); /** Handle SID_INSERTPAGE slot calls. */ diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx index 289fb1f5f072..c0a09e73bfe9 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferable.hxx @@ -65,7 +65,7 @@ public: Transferable ( SdDrawDocument* pSrcDoc, ::sd::View* pWorkView, - BOOL bInitOnGetData, + sal_Bool bInitOnGetData, SlideSorterViewShell* pViewShell, const ::std::vector<Representative>& rRepresentatives); |