CWS swlayoutrefactoring: resync to m100

1 files changed, 93 insertions, 93 deletions

diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index e8ebce2782c6..88e5cea8a8fb 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -62,8 +62,8 @@ SV_DECL_PTRARR(SwTOXMarks, SwTOXMark*, 0, 10)
      Description:  Entry of content index, alphabetical index or user defined index
  --------------------------------------------------------------------*/
 
-#define IVER_TOXMARK_STRPOOL ((USHORT)1)
-#define IVER_TOXMARK_NEWTOX ((USHORT)2)
+#define IVER_TOXMARK_STRPOOL ((sal_uInt16)1)
+#define IVER_TOXMARK_NEWTOX ((sal_uInt16)2)
 
 class SW_DLLPUBLIC SwTOXMark
     : public SfxPoolItem
@@ -82,9 +82,9 @@ class SW_DLLPUBLIC SwTOXMark
 
     SwTxtTOXMark* pTxtAttr;
 
-    USHORT  nLevel;
-    BOOL    bAutoGenerated : 1;     // generated using a concordance file
-    BOOL    bMainEntry : 1;         // main entry emphasized by character style
+    sal_uInt16  nLevel;
+    sal_Bool    bAutoGenerated : 1;     // generated using a concordance file
+    sal_Bool    bMainEntry : 1;         // main entry emphasized by character style
 
     ::com::sun::star::uno::WeakReference<
         ::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark;
@@ -113,14 +113,14 @@ public:
 
     String                  GetText() const;
 
-    inline BOOL             IsAlternativeText() const;
+    inline sal_Bool             IsAlternativeText() const;
     inline const String&    GetAlternativeText() const;
 
     inline void             SetAlternativeText( const String& rAlt );
 
     // content or user defined index
-    inline void             SetLevel(USHORT nLevel);
-    inline USHORT           GetLevel() const;
+    inline void             SetLevel(sal_uInt16 nLevel);
+    inline sal_uInt16           GetLevel() const;
 
     // for alphabetical index only
     inline void             SetPrimaryKey(const String& rStr );
@@ -135,11 +135,11 @@ public:
     inline const String&    GetPrimaryKeyReading() const;
     inline const String&    GetSecondaryKeyReading() const;
 
-    BOOL                    IsAutoGenerated() const {return bAutoGenerated;}
-    void                    SetAutoGenerated(BOOL bSet) {bAutoGenerated = bSet;}
+    sal_Bool                    IsAutoGenerated() const {return bAutoGenerated;}
+    void                    SetAutoGenerated(sal_Bool bSet) {bAutoGenerated = bSet;}
 
-    BOOL                    IsMainEntry() const {return bMainEntry;}
-    void                    SetMainEntry(BOOL bSet) { bMainEntry = bSet;}
+    sal_Bool                    IsMainEntry() const {return bMainEntry;}
+    void                    SetMainEntry(sal_Bool bSet) { bMainEntry = bSet;}
 
     inline const SwTOXType*    GetTOXType() const;
 
@@ -227,13 +227,13 @@ struct SW_DLLPUBLIC SwFormToken
     String          sCharStyleName;
     SwTwips         nTabStopPosition;
     FormTokenType   eTokenType;
-    USHORT          nPoolId;
+    sal_uInt16          nPoolId;
     SvxTabAdjust    eTabAlign;
-    USHORT          nChapterFormat;     //SwChapterFormat;
-    USHORT          nOutlineLevel;//the maximum permitted outline level in numbering
-    USHORT          nAuthorityField;    //enum ToxAuthorityField
+    sal_uInt16          nChapterFormat;     //SwChapterFormat;
+    sal_uInt16          nOutlineLevel;//the maximum permitted outline level in numbering
+    sal_uInt16          nAuthorityField;    //enum ToxAuthorityField
     sal_Unicode     cTabFillChar;
-    sal_Bool        bWithTab;      // TRUE: do generate tab
+    sal_Bool        bWithTab;      // sal_True: do generate tab
                                    // character only the tab stop
                                    // #i21237#
 
@@ -259,8 +259,8 @@ struct SW_DLLPUBLIC SwFormToken
     @param _eType  the type to check for
     @param rToken  the token to check
 
