removetooltypes01: #i112600# remove tooltypes from reportdesign

17 files changed, 87 insertions, 87 deletions

diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx
index 1e06d68f8..74543888c 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -60,7 +60,7 @@ namespace rptui
     public:
         virtual void            addCondition( size_t _nAddAfterIndex ) = 0;
         virtual void            deleteCondition( size_t _nCondIndex ) = 0;
-        virtual void            applyCommand( size_t _nCondIndex, USHORT _nCommandId, const ::Color _aColor ) = 0;
+        virtual void            applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor ) = 0;
         virtual void            moveConditionUp( size_t _nCondIndex ) = 0;
         virtual void            moveConditionDown( size_t _nCondIndex ) = 0;
         virtual ::rtl::OUString getDataField() const = 0;
@@ -109,7 +109,7 @@ namespace rptui
         // IConditionalFormatAction overridables
         virtual void addCondition( size_t _nAddAfterIndex );
         virtual void deleteCondition( size_t _nCondIndex );
-        virtual void applyCommand( size_t _nCondIndex, USHORT _nCommandId, const ::Color _aColor );
+        virtual void applyCommand( size_t _nCondIndex, sal_uInt16 _nCommandId, const ::Color _aColor );
         virtual void moveConditionUp( size_t _nCondIndex );
         virtual void moveConditionDown( size_t _nCondIndex );
         virtual ::rtl::OUString getDataField() const;
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 16d4e6c34..ac8377e11 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -83,14 +83,14 @@ namespace rptui
         Timer								m_aMarkTimer;
         Point								m_aScrollOffset;
         DlgEdMode							m_eMode;
-        USHORT								m_nCurrentPosition;
-        USHORT								m_eActObj;
-        BOOL								m_bFirstDraw;
+        sal_uInt16								m_nCurrentPosition;
+        sal_uInt16								m_eActObj;
+        sal_Bool								m_bFirstDraw;
         Size                                m_aGridSizeCoarse;
         Size                                m_aGridSizeFine;
-        BOOL								m_bGridVisible;
-        BOOL								m_bGridSnap;
-        BOOL								m_bDeleted;
+        sal_Bool								m_bGridVisible;
+        sal_Bool								m_bGridSnap;
+        sal_Bool								m_bDeleted;
         
 
         DECL_LINK( MarkTimeout, Timer * );
@@ -125,8 +125,8 @@ namespace rptui
         inline OReportController&	getController() const { return m_rReportController; }
 
         void 			SetMode( DlgEdMode m_eMode );
-        void			SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString());
-        USHORT    		GetInsertObj() const;
+        void			SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString());
+        sal_uInt16    		GetInsertObj() const;
         rtl::OUString   GetInsertObjString() const;
         DlgEdMode   	GetMode() const { return m_eMode; }
 
@@ -142,7 +142,7 @@ namespace rptui
         *
         * \return <TRUE/> if paste is allowed
         */
-        BOOL IsPasteAllowed() const;
+        sal_Bool IsPasteAllowed() const;
 
         /** paste a new control in this section
         */
@@ -168,17 +168,17 @@ namespace rptui
         void            SelectAll(const sal_uInt16 _nObjectType);
 
         /// checks if a selection exists
-        BOOL			HasSelection() const;
+        sal_Bool			HasSelection() const;
 
         void            UpdatePropertyBrowserDelayed(OSectionView& _rView);
 
-        USHORT			getSectionCount() const;
+        sal_uInt16			getSectionCount() const;
 
         /** removes the section at the given position.
         *
         * \param _nPosition Zero based.
         */
-        void			removeSection(USHORT _nPosition);
+        void			removeSection(sal_uInt16 _nPosition);
 
         /** adds a new section at position _nPosition.
             If the section is <NULL/> nothing happens.
@@ -186,13 +186,13 @@ namespace rptui
         */
         void			addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
                                     ,const ::rtl::OUString& _sColorEntry
