removetooltypes01: #i112600# remove tooltypes from cui

1 files changed, 94 insertions, 94 deletions

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 3cda2a7db..9a1909bf9 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -59,13 +59,13 @@ private:
     ChangeType          mnGradientListState;
     ChangeType          mnHatchingListState;
 
-    USHORT              mnPageType;
-    USHORT              mnDlgType;
-    USHORT              mnPos;
-    BOOL                mbAreaTP;
-    BOOL                mbDeleteColorTable;
+    sal_uInt16              mnPageType;
+    sal_uInt16              mnDlgType;
+    sal_uInt16              mnPos;
+    sal_Bool                mbAreaTP;
+    sal_Bool                mbDeleteColorTable;
 
-    virtual void        PageCreated( USHORT nId, SfxTabPage &rPage );
+    virtual void        PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
 
 protected:
     virtual short       Ok();
@@ -102,7 +102,7 @@ public:
     XBitmapList*		 GetNewBitmapList() const { return mpNewBitmapList; }
     const XBitmapList*	 GetBitmapList() const { return mpBitmapList; }
 
-    void				 DontDeleteColorTable() { mbDeleteColorTable = FALSE; }
+    void				 DontDeleteColorTable() { mbDeleteColorTable = sal_False; }
 };
 
 /*************************************************************************
@@ -119,10 +119,10 @@ class SvxTransparenceTabPage : public SvxTabPage
     const SfxItemSet&   rOutAttrs;
     RECT_POINT          eRP;
 
-    //CHINA001 UINT16*             pPageType;
-    //CHINA001 UINT16*             pDlgType;
-    UINT16             nPageType; //add CHINA001 
-    UINT16             nDlgType;  //add CHINA001 
+    //CHINA001 sal_uInt16*             pPageType;
+    //CHINA001 sal_uInt16*             pDlgType;
+    sal_uInt16             nPageType; //add CHINA001 
+    sal_uInt16             nDlgType;  //add CHINA001 
 
     // main selection
     FixedLine           aFlProp;
@@ -152,7 +152,7 @@ class SvxTransparenceTabPage : public SvxTabPage
     // preview
     SvxXRectPreview     aCtlBitmapPreview;
     SvxXRectPreview     aCtlXRectPreview;
-    BOOL				bBitmap;
+    sal_Bool				bBitmap;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -167,30 +167,30 @@ class SvxTransparenceTabPage : public SvxTabPage
     DECL_LINK(ModifiedTrgrHdl_Impl, void*);
 #endif
 
-    void ActivateLinear(BOOL bActivate);
-    void ActivateGradient(BOOL bActivate);
+    void ActivateLinear(sal_Bool bActivate);
+    void ActivateGradient(sal_Bool bActivate);
     void SetControlState_Impl(XGradientStyle eXGS);
 
-    BOOL InitPreview ( const SfxItemSet& rSet );
-    void InvalidatePreview (BOOL bEnable = TRUE );
+    sal_Bool InitPreview ( const SfxItemSet& rSet );
+    void InvalidatePreview (sal_Bool bEnable = sal_True );
 
 public:
     SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs);
     void Construct();
 
     static SfxTabPage* Create(Window*, const SfxItemSet&);
-    static UINT16* GetRanges();
+    static sal_uInt16* GetRanges();
 
-    virtual BOOL FillItemSet(SfxItemSet&);
+    virtual sal_Bool FillItemSet(SfxItemSet&);
     virtual void Reset(const SfxItemSet&);
     virtual void ActivatePage(const SfxItemSet& rSet);
     virtual int  DeactivatePage(SfxItemSet* pSet);
     virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
 
-    //CHINA001 void SetPageType(UINT16 *pInType) { pPageType = pInType; }
-    //CHINA001 void SetDlgType(UINT16* pInType) { pDlgType = pInType; }
-    void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001 
-    void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001 
+    //CHINA001 void SetPageType(sal_uInt16 *pInType) { pPageType = pInType; }
+    //CHINA001 void SetDlgType(sal_uInt16* pInType) { pDlgType = pInType; }
+    void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } //add CHINA001 
+    void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }//add CHINA001 
     virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 
 };
 
@@ -257,14 +257,14 @@ private:
     ChangeType*         pnGradientListState;
     ChangeType*         pnHatchingListState;
 
-    //CHINA001 USHORT*             pPageType;
-    //CHINA001 USHORT*             pDlgType;
-    //CHINA001 USHORT*             pPos;
-    UINT16 nPageType; //add CHINA001 
-    UINT16 nDlgType;//add CHINA001 
-    UINT16 nPos; //add CHINA001 
+    //CHINA001 sal_uInt16*             pPageType;
+    //CHINA001 sal_uInt16*             pDlgType;
+    //CHINA001 sal_uInt16*             pPos;
+    sal_uInt16 nPageType; //add CHINA001 
+    sal_uInt16 nDlgType;//add CHINA001 
+    sal_uInt16 nPos; //add CHINA001 
 
-    BOOL*               pbAreaTP;
+    sal_Bool*               pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -298,9 +298,9 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*	    GetRanges();
+    static  sal_uInt16*	    GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
@@ -313,13 +313,13 @@ public:
                 { pHatchingList = pHtchLst; }
     void    SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
 
-    //CHINA001 void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 
-    //CHINA001 void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001 
-    //CHINA001 void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001 
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    //CHINA001 void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001 
+    //CHINA001 void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }//add CHINA001 
+    //CHINA001 void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetPos( sal_uInt16 nInPos ) { nPos = nInPos; }//add CHINA001 
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
     virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
     void    SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
@@ -356,12 +356,12 @@ private:
 
     XColorTable*        pColorTab;
     ChangeType*         pnColorTableState;
-    UINT16				nPageType;	//add CHINA001 
-    UINT16				nDlgType;	//add CHINA001 
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16				nPageType;	//add CHINA001 
+    sal_uInt16				nDlgType;	//add CHINA001 
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
-    BOOL				bDisable;
+    sal_Bool				bDisable;
 
     XOutdevItemPool*    pXPool;
     XFillAttrSetItem    aXFillAttr;
@@ -378,23 +378,23 @@ public:
 
     void    Construct();
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    static  USHORT*	    GetRanges();
+    static  sal_uInt16*	    GetRanges();
 
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
     virtual void ActivatePage( const SfxItemSet& rSet );
     virtual int  DeactivatePage( SfxItemSet* pSet );
     virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
 
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
-//CHINA001	void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-//CHINA001	void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001 
-    void    SetDlgType( UINT16 nInType ) { nDlgType = nInType; }	//add CHINA001 
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+//CHINA001	void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+//CHINA001	void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001 
+    void    SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }	//add CHINA001 
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
     virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001 
-    void	DisablePage( BOOL bIn ) { bDisable = bIn; }
+    void	DisablePage( sal_Bool bIn ) { bDisable = bIn; }
 };
 
 /*************************************************************************
@@ -441,10 +441,10 @@ private:
 
     ChangeType*         pnGradientListState;
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -471,7 +471,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -481,10 +481,10 @@ public:
     void    SetGradientList( XGradientList* pGrdLst)
                 { pGradientList = pGrdLst; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -528,10 +528,10 @@ private:
 
     ChangeType*         pnHatchingListState;
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -559,7 +559,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -571,10 +571,10 @@ public:
     void    SetHatchingList( XHatchList* pHtchLst)
                 { pHatchingList = pHtchLst; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -620,12 +620,12 @@ private:
 
     ChangeType*         pnBitmapListState;
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
 
-    BOOL                bBmpChanged;
+    sal_Bool                bBmpChanged;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -653,7 +653,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -664,10 +664,10 @@ public:
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
     void    SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetBmpChgd( ChangeType* pIn ) { pnBitmapListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -730,11 +730,11 @@ private:
     XColorTable*        pColorTab;
 
     ChangeType*         pnColorTableState;
-    USHORT*             pPageType;
-    USHORT*             pDlgType;
-    USHORT*             pPos;
-    BOOL*               pbAreaTP;
-    BOOL                bDeleteColorTable;
+    sal_uInt16*             pPageType;
+    sal_uInt16*             pDlgType;
+    sal_uInt16*             pPos;
+    sal_Bool*               pbAreaTP;
+    sal_Bool                bDeleteColorTable;
 
     XOutdevItemPool*    pXPool;
     XFillStyleItem      aXFStyleItem;
@@ -748,10 +748,10 @@ private:
 
 #ifdef _SVX_TPCOLOR_CXX
     void    ConvertColorValues (Color& rColor, ColorModel eModell);
-    void    RgbToCmyk_Impl( Color& rColor, USHORT& rK );
-    void    CmykToRgb_Impl( Color& rColor, const USHORT nKey );
-    USHORT  ColorToPercent_Impl( USHORT nColor );
-    USHORT  PercentToColor_Impl( USHORT nPercent );
+    void    RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK );
+    void    CmykToRgb_Impl( Color& rColor, const sal_uInt16 nKey );
+    sal_uInt16  ColorToPercent_Impl( sal_uInt16 nColor );
+    sal_uInt16  PercentToColor_Impl( sal_uInt16 nPercent );
 
     void    FillValueSet_Impl( ValueSet& rVs );
     //-----------------------------------------------------------------------------------------------------
@@ -777,7 +777,7 @@ public:
     void    Construct();
 
     static  SfxTabPage* Create( Window*, const SfxItemSet& );
-    virtual BOOL FillItemSet( SfxItemSet& );
+    virtual sal_Bool FillItemSet( SfxItemSet& );
     virtual void Reset( const SfxItemSet & );
 
     virtual void ActivatePage( const SfxItemSet& rSet );
@@ -785,14 +785,14 @@ public:
 
     void    SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
 
-    void    SetPageType( USHORT* pInType ) { pPageType = pInType; }
-    void    SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
-    void    SetPos( USHORT* pInPos ) { pPos = pInPos; }
-    void    SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+    void    SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+    void    SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+    void    SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+    void    SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
 
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
 
-    void	SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; }
+    void	SetDeleteColorTable( sal_Bool bIn ) { bDeleteColorTable = bIn; }
 
     virtual void FillUserData();
 };