-    @retval TRUE   the token has the given type
-    @retval FALSE  else
+    @retval sal_True   the token has the given type
+    @retval sal_False  else
 */
 struct SwFormTokenEqualToFormTokenType
 {
@@ -364,13 +364,13 @@ class SW_DLLPUBLIC SwForm
     String  aTemplate[ AUTH_TYPE_END + 1 ];
 
     TOXTypes    eType;
-    USHORT      nFormMaxLevel;
+    sal_uInt16      nFormMaxLevel;
 
-    //USHORT    nFirstTabPos; -> Value in tab token
-//  BOOL    bHasFirstTabPos : 1;
-    BOOL    bGenerateTabPos : 1;
-    BOOL    bIsRelTabPos : 1;
-    BOOL    bCommaSeparated : 1;
+    //sal_uInt16    nFirstTabPos; -> Value in tab token
+//  sal_Bool    bHasFirstTabPos : 1;
+    sal_Bool    bGenerateTabPos : 1;
+    sal_Bool    bIsRelTabPos : 1;
+    sal_Bool    bCommaSeparated : 1;
 
 public:
     SwForm( TOXTypes eTOXType = TOX_CONTENT );
@@ -378,57 +378,57 @@ public:
 
     SwForm& operator=( const SwForm& rForm );
 
-    inline void SetTemplate(USHORT nLevel, const String& rName);
-    inline const String&    GetTemplate(USHORT nLevel) const;
+    inline void SetTemplate(sal_uInt16 nLevel, const String& rName);
+    inline const String&    GetTemplate(sal_uInt16 nLevel) const;
 
     // #i21237#
-    void    SetPattern(USHORT nLevel, const SwFormTokens& rName);
-    void    SetPattern(USHORT nLevel, const String& rStr);
-    const SwFormTokens& GetPattern(USHORT nLevel) const;
+    void    SetPattern(sal_uInt16 nLevel, const SwFormTokens& rName);
+    void    SetPattern(sal_uInt16 nLevel, const String& rStr);
+    const SwFormTokens& GetPattern(sal_uInt16 nLevel) const;
 
     // fill tab stop positions from template to pattern
     // #i21237#
     void                    AdjustTabStops(SwDoc& rDoc,
-                                           BOOL bInsertNewTabStops = FALSE);
+                                           sal_Bool bInsertNewTabStops = sal_False);
 
     inline TOXTypes GetTOXType() const;
-    inline USHORT   GetFormMax() const;
+    inline sal_uInt16   GetFormMax() const;
 
-    BOOL IsRelTabPos() const    {   return bIsRelTabPos; }
-    void SetRelTabPos( BOOL b ) {   bIsRelTabPos = b;       }
+    sal_Bool IsRelTabPos() const    {   return bIsRelTabPos; }
+    void SetRelTabPos( sal_Bool b ) {   bIsRelTabPos = b;       }
 
-    BOOL IsCommaSeparated() const       { return bCommaSeparated;}
-    void SetCommaSeparated( BOOL b)     { bCommaSeparated = b;}
+    sal_Bool IsCommaSeparated() const       { return bCommaSeparated;}
+    void SetCommaSeparated( sal_Bool b)     { bCommaSeparated = b;}
 
-    static USHORT GetFormMaxLevel( TOXTypes eType );
+    static sal_uInt16 GetFormMaxLevel( TOXTypes eType );
 
     static const sal_Char*  aFormEntry;             // <E>
-    static BYTE nFormEntryLen;                      // 3 characters
+    static sal_uInt8 nFormEntryLen;                      // 3 characters
     static const sal_Char*  aFormTab;               // <T>
-    static BYTE nFormTabLen;                        // 3 characters
+    static sal_uInt8 nFormTabLen;                        // 3 characters
     static const sal_Char*  aFormPageNums;          // <P>
-    static BYTE nFormPageNumsLen;                   // 3 characters
+    static sal_uInt8 nFormPageNumsLen;                   // 3 characters
     static const sal_Char* aFormLinkStt;            // <LS>
-    static BYTE nFormLinkSttLen;                    // 4 characters
+    static sal_uInt8 nFormLinkSttLen;                    // 4 characters
     static const sal_Char* aFormLinkEnd;            // <LE>
-    static BYTE nFormLinkEndLen;                    // 4 characters
+    static sal_uInt8 nFormLinkEndLen;                    // 4 characters
     static const sal_Char*  aFormEntryNum;          // <E#>