-                                    ,USHORT _nPosition = USHRT_MAX);
+                                    ,sal_uInt16 _nPosition = USHRT_MAX);
 
         inline Size     getGridSizeCoarse() const { return m_aGridSizeCoarse; }
         inline Size     getGridSizeFine() const { return m_aGridSizeFine; }
-        inline BOOL		isGridSnap() const { return m_bGridSnap; }
-        void            setGridSnap(BOOL bOn);
-        void            setDragStripes(BOOL bOn);
+        inline sal_Bool		isGridSnap() const { return m_bGridSnap; }
+        void            setGridSnap(sal_Bool bOn);
+        void            setDragStripes(sal_Bool bOn);
         /** turns the grid on or off
         *
         * \param _bGridVisible
@@ -201,10 +201,10 @@ namespace rptui
 
         void			togglePropertyBrowser(sal_Bool _bToogleOn);
 
-        BOOL			isAddFieldVisible() const;
+        sal_Bool			isAddFieldVisible() const;
         void			toggleAddField();
 
-        BOOL			isReportExplorerVisible() const;
+        sal_Bool			isReportExplorerVisible() const;
         void			toggleReportExplorer();
 
         /** shows or hides the ruler.
diff --git a/reportdesign/source/ui/inc/Formula.hxx b/reportdesign/source/ui/inc/Formula.hxx
index a91131d4b..1e5953a2a 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -72,11 +72,11 @@ public:
     virtual void notifyChange();
     virtual void fill();
     virtual bool calculateValue(const String& _sExpression,String& _rResult);
-    virtual void doClose(BOOL _bOk);
+    virtual void doClose(sal_Bool _bOk);
     virtual void insertEntryToLRUList(const formula::IFunctionDescription*	pDesc);
     virtual void showReference(const String& _sFormula);
-    virtual void dispatch(BOOL _bOK,BOOL _bMartixChecked);
-    virtual void setDispatcherLock( BOOL bLock );
+    virtual void dispatch(sal_Bool _bOK,sal_Bool _bMartixChecked);
+    virtual void setDispatcherLock( sal_Bool bLock );
     virtual void setReferenceInput(const formula::FormEditData* _pData);
     virtual void deleteFormData();
     virtual void clear();
@@ -96,7 +96,7 @@ public:
 
     // IControlReferenceHandler
     virtual void ShowReference(const String& _sRef);
-    virtual void HideReference( BOOL bDoneRefMode = TRUE );
+    virtual void HideReference( sal_Bool bDoneRefMode = sal_True );
     virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
     virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL );
 
diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx
index c7dc8a9ed..792e2885b 100644
--- a/reportdesign/source/ui/inc/FunctionHelper.hxx
+++ b/reportdesign/source/ui/inc/FunctionHelper.hxx
@@ -78,7 +78,7 @@ public:
     virtual ::rtl::OUString getDescription() const ;
     virtual xub_StrLen getSuppressedArgumentCount() const ;
     virtual ::rtl::OUString getFormula(const ::std::vector< ::rtl::OUString >& _aArguments) const ;
-    virtual void fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const ;
+    virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& _rArguments) const ;
     virtual void initArgumentInfo()  const;
     virtual ::rtl::OUString getSignature() const ;
     virtual rtl::OString getHelpId() const ;
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx b/reportdesign/source/ui/inc/GeometryHandler.hxx
index eb2546f4c..ac3b8779a 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -195,7 +195,7 @@ namespace rptui
         * \param _sQuotedFunction the quoted function name
         * \param _Out_rDataField the data field which is used in the function
         * \param _xFunctionsSupplier teh function supplier to search or empty if not used
-        * \param _bSet If set to TRUE than the m_sDefaultFunction and m_sScope vars will be set if successful.
+        * \param _bSet If set to sal_True than the m_sDefaultFunction and m_sScope vars will be set if successful.
         * \return sal_True with known otherwise sal_False
         */
         sal_Bool isDefaultFunction(const ::rtl::OUString& _sQuotedFunction
diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx
index 891b9c966..5da272ae2 100644
--- a/reportdesign/source/ui/inc/GroupsSorting.hxx
+++ b/reportdesign/source/ui/inc/GroupsSorting.hxx
@@ -143,7 +143,7 @@ private:
     /** shows the text given by the id in the multiline edit
         @param	_nResId	the string id
     */
-    void showHelpText(USHORT _nResId);
+    void showHelpText(sal_uInt16 _nResId);
     /** display the group props
         @param	_xGroup the group to display
     */
diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx
index 8552e4ee2..5077c8ef3 100644
--- a/reportdesign/source/ui/inc/ReportController.hxx
+++ b/reportdesign/source/ui/inc/ReportController.hxx
@@ -213,8 +213,8 @@ namespace rptui
                          ,sal_Int32 _nGroupPos
                          ,bool _bShow);
 
