removetooltypes01: #i112600# remove tooltypes from reportdesign

6 files changed, 29 insertions, 29 deletions

diff --git a/reportdesign/inc/ModuleHelper.hxx b/reportdesign/inc/ModuleHelper.hxx
index 79d3b996db81..73f195ffb678 100644
--- a/reportdesign/inc/ModuleHelper.hxx
+++ b/reportdesign/inc/ModuleHelper.hxx
@@ -89,7 +89,7 @@ namespace rptui
     class REPORTDESIGN_DLLPUBLIC ModuleRes : public ::ResId
     {
     public:
-        inline ModuleRes(USHORT _nId) : ResId(_nId, *OModule::getResManager()) { }
+        inline ModuleRes(sal_uInt16 _nId) : ResId(_nId, *OModule::getResManager()) { }
     };
 //.........................................................................
 }   // namespace rptui
diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx
index 6a1fbf7a27ce..a5f0aa508c3a 100644
--- a/reportdesign/inc/RptDef.hxx
+++ b/reportdesign/inc/RptDef.hxx
@@ -50,18 +50,18 @@ namespace rptui
 #define RPT_LAYER_HIDDEN        2
 
 
-const UINT32 ReportInventor = UINT32('R')*0x00000001+
-                           UINT32('P')*0x00000100+
-                           UINT32('T')*0x00010000+
-                           UINT32('1')*0x01000000;
+const sal_uInt32 ReportInventor = sal_uInt32('R')*0x00000001+
+                           sal_uInt32('P')*0x00000100+
+                           sal_uInt32('T')*0x00010000+
+                           sal_uInt32('1')*0x01000000;
 
 
-#define OBJ_DLG_FIXEDTEXT       ((UINT16) OBJ_MAXI + 1)
+#define OBJ_DLG_FIXEDTEXT       ((sal_uInt16) OBJ_MAXI + 1)
 #define OBJ_DLG_IMAGECONTROL    OBJ_FM_IMAGECONTROL
-#define OBJ_DLG_FORMATTEDFIELD  ((UINT16) OBJ_MAXI + 3)
-#define OBJ_DLG_HFIXEDLINE      ((UINT16) OBJ_MAXI + 4)
-#define OBJ_DLG_VFIXEDLINE      ((UINT16) OBJ_MAXI + 5)
-#define OBJ_DLG_SUBREPORT       ((UINT16) OBJ_MAXI + 6)
+#define OBJ_DLG_FORMATTEDFIELD  ((sal_uInt16) OBJ_MAXI + 3)
+#define OBJ_DLG_HFIXEDLINE      ((sal_uInt16) OBJ_MAXI + 4)
+#define OBJ_DLG_VFIXEDLINE      ((sal_uInt16) OBJ_MAXI + 5)
+#define OBJ_DLG_SUBREPORT       ((sal_uInt16) OBJ_MAXI + 6)
 
 // allows the alignment and resizing of controls
 namespace ControlModification
diff --git a/reportdesign/inc/RptModel.hxx b/reportdesign/inc/RptModel.hxx
index 872938426259..c4fcbdc2da34 100644
--- a/reportdesign/inc/RptModel.hxx
+++ b/reportdesign/inc/RptModel.hxx
@@ -72,7 +72,7 @@ public:
     virtual void        SetChanged(sal_Bool bFlg = sal_True);
     virtual SdrPage*    AllocPage(FASTBOOL bMasterPage);
     virtual Window*     GetCurDocViewWin();
-    virtual SdrPage*    RemovePage(USHORT nPgNum);
+    virtual SdrPage*    RemovePage(sal_uInt16 nPgNum);
     /** returns the numbering type that is used to format page fields in drawing shapes */
     virtual SvxNumType  GetPageNumType() const;
 
diff --git a/reportdesign/inc/RptObject.hxx b/reportdesign/inc/RptObject.hxx
index 5c920947990b..2af9a25267a1 100644
--- a/reportdesign/inc/RptObject.hxx
+++ b/reportdesign/inc/RptObject.hxx
@@ -175,8 +175,8 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape();
-    virtual UINT16 GetObjIdentifier() const;
-    virtual UINT32 GetObjInventor() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
+    virtual sal_uInt32 GetObjInventor() const;
 };
 
 //============================================================================
@@ -187,17 +187,17 @@ class REPORTDESIGN_DLLPUBLIC OOle2Obj: public SdrOle2Obj , public OObjectBase
     friend class OReportPage;
     friend class DlgEdFactory;
 