-    static BYTE nFormEntryNumLen;                   // 4 characters
+    static sal_uInt8 nFormEntryNumLen;                   // 4 characters
     static const sal_Char*  aFormEntryTxt;          // <ET>
-    static BYTE nFormEntryTxtLen;                   // 4 characters
+    static sal_uInt8 nFormEntryTxtLen;                   // 4 characters
     static const sal_Char*  aFormChapterMark;       // <C>
-    static BYTE nFormChapterMarkLen;                // 3 characters
+    static sal_uInt8 nFormChapterMarkLen;                // 3 characters
     static const sal_Char*  aFormText;              // <TX>
-    static BYTE nFormTextLen;                       // 4 characters
+    static sal_uInt8 nFormTextLen;                       // 4 characters
     static const sal_Char*  aFormAuth;              // <Axx> xx - decimal enum value
-    static BYTE nFormAuthLen;                       // 3 characters
+    static sal_uInt8 nFormAuthLen;                       // 3 characters
 };
 
 /*--------------------------------------------------------------------
      Description: Content to create indexes of
  --------------------------------------------------------------------*/
 
-typedef USHORT SwTOXElement;
+typedef sal_uInt16 SwTOXElement;
 namespace nsSwTOXElement
 {
     const SwTOXElement TOX_MARK             = 1;
@@ -441,7 +441,7 @@ namespace nsSwTOXElement
     const SwTOXElement TOX_SEQUENCE         = 128;
 }
 
-typedef USHORT SwTOIOptions;
+typedef sal_uInt16 SwTOIOptions;
 namespace nsSwTOIOptions
 {
     const SwTOIOptions TOI_SAME_ENTRY       = 1;
@@ -461,7 +461,7 @@ enum SwCaptionDisplay
     CAPTION_TEXT
 };
 
-typedef USHORT SwTOOElements;
+typedef sal_uInt16 SwTOOElements;
 namespace nsSwTOOElements
 {
     const SwTOOElements TOO_MATH            = 0x01;
@@ -493,25 +493,25 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient
     String          sSortAlgorithm;
 
     union {
-        USHORT      nLevel;             // consider outline levels
-        USHORT      nOptions;           // options of alphabetical index
+        sal_uInt16      nLevel;             // consider outline levels
+        sal_uInt16      nOptions;           // options of alphabetical index
     } aData;
 
-    USHORT      nCreateType;        // sources to create the index from
-    USHORT      nOLEOptions;        // OLE sources
+    sal_uInt16      nCreateType;        // sources to create the index from
+    sal_uInt16      nOLEOptions;        // OLE sources
     SwCaptionDisplay eCaptionDisplay;   //
-    BOOL        bProtected : 1;         // index protected ?
-    BOOL        bFromChapter : 1;       // create from chapter or document
-    BOOL        bFromObjectNames : 1;   // create a table or object index
+    sal_Bool        bProtected : 1;         // index protected ?
+    sal_Bool        bFromChapter : 1;       // create from chapter or document
+    sal_Bool        bFromObjectNames : 1;   // create a table or object index
                                     // from the names rather than the caption
-    BOOL        bLevelFromChapter : 1; // User index: get the level from the source chapter
+    sal_Bool        bLevelFromChapter : 1; // User index: get the level from the source chapter
 public:
     SwTOXBase( const SwTOXType* pTyp, const SwForm& rForm,
-               USHORT nCreaType, const String& rTitle );
+               sal_uInt16 nCreaType, const String& rTitle );
     SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = 0 );
     virtual ~SwTOXBase();
 
-    virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
+    virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const;
 
     // a kind of CopyCtor - check if the TOXBase is at TOXType of the doc.
     // If not, so create it an copy all other used things. The return is this
@@ -519,7 +519,7 @@ public:
 
     const SwTOXType*    GetTOXType() const; //
 
-    USHORT              GetCreateType() const;      // creation types
+    sal_uInt16              GetCreateType() const;      // creation types
 
     const String&       GetTOXName() const {return aName;}
     void                SetTOXName(const String& rSet) {aName = rSet;}
@@ -528,7 +528,7 @@ public:
     const String&       GetTypeName() const;        // Name
     const SwForm&       GetTOXForm() const;         // description of the lines
 