-        void executeMethodWithUndo(USHORT _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun);
-        void alignControlsWithUndo(USHORT _nUndoStrId,sal_Int32 _nControlModification,bool _bAlignAtSection = false);
+        void executeMethodWithUndo(sal_uInt16 _nUndoStrId,const ::std::mem_fun_t<void,ODesignView>& _pMemfun);
+        void alignControlsWithUndo(sal_uInt16 _nUndoStrId,sal_Int32 _nControlModification,bool _bAlignAtSection = false);
         /** shrink a section
         @param _nUndoStrId the string id of the string which is shown in undo menu
         @param _nShrinkId  ID of what you would like to shrink.
@@ -224,7 +224,7 @@ namespace rptui
         void shrinkSectionTop(::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection);
     public:
         
-        void shrinkSection(USHORT _nUndoStrId, ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection, sal_Int32 _nShrinkId);
+        void shrinkSection(sal_uInt16 _nUndoStrId, ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > _xSection, sal_Int32 _nShrinkId);
 
         /** opens the file open dialog to allow the user to select a image which will be 
         * bound to a newly created image button.
@@ -279,7 +279,7 @@ namespace rptui
 
         /** collapse or expand the currently selected section.
         *
-        * \param _bCollapse collapse if TRUE otherwise expand
+        * \param _bCollapse collapse if sal_True otherwise expand
         */
         void collapseSection(const bool _bCollapse);
 
diff --git a/reportdesign/source/ui/inc/ReportRuler.hxx b/reportdesign/source/ui/inc/ReportRuler.hxx
index c16e18a39..fc40a4217 100644
--- a/reportdesign/source/ui/inc/ReportRuler.hxx
+++ b/reportdesign/source/ui/inc/ReportRuler.hxx
@@ -55,7 +55,7 @@ namespace rptui
         *
         * \param _bVisible when <TRUE/> the grid is made visible
         */
-        void SetGridVisible(BOOL _bVisible);
+        void SetGridVisible(sal_Bool _bVisible);
     };
 //==============================================================================
 } // rptui
diff --git a/reportdesign/source/ui/inc/ReportSection.hxx b/reportdesign/source/ui/inc/ReportSection.hxx
index ca4f11eb1..74444f23d 100644
--- a/reportdesign/source/ui/inc/ReportSection.hxx
+++ b/reportdesign/source/ui/inc/ReportSection.hxx
@@ -61,7 +61,7 @@ namespace rptui
         ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >              m_xSection;
         
         DlgEdMode					m_eMode;
-        BOOL						m_bDialogModelChanged;
+        sal_Bool						m_bDialogModelChanged;
         sal_Bool					m_bInDrag;
 
         /** fills the section with all control from the report section
@@ -117,15 +117,15 @@ namespace rptui
         *
         * \param _bVisible when <TRUE/> the grid is made visible
         */