-    UINT16 m_nType;
+    sal_uInt16 m_nType;
     bool    m_bOnlyOnce;
     void impl_createDataProvider_nothrow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel>& _xModel);
 public:
-    static OOle2Obj* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,UINT16 _nType )
+    static OOle2Obj* Create( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType )
     {
         return new OOle2Obj( _xComponent,_nType );
     }
 protected:
-    OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,UINT16 _nType);
-    OOle2Obj(const ::rtl::OUString& _sComponentName,UINT16 _nType);
+    OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,sal_uInt16 _nType);
+    OOle2Obj(const ::rtl::OUString& _sComponentName,sal_uInt16 _nType);
 
 
     virtual void NbcMove( const Size& rSize );
@@ -217,8 +217,8 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> getAwtComponent();
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape();
-    virtual UINT16 GetObjIdentifier() const;
-    virtual UINT32 GetObjInventor() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
+    virtual sal_uInt32 GetObjInventor() const;
     // Clone() soll eine komplette Kopie des Objektes erzeugen.
     virtual SdrObject* Clone() const;
     virtual void initializeOle();
@@ -270,8 +270,8 @@ public:
     static ::rtl::OUString GetDefaultName(const OUnoObject* _pObj);
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > getUnoShape();
-    virtual UINT16 GetObjIdentifier() const;
-    virtual UINT32 GetObjInventor() const;
+    virtual sal_uInt16 GetObjIdentifier() const;
+    virtual sal_uInt32 GetObjInventor() const;
     virtual SdrObject* Clone() const;
 
 private:
diff --git a/reportdesign/inc/RptPage.hxx b/reportdesign/inc/RptPage.hxx
index f890264d6dc0..7b24ba6b297c 100644
--- a/reportdesign/inc/RptPage.hxx
+++ b/reportdesign/inc/RptPage.hxx
@@ -63,19 +63,19 @@ public:
 
     OReportPage( OReportModel& rModel
                 ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection >& _xSection
-                ,FASTBOOL bMasterPage=FALSE );
+                ,FASTBOOL bMasterPage=sal_False );
 
 
     virtual SdrPage* Clone() const;
     using SdrPage::Clone;
 
-    virtual void NbcInsertObject(SdrObject* pObj, ULONG nPos, const SdrInsertReason* pReason);
-    virtual SdrObject* RemoveObject(ULONG nObjNum);
+    virtual void NbcInsertObject(SdrObject* pObj, sal_uLong nPos, const SdrInsertReason* pReason);
+    virtual SdrObject* RemoveObject(sal_uLong nObjNum);
 
     /** returns the index inside the object list which belongs to the report component.
         @param  _xObject    the report component
     */
-    ULONG getIndexOf(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
+    sal_uLong getIndexOf(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent >& _xObject);
 
     /** removes the SdrObject which belongs to the report component.
         @param  _xObject    the report component
diff --git a/reportdesign/inc/UndoActions.hxx b/reportdesign/inc/UndoActions.hxx
index 180fa616cf39..b7b09292cfbe 100644
--- a/reportdesign/inc/UndoActions.hxx
+++ b/reportdesign/inc/UndoActions.hxx
@@ -145,7 +145,7 @@ namespace rptui
     public:
         TYPEINFO();
         OCommentUndoAction( SdrModel& rMod
-                            ,USHORT nCommentID);
+                            ,sal_uInt16 nCommentID);
         virtual ~OCommentUndoAction();
 
         virtual UniString   GetComment() const { return m_strComment; }
@@ -175,7 +175,7 @@ namespace rptui
                             ,Action _eAction
                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > _xContainer
                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem
-                            ,USHORT _nCommentId);
+                            ,sal_uInt16 _nCommentId);
         virtual ~OUndoContainerAction();
 
         virtual void Undo();
@@ -201,7 +201,7 @@ namespace rptui
                                 ,OReportHelper> _pMemberFunction
                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportDefinition >& _xReport
                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem
-                            ,USHORT _nCommentId);
+                            ,sal_uInt16 _nCommentId);
 
     protected:
         virtual void    implReInsert( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );
@@ -223,7 +223,7 @@ namespace rptui
                                             ,OGroupHelper> _pMemberFunction
                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::report::XGroup >& _xGroup
                             ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElem
-                            ,USHORT _nCommentId);
+                            ,sal_uInt16 _nCommentId);
 
     protected:
         virtual void    implReInsert( ) SAL_THROW( ( ::com::sun::star::uno::Exception ) );