-    void                SetCreate(USHORT);
+    void                SetCreate(sal_uInt16);
     void                SetTitle(const String& rTitle);
     void                SetTOXForm(const SwForm& rForm);
 
@@ -538,43 +538,43 @@ public:
     void                SetMainEntryCharStyle(const String& rSet)  {sMainEntryCharStyle = rSet;}
 
     // content index only
-    inline void             SetLevel(USHORT);                   // consider outline level
-    inline USHORT           GetLevel() const;
+    inline void             SetLevel(sal_uInt16);                   // consider outline level
+    inline sal_uInt16           GetLevel() const;
 
     // alphabetical index only
-    inline USHORT           GetOptions() const;                 // alphabetical index options
-    inline void             SetOptions(USHORT nOpt);
+    inline sal_uInt16           GetOptions() const;                 // alphabetical index options
+    inline void             SetOptions(sal_uInt16 nOpt);
 
     // index of objects
-    USHORT      GetOLEOptions() const {return nOLEOptions;}
-    void        SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;}
+    sal_uInt16      GetOLEOptions() const {return nOLEOptions;}
+    void        SetOLEOptions(sal_uInt16 nOpt) {nOLEOptions = nOpt;}
 
     // index of objects
 
     // user defined index only
     inline void             SetTemplateName(const String& rName); // Absatzlayout beachten
 
-    const String&           GetStyleNames(USHORT nLevel) const
+    const String&           GetStyleNames(sal_uInt16 nLevel) const
                                 {
                                 DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
                                 return aStyleNames[nLevel];
                                 }
-    void                    SetStyleNames(const String& rSet, USHORT nLevel)
+    void                    SetStyleNames(const String& rSet, sal_uInt16 nLevel)
                                 {
                                 DBG_ASSERT( nLevel < MAXLEVEL, "Which level?");
                                 aStyleNames[nLevel] = rSet;
                                 }
-    BOOL                    IsFromChapter() const { return bFromChapter;}
-    void                    SetFromChapter(BOOL bSet) { bFromChapter = bSet;}
+    sal_Bool                    IsFromChapter() const { return bFromChapter;}
+    void                    SetFromChapter(sal_Bool bSet) { bFromChapter = bSet;}
 
-    BOOL                    IsFromObjectNames() const {return bFromObjectNames;}
-    void                    SetFromObjectNames(BOOL bSet) {bFromObjectNames = bSet;}
+    sal_Bool                    IsFromObjectNames() const {return bFromObjectNames;}
+    void                    SetFromObjectNames(sal_Bool bSet) {bFromObjectNames = bSet;}
 
-    BOOL                    IsLevelFromChapter() const {return bLevelFromChapter;}
-    void                    SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;}
+    sal_Bool                    IsLevelFromChapter() const {return bLevelFromChapter;}
+    void                    SetLevelFromChapter(sal_Bool bSet) {bLevelFromChapter = bSet;}
 
-    BOOL                    IsProtected() const { return bProtected; }
-    void                    SetProtected(BOOL bSet) { bProtected = bSet; }
+    sal_Bool                    IsProtected() const { return bProtected; }
+    void                    SetProtected(sal_Bool bSet) { bProtected = bSet; }
 
     const String&           GetSequenceName() const {return sSequenceName;}
     void                    SetSequenceName(const String& rSet) {sSequenceName = rSet;}
@@ -582,7 +582,7 @@ public:
     SwCaptionDisplay        GetCaptionDisplay() const { return eCaptionDisplay;}
     void                    SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;}
 
-    BOOL                    IsTOXBaseInReadonly() const;
+    sal_Bool                    IsTOXBaseInReadonly() const;
 
     const SfxItemSet*       GetAttrSet() const;
     void                    SetAttrSet( const SfxItemSet& );
@@ -593,7 +593,7 @@ public:
     const String&   GetSortAlgorithm()const {return sSortAlgorithm;}
     void            SetSortAlgorithm(const String& rSet) {sSortAlgorithm = rSet;}
     // #i21237#
-    void AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop);
+    void AdjustTabStops(SwDoc & rDoc, sal_Bool bDefaultRightTabStop);
     SwTOXBase&          operator=(const SwTOXBase& rSource);
     void RegisterToTOXType( SwTOXType& rMark );
 };