-        void SetGridVisible(BOOL _bVisible);
+        void SetGridVisible(sal_Bool _bVisible);
 
         inline OSectionWindow*		getSectionWindow() const { return m_pParent; }
         inline OSectionView&		getSectionView() const { return *m_pView; }
         inline OReportPage*			getPage() const { return m_pPage; }
         inline ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection > getSection() const { return m_xSection; }
 
-        void			SetDialogModelChanged( BOOL bChanged = TRUE ) { m_bDialogModelChanged = bChanged; }
-        BOOL			IsDialogModelChanged() const { return m_bDialogModelChanged; }
+        void			SetDialogModelChanged( sal_Bool bChanged = sal_True ) { m_bDialogModelChanged = bChanged; }
+        sal_Bool			IsDialogModelChanged() const { return m_bDialogModelChanged; }
         DlgEdMode   	GetMode() const { return m_eMode; }
         void 			SetMode( DlgEdMode m_eMode );
 
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index 294431ca5..2b3e1c3fb 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -86,10 +86,10 @@ namespace rptui
         inline OScrollWindowHelper*	getScrollWindow() const { return m_pParent; }
 
         void 			SetMode( DlgEdMode m_eMode );
-        void			SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString());
+        void			SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString());
         rtl::OUString   GetInsertObjString() const;
-        void            setGridSnap(BOOL bOn);
-        void            setDragStripes(BOOL bOn);
+        void            setGridSnap(sal_Bool bOn);
+        void            setDragStripes(sal_Bool bOn);
 
         /** copies the current selection in this section
         */
@@ -99,7 +99,7 @@ namespace rptui
         *
         * \return <TRUE/> if paste is allowed
         */
-        BOOL IsPasteAllowed() const;
+        sal_Bool IsPasteAllowed() const;
 
         /** paste a new control in this section
         */
@@ -116,7 +116,7 @@ namespace rptui
 
         /** returns <TRUE/> when a object is marked
         */
-        BOOL HasSelection() const;
+        sal_Bool HasSelection() const;
 
         Point			getThumbPos() const;
 
@@ -124,7 +124,7 @@ namespace rptui
         *
         * \param _nPosition Zero based.
         */
-        void			removeSection(USHORT _nPosition);
+        void			removeSection(sal_uInt16 _nPosition);
 
         /** adds a new section at position _nPosition.
             If the section is <NULL/> nothing happens.
@@ -132,9 +132,9 @@ namespace rptui
         */
         void			addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
                                     ,const ::rtl::OUString& _sColorEntry
-                                    ,USHORT _nPosition = USHRT_MAX);
+                                    ,sal_uInt16 _nPosition = USHRT_MAX);
 
-        USHORT			getSectionCount() const;
+        sal_uInt16			getSectionCount() const;
 
         /** turns the grid on or off
         *
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 9df2b83dd..a1937a071 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -99,10 +99,10 @@ namespace rptui
 
         // forwards
         void 					SetMode( DlgEdMode _eMode );
-        void					SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString());
+        void					SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString());
         rtl::OUString           GetInsertObjString() const;
-        void                    setGridSnap(BOOL bOn);
-        void                    setDragStripes(BOOL bOn);
+        void                    setGridSnap(sal_Bool bOn);
+        void                    setDragStripes(sal_Bool bOn);
         /** copies the current selection in this section
         */
         void Copy();
@@ -111,7 +111,7 @@ namespace rptui
         *
         * \return <TRUE/> if paste is allowed
         */
-        BOOL IsPasteAllowed() const;
+        sal_Bool IsPasteAllowed() const;
 
         /** paste a new control in this section
         */
@@ -128,13 +128,13 @@ namespace rptui
 
         /** returns <TRUE/> when a object is marked
         */
-        BOOL HasSelection() const;
+        sal_Bool HasSelection() const;
 
         /** removes the section at the given position.
         *
         * \param _nPosition Zero based.
         */
