summaryrefslogtreecommitdiff
path: root/sw/source/filter/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/inc')
-rw-r--r--sw/source/filter/inc/fltbase.hxx26
-rw-r--r--sw/source/filter/inc/fltglbls.hxx46
-rw-r--r--sw/source/filter/inc/fltini.hxx12
-rw-r--r--sw/source/filter/inc/fltshell.hxx240
-rw-r--r--sw/source/filter/inc/msfilter.hxx12
-rw-r--r--sw/source/filter/inc/rtf.hxx70
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx2
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx142
8 files changed, 275 insertions, 275 deletions
diff --git a/sw/source/filter/inc/fltbase.hxx b/sw/source/filter/inc/fltbase.hxx
index b67b54ce314a..cc8e9b6f41f1 100644
--- a/sw/source/filter/inc/fltbase.hxx
+++ b/sw/source/filter/inc/fltbase.hxx
@@ -35,23 +35,23 @@ class SwFilterBase
protected:
SvStream *pIn;
sal_Char *pReadBuff; // Groessenangabe
- INT32 nBytesLeft; // noch zu lesende Bytes des aktuelle Records
+ sal_Int32 nBytesLeft; // noch zu lesende Bytes des aktuelle Records
CharSet eQuellChar; // Quell-Zeichensatz (interner Zeichensatz)
// CharSet eZielChar; // Ziel-Zeichensatz
- USHORT nTab; // z.Zt. bearbeitete Tabelle
- USHORT nReadBuffSize;// temporaerer Lesepuffer mit
+ sal_uInt16 nTab; // z.Zt. bearbeitete Tabelle
+ sal_uInt16 nReadBuffSize;// temporaerer Lesepuffer mit
// ----------------------------------------------------------
inline void ReadChar( char &rC );
- inline void ReadByte( BYTE &rN );
+ inline void ReadByte( sal_uInt8 &rN );
inline void Read( short &rN );
inline void ReadUnicode( sal_Unicode &rU );
- inline void Read( BYTE &rN0, USHORT &rN1, USHORT &rN2 );
- inline void Read( USHORT &rN );
- inline void Read( USHORT &rN1, USHORT &rN2 );
- inline void Read( USHORT &rN1, USHORT &rN2, USHORT &rN3, USHORT &rN4 );
+ inline void Read( sal_uInt8 &rN0, sal_uInt16 &rN1, sal_uInt16 &rN2 );
+ inline void Read( sal_uInt16 &rN );
+ inline void Read( sal_uInt16 &rN1, sal_uInt16 &rN2 );
+ inline void Read( sal_uInt16 &rN1, sal_uInt16 &rN2, sal_uInt16 &rN3, sal_uInt16 &rN4 );
inline void Read( double &rF );
void Read( String &rS ); // liest 0-terminierten C-String!
inline void ClearBytesLeft( void );
@@ -64,7 +64,7 @@ inline void SwFilterBase::ReadChar( char &rC )
nBytesLeft--;
}
-inline void SwFilterBase::ReadByte( BYTE &rN )
+inline void SwFilterBase::ReadByte( sal_uInt8 &rN )
{
*pIn >> rN;
nBytesLeft--;
@@ -86,25 +86,25 @@ inline void SwFilterBase::Read( short &rN )
nBytesLeft -= 2;
}
-inline void SwFilterBase::Read( BYTE &rN0, USHORT &rN1, USHORT &rN2 )
+inline void SwFilterBase::Read( sal_uInt8 &rN0, sal_uInt16 &rN1, sal_uInt16 &rN2 )
{
*pIn >> rN0 >> rN1 >> rN2;
nBytesLeft -= 5;
}
-inline void SwFilterBase::Read( USHORT &rN )
+inline void SwFilterBase::Read( sal_uInt16 &rN )
{
*pIn >> rN;
nBytesLeft -= 2;
}
-inline void SwFilterBase::Read( USHORT &rN1, USHORT &rN2 )
+inline void SwFilterBase::Read( sal_uInt16 &rN1, sal_uInt16 &rN2 )
{
*pIn >> rN1 >> rN2;
nBytesLeft -= 4;
}
-inline void SwFilterBase::Read( USHORT &rN1, USHORT &rN2, USHORT &rN3, USHORT &rN4 )
+inline void SwFilterBase::Read( sal_uInt16 &rN1, sal_uInt16 &rN2, sal_uInt16 &rN3, sal_uInt16 &rN4 )
{
*pIn >> rN1 >> rN2 >> rN3 >> rN4;
nBytesLeft -= 8;
diff --git a/sw/source/filter/inc/fltglbls.hxx b/sw/source/filter/inc/fltglbls.hxx
index cf2c4a29610b..38867a4125e4 100644
--- a/sw/source/filter/inc/fltglbls.hxx
+++ b/sw/source/filter/inc/fltglbls.hxx
@@ -54,12 +54,12 @@ class FilterGlobals
{
protected:
SvPtrarr aTblFmts;
- USHORT nColStart;
- USHORT nColEnd;
- USHORT nRowStart;
- USHORT nRowEnd;
- USHORT nAnzCols;
- USHORT nAnzRows;
+ sal_uInt16 nColStart;
+ sal_uInt16 nColEnd;
+ sal_uInt16 nRowStart;
+ sal_uInt16 nRowEnd;
+ sal_uInt16 nAnzCols;
+ sal_uInt16 nAnzRows;
public:
FilterGlobals( SwDoc& rDoc, const SwPaM& rPam );
@@ -71,41 +71,41 @@ public:
SvNumberFormatter *pNumFormatter;
LanguageType eDefLanguage;
- ULONG nStandard;
- ULONG nDefFormat; // = 0xFFFFFFFF
+ sal_uLong nStandard;
+ sal_uLong nDefFormat; // = 0xFFFFFFFF
- void SetRange( USHORT nCS, USHORT nCE, USHORT nRS, USHORT nRE );
+ void SetRange( sal_uInt16 nCS, sal_uInt16 nCE, sal_uInt16 nRS, sal_uInt16 nRE );
- BOOL IsInColRange( USHORT nCol )
+ sal_Bool IsInColRange( sal_uInt16 nCol )
{ return ( nCol >= nColStart && nCol <= nColEnd ); }
- BOOL IsInRowRange( USHORT nRow )
+ sal_Bool IsInRowRange( sal_uInt16 nRow )
{ return ( nRow >= nRowStart && nRow <= nRowEnd ); }
- BOOL IsInRange( USHORT nCol, USHORT nRow )
+ sal_Bool IsInRange( sal_uInt16 nCol, sal_uInt16 nRow )
{ return IsInRowRange(nRow) && IsInColRange(nCol); }
- void NormalizeCol( USHORT &rCol ) { rCol -= nColStart; }
- void NormalizeRow( USHORT &rRow ) { rRow -= nRowStart; }
- void Normalize( USHORT &rCol, USHORT &rRow )
+ void NormalizeCol( sal_uInt16 &rCol ) { rCol -= nColStart; }
+ void NormalizeRow( sal_uInt16 &rRow ) { rRow -= nRowStart; }
+ void Normalize( sal_uInt16 &rCol, sal_uInt16 &rRow )
{ NormalizeCol( rCol ); NormalizeRow( rRow ); }
- USHORT AnzCols() const { return nAnzCols; }
- USHORT AnzRows() const { return nAnzRows; }
+ sal_uInt16 AnzCols() const { return nAnzCols; }
+ sal_uInt16 AnzRows() const { return nAnzRows; }
- BOOL ColRangeLimitter( USHORT &rCS, USHORT &rCE );
+ sal_Bool ColRangeLimitter( sal_uInt16 &rCS, sal_uInt16 &rCE );
- void InsertText( USHORT nCol, USHORT nRow, const String& rStr );
+ void InsertText( sal_uInt16 nCol, sal_uInt16 nRow, const String& rStr );
void CreateTable();
void InsertAttr( const SfxPoolItem& rItem );
- inline void ColLimitter( USHORT &rCol );
- inline void RowLimitter( USHORT &rRow );
+ inline void ColLimitter( sal_uInt16 &rCol );
+ inline void RowLimitter( sal_uInt16 &rRow );
};
-inline void FilterGlobals::ColLimitter( USHORT &rCol )
+inline void FilterGlobals::ColLimitter( sal_uInt16 &rCol )
{
if( rCol < nColStart )
rCol = nColStart;
@@ -113,7 +113,7 @@ inline void FilterGlobals::ColLimitter( USHORT &rCol )
rCol = nColEnd;
}
-inline void FilterGlobals::RowLimitter( USHORT &rRow )
+inline void FilterGlobals::RowLimitter( sal_uInt16 &rRow )
{
if( rRow < nRowStart )
rRow = nRowStart;
diff --git a/sw/source/filter/inc/fltini.hxx b/sw/source/filter/inc/fltini.hxx
index a9711f1331a5..f92edaa83f87 100644
--- a/sw/source/filter/inc/fltini.hxx
+++ b/sw/source/filter/inc/fltini.hxx
@@ -42,7 +42,7 @@ class HTMLReader: public Reader
{
// wir wollen die Streams / Storages nicht geoeffnet haben
virtual int SetStrmStgPtr();
- virtual ULONG Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &);
+ virtual sal_uLong Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &);
virtual String GetTemplateName() const;
public:
HTMLReader();
@@ -50,12 +50,12 @@ public:
class WW1Reader : public Reader
{
- virtual ULONG Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &);
+ virtual sal_uLong Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &);
};
class XMLReader : public Reader
{
- virtual ULONG Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &);
+ virtual sal_uLong Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &);
public:
virtual int GetReaderType();
@@ -63,7 +63,7 @@ public:
// read the sections of the document, which is equal to the medium.
// returns the count of it
- virtual USHORT GetSectionList( SfxMedium& rMedium,
+ virtual sal_uInt16 GetSectionList( SfxMedium& rMedium,
SvStrings& rStrings ) const;
};
@@ -81,12 +81,12 @@ void GetWW8Writer( const String&, const String&, WriterRef& );
class SW_DLLPUBLIC SwRelNumRuleSpaces
{
SwNumRuleTbl* pNumRuleTbl; // Liste aller benannten NumRules
- BOOL bNewDoc;
+ sal_Bool bNewDoc;
void SetNumLSpace( SwTxtNode& rNd, const SwNumRule& rRule );
public:
- SwRelNumRuleSpaces( SwDoc& rDoc, BOOL bNewDoc );
+ SwRelNumRuleSpaces( SwDoc& rDoc, sal_Bool bNewDoc );
~SwRelNumRuleSpaces();
void SetNumRelSpaces( SwDoc& rDoc );
diff --git a/sw/source/filter/inc/fltshell.hxx b/sw/source/filter/inc/fltshell.hxx
index c511d4aab02a..2c5adee0381c 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -52,13 +52,13 @@ class SwPaM;
using namespace com::sun::star;
-inline void SwFltClearFlag(ULONG& rFieldFlags, int no)
+inline void SwFltClearFlag(sal_uLong& rFieldFlags, int no)
{ rFieldFlags &= ~(1L << no); }
-inline void SwFltSetFlag(ULONG& rFieldFlags, int no)
+inline void SwFltSetFlag(sal_uLong& rFieldFlags, int no)
{ rFieldFlags |= 1L << no; }
-inline BOOL SwFltGetFlag(ULONG nFieldFlags, int no)
+inline sal_Bool SwFltGetFlag(sal_uLong nFieldFlags, int no)
{ return (nFieldFlags & (1L << no)) != 0; }
// Stack-Eintrag fuer die Attribute Es werden immer Pointer auf neue Attribute uebergeben.
@@ -72,10 +72,10 @@ public:
xub_StrLen nMkCntnt;// Nachbildung von Mark()
xub_StrLen nPtCntnt;// Nachbildung von GetPoint()
- BOOL bOld; // to mark Attributes *before* skipping field results
- BOOL bLocked;
- BOOL bCopied;
- BOOL bConsumedByField;
+ sal_Bool bOld; // to mark Attributes *before* skipping field results
+ sal_Bool bLocked;
+ sal_Bool bCopied;
+ sal_Bool bConsumedByField;
SW_DLLPUBLIC SwFltStackEntry(const SwPosition & rStartPos, SfxPoolItem* pHt );
SW_DLLPUBLIC SwFltStackEntry(const SwFltStackEntry& rEntry);
@@ -83,7 +83,7 @@ public:
void SetStartPos(const SwPosition & rStartPos);
SW_DLLPUBLIC void SetEndPos( const SwPosition & rEndPos);
- SW_DLLPUBLIC BOOL MakeRegion(SwDoc* pDoc, SwPaM& rRegion, BOOL bCheck );
+ SW_DLLPUBLIC sal_Bool MakeRegion(SwDoc* pDoc, SwPaM& rRegion, sal_Bool bCheck );
};
class SW_DLLPUBLIC SwFltControlStack
@@ -93,12 +93,12 @@ class SW_DLLPUBLIC SwFltControlStack
Entries maEntries;
friend class SwFltShell;
- ULONG nFieldFlags;
+ sal_uLong nFieldFlags;
KeyCode aEmptyKeyCode; // fuer Bookmarks
protected:
SwDoc* pDoc;
- BOOL bIsEndStack;
+ sal_Bool bIsEndStack;
void MoveAttrs( const SwPosition& rPos );
virtual void SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry* pEntry);
@@ -117,20 +117,20 @@ public:
DONT_HARD_PROTECT
};
- SwFltControlStack(SwDoc* pDo, ULONG nFieldFl);
+ SwFltControlStack(SwDoc* pDo, sal_uLong nFieldFl);
virtual ~SwFltControlStack();
- BOOL IsFlagSet(Flags no) const { return ::SwFltGetFlag(nFieldFlags, no);}
+ sal_Bool IsFlagSet(Flags no) const { return ::SwFltGetFlag(nFieldFlags, no);}
void NewAttr(const SwPosition& rPos, const SfxPoolItem & rAttr );
- virtual void SetAttr(const SwPosition& rPos, USHORT nAttrId=0, BOOL bTstEnde=TRUE, long nHand = LONG_MAX, BOOL consumedByField=FALSE);
+ virtual void SetAttr(const SwPosition& rPos, sal_uInt16 nAttrId=0, sal_Bool bTstEnde=sal_True, long nHand = LONG_MAX, sal_Bool consumedByField=sal_False);
- void StealAttr(const SwPosition* pPos, USHORT nAttrId = 0);
+ void StealAttr(const SwPosition* pPos, sal_uInt16 nAttrId = 0);
void MarkAllAttrsOld();
void KillUnlockedAttrs(const SwPosition& pPos);
- SfxPoolItem* GetFmtStackAttr(USHORT nWhich, USHORT * pPos = 0);
- const SfxPoolItem* GetFmtAttr(const SwPosition& rPos, USHORT nWhich);
+ SfxPoolItem* GetFmtStackAttr(sal_uInt16 nWhich, sal_uInt16 * pPos = 0);
+ const SfxPoolItem* GetFmtAttr(const SwPosition& rPos, sal_uInt16 nWhich);
void Delete(const SwPaM &rPam);
Entries::size_type Count() { return maEntries.size(); }
@@ -177,14 +177,14 @@ public:
DateTime aStampPrev;
RedlineType_t eType;
RedlineType_t eTypePrev;
- USHORT nAutorNo;
- USHORT nAutorNoPrev;
+ sal_uInt16 nAutorNo;
+ sal_uInt16 nAutorNoPrev;
SwFltRedline(RedlineType_t eType_,
- USHORT nAutorNo_,
+ sal_uInt16 nAutorNo_,
const DateTime& rStamp_,
RedlineType_t eTypePrev_ = nsRedlineType_t::REDLINE_INSERT,
- USHORT nAutorNoPrev_ = USHRT_MAX,
+ sal_uInt16 nAutorNoPrev_ = USHRT_MAX,
const DateTime* pStampPrev_ = 0)
: SfxPoolItem(RES_FLTR_REDLINE), aStamp(rStamp_), eType(eType_),
eTypePrev(eTypePrev_), nAutorNo(nAutorNo_), nAutorNoPrev(nAutorNoPrev_)
@@ -213,44 +213,44 @@ class SW_DLLPUBLIC SwFltBookmark : public SfxPoolItem
long nHandle;
String aName;
String aVal;
- BOOL bOnlyRef; // "FRAGE"-Feld, Ref/Seitenrf oder nichts
- BOOL bRef;
- BOOL bPgRef;
+ sal_Bool bOnlyRef; // "FRAGE"-Feld, Ref/Seitenrf oder nichts
+ sal_Bool bRef;
+ sal_Bool bPgRef;
public:
SwFltBookmark( const String& rNa, const String& rVa,
- long nHand, BOOL bOnlyR );
+ long nHand, sal_Bool bOnlyR );
SwFltBookmark( const SwFltBookmark& );
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
const String& GetName() const { return aName; }
const String& GetValSys() const { return aVal; }
- BOOL IsOnlyRef() const { return bOnlyRef; }
- BOOL IsRef() const { return bRef; }
- void SetRef(BOOL b = TRUE) { bRef = b; }
- BOOL IsPgRef() const { return bPgRef; }
- void SetPgRef(BOOL b = TRUE) { bPgRef = b; }
+ sal_Bool IsOnlyRef() const { return bOnlyRef; }
+ sal_Bool IsRef() const { return bRef; }
+ void SetRef(sal_Bool b = sal_True) { bRef = b; }
+ sal_Bool IsPgRef() const { return bPgRef; }
+ void SetPgRef(sal_Bool b = sal_True) { bPgRef = b; }
long GetHandle() const { return nHandle; }
};
class SW_DLLPUBLIC SwFltTOX : public SfxPoolItem
{
SwTOXBase* pTOXBase;
- USHORT nCols;
- BOOL bHadBreakItem; // there was a break item BEFORE insertion of the TOX
- BOOL bHadPageDescItem; // ...
+ sal_uInt16 nCols;
+ sal_Bool bHadBreakItem; // there was a break item BEFORE insertion of the TOX
+ sal_Bool bHadPageDescItem; // ...
public:
- SwFltTOX(SwTOXBase* pBase, USHORT _nCols = 0);
+ SwFltTOX(SwTOXBase* pBase, sal_uInt16 _nCols = 0);
SwFltTOX(const SwFltTOX&);
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==(const SfxPoolItem&) const;
virtual SfxPoolItem* Clone(SfxItemPool* = 0) const;
SwTOXBase* GetBase() { return pTOXBase; }
- USHORT GetCols() const { return nCols; }
- void SetHadBreakItem( BOOL bVal ) { bHadBreakItem = bVal; }
- void SetHadPageDescItem( BOOL bVal ) { bHadPageDescItem = bVal; }
- BOOL HadBreakItem() const { return bHadBreakItem; }
- BOOL HadPageDescItem() const { return bHadPageDescItem; }
+ sal_uInt16 GetCols() const { return nCols; }
+ void SetHadBreakItem( sal_Bool bVal ) { bHadBreakItem = bVal; }
+ void SetHadPageDescItem( sal_Bool bVal ) { bHadPageDescItem = bVal; }
+ sal_Bool HadBreakItem() const { return bHadBreakItem; }
+ sal_Bool HadPageDescItem() const { return bHadPageDescItem; }
};
class SwFltSection : public SfxPoolItem
@@ -271,10 +271,10 @@ public:
class SwFltEndStack : public SwFltControlStack
{
public:
- SwFltEndStack(SwDoc* pDo, ULONG nFieldFl)
+ SwFltEndStack(SwDoc* pDo, sal_uLong nFieldFl)
:SwFltControlStack(pDo, nFieldFl)
{
- bIsEndStack = TRUE;
+ bIsEndStack = sal_True;
}
};
@@ -297,7 +297,7 @@ class SwFltOutBase
SwDoc& rDoc;
protected:
RndStdIds eFlyAnchor;
- BOOL bFlyAbsPos;
+ sal_Bool bFlyAbsPos;
SwDoc& GetDoc() { return rDoc; }
SfxItemSet* NewFlyDefaults();
@@ -306,26 +306,26 @@ protected:
public:
virtual SwFltOutBase& operator << (const SfxPoolItem& rItem) = 0;
- virtual const SfxPoolItem& GetAttr(USHORT nWhich) = 0;
- virtual const SfxPoolItem& GetNodeOrStyAttr(USHORT nWhich) = 0;
+ virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich) = 0;
+ virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich) = 0;
- virtual const SfxPoolItem& GetCellAttr(USHORT nWhich);
- virtual BOOL BeginTable();
+ virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich);
+ virtual sal_Bool BeginTable();
virtual void NextTableCell();
virtual void NextTableRow();
virtual void SetTableWidth(SwTwips nW);
virtual void SetTableOrient(sal_Int16 eOri);
- virtual void SetCellWidth(SwTwips nWidth, USHORT nCell);
+ virtual void SetCellWidth(SwTwips nWidth, sal_uInt16 nCell);
virtual void SetCellHeight(SwTwips nH);
- virtual void SetCellBorder(const SvxBoxItem& rFmtBox, USHORT nCell);
- virtual void SetCellSpace(USHORT nSp);
- virtual void DeleteCell(USHORT nCell);
+ virtual void SetCellBorder(const SvxBoxItem& rFmtBox, sal_uInt16 nCell);
+ virtual void SetCellSpace(sal_uInt16 nSp);
+ virtual void DeleteCell(sal_uInt16 nCell);
virtual void EndTable();
- virtual BOOL IsInFly() = 0;
+ virtual sal_Bool IsInFly() = 0;
virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr) = 0;
- virtual const SfxPoolItem& GetFlyFrmAttr(USHORT nWhich) = 0;
- virtual BOOL BeginFly( RndStdIds eAnchor, BOOL bAbsolutePos,
+ virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich) = 0;
+ virtual sal_Bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
const SfxItemSet* pMoreAttrs = 0 );
virtual void SetFlyAnchor( RndStdIds eAnchor );
virtual void EndFly();
@@ -342,48 +342,48 @@ class SwFltOutDoc : public SwFltOutBase
SwPosition* pTabSavedPos; // set when in table
SwPosition* pFlySavedPos; // set when in fly
SwTwips nTableWidth;
- USHORT usTableX;
- USHORT usTableY;
- BOOL bReadNoTbl; // Keine Tabellen
+ sal_uInt16 usTableX;
+ sal_uInt16 usTableY;
+ sal_Bool bReadNoTbl; // Keine Tabellen
- SwTableBox* GetBox(USHORT ny, USHORT nx = USHRT_MAX);
- BOOL SeekCell( short nRow, short nCol, BOOL bPam );
+ SwTableBox* GetBox(sal_uInt16 ny, sal_uInt16 nx = USHRT_MAX);
+ sal_Bool SeekCell( short nRow, short nCol, sal_Bool bPam );
void SplitTable();
public:
SwFltOutDoc(SwDoc& rDocu, SwPaM* pP, SwFltControlStack& rStk,
SwFltEndStack& rEStk)
: SwFltOutBase(rDocu), rStack(rStk), rEndStack(rEStk), pPaM(pP),
pFly(0), pTable(0), pTabSavedPos(0), pFlySavedPos(0),
- nTableWidth(0), bReadNoTbl(FALSE)
+ nTableWidth(0), bReadNoTbl(sal_False)
{}
- void SetReadNoTable() { bReadNoTbl = TRUE; }
- BOOL IsTableWidthSet() const { return 0 != nTableWidth; }
+ void SetReadNoTable() { bReadNoTbl = sal_True; }
+ sal_Bool IsTableWidthSet() const { return 0 != nTableWidth; }
virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
- virtual const SfxPoolItem& GetAttr(USHORT nWhich);
- virtual const SfxPoolItem& GetNodeOrStyAttr(USHORT nWhich);
+ virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich);
+ virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich);
- BOOL IsInTable();
- virtual const SfxPoolItem& GetCellAttr(USHORT nWhich);
- virtual BOOL BeginTable();
+ sal_Bool IsInTable();
+ virtual const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich);
+ virtual sal_Bool BeginTable();
virtual void NextTableCell();
virtual void NextTableRow();
virtual void SetTableWidth(SwTwips nW);
virtual void SetTableOrient(sal_Int16 eOri);
- virtual void SetCellWidth(SwTwips nWidth, USHORT nCell);
+ virtual void SetCellWidth(SwTwips nWidth, sal_uInt16 nCell);
virtual void SetCellHeight(SwTwips nH);
- virtual void SetCellBorder(const SvxBoxItem& rFmtBox, USHORT nCell);
- virtual void SetCellSpace(USHORT nSp);
- virtual void DeleteCell(USHORT nCell);
+ virtual void SetCellBorder(const SvxBoxItem& rFmtBox, sal_uInt16 nCell);
+ virtual void SetCellSpace(sal_uInt16 nSp);
+ virtual void DeleteCell(sal_uInt16 nCell);
virtual void EndTable();
SwFrmFmt* MakeFly( RndStdIds eAnchor, SfxItemSet* pSet );
- virtual BOOL IsInFly();
+ virtual sal_Bool IsInFly();
virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr);
- virtual const SfxPoolItem& GetFlyFrmAttr(USHORT nWhich);
- virtual BOOL BeginFly( RndStdIds eAnchor, BOOL bAbsolutePos,
+ virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
+ virtual sal_Bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
const SfxItemSet* pMoreAttrs = 0 );
virtual void EndFly();
};
@@ -392,7 +392,7 @@ class SwFltFormatCollection : public SwFltOutBase
{
SwTxtFmtColl* pColl;
SfxItemSet* pFlyAttrs; // Simulation der Flys in Styles
- BOOL bHasFly;
+ sal_Bool bHasFly;
public:
SwFltFormatCollection(SwDoc&, RES_POOL_COLLFMT_TYPE nType);
SwFltFormatCollection(SwDoc&, const String& rName );
@@ -403,26 +403,26 @@ public:
// --> OD 2007-01-25 #i73790# - method renamed
pColl->ResetAllFmtAttr();
// <--
- pColl->SetAuto(FALSE); // nach Empfehlung JP
+ pColl->SetAuto(sal_False); // nach Empfehlung JP
}
void Derived(SwTxtFmtColl* pBase)
{ pColl->SetDerivedFrom(pBase); }
// SwTxtFmtColl* Search(String, CharSet eSrc);
SwTxtFmtColl* GetColl() { return pColl; }
- void SetHasFly() { bHasFly = TRUE; }
+ void SetHasFly() { bHasFly = sal_True; }
SfxItemSet* GetpFlyAttrs() { return pFlyAttrs; }
virtual SwFltOutBase& operator << (const SfxPoolItem& rItem);
- virtual const SfxPoolItem& GetAttr(USHORT nWhich);
- virtual const SfxPoolItem& GetNodeOrStyAttr(USHORT nWhich);
+ virtual const SfxPoolItem& GetAttr(sal_uInt16 nWhich);
+ virtual const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich);
- virtual BOOL IsInFly();
+ virtual sal_Bool IsInFly();
virtual void SetFlyFrmAttr(const SfxPoolItem& rAttr);
- virtual const SfxPoolItem& GetFlyFrmAttr(USHORT nWhich);
- virtual BOOL BeginFly( RndStdIds eAnchor, BOOL bAbsolutePos,
+ virtual const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
+ virtual sal_Bool BeginFly( RndStdIds eAnchor, sal_Bool bAbsolutePos,
const SfxItemSet* pMoreAttrs = 0 );
- BOOL BeginStyleFly( SwFltOutDoc* pOutDoc );
+ sal_Bool BeginStyleFly( SwFltOutDoc* pOutDoc );
virtual void EndFly();
};
@@ -461,22 +461,22 @@ class SwFltShell
} eSubMode;
// Fly items:
- USHORT nAktStyle; // zur Indizierung pStyleFlyTable
+ sal_uInt16 nAktStyle; // zur Indizierung pStyleFlyTable
//
SwFltControlStack aStack;
SwFltEndStack aEndStack;
SwPaM* pPaM;
//
String sBaseURL;
- USHORT nPageDescOffset; // fuers update der pagedescs
+ sal_uInt16 nPageDescOffset; // fuers update der pagedescs
CharSet eSrcCharSet; // charset der quelle
friend class SwFltControlStack;
- BOOL bNewDoc;
- BOOL bStdPD;
- BOOL bProtect;
+ sal_Bool bNewDoc;
+ sal_Bool bStdPD;
+ sal_Bool bProtect;
public:
- SwFltShell(SwDoc* , SwPaM& , const String& rBaseURL, BOOL bNew, ULONG = 0);
+ SwFltShell(SwDoc* , SwPaM& , const String& rBaseURL, sal_Bool bNew, sal_uLong = 0);
~SwFltShell();
SwDoc& GetDoc() { return *aStack.pDoc; }
@@ -485,20 +485,20 @@ public:
eSrcCharSet = eNew;
return eOld;
}
- void SetUseStdPageDesc() { bStdPD = TRUE; }
- void SetProtect() { bProtect = TRUE; }
+ void SetUseStdPageDesc() { bStdPD = sal_True; }
+ void SetProtect() { bProtect = sal_True; }
SwPageDesc* MakePageDesc(SwPageDesc* pFirstPageDesc = NULL);
SwPageDesc& GetPageDesc() { return *pCurrentPageDesc; }
- void NextTab() { (*this) << BYTE(0x09); }
- void NextLine() { (*this) << BYTE(0x0a); }
+ void NextTab() { (*this) << sal_uInt8(0x09); }
+ void NextLine() { (*this) << sal_uInt8(0x0a); }
void NextParagraph();
void NextPage();
void NextSection() { pCurrentPageDesc = MakePageDesc(); }
SwFltShell& AddGraphic( const String& rPicName );
SwFltShell& AddError( const sal_Char* pErr );
- SwFltShell& EndItem( USHORT nId );
- SwFltShell& SetStyle( USHORT nStyle );
+ SwFltShell& EndItem( sal_uInt16 nId );
+ SwFltShell& SetStyle( sal_uInt16 nStyle );
SwFltShell& operator << ( Graphic& );
SwFltShell& operator << ( SwFltBookmark& aBook );
@@ -520,12 +520,12 @@ public:
void BeginFootnote();
void EndFootnote();
// methoden zur verwaltung von Tabellen
- BOOL IsInTable() {
+ sal_Bool IsInTable() {
return ( pOut == pOutDoc ) ? pOutDoc->IsInTable() : 0; }
- const SfxPoolItem& GetCellAttr(USHORT nWhich) {
+ const SfxPoolItem& GetCellAttr(sal_uInt16 nWhich) {
return pOut->GetCellAttr(nWhich); }
- BOOL BeginTable() {
- BOOL b = pOut->BeginTable();
+ sal_Bool BeginTable() {
+ sal_Bool b = pOut->BeginTable();
if(b) eSubMode = Table;
return b; }
void NextTableCell() {
@@ -534,25 +534,25 @@ public:
pOut->NextTableRow(); }
void SetTableWidth(SwTwips nW) {
pOut->SetTableWidth(nW); }
- BOOL IsTableWidthSet() {
+ sal_Bool IsTableWidthSet() {
return pOutDoc->IsTableWidthSet(); }
void SetTableOrient(sal_Int16 eOri) {
pOut->SetTableOrient(eOri); }
- void SetCellWidth(SwTwips nWidth, USHORT nCell = USHRT_MAX ) {
+ void SetCellWidth(SwTwips nWidth, sal_uInt16 nCell = USHRT_MAX ) {
pOut->SetCellWidth(nWidth, nCell); }
void SetCellHeight(SwTwips nH) {
pOut->SetCellHeight(nH); }
- void SetCellBorder(const SvxBoxItem& rFmtBox, USHORT nCell = USHRT_MAX ){
+ void SetCellBorder(const SvxBoxItem& rFmtBox, sal_uInt16 nCell = USHRT_MAX ){
pOut->SetCellBorder(rFmtBox, nCell); }
- void SetCellSpace(USHORT nSp) {
+ void SetCellSpace(sal_uInt16 nSp) {
pOut->SetCellSpace(nSp); }
- void DeleteCell(USHORT nCell = USHRT_MAX) {
+ void DeleteCell(sal_uInt16 nCell = USHRT_MAX) {
pOut->DeleteCell(nCell); }
void EndTable() {
pOut->EndTable(); }
// methoden zur verwaltung von Flys
- BOOL IsInFly() { return pOut->IsInFly(); }
- BOOL BeginFly( RndStdIds eAnchor = FLY_AT_PARA, BOOL bAbsolutePos = FALSE );
+ sal_Bool IsInFly() { return pOut->IsInFly(); }
+ sal_Bool BeginFly( RndStdIds eAnchor = FLY_AT_PARA, sal_Bool bAbsolutePos = sal_False );
void SetFlyAnchor( RndStdIds eAnchor )
{ pOut->SetFlyAnchor( eAnchor ); }
void SetFlyXPos( short nXPos, sal_Int16 eHRel = com::sun::star::text::RelOrientation::FRAME,
@@ -563,7 +563,7 @@ public:
pOut->SetFlyFrmAttr( rAttr ); }
void EndFly();
// methoden zur verwaltung von styles:
- void BeginStyle(USHORT nUserCode, RES_POOL_COLLFMT_TYPE aType)
+ void BeginStyle(sal_uInt16 nUserCode, RES_POOL_COLLFMT_TYPE aType)
{
ASSERT(nUserCode<sizeof(pColls)/sizeof(*pColls), "code out of bounds");
ASSERT(pColls[nUserCode] == NULL, "user codes dublicate");
@@ -573,7 +573,7 @@ public:
nAktStyle = nUserCode;
eSubMode = Style;
}
- void BeginStyle( USHORT nUserCode, const String& rName )
+ void BeginStyle( sal_uInt16 nUserCode, const String& rName )
{
ASSERT(nUserCode<sizeof(pColls)/sizeof(*pColls), "code out of bounds");
ASSERT(pColls[nUserCode] == NULL, "user codes dublicate");
@@ -583,16 +583,16 @@ public:
nAktStyle = nUserCode;
eSubMode = Style;
}
- BOOL IsStyleImported(USHORT nUserCode)
+ sal_Bool IsStyleImported(sal_uInt16 nUserCode)
{ return pColls[nUserCode] != 0; }
- void BaseStyle(USHORT nBased)
+ void BaseStyle(sal_uInt16 nBased)
{
ASSERT(eSubMode == Style, "wrong state for style");
ASSERT(pColls[nBased], "Style based on noexistent style" );
if( eSubMode == Style && pColls[nBased]->GetColl() )
((SwFltFormatCollection*)pOut)->Derived(pColls[nBased]->GetColl());
}
- void NextStyle(USHORT nWhich, USHORT nNext);
+ void NextStyle(sal_uInt16 nWhich, sal_uInt16 nNext);
void EndStyle()
{
@@ -602,22 +602,22 @@ public:
eSubMode = None;
}
- BOOL IsFlagSet(SwFltControlStack::Flags no) const
+ sal_Bool IsFlagSet(SwFltControlStack::Flags no) const
{ return aStack.IsFlagSet(no); }
void ConvertUStr( String& rInOut );
String QuoteStr( const String& rIn );
// folgende status kann die shell verwalten:
- const SfxPoolItem& GetNodeOrStyAttr(USHORT nWhich);
- const SfxPoolItem& GetAttr(USHORT nWhich);
- const SfxPoolItem& GetFlyFrmAttr(USHORT nWhich);
- SwFieldType* GetSysFldType(USHORT eWhich);
- BOOL GetWeightBold();
- BOOL GetPostureItalic();
- BOOL GetCrossedOut();
- BOOL GetContour();
- BOOL GetCaseKapitaelchen();
- BOOL GetCaseVersalien();
+ const SfxPoolItem& GetNodeOrStyAttr(sal_uInt16 nWhich);
+ const SfxPoolItem& GetAttr(sal_uInt16 nWhich);
+ const SfxPoolItem& GetFlyFrmAttr(sal_uInt16 nWhich);
+ SwFieldType* GetSysFldType(sal_uInt16 eWhich);
+ sal_Bool GetWeightBold();
+ sal_Bool GetPostureItalic();
+ sal_Bool GetCrossedOut();
+ sal_Bool GetContour();
+ sal_Bool GetCaseKapitaelchen();
+ sal_Bool GetCaseVersalien();
const String& GetBaseURL() const { return sBaseURL; }
};
diff --git a/sw/source/filter/inc/msfilter.hxx b/sw/source/filter/inc/msfilter.hxx
index 2f93e279c21d..d4f02f690245 100644
--- a/sw/source/filter/inc/msfilter.hxx
+++ b/sw/source/filter/inc/msfilter.hxx
@@ -120,7 +120,7 @@ namespace sw
@author
<a href="mailto:mmaher@openoffice.org">Martin Maher</a
*/
- ULONG MSDateTimeFormatToSwFormat(String& rParams, SvNumberFormatter *pFormatter, USHORT &rLang, bool bHijri);
+ sal_uLong MSDateTimeFormatToSwFormat(String& rParams, SvNumberFormatter *pFormatter, sal_uInt16 &rLang, bool bHijri);
/** Used by MSDateTimeFormatToSwFormat to identify AM time fields
@@ -146,10 +146,10 @@ namespace sw
/// Redlining Authors
struct AuthorInfo
{
- USHORT nWWAuthorId;
- USHORT nOurId;
+ sal_uInt16 nWWAuthorId;
+ sal_uInt16 nOurId;
- AuthorInfo(USHORT nWWAuthorId_, USHORT nOurId_ = 0):
+ AuthorInfo(sal_uInt16 nWWAuthorId_, sal_uInt16 nOurId_ = 0):
nWWAuthorId( nWWAuthorId_ ),
nOurId( nOurId_ )
{}
@@ -438,7 +438,7 @@ namespace sw
protected:
std::vector<String> maAuthors; // Array of Sw - Bookmarknames
- USHORT GetPos( const String& rNm );
+ sal_uInt16 GetPos( const String& rNm );
//No copying
WrtRedlineAuthor(const WrtRedlineAuthor&);
@@ -447,7 +447,7 @@ namespace sw
WrtRedlineAuthor() {}
virtual ~WrtRedlineAuthor() {}
- USHORT AddName( const String& rNm );
+ sal_uInt16 AddName( const String& rNm );
virtual void Write(Writer &rWrt) = 0;
// std::vector<String> GetNames();
};
diff --git a/sw/source/filter/inc/rtf.hxx b/sw/source/filter/inc/rtf.hxx
index 9f7578fd5f71..4ca97a99648e 100644
--- a/sw/source/filter/inc/rtf.hxx
+++ b/sw/source/filter/inc/rtf.hxx
@@ -34,23 +34,23 @@ class RTFVertOrient
{
union {
struct {
- USHORT nOrient : 4;
- USHORT nRelOrient : 1;
+ sal_uInt16 nOrient : 4;
+ sal_uInt16 nRelOrient : 1;
} Flags;
- USHORT nVal;
+ sal_uInt16 nVal;
} Value;
public:
- RTFVertOrient( USHORT nValue ) { Value.nVal = nValue; }
+ RTFVertOrient( sal_uInt16 nValue ) { Value.nVal = nValue; }
- RTFVertOrient( USHORT nOrient, USHORT nRelOrient ) {
+ RTFVertOrient( sal_uInt16 nOrient, sal_uInt16 nRelOrient ) {
Value.Flags.nOrient = nOrient;
Value.Flags.nRelOrient = nRelOrient;
}
- USHORT GetOrient() const { return Value.Flags.nOrient; }
- USHORT GetRelation() const { return Value.Flags.nRelOrient; }
- USHORT GetValue() const { return Value.nVal; }
+ sal_uInt16 GetOrient() const { return Value.Flags.nOrient; }
+ sal_uInt16 GetRelation() const { return Value.Flags.nRelOrient; }
+ sal_uInt16 GetValue() const { return Value.nVal; }
};
@@ -58,50 +58,50 @@ class RTFHoriOrient
{
union {
struct {
- USHORT nOrient : 4;
- USHORT nRelAnchor : 4;
- USHORT nRelOrient : 1;
+ sal_uInt16 nOrient : 4;
+ sal_uInt16 nRelAnchor : 4;
+ sal_uInt16 nRelOrient : 1;
} Flags;
- USHORT nVal;
+ sal_uInt16 nVal;
} Value;
public:
- RTFHoriOrient( USHORT nValue ) { Value.nVal = nValue; }
+ RTFHoriOrient( sal_uInt16 nValue ) { Value.nVal = nValue; }
- RTFHoriOrient( USHORT nOrient, USHORT nRelOrient ) {
+ RTFHoriOrient( sal_uInt16 nOrient, sal_uInt16 nRelOrient ) {
Value.Flags.nOrient = nOrient;
Value.Flags.nRelOrient = nRelOrient;
Value.Flags.nRelAnchor = 0;
}
- USHORT GetOrient() const { return Value.Flags.nOrient; }
- USHORT GetRelation() const { return Value.Flags.nRelOrient; }
- USHORT GetValue() const { return Value.nVal; }
+ sal_uInt16 GetOrient() const { return Value.Flags.nOrient; }
+ sal_uInt16 GetRelation() const { return Value.Flags.nRelOrient; }
+ sal_uInt16 GetValue() const { return Value.nVal; }
};
class RTFProtect
{
union {
struct {
- BOOL bCntnt : 1;
- BOOL bSize : 1;
- BOOL bPos : 1;
+ sal_Bool bCntnt : 1;
+ sal_Bool bSize : 1;
+ sal_Bool bPos : 1;
} Flags;
- BYTE nVal;
+ sal_uInt8 nVal;
} Value;
public:
- RTFProtect( BYTE nValue ) { Value.nVal = nValue; }
+ RTFProtect( sal_uInt8 nValue ) { Value.nVal = nValue; }
- RTFProtect( BOOL bCntnt, BOOL bSize, BOOL bPos ) {
+ RTFProtect( sal_Bool bCntnt, sal_Bool bSize, sal_Bool bPos ) {
Value.Flags.bCntnt = bCntnt;
Value.Flags.bSize = bSize;
Value.Flags.bPos = bPos;
}
- BOOL GetCntnt() const { return Value.Flags.bCntnt; }
- BOOL GetSize() const { return Value.Flags.bSize; }
- BOOL GetPos() const { return Value.Flags.bPos; }
- USHORT GetValue() const { return Value.nVal; }
+ sal_Bool GetCntnt() const { return Value.Flags.bCntnt; }
+ sal_Bool GetSize() const { return Value.Flags.bSize; }
+ sal_Bool GetPos() const { return Value.Flags.bPos; }
+ sal_uInt16 GetValue() const { return Value.nVal; }
};
@@ -109,22 +109,22 @@ class RTFSurround
{
union {
struct {
- USHORT nGoldCut : 1;
- USHORT nOrder : 4;
+ sal_uInt16 nGoldCut : 1;
+ sal_uInt16 nOrder : 4;
} Flags;
- BYTE nVal;
+ sal_uInt8 nVal;
} Value;
public:
- RTFSurround( BYTE nValue ) { Value.nVal = nValue; }
+ RTFSurround( sal_uInt8 nValue ) { Value.nVal = nValue; }
- RTFSurround( BOOL bGoldCut, BYTE nOrder ) {
+ RTFSurround( sal_Bool bGoldCut, sal_uInt8 nOrder ) {
Value.Flags.nOrder = nOrder;
Value.Flags.nGoldCut = bGoldCut;
}
- BYTE GetOrder() const { return (BYTE)Value.Flags.nOrder; }
- BOOL GetGoldCut() const { return (BOOL)Value.Flags.nGoldCut; }
- USHORT GetValue() const { return Value.nVal; }
+ sal_uInt8 GetOrder() const { return (sal_uInt8)Value.Flags.nOrder; }
+ sal_Bool GetGoldCut() const { return (sal_Bool)Value.Flags.nGoldCut; }
+ sal_uInt16 GetValue() const { return Value.nVal; }
};
#endif // _RTF_HXX
diff --git a/sw/source/filter/inc/wrt_fn.hxx b/sw/source/filter/inc/wrt_fn.hxx
index f190811a6f46..80bf3b2ec35b 100644
--- a/sw/source/filter/inc/wrt_fn.hxx
+++ b/sw/source/filter/inc/wrt_fn.hxx
@@ -41,7 +41,7 @@ typedef FnAttrOut SwAttrFnTab[ POOLATTR_END - POOLATTR_BEGIN ];
SW_DLLPUBLIC Writer& Out( const SwAttrFnTab, const SfxPoolItem&, Writer& );
SW_DLLPUBLIC Writer& Out_SfxItemSet( const SwAttrFnTab, Writer&, const SfxItemSet&,
- BOOL bDeep, BOOL bTstForDefault = TRUE );
+ sal_Bool bDeep, sal_Bool bTstForDefault = sal_True );
/* Funktionspointer auf die Node-Write-Funktionen */
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index c47ac7809bd0..c717cfb5d96c 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -63,44 +63,44 @@ class SwWriteTableCell
sal_uInt32 nWidthOpt; // Breite aus Option;
- USHORT nRow; // Start-Zeile
- USHORT nCol; // Start-Spalte
+ sal_uInt16 nRow; // Start-Zeile
+ sal_uInt16 nCol; // Start-Spalte
- USHORT nRowSpan; // ueberspannte Zeilen
- USHORT nColSpan; // ueberspannte Spalten
+ sal_uInt16 nRowSpan; // ueberspannte Zeilen
+ sal_uInt16 nColSpan; // ueberspannte Spalten
- BOOL bPrcWidthOpt;
+ sal_Bool bPrcWidthOpt;
public:
- SwWriteTableCell(const SwTableBox *pB, USHORT nR, USHORT nC, USHORT nRSpan,
- USHORT nCSpan, long nHght, const SvxBrushItem *pBGround)
+ SwWriteTableCell(const SwTableBox *pB, sal_uInt16 nR, sal_uInt16 nC, sal_uInt16 nRSpan,
+ sal_uInt16 nCSpan, long nHght, const SvxBrushItem *pBGround)
: pBox( pB ), pBackground( pBGround ), nHeight( nHght ), nWidthOpt( 0 ),
nRow( nR ), nCol( nC ), nRowSpan( nRSpan ), nColSpan( nCSpan ),
- bPrcWidthOpt( FALSE )
+ bPrcWidthOpt( sal_False )
{}
const SwTableBox *GetBox() const { return pBox; }
- USHORT GetRow() const { return nRow; }
- USHORT GetCol() const { return nCol; }
+ sal_uInt16 GetRow() const { return nRow; }
+ sal_uInt16 GetCol() const { return nCol; }
- USHORT GetRowSpan() const { return nRowSpan; }
- USHORT GetColSpan() const { return nColSpan; }
+ sal_uInt16 GetRowSpan() const { return nRowSpan; }
+ sal_uInt16 GetColSpan() const { return nColSpan; }
long GetHeight() const { return nHeight; }
sal_Int16 GetVertOri() const;
const SvxBrushItem *GetBackground() const { return pBackground; }
- void SetWidthOpt( USHORT nWidth, BOOL bPrc )
+ void SetWidthOpt( sal_uInt16 nWidth, sal_Bool bPrc )
{
nWidthOpt = nWidth; bPrcWidthOpt = bPrc;
}
sal_uInt32 GetWidthOpt() const { return nWidthOpt; }
- BOOL HasPrcWidthOpt() const { return bPrcWidthOpt; }
+ sal_Bool HasPrcWidthOpt() const { return bPrcWidthOpt; }
};
typedef SwWriteTableCell *SwWriteTableCellPtr;
@@ -115,7 +115,7 @@ class SwWriteTableRow
const SvxBrushItem *pBackground;// Hintergrund
long nPos; // End-Position (twips) der Zeile
- BOOL mbUseLayoutHeights;
+ sal_Bool mbUseLayoutHeights;
// Forbidden and not implemented.
SwWriteTableRow();
@@ -128,17 +128,17 @@ protected:
public:
- USHORT nTopBorder; // Dicke der oberen/unteren Umrandugen
- USHORT nBottomBorder;
+ sal_uInt16 nTopBorder; // Dicke der oberen/unteren Umrandugen
+ sal_uInt16 nBottomBorder;
- BOOL bTopBorder : 1; // Welche Umrandungen sind da?
- BOOL bBottomBorder : 1;
+ sal_Bool bTopBorder : 1; // Welche Umrandungen sind da?
+ sal_Bool bBottomBorder : 1;
- SwWriteTableRow( long nPos, BOOL bUseLayoutHeights );
+ SwWriteTableRow( long nPos, sal_Bool bUseLayoutHeights );
SwWriteTableCell *AddCell( const SwTableBox *pBox,
- USHORT nRow, USHORT nCol,
- USHORT nRowSpan, USHORT nColSpan,
+ sal_uInt16 nRow, sal_uInt16 nCol,
+ sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
long nHeight,
const SvxBrushItem *pBackground );
@@ -148,8 +148,8 @@ public:
}
const SvxBrushItem *GetBackground() const { return pBackground; }
- BOOL HasTopBorder() const { return bTopBorder; }
- BOOL HasBottomBorder() const { return bBottomBorder; }
+ sal_Bool HasTopBorder() const { return bTopBorder; }
+ sal_Bool HasBottomBorder() const { return bBottomBorder; }
long GetPos() const { return nPos; }
const SwWriteTableCells& GetCells() const { return aCells; }
@@ -184,35 +184,35 @@ class SwWriteTableCol
sal_uInt32 nWidthOpt;
- BOOL bRelWidthOpt : 1;
- BOOL bOutWidth : 1; // Spaltenbreite ausgeben?
+ sal_Bool bRelWidthOpt : 1;
+ sal_Bool bOutWidth : 1; // Spaltenbreite ausgeben?
public:
- BOOL bLeftBorder : 1; // Welche Umrandungen sind da?
- BOOL bRightBorder : 1;
+ sal_Bool bLeftBorder : 1; // Welche Umrandungen sind da?
+ sal_Bool bRightBorder : 1;
SwWriteTableCol( sal_uInt32 nPosition );
sal_uInt32 GetPos() const { return nPos; }
- void SetLeftBorder( BOOL bBorder ) { bLeftBorder = bBorder; }
- BOOL HasLeftBorder() const { return bLeftBorder; }
+ void SetLeftBorder( sal_Bool bBorder ) { bLeftBorder = bBorder; }
+ sal_Bool HasLeftBorder() const { return bLeftBorder; }
- void SetRightBorder( BOOL bBorder ) { bRightBorder = bBorder; }
- BOOL HasRightBorder() const { return bRightBorder; }
+ void SetRightBorder( sal_Bool bBorder ) { bRightBorder = bBorder; }
+ sal_Bool HasRightBorder() const { return bRightBorder; }
- void SetOutWidth( BOOL bSet ) { bOutWidth = bSet; }
- BOOL GetOutWidth() const { return bOutWidth; }
+ void SetOutWidth( sal_Bool bSet ) { bOutWidth = bSet; }
+ sal_Bool GetOutWidth() const { return bOutWidth; }
inline int operator==( const SwWriteTableCol& rCol ) const;
inline int operator<( const SwWriteTableCol& rCol ) const;
- void SetWidthOpt( sal_uInt32 nWidth, BOOL bRel )
+ void SetWidthOpt( sal_uInt32 nWidth, sal_Bool bRel )
{
nWidthOpt = nWidth; bRelWidthOpt = bRel;
}
sal_uInt32 GetWidthOpt() const { return nWidthOpt; }
- BOOL HasRelWidthOpt() const { return bRelWidthOpt; }
+ sal_Bool HasRelWidthOpt() const { return bRelWidthOpt; }
};
inline int SwWriteTableCol::operator==( const SwWriteTableCol& rCol ) const
@@ -241,70 +241,70 @@ protected:
SwWriteTableCols aCols; // alle Spalten
SwWriteTableRows aRows; // alle Zellen
- UINT32 nBorderColor; // Umrandungsfarbe
+ sal_uInt32 nBorderColor; // Umrandungsfarbe
- USHORT nCellSpacing; // Dicke der inneren Umrandung
- USHORT nCellPadding; // Absatnd Umrandung-Inhalt
+ sal_uInt16 nCellSpacing; // Dicke der inneren Umrandung
+ sal_uInt16 nCellPadding; // Absatnd Umrandung-Inhalt
- USHORT nBorder; // Dicke der ausseren Umrandung
- USHORT nInnerBorder; // Dicke der inneren Umrandung
+ sal_uInt16 nBorder; // Dicke der ausseren Umrandung
+ sal_uInt16 nInnerBorder; // Dicke der inneren Umrandung
sal_uInt32 nBaseWidth; // Bezugsgroesse fur Breiten SwFmtFrmSize
- USHORT nHeadEndRow; // letzte Zeile des Tabellen-Kopfes
+ sal_uInt16 nHeadEndRow; // letzte Zeile des Tabellen-Kopfes
- USHORT nLeftSub;
- USHORT nRightSub;
+ sal_uInt16 nLeftSub;
+ sal_uInt16 nRightSub;
sal_uInt32 nTabWidth; // Absolute/Relative Breite der Tabelle
- BOOL bRelWidths : 1; // Breiten relativ ausgeben?
- BOOL bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
+ sal_Bool bRelWidths : 1; // Breiten relativ ausgeben?
+ sal_Bool bUseLayoutHeights : 1; // Layout zur Hoehenbestimmung nehmen?
#ifdef DBG_UTIL
- BOOL bGetLineHeightCalled : 1;
+ sal_Bool bGetLineHeightCalled : 1;
#endif
- BOOL bColsOption : 1;
- BOOL bColTags : 1;
- BOOL bLayoutExport : 1;
- BOOL bCollectBorderWidth : 1;
+ sal_Bool bColsOption : 1;
+ sal_Bool bColTags : 1;
+ sal_Bool bLayoutExport : 1;
+ sal_Bool bCollectBorderWidth : 1;
- virtual BOOL ShouldExpandSub( const SwTableBox *pBox,
- BOOL bExpandedBefore, USHORT nDepth ) const;
+ virtual sal_Bool ShouldExpandSub( const SwTableBox *pBox,
+ sal_Bool bExpandedBefore, sal_uInt16 nDepth ) const;
void CollectTableRowsCols( long nStartRPos, sal_uInt32 nStartCPos,
long nParentLineHeight,
sal_uInt32 nParentLineWidth,
const SwTableLines& rLines,
- USHORT nDepth );
+ sal_uInt16 nDepth );
- void FillTableRowsCols( long nStartRPos, USHORT nStartRow,
- sal_uInt32 nStartCPos, USHORT nStartCol,
+ void FillTableRowsCols( long nStartRPos, sal_uInt16 nStartRow,
+ sal_uInt32 nStartCPos, sal_uInt16 nStartCol,
long nParentLineHeight,
sal_uInt32 nParentLineWidth,
const SwTableLines& rLines,
const SvxBrushItem* pLineBrush,
- USHORT nDepth,
+ sal_uInt16 nDepth,
sal_uInt16 nNumOfHeaderRows );
- void MergeBorders( const SvxBorderLine* pBorderLine, BOOL bTable );
+ void MergeBorders( const SvxBorderLine* pBorderLine, sal_Bool bTable );
- USHORT MergeBoxBorders( const SwTableBox *pBox, USHORT nRow, USHORT nCol,
- USHORT nRowSpan, USHORT nColSpan,
- USHORT &rTopBorder, USHORT &rBottomBorder );
+ sal_uInt16 MergeBoxBorders( const SwTableBox *pBox, sal_uInt16 nRow, sal_uInt16 nCol,
+ sal_uInt16 nRowSpan, sal_uInt16 nColSpan,
+ sal_uInt16 &rTopBorder, sal_uInt16 &rBottomBorder );
sal_uInt32 GetBaseWidth() const { return nBaseWidth; }
- BOOL HasRelWidths() const { return bRelWidths; }
+ sal_Bool HasRelWidths() const { return bRelWidths; }
public:
static sal_uInt32 GetBoxWidth( const SwTableBox *pBox );
- sal_uInt32 GetRawWidth( USHORT nCol, USHORT nColSpan ) const;
- USHORT GetAbsWidth( USHORT nCol, USHORT nColSpan ) const;
- USHORT GetRelWidth( USHORT nCol, USHORT nColSpan ) const;
- USHORT GetPrcWidth( USHORT nCol, USHORT nColSpan ) const;
+ sal_uInt32 GetRawWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
+ sal_uInt16 GetAbsWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
+ sal_uInt16 GetRelWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
+ sal_uInt16 GetPrcWidth( sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
- long GetAbsHeight( long nRawWidth, USHORT nRow, USHORT nRowSpan ) const;
+ long GetAbsHeight( long nRawWidth, sal_uInt16 nRow, sal_uInt16 nRowSpan ) const;
protected:
long GetLineHeight( const SwTableLine *pLine );
@@ -312,14 +312,14 @@ protected:
const SvxBrushItem *GetLineBrush( const SwTableBox *pBox,
SwWriteTableRow *pRow );
- USHORT GetLeftSpace( USHORT nCol ) const;
- USHORT GetRightSpace( USHORT nCol, USHORT nColSpan ) const;
+ sal_uInt16 GetLeftSpace( sal_uInt16 nCol ) const;
+ sal_uInt16 GetRightSpace( sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
public:
SwWriteTable( const SwTableLines& rLines, long nWidth, sal_uInt32 nBWidth,
- BOOL bRel, USHORT nMaxDepth = USHRT_MAX,
- USHORT nLeftSub=0, USHORT nRightSub=0, sal_uInt32 nNumOfRowsToRepeat=0 );
+ sal_Bool bRel, sal_uInt16 nMaxDepth = USHRT_MAX,
+ sal_uInt16 nLeftSub=0, sal_uInt16 nRightSub=0, sal_uInt32 nNumOfRowsToRepeat=0 );
SwWriteTable( const SwHTMLTableLayout *pLayoutInfo );
virtual ~SwWriteTable();
generated by cgit (git 2.34.1) at 2024-07-18 12:19:37 +0000