Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 5 insertions, 5 deletions

diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index e37ae2057d3f..06875cc26f47 100644..100755
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -61,11 +61,11 @@ public:
     virtual bool Command( const CommandEvent& rCEvt );
 
     // callbacks from sdr view
-    virtual ULONG GetMarkablePointCount() const;
-    virtual ULONG GetMarkedPointCount() const;
-    virtual BOOL MarkPoint(SdrHdl& rHdl, BOOL bUnmark=FALSE);
+    virtual sal_uLong GetMarkablePointCount() const;
+    virtual sal_uLong GetMarkedPointCount() const;
+    virtual sal_Bool MarkPoint(SdrHdl& rHdl, sal_Bool bUnmark=sal_False);
     virtual void CheckPossibilities();
-    virtual BOOL MarkPoints(const Rectangle* pRect, BOOL bUnmark);
+    virtual sal_Bool MarkPoints(const Rectangle* pRect, sal_Bool bUnmark);
 
     void Move( int nDX, int nDY );
     bool OnMove( const KeyEvent& rKEvt );
@@ -97,7 +97,7 @@ private:
     int                                             mnIndex;
     const Font&                                     mrFont;
     Size                                            maSize;
-    ULONG                                           mnClosePopupEvent;
+    sal_uLong                                           mnClosePopupEvent;
     ::Window*                                       mpListenWindow;
     Point                                           maMouseDownPos;
 };