-        void					removeSection(USHORT _nPosition);
+        void					removeSection(sal_uInt16 _nPosition);
 
         /** adds a new section at position _nPosition.
             If the section is <NULL/> nothing happens.
@@ -142,9 +142,9 @@ namespace rptui
         */
         void					addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
                                     ,const ::rtl::OUString& _sColorEntry
-                                    ,USHORT _nPosition = USHRT_MAX);
+                                    ,sal_uInt16 _nPosition = USHRT_MAX);
 
-        USHORT					getSectionCount() const;
+        sal_uInt16					getSectionCount() const;
 
         /** turns the grid on or off
         *
diff --git a/reportdesign/source/ui/inc/SectionWindow.hxx b/reportdesign/source/ui/inc/SectionWindow.hxx
index 157c1d7cf..803ed5386 100644
--- a/reportdesign/source/ui/inc/SectionWindow.hxx
+++ b/reportdesign/source/ui/inc/SectionWindow.hxx
@@ -75,9 +75,9 @@ namespace rptui
         * \param _nResId 
         * \param _pGetSection 
         * \param _pIsSectionOn 
-        * @return TRUE when title was set otherwise FALSE
+        * @return sal_True when title was set otherwise FALSE
         */
-        bool setGroupSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup,USHORT _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OGroupHelper> _pIsSectionOn);
+        bool setGroupSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OGroupHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OGroupHelper> _pIsSectionOn);
 
         /** set the title of the (report/page) header or footer
         *
@@ -85,9 +85,9 @@ namespace rptui
         * \param _nResId 
         * \param _pGetSection 
         * \param _pIsSectionOn 
-        * @return TRUE when title was set otherwise FALSE
+        * @return sal_True when title was set otherwise FALSE
         */
-        bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,USHORT _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OReportHelper> _pIsSectionOn);
+        bool setReportSectionTitle(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition>& _xReport,sal_uInt16 _nResId,::std::mem_fun_t< ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection> , OReportHelper> _pGetSection,::std::mem_fun_t<sal_Bool, OReportHelper> _pIsSectionOn);
         void ImplInitSettings();
 
         DECL_LINK(Collapsed,OColorListener*);
diff --git a/reportdesign/source/ui/inc/UITools.hxx b/reportdesign/source/ui/inc/UITools.hxx
index 420715f9e..5ff57f1ff 100644
--- a/reportdesign/source/ui/inc/UITools.hxx
+++ b/reportdesign/source/ui/inc/UITools.hxx
@@ -168,7 +168,7 @@ namespace rptui
     *
     * \param pControl           the control which should place in the section without overlapping
     * \param _pReportSection    the section
-    * \param _bInsert           TRUE whe the control should be inserted, otherwise not.
+    * \param _bInsert           sal_True whe the control should be inserted, otherwise not.
     */
     void correctOverlapping(SdrObject* pControl,OReportSection& _aReportSection,bool _bInsert = true);
 
diff --git a/reportdesign/source/ui/inc/Undo.hxx b/reportdesign/source/ui/inc/Undo.hxx
index 906755fe3..7b8230e88 100644
--- a/reportdesign/source/ui/inc/Undo.hxx
+++ b/reportdesign/source/ui/inc/Undo.hxx
@@ -67,7 +67,7 @@ namespace rptui
         OSectionUndo(	OReportModel& rMod
                         ,sal_uInt16 _nSlot
                         ,Action _eAction
-                        ,USHORT nCommentID);
+                        ,sal_uInt16 nCommentID);
         virtual ~OSectionUndo();
 
         virtual void		Undo();
@@ -95,7 +95,7 @@ namespace rptui
                                 ,OReportHelper> _pMemberFunction
                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport
                             ,Action _eAction
-                            ,USHORT nCommentID);
+                            ,sal_uInt16 nCommentID);
         virtual ~OReportSectionUndo();
     };
 