@@ -612,7 +612,7 @@ inline const String& SwTOXMark::GetAlternativeText() const
 inline const SwTOXType* SwTOXMark::GetTOXType() const
     { return (SwTOXType*)GetRegisteredIn(); }
 
-inline BOOL SwTOXMark::IsAlternativeText() const
+inline sal_Bool SwTOXMark::IsAlternativeText() const
     { return aAltText.Len() > 0; }
 
 inline void SwTOXMark::SetAlternativeText(const String& rAlt)
@@ -620,7 +620,7 @@ inline void SwTOXMark::SetAlternativeText(const String& rAlt)
     aAltText = rAlt;
 }
 
-inline void SwTOXMark::SetLevel( USHORT nLvl )
+inline void SwTOXMark::SetLevel( sal_uInt16 nLvl )
 {
     ASSERT( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     nLevel = nLvl;
@@ -656,7 +656,7 @@ inline void SwTOXMark::SetSecondaryKeyReading( const String& rKey )
     aSecondaryKeyReading = rKey;
 }
 
-inline USHORT SwTOXMark::GetLevel() const
+inline sal_uInt16 SwTOXMark::GetLevel() const
 {
     ASSERT( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     return nLevel;
@@ -695,13 +695,13 @@ inline const String& SwTOXMark::GetSecondaryKeyReading() const
 //
 //SwForm
 //
-inline void SwForm::SetTemplate(USHORT nLevel, const String& rTemplate)
+inline void SwForm::SetTemplate(sal_uInt16 nLevel, const String& rTemplate)
 {
     ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX");
     aTemplate[nLevel] = rTemplate;
 }
 
-inline const String& SwForm::GetTemplate(USHORT nLevel) const
+inline const String& SwForm::GetTemplate(sal_uInt16 nLevel) const
 {
     ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX");
     return aTemplate[nLevel];
@@ -712,7 +712,7 @@ inline TOXTypes SwForm::GetTOXType() const
     return eType;
 }
 
-inline USHORT SwForm::GetFormMax() const
+inline sal_uInt16 SwForm::GetFormMax() const
 {
     return nFormMaxLevel;
 }
@@ -733,7 +733,7 @@ inline TOXTypes SwTOXType::GetType() const
 inline const SwTOXType* SwTOXBase::GetTOXType() const
     { return (SwTOXType*)GetRegisteredIn(); }
 
-inline USHORT SwTOXBase::GetCreateType() const
+inline sal_uInt16 SwTOXBase::GetCreateType() const
     { return nCreateType; }
 
 inline const String& SwTOXBase::GetTitle() const
@@ -745,12 +745,12 @@ inline const String& SwTOXBase::GetTypeName() const
 inline const SwForm& SwTOXBase::GetTOXForm() const
     { return aForm; }
 
-inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop)
+inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, sal_Bool bDefaultRightTabStop)
 {
     aForm.AdjustTabStops(rDoc, bDefaultRightTabStop);
 }
 
-inline void SwTOXBase::SetCreate(USHORT nCreate)
+inline void SwTOXBase::SetCreate(sal_uInt16 nCreate)
     { nCreateType = nCreate; }
 
 inline void SwTOXBase::SetTOXForm(const SwForm& rForm)
@@ -759,13 +759,13 @@ inline void SwTOXBase::SetTOXForm(const SwForm& rForm)
 inline TOXTypes SwTOXBase::GetType() const
     { return GetTOXType()->GetType(); }
 
-inline void SwTOXBase::SetLevel(USHORT nLev)
+inline void SwTOXBase::SetLevel(sal_uInt16 nLev)
 {
     ASSERT(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     aData.nLevel = nLev;
 }
 
-inline USHORT SwTOXBase::GetLevel() const
+inline sal_uInt16 SwTOXBase::GetLevel() const
 {
     ASSERT(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
     return aData.nLevel;
@@ -781,13 +781,13 @@ inline void SwTOXBase::SetTemplateName(const String& rName)
 
 }
 
-inline USHORT SwTOXBase::GetOptions() const
+inline sal_uInt16 SwTOXBase::GetOptions() const
 {
     ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     return aData.nOptions;
 }
 
-inline void SwTOXBase::SetOptions(USHORT nOpt)
+inline void SwTOXBase::SetOptions(sal_uInt16 nOpt)
 {
     ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
     aData.nOptions = nOpt;