removetooltypes01: #i112600# Remove tools types from sw

1 files changed, 33 insertions, 33 deletions

diff --git a/sw/source/ui/inc/content.hxx b/sw/source/ui/inc/content.hxx
index bfcd31dcba87..c7bc20ebb65b 100644
--- a/sw/source/ui/inc/content.hxx
+++ b/sw/source/ui/inc/content.hxx
@@ -47,7 +47,7 @@ class SwRedline;
 
 class SwPopup : public PopupMenu
 {
-    USHORT          nCurId;
+    sal_uInt16          nCurId;
     virtual void    Select(){nCurId = GetCurItemId();}
 
 public:
@@ -55,7 +55,7 @@ public:
         PopupMenu(),
         nCurId(USHRT_MAX){}
 
-    USHORT          GetCurId() const { return nCurId; }
+    sal_uInt16          GetCurId() const { return nCurId; }
 
 };
 
@@ -63,38 +63,38 @@ public:
 
 class SwOutlineContent : public SwContent
 {
-    USHORT  nOutlinePos;
-    BYTE    nOutlineLevel;
-    BOOL    bIsMoveable;
+    sal_uInt16  nOutlinePos;
+    sal_uInt8   nOutlineLevel;
+    sal_Bool    bIsMoveable;
     public:
         SwOutlineContent(   const SwContentType* pCnt,
                             const String& rName,
-                            USHORT nArrPos,
-                            BYTE nLevel,
-                            BOOL bMove,
+                            sal_uInt16 nArrPos,
+                            sal_uInt8 nLevel,
+                            sal_Bool bMove,
                             long nYPos) :
             SwContent(pCnt, rName, nYPos),
             nOutlinePos(nArrPos), nOutlineLevel(nLevel), bIsMoveable(bMove) {}
 
-    USHORT  GetPos(){return nOutlinePos;}
-    BYTE    GetOutlineLevel(){return nOutlineLevel;}
-    BOOL    IsMoveable(){return bIsMoveable;};
+    sal_uInt16  GetPos(){return nOutlinePos;}
+    sal_uInt8   GetOutlineLevel(){return nOutlineLevel;}
+    sal_Bool    IsMoveable(){return bIsMoveable;};
 };
 
 //----------------------------------------------------------------------------
 class SwRegionContent : public SwContent
 {
 
-    BYTE    nRegionLevel;
+    sal_uInt8   nRegionLevel;
 
     public:
         SwRegionContent(    const SwContentType* pCnt,
                             const String& rName,
-                            BYTE nLevel,
+                            sal_uInt8 nLevel,
                             long nYPos) :
             SwContent(pCnt, rName, nYPos),
                         nRegionLevel(nLevel){}
-    BYTE    GetRegionLevel() const {return nRegionLevel;}
+    sal_uInt8   GetRegionLevel() const {return nRegionLevel;}
 };
 //----------------------------------------------------------------------------
 
@@ -112,7 +112,7 @@ public:
         : SwContent( pCnt, rName, nYPos ), sURL( rURL ), pINetAttr( pAttr )
     {}
 
-    virtual BOOL    IsProtect() const;
+    virtual sal_Bool    IsProtect() const;
     const String&   GetURL()                { return sURL; }
     const SwTxtINetFmt* GetINetAttr()       { return pINetAttr; }
 };
@@ -139,7 +139,7 @@ public:
 
     const SwFmtFld* GetPostIt()     { return pFld; }
     SwRedline* GetRedline() { return pRedline; }
-    virtual BOOL    IsProtect()     const;
+    virtual sal_Bool    IsProtect()     const;
     bool            IsPostIt()      {return mbPostIt; }
 };
 
@@ -185,31 +185,31 @@ class SwContentType : public SwTypeNumber
     String              sContentTypeName;   // Name der Inhaltsform
     String              sSingleContentTypeName; // Name der Inhaltsform, Singular
     String              sTypeToken;         // Anhaengsel fuer URL
-    USHORT              nMemberCount;       // Inhaltsanzahl
-    USHORT              nContentType;       // Id der Inhaltsform
-    BYTE                nOutlineLevel;
-    BOOL                bMemberFilled : 1;  // wurden die Inhalte bereits eingefuegt?
-    BOOL                bIsInternalDrag:1;  // koennen die Inhalte verschoben werden?
-    BOOL                bDataValid :    1;  //
-    BOOL                bEdit:          1;  // kann diese Type bearbeitet werden ?
-    BOOL                bDelete:        1;  // kann diese Type geloescht werden ?
+    sal_uInt16              nMemberCount;       // Inhaltsanzahl
+    sal_uInt16              nContentType;       // Id der Inhaltsform
+    sal_uInt8               nOutlineLevel;
+    sal_Bool                bMemberFilled : 1;  // wurden die Inhalte bereits eingefuegt?
+    sal_Bool                bIsInternalDrag:1;  // koennen die Inhalte verschoben werden?
+    sal_Bool                bDataValid :    1;  //
+    sal_Bool                bEdit:          1;  // kann diese Type bearbeitet werden ?
+    sal_Bool                bDelete:        1;  // kann diese Type geloescht werden ?
 protected:
         void            RemoveNewline(String&);
 public:
-        SwContentType(SwWrtShell* pParent, USHORT nType, BYTE nLevel );
+        SwContentType(SwWrtShell* pParent, sal_uInt16 nType, sal_uInt8 nLevel );
         ~SwContentType();
 
-        void                Init(BOOL* pbInvalidateWindow = 0);
-        void                FillMemberList(BOOL* pbLevelChanged = NULL);
-        USHORT              GetMemberCount() const
+        void                Init(sal_Bool* pbInvalidateWindow = 0);
+        void                FillMemberList(sal_Bool* pbLevelChanged = NULL);
+        sal_uInt16              GetMemberCount() const
                                 {return nMemberCount;};
-        USHORT              GetType() const {return nContentType;}
-        const SwContent*    GetMember(USHORT nIndex);
+        sal_uInt16              GetType() const {return nContentType;}
+        const SwContent*    GetMember(sal_uInt16 nIndex);
         const String&       GetName() {return sContentTypeName;}
         const String&       GetSingleName() const {return sSingleContentTypeName;}
         const String&       GetTypeToken() const{return sTypeToken;}
 
-        void                SetOutlineLevel(BYTE nNew)
+        void                SetOutlineLevel(sal_uInt8 nNew)
                             {
                                 nOutlineLevel = nNew;
                                 Invalidate();
@@ -217,8 +217,8 @@ public:
 
         void                Invalidate(); // nur nMemberCount wird neu gelesen
 
-        BOOL                IsEditable() const {return bEdit;}
-        BOOL                IsDeletable() const {return bDelete;}
+        sal_Bool                IsEditable() const {return bEdit;}
+        sal_Bool                IsDeletable() const {return bDelete;}
 };
 
 #endif