@@ -122,7 +122,7 @@ namespace rptui
                                             ,OGroupHelper> _pMemberFunction
                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup
                             ,Action _eAction
-                            ,USHORT nCommentID);
+                            ,sal_uInt16 nCommentID);
 
         virtual String		GetComment() const;
     };
@@ -142,7 +142,7 @@ namespace rptui
     public:
         TYPEINFO();
         OGroupUndo(OReportModel& rMod
-                    ,USHORT nCommentID
+                    ,sal_uInt16 nCommentID
                     ,Action	_eAction
                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup>& _xGroup
                     ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReportDefinition);
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 2a653aa4b..3007c447a 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -92,7 +92,7 @@ namespace rptui
     public:
         OWindowPositionCorrector(Window* _pWindow,long _nDeltaX, long _nDeltaY) :m_nDeltaX(_nDeltaX), m_nDeltaY(_nDeltaY)
         {
-            USHORT nCount = _pWindow->GetChildCount();
+            sal_uInt16 nCount = _pWindow->GetChildCount();
             m_aChildren.reserve(nCount);
             while( nCount )
             {
@@ -146,7 +146,7 @@ namespace rptui
         void ImplInitSettings();
         /** returns the iterator at pos _nPos or the end()
         */
-        TSectionsMap::iterator getIteratorAtPos(USHORT _nPos);
+        TSectionsMap::iterator getIteratorAtPos(sal_uInt16 _nPos);
         void collectRectangles(TRectangleMap& _rMap,bool _bBoundRects);
         void collectBoundResizeRect(const TRectangleMap& _rSortRectangles,sal_Int32 _nControlModification,bool _bAlignAtSection,bool _bBoundRects,Rectangle& _rBound,Rectangle& _rResize);
         void impl_resizeSectionWindow(OSectionWindow& _rSectionWindow,Point& _rStartPoint,bool _bSet);
@@ -181,7 +181,7 @@ namespace rptui
         *
         * \param _nPosition Zero based.
         */
-        void			removeSection(USHORT _nPosition);
+        void			removeSection(sal_uInt16 _nPosition);
 
         /** adds a new section at position _nPosition.
             If the section is <NULL/> nothing happens.
@@ -189,23 +189,23 @@ namespace rptui
         */
         void			addSection(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
                                     ,const ::rtl::OUString& _sColorEntry
-                                    ,USHORT _nPosition = USHRT_MAX);
+                                    ,sal_uInt16 _nPosition = USHRT_MAX);
 
-        USHORT			getSectionCount() const;
+        sal_uInt16			getSectionCount() const;
         /** return the section at the given position
         *
         * \param _nPos 
         * \return the section at this pos or an empty section
         */
-        ::boost::shared_ptr<OSectionWindow> getSectionWindow(const USHORT _nPos) const;
+        ::boost::shared_ptr<OSectionWindow> getSectionWindow(const sal_uInt16 _nPos) const;
 
         /** turns the grid on or off
         *
         * \param _bVisible
         */
         void			toggleGrid(sal_Bool _bVisible);
-        void            setGridSnap(BOOL bOn);
-        void            setDragStripes(BOOL bOn);
+        void            setGridSnap(sal_Bool bOn);
+        void            setDragStripes(sal_Bool bOn);
 
         /** returns the total accumulated height of all sections until _pSection is reached
         */
@@ -213,7 +213,7 @@ namespace rptui
 
         inline bool		empty() const { return m_aSections.empty(); }
         void 			SetMode( DlgEdMode m_eMode );
-        void			SetInsertObj( USHORT eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString());
+        void			SetInsertObj( sal_uInt16 eObj,const ::rtl::OUString& _sShapeType = ::rtl::OUString());
         rtl::OUString   GetInsertObjString() const;
         /** copies the current selection in this section
         */
@@ -223,7 +223,7 @@ namespace rptui
         *
         * \return <TRUE/> if paste is allowed
         */
-        BOOL IsPasteAllowed() const;
+        sal_Bool IsPasteAllowed() const;
 
         /** paste a new control in this section
         */
@@ -240,7 +240,7 @@ namespace rptui
 
         /** returns <TRUE/> when a object is marked
         */
-        BOOL HasSelection() const;
+        sal_Bool HasSelection() const;
 
         /** unmark all objects on the views without the given one.
         *
@@ -293,7 +293,7 @@ namespace rptui
 
         /** returns the current position in the list
         */
-        USHORT getPosition(const OSectionWindow* _pSectionWindow = NULL) const;
+        sal_uInt16 getPosition(const OSectionWindow* _pSectionWindow = NULL) const;
 
         /** calls on every section BrkAction
         *
@@ -309,12 +309,12 @@ namespace rptui
         bool isObjectInMyTempList(SdrObject *);
     public:
         void BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionView* _pSection);
-        void EndDragObj(BOOL _bDragIntoNewSection,const OSectionView* _pSection,const Point& _aPnt);
+        void EndDragObj(sal_Bool _bDragIntoNewSection,const OSectionView* _pSection,const Point& _aPnt);
 
         void EndAction();
         void ForceMarkedToAnotherPage();
-        BOOL IsAction() const;
-        BOOL IsDragObj() const;
+        sal_Bool IsAction() const;
+        sal_Bool IsDragObj() const;
         void handleKey(const KeyCode& _rCode);
         void stopScrollTimer();
 
diff --git a/reportdesign/source/ui/inc/dlgedfunc.hxx b/reportdesign/source/ui/inc/dlgedfunc.hxx
index f7b673456..62489e9bf 100644
--- a/reportdesign/source/ui/inc/dlgedfunc.hxx
+++ b/reportdesign/source/ui/inc/dlgedfunc.hxx
@@ -93,9 +93,9 @@ public:
     DlgEdFunc( OReportSection* pParent );
     virtual ~DlgEdFunc();
 
-    virtual BOOL MouseButtonDown( const MouseEvent& rMEvt );
-    virtual BOOL MouseButtonUp( const MouseEvent& rMEvt );
-    virtual BOOL MouseMove( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
 
     /** checks if the keycode is known by the child windows
         @param	_rCode	the keycode
@@ -134,9 +134,9 @@ public:
     DlgEdFuncInsert( OReportSection* pParent );
     ~DlgEdFuncInsert();
 
-    virtual BOOL MouseButtonDown( const MouseEvent& rMEvt );
-    virtual BOOL MouseButtonUp( const MouseEvent& rMEvt );
-    virtual BOOL MouseMove( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
 };
 
 //============================================================================
@@ -149,11 +149,11 @@ public:
     DlgEdFuncSelect( OReportSection* pParent );
     ~DlgEdFuncSelect();
 
-    virtual BOOL MouseButtonDown( const MouseEvent& rMEvt );
-    virtual BOOL MouseButtonUp( const MouseEvent& rMEvt );
-    virtual BOOL MouseMove( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseButtonUp( const MouseEvent& rMEvt );
+    virtual sal_Bool MouseMove( const MouseEvent& rMEvt );
 
-    void SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, BOOL bQuickDrag);
+    void SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, sal_Bool bQuickDrag);
 };
 
 }
diff --git a/reportdesign/source/ui/inc/dlgpage.hxx b/reportdesign/source/ui/inc/dlgpage.hxx
index 491f0cba6..e707bf56f 100644
--- a/reportdesign/source/ui/inc/dlgpage.hxx
+++ b/reportdesign/source/ui/inc/dlgpage.hxx
@@ -45,7 +45,7 @@ private:
     void operator =(const ORptPageDialog&);
 public:
 
-    ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,USHORT _nPageId);
+    ORptPageDialog( Window* pParent, const SfxItemSet* pAttr,sal_uInt16 _nPageId);
     virtual ~ORptPageDialog() {}
 };
 // =============================================================================