summaryrefslogtreecommitdiff
path: root/sw/inc/pagedesc.hxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc/pagedesc.hxx')
-rw-r--r--sw/inc/pagedesc.hxx66
1 files changed, 33 insertions, 33 deletions
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index eb857b36dd55..0690a3d1b7ed 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -52,7 +52,7 @@ enum SwFtnAdj
class SW_DLLPUBLIC SwPageFtnInfo
{
SwTwips nMaxHeight; // Maximum height of the footnote area.
- ULONG nLineWidth; // Width of separator line.
+ sal_uLong nLineWidth; // Width of separator line.
Color aLineColor; // Color of the separator line.
Fraction aWidth; // Percentage width of the separator line.
SwFtnAdj eAdj; // Line adjustment.
@@ -61,7 +61,7 @@ class SW_DLLPUBLIC SwPageFtnInfo
public:
SwTwips GetHeight() const { return nMaxHeight; }
- ULONG GetLineWidth() const { return nLineWidth; }
+ sal_uLong GetLineWidth() const { return nLineWidth; }
const Color& GetLineColor() const { return aLineColor;}
const Fraction& GetWidth() const { return aWidth; }
SwFtnAdj GetAdj() const { return eAdj; }
@@ -69,7 +69,7 @@ public:
SwTwips GetBottomDist() const { return nBottomDist; }
void SetHeight( SwTwips nNew ) { nMaxHeight = nNew; }
- void SetLineWidth(ULONG nSet ) { nLineWidth = nSet; }
+ void SetLineWidth(sal_uLong nSet ) { nLineWidth = nSet; }
void SetLineColor(const Color& rCol ) { aLineColor = rCol;}
void SetWidth( const Fraction &rNew){ aWidth = rNew; }
void SetAdj ( SwFtnAdj eNew ) { eAdj = eNew; }
@@ -80,7 +80,7 @@ public:
SwPageFtnInfo( const SwPageFtnInfo& );
SwPageFtnInfo& operator=( const SwPageFtnInfo& );
- BOOL operator ==( const SwPageFtnInfo& ) const;
+ sal_Bool operator ==( const SwPageFtnInfo& ) const;
};
/*
@@ -117,7 +117,7 @@ public:
* document (contents are created or removed according to SHARE-information).
*/
-typedef USHORT UseOnPage;
+typedef sal_uInt16 UseOnPage;
namespace nsUseOnPage
{
const UseOnPage PD_NONE = 0x0000; // For internal use only.
@@ -142,10 +142,10 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
SwFrmFmt aLeft;
SwDepend aDepend; // Because of grid alignment (Registerhaltigkeit).
SwPageDesc *pFollow;
- USHORT nRegHeight; // Sentence spacing and fontascent of style.
- USHORT nRegAscent; // For grid alignment (Registerhaltigkeit).
+ sal_uInt16 nRegHeight; // Sentence spacing and fontascent of style.
+ sal_uInt16 nRegAscent; // For grid alignment (Registerhaltigkeit).
UseOnPage eUse;
- BOOL bLandscape;
+ sal_Bool bLandscape;
// Footnote information.
SwPageFtnInfo aFtnInfo;
@@ -162,8 +162,8 @@ public:
const String &GetName() const { return aDescName; }
void SetName( const String& rNewName ) { aDescName = rNewName; }
- BOOL GetLandscape() const { return bLandscape; }
- void SetLandscape( BOOL bNew ) { bLandscape = bNew; }
+ sal_Bool GetLandscape() const { return bLandscape; }
+ void SetLandscape( sal_Bool bNew ) { bLandscape = bNew; }
const SvxNumberType &GetNumType() const { return aNumType; }
void SetNumType( const SvxNumberType& rNew ) { aNumType = rNew; }
@@ -172,10 +172,10 @@ public:
SwPageFtnInfo &GetFtnInfo() { return aFtnInfo; }
void SetFtnInfo( const SwPageFtnInfo &rNew ) { aFtnInfo = rNew; }
- inline BOOL IsHeaderShared() const;
- inline BOOL IsFooterShared() const;
- inline void ChgHeaderShare( BOOL bNew );
- inline void ChgFooterShare( BOOL bNew );
+ inline sal_Bool IsHeaderShared() const;
+ inline sal_Bool IsFooterShared() const;
+ inline void ChgHeaderShare( sal_Bool bNew );
+ inline void ChgFooterShare( sal_Bool bNew );
inline void SetUseOn( UseOnPage eNew );
inline UseOnPage GetUseOn() const;
@@ -200,10 +200,10 @@ public:
inline SwFrmFmt *GetLeftFmt();
inline const SwFrmFmt *GetLeftFmt() const;
- USHORT GetRegHeight() const { return nRegHeight; }
- USHORT GetRegAscent() const { return nRegAscent; }
- void SetRegHeight( USHORT nNew ){ nRegHeight = nNew; }
- void SetRegAscent( USHORT nNew ){ nRegAscent = nNew; }
+ sal_uInt16 GetRegHeight() const { return nRegHeight; }
+ sal_uInt16 GetRegAscent() const { return nRegAscent; }
+ void SetRegHeight( sal_uInt16 nNew ){ nRegHeight = nNew; }
+ void SetRegAscent( sal_uInt16 nNew ){ nRegAscent = nNew; }
inline void SetFollow( const SwPageDesc* pNew );
const SwPageDesc* GetFollow() const { return pFollow; }
@@ -215,19 +215,19 @@ public:
void RegisterChange();
// Query and set PoolFormat-Id.
- USHORT GetPoolFmtId() const { return aMaster.GetPoolFmtId(); }
- void SetPoolFmtId( USHORT nId ) { aMaster.SetPoolFmtId( nId ); }
- USHORT GetPoolHelpId() const { return aMaster.GetPoolHelpId(); }
- void SetPoolHelpId( USHORT nId ) { aMaster.SetPoolHelpId( nId ); }
- BYTE GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); }
- void SetPoolHlpFileId( BYTE nId ) { aMaster.SetPoolHlpFileId( nId ); }
+ sal_uInt16 GetPoolFmtId() const { return aMaster.GetPoolFmtId(); }
+ void SetPoolFmtId( sal_uInt16 nId ) { aMaster.SetPoolFmtId( nId ); }
+ sal_uInt16 GetPoolHelpId() const { return aMaster.GetPoolHelpId(); }
+ void SetPoolHelpId( sal_uInt16 nId ) { aMaster.SetPoolHelpId( nId ); }
+ sal_uInt8 GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); }
+ void SetPoolHlpFileId( sal_uInt8 nId ) { aMaster.SetPoolHlpFileId( nId ); }
// Query information from Client.
- virtual BOOL GetInfo( SfxPoolItem& ) const;
+ virtual sal_Bool GetInfo( SfxPoolItem& ) const;
const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd,
- BOOL bCheckForThisPgDc = TRUE ) const;
- BOOL IsFollowNextPageOfNode( const SwNode& rNd ) const;
+ sal_Bool bCheckForThisPgDc = sal_True ) const;
+ sal_Bool IsFollowNextPageOfNode( const SwNode& rNd ) const;
//Given a SwNode return the pagedesc in use at that location.
static const SwPageDesc* GetPageDescOfNode(const SwNode& rNd);
@@ -243,22 +243,22 @@ inline void SwPageDesc::SetFollow( const SwPageDesc* pNew )
pFollow = pNew ? (SwPageDesc*)pNew : this;
}
-inline BOOL SwPageDesc::IsHeaderShared() const
+inline sal_Bool SwPageDesc::IsHeaderShared() const
{
- return eUse & nsUseOnPage::PD_HEADERSHARE ? TRUE : FALSE;
+ return eUse & nsUseOnPage::PD_HEADERSHARE ? sal_True : sal_False;
}
-inline BOOL SwPageDesc::IsFooterShared() const
+inline sal_Bool SwPageDesc::IsFooterShared() const
{
- return eUse & nsUseOnPage::PD_FOOTERSHARE ? TRUE : FALSE;
+ return eUse & nsUseOnPage::PD_FOOTERSHARE ? sal_True : sal_False;
}
-inline void SwPageDesc::ChgHeaderShare( BOOL bNew )
+inline void SwPageDesc::ChgHeaderShare( sal_Bool bNew )
{
if ( bNew )
eUse = (UseOnPage) (eUse | nsUseOnPage::PD_HEADERSHARE);
else
eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOHEADERSHARE);
}
-inline void SwPageDesc::ChgFooterShare( BOOL bNew )
+inline void SwPageDesc::ChgFooterShare( sal_Bool bNew )
{
if ( bNew )
eUse = (UseOnPage) (eUse | nsUseOnPage::PD_FOOTERSHARE);