10 files changed, 25 insertions, 25 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);
 
diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
index 9dfd861fd5cf..a8b3ca12e6a6 100644
--- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx
@@ -59,8 +59,8 @@ namespace sd { namespace slidesorter { namespace model {
 
 class DocumentPageContainer;
 
-inline sal_Int32 FromCoreIndex (const USHORT nCoreIndex) { return (nCoreIndex-1)/2; }
-inline USHORT ToCoreIndex (const sal_Int32 nIndex) { return nIndex*2+1; }
+inline sal_Int32 FromCoreIndex (const sal_uInt16 nCoreIndex) { return (nCoreIndex-1)/2; }
+inline sal_uInt16 ToCoreIndex (const sal_Int32 nIndex) { return nIndex*2+1; }
 
 /** The model of the slide sorter gives access to the slides that are to be
     displayed in the slide sorter view.  Via the SetDocumentSlides() method
@@ -155,7 +155,7 @@ public:
         the n*2+1 magic.  Only when a special model is set, like a custom
         slide show, then the returned value is different.
     */
-    USHORT GetCoreIndex (const sal_Int32 nIndex) const;
+    sal_uInt16 GetCoreIndex (const sal_Int32 nIndex) const;
 
     /** Call this method after the document has changed its structure.  This
         will get the model in sync with the SdDrawDocument.  This method
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
index 3586eead3532..3586eead3532 100644..100755
--- a/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageEnumeration.hxx
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
index 7e884fc54797..7e884fc54797 100644..100755
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectViewObjectContact.hxx
diff --git a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
index 2b39e6d2a3ee..0781d8ea3519 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsTheme.hxx
@@ -227,7 +227,7 @@ private:
     /** Guarded initialization of the specified icon in the maIcons
         container.  Call only while a LocalResource object is active.
     */
-    void InitializeIcon (const IconType eType, USHORT nResourceId);
+    void InitializeIcon (const IconType eType, sal_uInt16 nResourceId);
 };
 
 
diff --git a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
index b633b1f3f5ca..48a4c7c3d272 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsToolTip.hxx
@@ -77,7 +77,7 @@ private:
     model::SharedPageDescriptor mpDescriptor;
     ::rtl::OUString msDefaultHelpText;
     ::rtl::OUString msCurrentHelpText;
-    ULONG mnHelpWindowHandle;
+    sal_uLong mnHelpWindowHandle;
     Timer maTimer;
 
     /** Request to show the tool tip.