summaryrefslogtreecommitdiff
path: root/editeng/source/rtf
diff options
context:
space:
mode:
Diffstat (limited to 'editeng/source/rtf')
-rw-r--r--editeng/source/rtf/makefile.mk50
-rw-r--r--editeng/source/rtf/rtfgrf.cxx46
-rw-r--r--editeng/source/rtf/rtfitem.cxx280
-rw-r--r--editeng/source/rtf/svxrtf.cxx264
4 files changed, 295 insertions, 345 deletions
diff --git a/editeng/source/rtf/makefile.mk b/editeng/source/rtf/makefile.mk
deleted file mode 100644
index 081cd5b506cd..000000000000
--- a/editeng/source/rtf/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=editeng
-TARGET=rtf
-ENABLE_EXCEPTIONS=TRUE
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES= \
- $(SLO)$/rtfitem.obj \
- $(SLO)$/svxrtf.obj
-
-SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/rtfgrf.obj
-
-# ==========================================================================
-
-.INCLUDE : target.mk
-
diff --git a/editeng/source/rtf/rtfgrf.cxx b/editeng/source/rtf/rtfgrf.cxx
index 4b0051cd3c81..12e9c992070a 100644
--- a/editeng/source/rtf/rtfgrf.cxx
+++ b/editeng/source/rtf/rtfgrf.cxx
@@ -73,12 +73,12 @@ void GrfWindow::Paint( const Rectangle& )
}
#endif
-static BYTE __FAR_DATA aPal1[ 2 * 4 ] = {
+static sal_uInt8 __FAR_DATA aPal1[ 2 * 4 ] = {
0x00, 0x00, 0x00, 0x00, // Schwarz
0xFF, 0xFF, 0xFF, 0x00 // Weiss
};
-static BYTE __FAR_DATA aPal4[ 16 * 4 ] = {
+static sal_uInt8 __FAR_DATA aPal4[ 16 * 4 ] = {
0x00, 0x00, 0x00, 0x00,
0x80, 0x00, 0x00, 0x00,
0x00, 0x80, 0x00, 0x00,
@@ -97,7 +97,7 @@ static BYTE __FAR_DATA aPal4[ 16 * 4 ] = {
0xFF, 0xFF, 0xFF, 0x00
};
-static BYTE __FAR_DATA aPal8[ 256 * 4 ] =
+static sal_uInt8 __FAR_DATA aPal8[ 256 * 4 ] =
{
0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00,
0x80, 0x92, 0x00, 0x00, 0x00, 0x00, 0xAA, 0x00, 0x80, 0x00, 0xAA, 0x00,
@@ -213,14 +213,14 @@ inline short SwapShort( short n )
static void WriteBMPHeader( SvStream& rStream,
const SvxRTFPictureType& rPicType )
{
- ULONG n4Width = rPicType.nWidth;
- ULONG n4Height = rPicType.nHeight;
- USHORT n4ColBits = rPicType.nBitsPerPixel;
+ sal_uInt32 n4Width = rPicType.nWidth;
+ sal_uInt32 n4Height = rPicType.nHeight;
+ sal_uInt16 n4ColBits = rPicType.nBitsPerPixel;
- USHORT nColors = (1 << n4ColBits); // Anzahl der Farben ( 1, 16, 256 )
- USHORT nWdtOut = rPicType.nWidthBytes;
+ sal_uInt16 nColors = (1 << n4ColBits); // Anzahl der Farben ( 1, 16, 256 )
+ sal_uInt16 nWdtOut = rPicType.nWidthBytes;
if( !nWdtOut )
- nWdtOut = (USHORT)((( n4Width * n4ColBits + 31 ) / 32 ) * 4 );
+ nWdtOut = (sal_uInt16)((( n4Width * n4ColBits + 31 ) / 32 ) * 4 );
long nOffset = 14 + 40; // BMP_FILE_HD_SIZ + sizeof(*pBmpInfo);
if( 256 >= nColors )
@@ -235,7 +235,7 @@ static void WriteBMPHeader( SvStream& rStream,
rStream << SwapLong(40) // sizeof( BmpInfo )
<< SwapLong(n4Width)
<< SwapLong(n4Height)
- << (USHORT)1
+ << (sal_uInt16)1
<< n4ColBits
<< SwapLong(0)
<< SwapLong(0)
@@ -271,7 +271,7 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
xub_StrLen n, nLen;
sal_Unicode nVal;
- BOOL bValidData = TRUE;
+ sal_Bool bValidData = sal_True;
const sal_Unicode* pStr = rToken.GetBufferAccess();
sal_Char* pData = (sal_Char*)pStr;
for( n = 0, nLen = rToken.Len(); n < nLen; ++n, ++pStr )
@@ -285,7 +285,7 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
else
{
DBG_ASSERT( !this, "ungueltiger Hex-Wert" );
- bValidData = FALSE;
+ bValidData = sal_False;
break;
}
@@ -298,11 +298,11 @@ xub_StrLen SvxRTFParser::HexToBin( String& rToken )
return bValidData ? nLen / 2 : STRING_NOTFOUND;
}
-BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
+sal_Bool SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
{
// die alten Daten loeschen
rGrf.Clear();
-// ULONG nBmpSize = 0;
+// sal_uInt32 nBmpSize = 0;
rtl_TextEncoding eOldEnc = GetSrcEncoding();
SetSrcEncoding( RTL_TEXTENCODING_MS_1252 );
@@ -322,7 +322,7 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
while( _nOpenBrakets && IsParserWorking() && bValidBmp )
{
nToken = GetNextToken();
- USHORT nVal = USHORT( nTokenValue );
+ sal_uInt16 nVal = sal_uInt16( nTokenValue );
switch( nToken )
{
case '}':
@@ -423,11 +423,11 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
rPicType.uPicLen = nTokenValue;
if (rPicType.uPicLen)
{
- ULONG nPos = rStrm.Tell();
+ sal_uInt32 nPos = rStrm.Tell();
nPos = nPos;
rStrm.SeekRel(-1);
sal_uInt8 aData[4096];
- ULONG nSize = sizeof(aData);
+ sal_uInt32 nSize = sizeof(aData);
while (rPicType.uPicLen > 0)
{
@@ -489,14 +489,14 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
default:
break;
}
- bFirstTextToken = FALSE;
+ bFirstTextToken = sal_False;
}
if( pTmpFile && SvxRTFPictureType::HEX_MODE == rPicType.nMode )
{
xub_StrLen nTokenLen = HexToBin( aToken );
if( STRING_NOTFOUND == nTokenLen )
- bValidBmp = FALSE;
+ bValidBmp = sal_False;
else
{
pTmpFile->Write( (sal_Char*)aToken.GetBuffer(),
@@ -517,12 +517,12 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
if( bValidBmp )
{
GraphicFilter* pGF = GraphicFilter::GetGraphicFilter();
- USHORT nImportFilter = GRFILTER_FORMAT_DONTKNOW;
+ sal_uInt16 nImportFilter = GRFILTER_FORMAT_DONTKNOW;
if( pFilterNm )
{
String sTmp;
- for( USHORT n = pGF->GetImportFormatCount(); n; )
+ for( sal_uInt16 n = pGF->GetImportFormatCount(); n; )
{
sTmp = pGF->GetImportFormatShortName( --n );
if( sTmp.EqualsAscii( pFilterNm ))
@@ -566,8 +566,8 @@ BOOL SvxRTFParser::ReadBmpData( Graphic& rGrf, SvxRTFPictureType& rPicType )
else
aSize = OutputDevice::LogicToLogic( aSize,
rGrf.GetPrefMapMode(), aMap );
- rPicType.nWidth = sal::static_int_cast< USHORT >(aSize.Width());
- rPicType.nHeight = sal::static_int_cast< USHORT >(
+ rPicType.nWidth = sal::static_int_cast< sal_uInt16 >(aSize.Width());
+ rPicType.nHeight = sal::static_int_cast< sal_uInt16 >(
aSize.Height());
}
break;
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 58789fab2106..63a8dd3aa6f6 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -99,14 +99,14 @@
// einige Hilfs-Funktionen
// char
-inline const SvxEscapementItem& GetEscapement(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxEscapementItem& GetEscapement(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
{ return (const SvxEscapementItem&)rSet.Get( nId,bInP); }
-inline const SvxLineSpacingItem& GetLineSpacing(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxLineSpacingItem& GetLineSpacing(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
{ return (const SvxLineSpacingItem&)rSet.Get( nId,bInP); }
// frm
-inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxLRSpaceItem& GetLRSpace(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
{ return (const SvxLRSpaceItem&)rSet.Get( nId,bInP); }
-inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,USHORT nId,BOOL bInP=TRUE)
+inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,sal_uInt16 nId,sal_Bool bInP=sal_True)
{ return (const SvxULSpaceItem&)rSet.Get( nId,bInP); }
#define PARDID ((RTFPardAttrMapIds*)aPardMap.GetData())
@@ -115,7 +115,7 @@ inline const SvxULSpaceItem& GetULSpace(const SfxItemSet& rSet,USHORT nId,BOOL b
void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
SfxPoolItem& rItem )
{
- const USHORT *pNormal = 0, *pCJK = 0, *pCTL = 0;
+ const sal_uInt16 *pNormal = 0, *pCJK = 0, *pCTL = 0;
const RTFPlainAttrMapIds* pIds = (RTFPlainAttrMapIds*)aPlainMap.GetData();
switch( rItem.Which() )
{
@@ -219,14 +219,14 @@ void SvxRTFParser::SetScriptAttr( RTF_CharTypeDef eType, SfxItemSet& rSet,
void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
{
DBG_ASSERT( pSet, "Es muss ein SfxItemSet uebergeben werden!" );
- int bFirstToken = TRUE, bWeiter = TRUE;
- USHORT nStyleNo = 0; // default
+ int bFirstToken = sal_True, bWeiter = sal_True;
+ sal_uInt16 nStyleNo = 0; // default
FontUnderline eUnderline;
FontUnderline eOverline;
FontEmphasisMark eEmphasis;
- bPardTokenRead = FALSE;
+ bPardTokenRead = sal_False;
RTF_CharTypeDef eCharType = NOTDEF_CHARTYPE;
- USHORT nFontAlign;
+ sal_uInt16 nFontAlign;
int bChkStkPos = !bNewGroup && !aAttrStack.empty();
@@ -235,14 +235,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
switch( nToken )
{
case RTF_PARD:
- RTFPardPlain( TRUE, &pSet );
+ RTFPardPlain( sal_True, &pSet );
ResetPard();
nStyleNo = 0;
- bPardTokenRead = TRUE;
+ bPardTokenRead = sal_True;
break;
case RTF_PLAIN:
- RTFPardPlain( FALSE, &pSet );
+ RTFPardPlain( sal_False, &pSet );
break;
default:
@@ -264,7 +264,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
{
// eine neue Gruppe aufmachen
SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
- *pAkt, *pInsPos, TRUE );
+ *pAkt, *pInsPos, sal_True );
pNew->SetRTFDefaults( GetRTFDefaults() );
// alle bis hierher gueltigen Attribute "setzen"
@@ -280,7 +280,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
pAkt->SetStartPos( *pInsPos );
pSet = &pAkt->aAttrSet;
- } while( FALSE );
+ } while( sal_False );
switch( nToken )
{
@@ -298,18 +298,18 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
{
if( !bFirstToken )
SkipToken( -1 );
- bWeiter = FALSE;
+ bWeiter = sal_False;
}
else
{
- nStyleNo = -1 == nTokenValue ? 0 : USHORT(nTokenValue);
+ nStyleNo = -1 == nTokenValue ? 0 : sal_uInt16(nTokenValue);
// setze am akt. auf dem AttrStack stehenden Style die
// StyleNummer
SvxRTFItemStackType* pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
if( !pAkt )
break;
- pAkt->nStyleNo = USHORT( nStyleNo );
+ pAkt->nStyleNo = sal_uInt16( nStyleNo );
#if 0
// JP 05.09.95: zuruecksetzen der Style-Attribute fuehrt nur zu Problemen.
@@ -329,8 +329,8 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
SfxItemIter aIter( pStyle->aAttrSet );
SfxItemPool* pPool = pStyle->aAttrSet.GetPool();
- USHORT nWh = aIter.GetCurItem()->Which();
- while( TRUE )
+ sal_uInt16 nWh = aIter.GetCurItem()->Which();
+ while( sal_True )
{
pAkt->aAttrSet.Put( pPool->GetDefaultItem( nWh ));
if( aIter.IsAtEnd() )
@@ -345,14 +345,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
case RTF_KEEP:
if( PARDID->nSplit )
{
- pSet->Put( SvxFmtSplitItem( FALSE, PARDID->nSplit ));
+ pSet->Put( SvxFmtSplitItem( sal_False, PARDID->nSplit ));
}
break;
case RTF_KEEPN:
if( PARDID->nKeep )
{
- pSet->Put( SvxFmtKeepItem( TRUE, PARDID->nKeep ));
+ pSet->Put( SvxFmtKeepItem( sal_True, PARDID->nKeep ));
}
break;
@@ -360,7 +360,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
if( PARDID->nOutlineLvl )
{
pSet->Put( SfxUInt16Item( PARDID->nOutlineLvl,
- (UINT16)nTokenValue ));
+ (sal_uInt16)nTokenValue ));
}
break;
@@ -393,12 +393,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
if( PARDID->nLRSpace )
{
SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
- USHORT nSz = 0;
+ sal_uInt16 nSz = 0;
if( -1 != nTokenValue )
{
if( IsCalcValue() )
CalcValue();
- nSz = USHORT(nTokenValue);
+ nSz = sal_uInt16(nTokenValue);
}
aLR.SetTxtFirstLineOfst( nSz );
pSet->Put( aLR );
@@ -410,12 +410,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
if( PARDID->nLRSpace )
{
SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
- USHORT nSz = 0;
+ sal_uInt16 nSz = 0;
if( 0 < nTokenValue )
{
if( IsCalcValue() )
CalcValue();
- nSz = USHORT(nTokenValue);
+ nSz = sal_uInt16(nTokenValue);
}
aLR.SetTxtLeft( nSz );
pSet->Put( aLR );
@@ -427,12 +427,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
if( PARDID->nLRSpace )
{
SvxLRSpaceItem aLR( GetLRSpace(*pSet, PARDID->nLRSpace ));
- USHORT nSz = 0;
+ sal_uInt16 nSz = 0;
if( 0 < nTokenValue )
{
if( IsCalcValue() )
CalcValue();
- nSz = USHORT(nTokenValue);
+ nSz = sal_uInt16(nTokenValue);
}
aLR.SetRight( nSz );
pSet->Put( aLR );
@@ -443,12 +443,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
if( PARDID->nULSpace )
{
SvxULSpaceItem aUL( GetULSpace(*pSet, PARDID->nULSpace ));
- USHORT nSz = 0;
+ sal_uInt16 nSz = 0;
if( 0 < nTokenValue )
{
if( IsCalcValue() )
CalcValue();
- nSz = USHORT(nTokenValue);
+ nSz = sal_uInt16(nTokenValue);
}
aUL.SetUpper( nSz );
pSet->Put( aUL );
@@ -459,12 +459,12 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
if( PARDID->nULSpace )
{
SvxULSpaceItem aUL( GetULSpace(*pSet, PARDID->nULSpace ));
- USHORT nSz = 0;
+ sal_uInt16 nSz = 0;
if( 0 < nTokenValue )
{
if( IsCalcValue() )
CalcValue();
- nSz = USHORT(nTokenValue);
+ nSz = sal_uInt16(nTokenValue);
}
aUL.SetLower( nSz );
pSet->Put( aUL );
@@ -476,7 +476,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
{
// dann wird auf mehrzeilig umgeschaltet!
SvxLineSpacingItem aLSpace( GetLineSpacing( *pSet,
- PARDID->nLinespacing, FALSE ));
+ PARDID->nLinespacing, sal_False ));
// wieviel bekommt man aus dem LineHeight Wert heraus
@@ -491,9 +491,9 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
/ long( nTokenValue ) );
if( nTokenValue > 200 ) // Datenwert fuer PropLnSp
- nTokenValue = 200; // ist ein BYTE !!!
+ nTokenValue = 200; // ist ein sal_uInt8 !!!
- aLSpace.SetPropLineSpace( (const BYTE)nTokenValue );
+ aLSpace.SetPropLineSpace( (const sal_uInt8)nTokenValue );
aLSpace.GetLineSpaceRule() = SVX_LINE_SPACE_AUTO;
pSet->Put( aLSpace );
@@ -531,7 +531,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
CalcValue();
if (eLnSpc != SVX_LINE_SPACE_AUTO)
- aLSpace.SetLineHeight( (const USHORT)nTokenValue );
+ aLSpace.SetLineHeight( (const sal_uInt16)nTokenValue );
aLSpace.GetLineSpaceRule() = eLnSpc;
pSet->Put(aLSpace);
@@ -541,14 +541,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
case RTF_NOCWRAP:
if( PARDID->nForbRule )
{
- pSet->Put( SvxForbiddenRuleItem( FALSE,
+ pSet->Put( SvxForbiddenRuleItem( sal_False,
PARDID->nForbRule ));
}
break;
case RTF_NOOVERFLOW:
if( PARDID->nHangPunct )
{
- pSet->Put( SvxHangingPunctuationItem( FALSE,
+ pSet->Put( SvxHangingPunctuationItem( sal_False,
PARDID->nHangPunct ));
}
break;
@@ -556,7 +556,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
case RTF_ASPALPHA:
if( PARDID->nScriptSpace )
{
- pSet->Put( SvxScriptSpaceItem( TRUE,
+ pSet->Put( SvxScriptSpaceItem( sal_True,
PARDID->nScriptSpace ));
}
break;
@@ -614,14 +614,14 @@ SET_FONTALIGNMENT:
case RTF_SUB:
if( PLAINID->nEscapement )
{
- const USHORT nEsc = PLAINID->nEscapement;
+ const sal_uInt16 nEsc = PLAINID->nEscapement;
if( -1 == nTokenValue || RTF_SUB == nToken )
nTokenValue = 6;
if( IsCalcValue() )
CalcValue();
- const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, FALSE );
+ const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, sal_False );
short nEs;
- BYTE nProp;
+ sal_uInt8 nProp;
if( DFLT_ESC_AUTO_SUPER == rOld.GetEsc() )
{
nEs = DFLT_ESC_AUTO_SUB;
@@ -639,7 +639,7 @@ SET_FONTALIGNMENT:
case RTF_NOSUPERSUB:
if( PLAINID->nEscapement )
{
- const USHORT nEsc = PLAINID->nEscapement;
+ const sal_uInt16 nEsc = PLAINID->nEscapement;
pSet->Put( SvxEscapementItem( nEsc ));
}
break;
@@ -685,7 +685,7 @@ SET_FONTALIGNMENT:
case RTF_F:
case RTF_AF:
{
- const Font& rSVFont = GetFont( USHORT(nTokenValue) );
+ const Font& rSVFont = GetFont( sal_uInt16(nTokenValue) );
SvxFontItem aTmpItem( rSVFont.GetFamily(),
rSVFont.GetName(), rSVFont.GetStyleName(),
rSVFont.GetPitch(), rSVFont.GetCharSet(),
@@ -713,7 +713,7 @@ SET_FONTALIGNMENT:
// if( IsCalcValue() )
// CalcValue();
SvxFontHeightItem aTmpItem(
- (const USHORT)nTokenValue, 100,
+ (const sal_uInt16)nTokenValue, 100,
SID_ATTR_CHAR_FONTHEIGHT );
SetScriptAttr( eCharType, *pSet, aTmpItem );
}
@@ -734,7 +734,7 @@ SET_FONTALIGNMENT:
if( PLAINID->nContour &&
IsAttrSttPos() ) // nicht im Textfluss ?
{
- pSet->Put( SvxContourItem( nTokenValue ? TRUE : FALSE,
+ pSet->Put( SvxContourItem( nTokenValue ? sal_True : sal_False,
PLAINID->nContour ));
}
break;
@@ -743,7 +743,7 @@ SET_FONTALIGNMENT:
if( PLAINID->nShadowed &&
IsAttrSttPos() ) // nicht im Textfluss ?
{
- pSet->Put( SvxShadowedItem( nTokenValue ? TRUE : FALSE,
+ pSet->Put( SvxShadowedItem( nTokenValue ? sal_True : sal_False,
PLAINID->nShadowed ));
}
break;
@@ -827,7 +827,7 @@ SET_FONTALIGNMENT:
if( PLAINID->nWordlineMode )
{
- pSet->Put( SvxWordLineModeItem( TRUE, PLAINID->nWordlineMode ));
+ pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
}
goto ATTR_SETUNDERLINE;
@@ -844,7 +844,7 @@ ATTR_SETUNDERLINE:
SvxUnderlineItem aUL( UNDERLINE_SINGLE, PLAINID->nUnderline );
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == pSet->GetItemState(
- PLAINID->nUnderline, FALSE, &pItem ) )
+ PLAINID->nUnderline, sal_False, &pItem ) )
{
// is switched off ?
if( UNDERLINE_NONE ==
@@ -853,11 +853,11 @@ ATTR_SETUNDERLINE:
aUL = *(SvxUnderlineItem*)pItem;
}
else
- aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, FALSE );
+ aUL = (const SvxUnderlineItem&)pSet->Get( PLAINID->nUnderline, sal_False );
if( UNDERLINE_NONE == aUL.GetLineStyle() )
aUL.SetLineStyle( UNDERLINE_SINGLE );
- aUL.SetColor( GetColor( USHORT(nTokenValue) ));
+ aUL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
pSet->Put( aUL );
}
break;
@@ -922,7 +922,7 @@ ATTR_SETUNDERLINE:
if( PLAINID->nWordlineMode )
{
- pSet->Put( SvxWordLineModeItem( TRUE, PLAINID->nWordlineMode ));
+ pSet->Put( SvxWordLineModeItem( sal_True, PLAINID->nWordlineMode ));
}
goto ATTR_SETOVERLINE;
@@ -939,7 +939,7 @@ ATTR_SETOVERLINE:
SvxOverlineItem aOL( UNDERLINE_SINGLE, PLAINID->nOverline );
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == pSet->GetItemState(
- PLAINID->nOverline, FALSE, &pItem ) )
+ PLAINID->nOverline, sal_False, &pItem ) )
{
// is switched off ?
if( UNDERLINE_NONE ==
@@ -948,11 +948,11 @@ ATTR_SETOVERLINE:
aOL = *(SvxOverlineItem*)pItem;
}
else
- aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nUnderline, FALSE );
+ aOL = (const SvxOverlineItem&)pSet->Get( PLAINID->nUnderline, sal_False );
if( UNDERLINE_NONE == aOL.GetLineStyle() )
aOL.SetLineStyle( UNDERLINE_SINGLE );
- aOL.SetColor( GetColor( USHORT(nTokenValue) ));
+ aOL.SetColor( GetColor( sal_uInt16(nTokenValue) ));
pSet->Put( aOL );
}
break;
@@ -961,14 +961,14 @@ ATTR_SETOVERLINE:
case RTF_SUPER:
if( PLAINID->nEscapement )
{
- const USHORT nEsc = PLAINID->nEscapement;
+ const sal_uInt16 nEsc = PLAINID->nEscapement;
if( -1 == nTokenValue || RTF_SUPER == nToken )
nTokenValue = 6;
if( IsCalcValue() )
CalcValue();
- const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, FALSE );
+ const SvxEscapementItem& rOld = GetEscapement( *pSet, nEsc, sal_False );
short nEs;
- BYTE nProp;
+ sal_uInt8 nProp;
if( DFLT_ESC_AUTO_SUB == rOld.GetEsc() )
{
nEs = DFLT_ESC_AUTO_SUPER;
@@ -986,7 +986,7 @@ ATTR_SETOVERLINE:
case RTF_CF:
if( PLAINID->nColor )
{
- pSet->Put( SvxColorItem( GetColor( USHORT(nTokenValue) ),
+ pSet->Put( SvxColorItem( GetColor( sal_uInt16(nTokenValue) ),
PLAINID->nColor ));
}
break;
@@ -996,7 +996,7 @@ ATTR_SETOVERLINE:
case RTF_CB:
if( PLAINID->nBgColor )
{
- pSet->Put( SvxBrushItem( GetColor( USHORT(nTokenValue) ),
+ pSet->Put( SvxBrushItem( GetColor( sal_uInt16(nTokenValue) ),
PLAINID->nBgColor ));
}
break;
@@ -1025,10 +1025,10 @@ ATTR_SETOVERLINE:
break;
case RTF_RTLCH:
- bIsLeftToRightDef = FALSE;
+ bIsLeftToRightDef = sal_False;
break;
case RTF_LTRCH:
- bIsLeftToRightDef = TRUE;
+ bIsLeftToRightDef = sal_True;
break;
case RTF_RTLPAR:
if (PARDID->nDirection)
@@ -1079,7 +1079,7 @@ ATTR_SETEMPHASIS:
default: cStt = 0, cEnd = 0; break;
}
- pSet->Put( SvxTwoLinesItem( TRUE, cStt, cEnd,
+ pSet->Put( SvxTwoLinesItem( sal_True, cStt, cEnd,
PLAINID->nTwoLines ));
}
break;
@@ -1090,7 +1090,7 @@ ATTR_SETEMPHASIS:
//i21372
if (nTokenValue < 1 || nTokenValue > 600)
nTokenValue = 100;
- pSet->Put( SvxCharScaleWidthItem( USHORT(nTokenValue),
+ pSet->Put( SvxCharScaleWidthItem( sal_uInt16(nTokenValue),
PLAINID->nCharScaleX ));
}
break;
@@ -1169,7 +1169,7 @@ ATTR_SETEMPHASIS:
case RTF_SWG_ESCPROP:
{
// prozentuale Veraenderung speichern !
- BYTE nProp = BYTE( nTokenValue / 100 );
+ sal_uInt8 nProp = sal_uInt8( nTokenValue / 100 );
short nEsc = 0;
if( 1 == ( nTokenValue % 100 ))
// Erkennung unseres AutoFlags!
@@ -1184,10 +1184,10 @@ ATTR_SETEMPHASIS:
case RTF_HYPHEN:
{
SvxHyphenZoneItem aHypenZone(
- (nTokenValue & 1) ? TRUE : FALSE,
+ (nTokenValue & 1) ? sal_True : sal_False,
PARDID->nHyphenzone );
aHypenZone.SetPageEnd(
- (nTokenValue & 2) ? TRUE : FALSE );
+ (nTokenValue & 2) ? sal_True : sal_False );
if( PARDID->nHyphenzone &&
RTF_HYPHLEAD == GetNextToken() &&
@@ -1195,11 +1195,11 @@ ATTR_SETEMPHASIS:
RTF_HYPHMAX == GetNextToken() )
{
aHypenZone.GetMinLead() =
- BYTE(GetStackPtr( -2 )->nTokenValue);
+ sal_uInt8(GetStackPtr( -2 )->nTokenValue);
aHypenZone.GetMinTrail() =
- BYTE(GetStackPtr( -1 )->nTokenValue);
+ sal_uInt8(GetStackPtr( -1 )->nTokenValue);
aHypenZone.GetMaxHyphens() =
- BYTE(nTokenValue);
+ sal_uInt8(nTokenValue);
pSet->Put( aHypenZone );
}
@@ -1210,12 +1210,12 @@ ATTR_SETEMPHASIS:
case RTF_SHADOW:
{
- int bSkip = TRUE;
+ int bSkip = sal_True;
do { // middle check loop
SvxShadowLocation eSL = SvxShadowLocation( nTokenValue );
if( RTF_SHDW_DIST != GetNextToken() )
break;
- USHORT nDist = USHORT( nTokenValue );
+ sal_uInt16 nDist = sal_uInt16( nTokenValue );
if( RTF_SHDW_STYLE != GetNextToken() )
break;
@@ -1224,11 +1224,11 @@ ATTR_SETEMPHASIS:
if( RTF_SHDW_COL != GetNextToken() )
break;
- USHORT nCol = USHORT( nTokenValue );
+ sal_uInt16 nCol = sal_uInt16( nTokenValue );
if( RTF_SHDW_FCOL != GetNextToken() )
break;
-// USHORT nFillCol = USHORT( nTokenValue );
+// sal_uInt16 nFillCol = sal_uInt16( nTokenValue );
Color aColor = GetColor( nCol );
@@ -1236,8 +1236,8 @@ ATTR_SETEMPHASIS:
pSet->Put( SvxShadowItem( PARDID->nShadow,
&aColor, nDist, eSL ) );
- bSkip = FALSE;
- } while( FALSE );
+ bSkip = sal_False;
+ } while( sal_False );
if( bSkip )
SkipGroup(); // ans Ende der Gruppe
@@ -1300,7 +1300,7 @@ ATTR_SETEMPHASIS:
if (!bFirstToken)
--nSkip; // BRACELEFT: ist das naechste Token
SkipToken( nSkip );
- bWeiter = FALSE;
+ bWeiter = sal_False;
}
}
break;
@@ -1316,7 +1316,7 @@ ATTR_SETEMPHASIS:
// kenne das Token nicht also das Token "in den Parser zurueck"
if( !bFirstToken )
SkipToken( -1 );
- bWeiter = FALSE;
+ bWeiter = sal_False;
}
}
}
@@ -1324,7 +1324,7 @@ ATTR_SETEMPHASIS:
{
nToken = GetNextToken();
}
- bFirstToken = FALSE;
+ bFirstToken = sal_False;
}
/*
@@ -1338,11 +1338,11 @@ ATTR_SETEMPHASIS:
// akt. Set entfernen
const SfxPoolItem* pItem;
SfxItemIter aIter( *pSet );
- USHORT nWhich = aIter.GetCurItem()->Which();
- while( TRUE )
+ sal_uInt16 nWhich = aIter.GetCurItem()->Which();
+ while( sal_True )
{
if( SFX_ITEM_SET == pStyle->aAttrSet.GetItemState(
- nWhich, FALSE, &pItem ) && *pItem == *aIter.GetCurItem())
+ nWhich, sal_False, &pItem ) && *pItem == *aIter.GetCurItem())
pSet->ClearItem( nWhich ); // loeschen
if( aIter.IsAtEnd() )
@@ -1360,7 +1360,7 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
// dann lese doch mal alle TabStops ein
SvxTabStop aTabStop;
SvxTabStopItem aAttr( 0, 0, SVX_TAB_ADJUST_DEFAULT, PARDID->nTabStop );
- int bWeiter = TRUE;
+ int bWeiter = sal_True;
do {
switch( nToken )
{
@@ -1404,8 +1404,8 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
nSkip = -2;
else
{
- aTabStop.GetDecimal() = BYTE(nTokenValue & 0xff);
- aTabStop.GetFill() = BYTE((nTokenValue >> 8) & 0xff);
+ aTabStop.GetDecimal() = sal_uInt8(nTokenValue & 0xff);
+ aTabStop.GetFill() = sal_uInt8((nTokenValue >> 8) & 0xff);
// ueberlese noch die schliessende Klammer
if (bMethodOwnsToken)
GetNextToken();
@@ -1413,13 +1413,13 @@ void SvxRTFParser::ReadTabAttr( int nToken, SfxItemSet& rSet )
if( nSkip )
{
SkipToken( nSkip ); // Ignore wieder zurueck
- bWeiter = FALSE;
+ bWeiter = sal_False;
}
}
break;
default:
- bWeiter = FALSE;
+ bWeiter = sal_False;
}
if( bWeiter )
{
@@ -1468,11 +1468,11 @@ void SvxRTFParser::ReadBorderAttr( int nToken, SfxItemSet& rSet,
// dann lese doch mal das BoderAttribut ein
SvxBoxItem aAttr( PARDID->nBox );
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( PARDID->nBox, sal_False, &pItem ) )
aAttr = *(SvxBoxItem*)pItem;
SvxBorderLine aBrd( 0, DEF_LINE_WIDTH_0, 0, 0 ); // einfache Linien
- int bWeiter = TRUE, nBorderTyp = 0;
+ int bWeiter = sal_True, nBorderTyp = 0;
do {
switch( nToken )
@@ -1523,23 +1523,23 @@ SETBORDER:
switch( nBorderTyp )
{
case RTF_BRDRB:
- aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_BOTTOM );
+ aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_BOTTOM );
break;
case RTF_BRDRT:
- aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_TOP );
+ aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_TOP );
break;
case RTF_BRDRL:
- aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_LEFT );
+ aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_LEFT );
break;
case RTF_BRDRR:
- aAttr.SetDistance( (USHORT)nTokenValue, BOX_LINE_RIGHT );
+ aAttr.SetDistance( (sal_uInt16)nTokenValue, BOX_LINE_RIGHT );
break;
case RTF_BOX:
- aAttr.SetDistance( (USHORT)nTokenValue );
+ aAttr.SetDistance( (sal_uInt16)nTokenValue );
break;
}
}
@@ -1551,7 +1551,7 @@ case RTF_BRDRBAR: break;
case RTF_BRDRCF:
{
- aBrd.SetColor( GetColor( USHORT(nTokenValue) ) );
+ aBrd.SetColor( GetColor( sal_uInt16(nTokenValue) ) );
SetBorderLine( nBorderTyp, aAttr, aBrd );
}
break;
@@ -1642,13 +1642,13 @@ SETBORDERLINE:
nSkip = -1;
else
{
- int bSwgControl = TRUE, bFirstToken = TRUE;
+ int bSwgControl = sal_True, bFirstToken = sal_True;
nToken = GetNextToken();
do {
switch( nToken )
{
case RTF_BRDBOX:
- aAttr.SetDistance( USHORT(nTokenValue) );
+ aAttr.SetDistance( sal_uInt16(nTokenValue) );
break;
case RTF_BRDRT:
@@ -1656,46 +1656,46 @@ SETBORDERLINE:
case RTF_BRDRR:
case RTF_BRDRL:
nBorderTyp = nToken;
- bFirstToken = FALSE;
+ bFirstToken = sal_False;
if( RTF_BRDLINE_COL != GetNextToken() )
{
- bSwgControl = FALSE;
+ bSwgControl = sal_False;
break;
}
- aBrd.SetColor( GetColor( USHORT(nTokenValue) ));
+ aBrd.SetColor( GetColor( sal_uInt16(nTokenValue) ));
if( RTF_BRDLINE_IN != GetNextToken() )
{
- bSwgControl = FALSE;
+ bSwgControl = sal_False;
break;
}
- aBrd.SetInWidth( USHORT(nTokenValue));
+ aBrd.SetInWidth( sal_uInt16(nTokenValue));
if( RTF_BRDLINE_OUT != GetNextToken() )
{
- bSwgControl = FALSE;
+ bSwgControl = sal_False;
break;
}
- aBrd.SetOutWidth( USHORT(nTokenValue));
+ aBrd.SetOutWidth( sal_uInt16(nTokenValue));
if( RTF_BRDLINE_DIST != GetNextToken() )
{
- bSwgControl = FALSE;
+ bSwgControl = sal_False;
break;
}
- aBrd.SetDistance( USHORT(nTokenValue));
+ aBrd.SetDistance( sal_uInt16(nTokenValue));
SetBorderLine( nBorderTyp, aAttr, aBrd );
break;
default:
- bSwgControl = FALSE;
+ bSwgControl = sal_False;
break;
}
if( bSwgControl )
{
nToken = GetNextToken();
- bFirstToken = FALSE;
+ bFirstToken = sal_False;
}
} while( bSwgControl );
@@ -1718,7 +1718,7 @@ SETBORDERLINE:
if( nSkip )
{
SkipToken( nSkip ); // Ignore wieder zurueck
- bWeiter = FALSE;
+ bWeiter = sal_False;
}
}
break;
@@ -1733,7 +1733,7 @@ SETBORDERLINE:
SkipToken( -1 );
}
-inline ULONG CalcShading( ULONG nColor, ULONG nFillColor, BYTE nShading )
+inline sal_uInt32 CalcShading( sal_uInt32 nColor, sal_uInt32 nFillColor, sal_uInt8 nShading )
{
nColor = (nColor * nShading) / 100;
nFillColor = (nFillColor * ( 100 - nShading )) / 100;
@@ -1744,11 +1744,11 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
int bTableDef )
{
// dann lese doch mal das BoderAttribut ein
- int bWeiter = TRUE;
- USHORT nColor = USHRT_MAX, nFillColor = USHRT_MAX;
- BYTE nFillValue = 0;
+ int bWeiter = sal_True;
+ sal_uInt16 nColor = USHRT_MAX, nFillColor = USHRT_MAX;
+ sal_uInt8 nFillValue = 0;
- USHORT nWh = ( nToken & ~0xff ) == RTF_CHRFMT
+ sal_uInt16 nWh = ( nToken & ~0xff ) == RTF_CHRFMT
? PLAINID->nBgColor
: PARDID->nBrush;
@@ -1758,19 +1758,19 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
case RTF_CLCBPAT:
case RTF_CHCBPAT:
case RTF_CBPAT:
- nFillColor = USHORT( nTokenValue );
+ nFillColor = sal_uInt16( nTokenValue );
break;
case RTF_CLCFPAT:
case RTF_CHCFPAT:
case RTF_CFPAT:
- nColor = USHORT( nTokenValue );
+ nColor = sal_uInt16( nTokenValue );
break;
case RTF_CLSHDNG:
case RTF_CHSHDNG:
case RTF_SHADING:
- nFillValue = (BYTE)( nTokenValue / 100 );
+ nFillValue = (sal_uInt8)( nTokenValue / 100 );
break;
case RTF_CLBGDKHOR:
@@ -1857,9 +1857,9 @@ void SvxRTFParser::ReadBackgroundAttr( int nToken, SfxItemSet& rSet,
aColor = aCol;
else
aColor = Color(
- (BYTE)CalcShading( aCol.GetRed(), aFCol.GetRed(), nFillValue ),
- (BYTE)CalcShading( aCol.GetGreen(), aFCol.GetGreen(), nFillValue ),
- (BYTE)CalcShading( aCol.GetBlue(), aFCol.GetBlue(), nFillValue ) );
+ (sal_uInt8)CalcShading( aCol.GetRed(), aFCol.GetRed(), nFillValue ),
+ (sal_uInt8)CalcShading( aCol.GetGreen(), aFCol.GetGreen(), nFillValue ),
+ (sal_uInt8)CalcShading( aCol.GetBlue(), aFCol.GetBlue(), nFillValue ) );
rSet.Put( SvxBrushItem( aColor, nWh ) );
SkipToken( -1 );
@@ -1874,7 +1874,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
SvxRTFItemStackType* pAkt = aAttrStack.back();
int nLastToken = GetStackPtr(-1)->nTokenId;
- int bNewStkEntry = TRUE;
+ int bNewStkEntry = sal_True;
if( RTF_PARD != nLastToken &&
RTF_PLAIN != nLastToken &&
BRACELEFT != nLastToken )
@@ -1882,7 +1882,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
if( pAkt->aAttrSet.Count() || pAkt->pChildList || pAkt->nStyleNo )
{
// eine neue Gruppe aufmachen
- SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, TRUE );
+ SvxRTFItemStackType* pNew = new SvxRTFItemStackType( *pAkt, *pInsPos, sal_True );
pNew->SetRTFDefaults( GetRTFDefaults() );
// alle bis hierher gueltigen Attribute "setzen"
@@ -1896,7 +1896,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
{
// diesen Eintrag als neuen weiterbenutzen
pAkt->SetStartPos( *pInsPos );
- bNewStkEntry = FALSE;
+ bNewStkEntry = sal_False;
}
}
@@ -1905,8 +1905,8 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
( pAkt->aAttrSet.GetParent() || pAkt->aAttrSet.Count() ))
{
const SfxPoolItem *pItem, *pDef;
- const USHORT* pPtr;
- USHORT nCnt;
+ const sal_uInt16* pPtr;
+ sal_uInt16 nCnt;
const SfxItemSet* pDfltSet = &GetRTFDefaults();
if( bPard )
{
@@ -1920,7 +1920,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
nCnt = aPlainMap.Count();
}
- for( USHORT n = 0; n < nCnt; ++n, ++pPtr )
+ for( sal_uInt16 n = 0; n < nCnt; ++n, ++pPtr )
{
// Item gesetzt und unterschiedlich -> das Pooldefault setzen
//JP 06.04.98: bei Items die nur SlotItems sind, darf nicht
@@ -1935,19 +1935,19 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
else if( !pAkt->aAttrSet.GetParent() )
{
if( SFX_ITEM_SET ==
- pDfltSet->GetItemState( *pPtr, FALSE, &pDef ))
+ pDfltSet->GetItemState( *pPtr, sal_False, &pDef ))
pAkt->aAttrSet.Put( *pDef );
else
pAkt->aAttrSet.ClearItem( *pPtr );
}
else if( SFX_ITEM_SET == pAkt->aAttrSet.GetParent()->
- GetItemState( *pPtr, TRUE, &pItem ) &&
+ GetItemState( *pPtr, sal_True, &pItem ) &&
*( pDef = &pDfltSet->Get( *pPtr )) != *pItem )
pAkt->aAttrSet.Put( *pDef );
else
{
if( SFX_ITEM_SET ==
- pDfltSet->GetItemState( *pPtr, FALSE, &pDef ))
+ pDfltSet->GetItemState( *pPtr, sal_False, &pDef ))
pAkt->aAttrSet.Put( *pDef );
else
pAkt->aAttrSet.ClearItem( *pPtr );
@@ -1966,7 +1966,7 @@ void SvxRTFParser::RTFPardPlain( int bPard, SfxItemSet** ppSet )
//we can fall back to the ansicpg set codeset
if (nDfltFont != -1)
{
- const Font& rSVFont = GetFont(USHORT(nDfltFont));
+ const Font& rSVFont = GetFont(sal_uInt16(nDfltFont));
SetEncoding(rSVFont.GetCharSet());
}
else
@@ -1981,16 +1981,16 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
return;
SfxItemSet aTmp( *pAttrPool, aWhichMap.GetData() );
- BOOL bOldFlag = bIsLeftToRightDef;
- bIsLeftToRightDef = TRUE;
+ sal_Bool bOldFlag = bIsLeftToRightDef;
+ bIsLeftToRightDef = sal_True;
switch( nToken )
{
- case RTF_ADEFF: bIsLeftToRightDef = FALSE; // no break!
+ case RTF_ADEFF: bIsLeftToRightDef = sal_False; // no break!
case RTF_DEFF:
{
if( -1 == nValue )
nValue = 0;
- const Font& rSVFont = GetFont( USHORT(nValue) );
+ const Font& rSVFont = GetFont( sal_uInt16(nValue) );
SvxFontItem aTmpItem(
rSVFont.GetFamily(), rSVFont.GetName(),
rSVFont.GetStyleName(), rSVFont.GetPitch(),
@@ -1999,7 +1999,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
}
break;
- case RTF_ADEFLANG: bIsLeftToRightDef = FALSE; // no break!
+ case RTF_ADEFLANG: bIsLeftToRightDef = sal_False; // no break!
case RTF_DEFLANG:
// default Language merken
if( -1 != nValue )
@@ -2014,7 +2014,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
if( PARDID->nTabStop )
{
// RTF definiert 720 twips als default
- bIsSetDfltTab = TRUE;
+ bIsSetDfltTab = sal_True;
if( -1 == nValue || !nValue )
nValue = 720;
@@ -2035,7 +2035,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
e.g.
- SvxTabStopItem aNewTab(1, USHORT(nValue), SVX_TAB_ADJUST_DEFAULT,
+ SvxTabStopItem aNewTab(1, sal_uInt16(nValue), SVX_TAB_ADJUST_DEFAULT,
PARDID->nTabStop);
((SvxTabStop&)aNewTab[0]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT;
@@ -2054,7 +2054,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
/*-----------------14.12.94 19:32-------------------
?? wie kommt man auf die 13 ??
--------------------------------------------------*/
- USHORT nAnzTabs = (SVX_TAB_DEFDIST * 13 ) / USHORT(nValue);
+ sal_uInt16 nAnzTabs = (SVX_TAB_DEFDIST * 13 ) / sal_uInt16(nValue);
/*
cmc, make sure we have at least one, or all hell breaks loose in
everybodies exporters, #i8247#
@@ -2063,7 +2063,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
nAnzTabs = 1;
// wir wollen Defaulttabs
- SvxTabStopItem aNewTab( nAnzTabs, USHORT(nValue),
+ SvxTabStopItem aNewTab( nAnzTabs, sal_uInt16(nValue),
SVX_TAB_ADJUST_DEFAULT, PARDID->nTabStop );
while( nAnzTabs )
((SvxTabStop&)aNewTab[ --nAnzTabs ]).GetAdjustment() = SVX_TAB_ADJUST_DEFAULT;
@@ -2078,7 +2078,7 @@ void SvxRTFParser::SetDefault( int nToken, int nValue )
{
SfxItemIter aIter( aTmp );
const SfxPoolItem* pItem = aIter.GetCurItem();
- while( TRUE )
+ while( sal_True )
{
pAttrPool->SetPoolDefaultItem( *pItem );
if( aIter.IsAtEnd() )
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 2788d2fd4b10..106ee9b61bbc 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -91,18 +91,18 @@ SvxRTFParser::SvxRTFParser( SfxItemPool& rPool, SvStream& rIn,
{
bNewDoc = bReadNewDoc;
- bChkStyleAttr = bCalcValue = bReadDocInfo = bIsInReadStyleTab = FALSE;
- bIsLeftToRightDef = TRUE;
+ bChkStyleAttr = bCalcValue = bReadDocInfo = bIsInReadStyleTab = sal_False;
+ bIsLeftToRightDef = sal_True;
{
RTFPlainAttrMapIds aTmp( rPool );
- aPlainMap.Insert( (USHORT*)&aTmp,
- sizeof( RTFPlainAttrMapIds ) / sizeof(USHORT), 0 );
+ aPlainMap.Insert( (sal_uInt16*)&aTmp,
+ sizeof( RTFPlainAttrMapIds ) / sizeof(sal_uInt16), 0 );
}
{
RTFPardAttrMapIds aTmp( rPool );
- aPardMap.Insert( (USHORT*)&aTmp,
- sizeof( RTFPardAttrMapIds ) / sizeof(USHORT), 0 );
+ aPardMap.Insert( (sal_uInt16*)&aTmp,
+ sizeof( RTFPardAttrMapIds ) / sizeof(sal_uInt16), 0 );
}
pDfltFont = new Font;
pDfltColor = new Color;
@@ -161,8 +161,8 @@ SvParserState SvxRTFParser::CallParser()
if( !aAttrStack.empty() )
ClearAttrStack();
- bIsSetDfltTab = FALSE;
- bNewGroup = FALSE;
+ bIsSetDfltTab = sal_False;
+ bNewGroup = sal_False;
nDfltFont = 0;
sBaseURL.Erase();
@@ -242,7 +242,7 @@ INSINGLECHAR:
{
InsertText();
// alle angesammelten Attribute setzen
- for( USHORT n = aAttrSetList.Count(); n; )
+ for( sal_uInt16 n = aAttrSetList.Count(); n; )
{
SvxRTFItemStackType* pStkSet = aAttrSetList[--n];
SetAttrSet( *pStkSet );
@@ -357,8 +357,8 @@ void SvxRTFParser::ReadStyleTable()
SvxRTFStyleType* pStyle = new SvxRTFStyleType( *pAttrPool, aWhichMap.GetData() );
pStyle->aAttrSet.Put( GetRTFDefaults() );
- bIsInReadStyleTab = TRUE;
- bChkStyleAttr = FALSE; // Attribute nicht gegen die Styles checken
+ bIsInReadStyleTab = sal_True;
+ bChkStyleAttr = sal_False; // Attribute nicht gegen die Styles checken
while( _nOpenBrakets && IsParserWorking() )
{
@@ -389,13 +389,13 @@ void SvxRTFParser::ReadStyleTable()
}
break;
- case RTF_SBASEDON: pStyle->nBasedOn = USHORT(nTokenValue); pStyle->bBasedOnIsSet=TRUE; break;
- case RTF_SNEXT: pStyle->nNext = USHORT(nTokenValue); break;
+ case RTF_SBASEDON: pStyle->nBasedOn = sal_uInt16(nTokenValue); pStyle->bBasedOnIsSet=sal_True; break;
+ case RTF_SNEXT: pStyle->nNext = sal_uInt16(nTokenValue); break;
case RTF_OUTLINELEVEL:
- case RTF_SOUTLVL: pStyle->nOutlineNo = BYTE(nTokenValue); break;
+ case RTF_SOUTLVL: pStyle->nOutlineNo = sal_uInt8(nTokenValue); break;
case RTF_S: nStyleNo = (short)nTokenValue; break;
case RTF_CS: nStyleNo = (short)nTokenValue;
- pStyle->bIsCharFmt = TRUE;
+ pStyle->bIsCharFmt = sal_True;
break;
case RTF_TEXTTOKEN:
@@ -456,21 +456,21 @@ void SvxRTFParser::ReadStyleTable()
// Flag wieder auf alten Zustand
bChkStyleAttr = bSaveChkStyleAttr;
- bIsInReadStyleTab = FALSE;
+ bIsInReadStyleTab = sal_False;
}
void SvxRTFParser::ReadColorTable()
{
int nToken;
- BYTE nRed = 0xff, nGreen = 0xff, nBlue = 0xff;
+ sal_uInt8 nRed = 0xff, nGreen = 0xff, nBlue = 0xff;
while( '}' != ( nToken = GetNextToken() ) && IsParserWorking() )
{
switch( nToken )
{
- case RTF_RED: nRed = BYTE(nTokenValue); break;
- case RTF_GREEN: nGreen = BYTE(nTokenValue); break;
- case RTF_BLUE: nBlue = BYTE(nTokenValue); break;
+ case RTF_RED: nRed = sal_uInt8(nTokenValue); break;
+ case RTF_GREEN: nGreen = sal_uInt8(nTokenValue); break;
+ case RTF_BLUE: nBlue = sal_uInt8(nTokenValue); break;
case RTF_TEXTTOKEN: // oder sollte irgendein Unsin darumstehen?
if( 1 == aToken.Len()
@@ -487,7 +487,7 @@ void SvxRTFParser::ReadColorTable()
// versuche die Werte auf SV interne Namen zu mappen
ColorPtr pColor = new Color( nRed, nGreen, nBlue );
if( aColorTbl.empty() &&
- BYTE(-1) == nRed && BYTE(-1) == nGreen && BYTE(-1) == nBlue )
+ sal_uInt8(-1) == nRed && sal_uInt8(-1) == nGreen && sal_uInt8(-1) == nBlue )
pColor->SetColor( COL_AUTO );
aColorTbl.push_back( pColor );
nRed = 0, nGreen = 0, nBlue = 0;
@@ -509,7 +509,7 @@ void SvxRTFParser::ReadFontTable()
Font* pFont = new Font();
short nFontNo(0), nInsFontNo (0);
String sAltNm, sFntNm;
- BOOL bIsAltFntNm = FALSE, bCheckNewFont;
+ sal_Bool bIsAltFntNm = sal_False, bCheckNewFont;
CharSet nSystemChar = lcl_GetDefaultTextEncodingForRTF();
pFont->SetCharSet( nSystemChar );
@@ -517,16 +517,16 @@ void SvxRTFParser::ReadFontTable()
while( _nOpenBrakets && IsParserWorking() )
{
- bCheckNewFont = FALSE;
+ bCheckNewFont = sal_False;
switch( ( nToken = GetNextToken() ))
{
case '}':
- bIsAltFntNm = FALSE;
+ bIsAltFntNm = sal_False;
// Style konnte vollstaendig gelesen werden,
// also ist das noch ein stabiler Status
if( --_nOpenBrakets <= 1 && IsParserWorking() )
SaveState( RTF_FONTTBL );
- bCheckNewFont = TRUE;
+ bCheckNewFont = sal_True;
nInsFontNo = nFontNo;
break;
case '{':
@@ -575,7 +575,7 @@ void SvxRTFParser::ReadFontTable()
if (-1 != nTokenValue)
{
CharSet nCharSet = rtl_getTextEncodingFromWindowsCharset(
- (BYTE)nTokenValue);
+ (sal_uInt8)nTokenValue);
pFont->SetCharSet(nCharSet);
//When we're in a font, the fontname is in the font
//charset, except for symbol fonts I believe
@@ -596,12 +596,12 @@ void SvxRTFParser::ReadFontTable()
}
break;
case RTF_F:
- bCheckNewFont = TRUE;
+ bCheckNewFont = sal_True;
nInsFontNo = nFontNo;
nFontNo = (short)nTokenValue;
break;
case RTF_FALT:
- bIsAltFntNm = TRUE;
+ bIsAltFntNm = sal_True;
break;
case RTF_TEXTTOKEN:
DelCharAtEnd( aToken, ';' );
@@ -689,19 +689,19 @@ String& SvxRTFParser::GetTextToEndGroup( String& rStr )
util::DateTime SvxRTFParser::GetDateTimeStamp( )
{
util::DateTime aDT;
- BOOL bWeiter = TRUE;
+ sal_Bool bWeiter = sal_True;
int nToken;
while( bWeiter && IsParserWorking() )
{
switch( nToken = GetNextToken() )
{
- case RTF_YR: aDT.Year = (USHORT)nTokenValue; break;
- case RTF_MO: aDT.Month = (USHORT)nTokenValue; break;
- case RTF_DY: aDT.Day = (USHORT)nTokenValue; break;
- case RTF_HR: aDT.Hours = (USHORT)nTokenValue; break;
- case RTF_MIN: aDT.Minutes = (USHORT)nTokenValue; break;
+ case RTF_YR: aDT.Year = (sal_uInt16)nTokenValue; break;
+ case RTF_MO: aDT.Month = (sal_uInt16)nTokenValue; break;
+ case RTF_DY: aDT.Day = (sal_uInt16)nTokenValue; break;
+ case RTF_HR: aDT.Hours = (sal_uInt16)nTokenValue; break;
+ case RTF_MIN: aDT.Minutes = (sal_uInt16)nTokenValue; break;
default:
- bWeiter = FALSE;
+ bWeiter = sal_False;
}
}
SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
@@ -825,13 +825,13 @@ void SvxRTFParser::ClearColorTbl()
void SvxRTFParser::ClearFontTbl()
{
- for( ULONG nCnt = aFontTbl.Count(); nCnt; )
+ for( sal_uInt32 nCnt = aFontTbl.Count(); nCnt; )
delete aFontTbl.GetObject( --nCnt );
}
void SvxRTFParser::ClearStyleTbl()
{
- for( ULONG nCnt = aStyleTbl.Count(); nCnt; )
+ for( sal_uInt32 nCnt = aStyleTbl.Count(); nCnt; )
delete aStyleTbl.GetObject( --nCnt );
}
@@ -858,7 +858,7 @@ String& SvxRTFParser::DelCharAtEnd( String& rStr, const sal_Unicode cDel )
}
-const Font& SvxRTFParser::GetFont( USHORT nId )
+const Font& SvxRTFParser::GetFont( sal_uInt16 nId )
{
const Font* pFont = aFontTbl.Get( nId );
if( !pFont )
@@ -885,7 +885,7 @@ SvxRTFItemStackType* SvxRTFParser::_GetAttrSet( int bCopyAttr )
pNew->SetRTFDefaults( GetRTFDefaults() );
aAttrStack.push_back( pNew );
- bNewGroup = FALSE;
+ bNewGroup = sal_False;
return pNew;
}
@@ -904,10 +904,10 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType )
!rStkType.GetAttrSet().Count() ||
0 == ( pStyle = aStyleTbl.Get( rStkType.nStyleNo ) ))
{
- for( USHORT nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
+ for( sal_uInt16 nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
{
if( SFX_WHICH_MAX > nWhich &&
- SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem ) &&
+ SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem ) &&
rPool.GetDefaultItem( nWhich ) == *pItem )
rSet.ClearItem( nWhich ); // loeschen
}
@@ -918,19 +918,19 @@ void SvxRTFParser::_ClearStyleAttr( SvxRTFItemStackType& rStkType )
// akt. AttrSet entfernen
SfxItemSet &rStyleSet = pStyle->aAttrSet;
const SfxPoolItem* pSItem;
- for( USHORT nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
+ for( sal_uInt16 nWhich = aIter.GetCurWhich(); nWhich; nWhich = aIter.NextWhich() )
{
- if( SFX_ITEM_SET == rStyleSet.GetItemState( nWhich, TRUE, &pSItem ))
+ if( SFX_ITEM_SET == rStyleSet.GetItemState( nWhich, sal_True, &pSItem ))
{
// JP 22.06.99: im Style und im Set gleich gesetzt -> loeschen
- if( SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem )
+ if( SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem )
&& *pItem == *pSItem )
rSet.ClearItem( nWhich ); // loeschen
}
// Bug 59571 - falls nicht im Style gesetzt und gleich mit
// dem PoolDefault -> auch dann loeschen
else if( SFX_WHICH_MAX > nWhich &&
- SFX_ITEM_SET == rSet.GetItemState( nWhich, FALSE, &pItem ) &&
+ SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False, &pItem ) &&
rPool.GetDefaultItem( nWhich ) == *pItem )
rSet.ClearItem( nWhich ); // loeschen
}
@@ -946,7 +946,7 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
SvxRTFItemStackType *pAkt = aAttrStack.empty() ? 0 : aAttrStack.back();
do { // middle check loop
- ULONG nOldSttNdIdx = pOld->pSttNd->GetIdx();
+ sal_uLong nOldSttNdIdx = pOld->pSttNd->GetIdx();
if( !pOld->pChildList &&
((!pOld->aAttrSet.Count() && !pOld->nStyleNo ) ||
(nOldSttNdIdx == pInsPos->GetNodeIdx() &&
@@ -958,10 +958,10 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
{
SfxItemIter aIter( pOld->aAttrSet );
const SfxPoolItem* pItem = aIter.GetCurItem(), *pGet;
- while( TRUE )
+ while( sal_True )
{
if( SFX_ITEM_SET == pAkt->aAttrSet.GetItemState(
- pItem->Which(), FALSE, &pGet ) &&
+ pItem->Which(), sal_False, &pGet ) &&
*pItem == *pGet )
pOld->aAttrSet.ClearItem( pItem->Which() );
@@ -981,8 +981,8 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
if( bCrsrBack )
{
// am Absatzanfang ? eine Position zurueck
- ULONG nNd = pInsPos->GetNodeIdx();
- MovePos( FALSE );
+ sal_uLong nNd = pInsPos->GetNodeIdx();
+ MovePos( sal_False );
// if can not move backward then later dont move forward !
bCrsrBack = nNd != pInsPos->GetNodeIdx();
}
@@ -1014,7 +1014,7 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
if( pOld->nSttCnt )
{
pOld->nStyleNo = 0;
- for( USHORT n = 0; n < aPardMap.Count() &&
+ for( sal_uInt16 n = 0; n < aPardMap.Count() &&
pOld->aAttrSet.Count(); ++n )
if( aPardMap[n] )
pOld->aAttrSet.ClearItem( aPardMap[n] );
@@ -1032,11 +1032,11 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
// - alle Absatz-Attribute bekommen den Bereich
// bis zum vorherigen Absatz
SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
- *pOld, *pInsPos, TRUE );
+ *pOld, *pInsPos, sal_True );
pNew->aAttrSet.SetParent( pOld->aAttrSet.GetParent() );
// loesche aus pNew alle Absatz Attribute
- for( USHORT n = 0; n < aPardMap.Count() &&
+ for( sal_uInt16 n = 0; n < aPardMap.Count() &&
pNew->aAttrSet.Count(); ++n )
if( aPardMap[n] )
pNew->aAttrSet.ClearItem( aPardMap[n] );
@@ -1108,12 +1108,12 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
if( bCrsrBack && 50 < pAkt->pChildList->Count() )
{
// am Absatzanfang ? eine Position zurueck
- MovePos( TRUE );
- bCrsrBack = FALSE;
+ MovePos( sal_True );
+ bCrsrBack = sal_False;
// eine neue Gruppe aufmachen
SvxRTFItemStackType* pNew = new SvxRTFItemStackType(
- *pAkt, *pInsPos, TRUE );
+ *pAkt, *pInsPos, sal_True );
pNew->SetRTFDefaults( GetRTFDefaults() );
// alle bis hierher gueltigen Attribute "setzen"
@@ -1135,14 +1135,14 @@ void SvxRTFParser::AttrGroupEnd() // den akt. Bearbeiten, vom Stack loeschen
if( bCrsrBack )
// am Absatzanfang ? eine Position zurueck
- MovePos( TRUE );
+ MovePos( sal_True );
- } while( FALSE );
+ } while( sal_False );
if( pOld )
delete pOld;
- bNewGroup = FALSE;
+ bNewGroup = sal_False;
}
}
@@ -1152,7 +1152,7 @@ void SvxRTFParser::SetAllAttrOfStk() // end all Attr. and set it into doc
while( !aAttrStack.empty() )
AttrGroupEnd();
- for( USHORT n = aAttrSetList.Count(); n; )
+ for( sal_uInt16 n = aAttrSetList.Count(); n; )
{
SvxRTFItemStackType* pStkSet = aAttrSetList[--n];
SetAttrSet( *pStkSet );
@@ -1174,7 +1174,7 @@ void SvxRTFParser::SetAttrSet( SvxRTFItemStackType &rSet )
// dann mal alle Childs abarbeiten
if( rSet.pChildList )
- for( USHORT n = 0; n < rSet.pChildList->Count(); ++n )
+ for( sal_uInt16 n = 0; n < rSet.pChildList->Count(); ++n )
SetAttrSet( *(*rSet.pChildList)[ n ] );
}
@@ -1207,13 +1207,13 @@ void SvxRTFParser::BuildWhichTbl()
{
if( aWhichMap.Count() )
aWhichMap.Remove( 0, aWhichMap.Count() );
- aWhichMap.Insert( (USHORT)0, (USHORT)0 );
+ aWhichMap.Insert( (sal_uInt16)0, (sal_uInt16)0 );
// Aufbau einer Which-Map 'rWhichMap' aus einem Array von
// 'pWhichIds' von Which-Ids. Es hat die Lange 'nWhichIds'.
// Die Which-Map wird nicht geloescht.
- SvParser::BuildWhichTbl( aWhichMap, (USHORT*)aPardMap.GetData(), aPardMap.Count() );
- SvParser::BuildWhichTbl( aWhichMap, (USHORT*)aPlainMap.GetData(), aPlainMap.Count() );
+ SvParser::BuildWhichTbl( aWhichMap, (sal_uInt16*)aPardMap.GetData(), aPardMap.Count() );
+ SvParser::BuildWhichTbl( aWhichMap, (sal_uInt16*)aPlainMap.GetData(), aPlainMap.Count() );
}
const SfxItemSet& SvxRTFParser::GetRTFDefaults()
@@ -1221,10 +1221,10 @@ const SfxItemSet& SvxRTFParser::GetRTFDefaults()
if( !pRTFDefaults )
{
pRTFDefaults = new SfxItemSet( *pAttrPool, aWhichMap.GetData() );
- USHORT nId;
+ sal_uInt16 nId;
if( 0 != ( nId = ((RTFPardAttrMapIds*)aPardMap.GetData())->nScriptSpace ))
{
- SvxScriptSpaceItem aItem( FALSE, nId );
+ SvxScriptSpaceItem aItem( sal_False, nId );
if( bNewDoc )
pAttrPool->SetPoolDefaultItem( aItem );
else
@@ -1236,19 +1236,19 @@ const SfxItemSet& SvxRTFParser::GetRTFDefaults()
/* */
-SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const USHORT* pWhichRange )
+SvxRTFStyleType::SvxRTFStyleType( SfxItemPool& rPool, const sal_uInt16* pWhichRange )
: aAttrSet( rPool, pWhichRange )
{
- nOutlineNo = BYTE(-1); // nicht gesetzt
+ nOutlineNo = sal_uInt8(-1); // nicht gesetzt
nBasedOn = 0;
- bBasedOnIsSet = FALSE; //$flr #117411#
+ bBasedOnIsSet = sal_False; //$flr #117411#
nNext = 0;
- bIsCharFmt = FALSE;
+ bIsCharFmt = sal_False;
}
SvxRTFItemStackType::SvxRTFItemStackType(
- SfxItemPool& rPool, const USHORT* pWhichRange,
+ SfxItemPool& rPool, const sal_uInt16* pWhichRange,
const SvxPosition& rPos )
: aAttrSet( rPool, pWhichRange ),
pChildList( 0 ),
@@ -1337,8 +1337,8 @@ void SvxRTFItemStackType::MoveFullNode(const SvxNodeIdx &rOldNode,
}
//And the same for all the children
- USHORT nCount = pChildList ? pChildList->Count() : 0;
- for (USHORT i = 0; i < nCount; ++i)
+ sal_uInt16 nCount = pChildList ? pChildList->Count() : 0;
+ for (sal_uInt16 i = 0; i < nCount; ++i)
{
SvxRTFItemStackType* pStk = (*pChildList)[i];
pStk->MoveFullNode(rOldNode, rNewNode);
@@ -1354,7 +1354,7 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
{
DBG_ASSERT( pChildList, "es gibt keine ChildListe" );
- USHORT n;
+ sal_uInt16 n;
SvxRTFItemStackType* pTmp = (*pChildList)[0];
if( !pTmp->aAttrSet.Count() ||
@@ -1393,15 +1393,15 @@ void SvxRTFItemStackType::Compress( const SvxRTFParser& rParser )
SfxItemIter aIter( aMrgSet );
const SfxPoolItem* pItem;
do {
- USHORT nWhich = aIter.GetCurItem()->Which();
+ sal_uInt16 nWhich = aIter.GetCurItem()->Which();
if( SFX_ITEM_SET != pTmp->aAttrSet.GetItemState( nWhich,
- FALSE, &pItem ) || *pItem != *aIter.GetCurItem() )
+ sal_False, &pItem ) || *pItem != *aIter.GetCurItem() )
aMrgSet.ClearItem( nWhich );
if( aIter.IsAtEnd() )
break;
aIter.NextItem();
- } while( TRUE );
+ } while( sal_True );
if( !aMrgSet.Count() )
return;
@@ -1442,14 +1442,14 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet& rDefaults )
{
SfxItemIter aIter( rDefaults );
do {
- USHORT nWhich = aIter.GetCurItem()->Which();
- if( SFX_ITEM_SET != aAttrSet.GetItemState( nWhich, FALSE ))
+ sal_uInt16 nWhich = aIter.GetCurItem()->Which();
+ if( SFX_ITEM_SET != aAttrSet.GetItemState( nWhich, sal_False ))
aAttrSet.Put( *aIter.GetCurItem() );
if( aIter.IsAtEnd() )
break;
aIter.NextItem();
- } while( TRUE );
+ } while( sal_True );
}
}
@@ -1457,62 +1457,62 @@ void SvxRTFItemStackType::SetRTFDefaults( const SfxItemSet& rDefaults )
RTFPlainAttrMapIds::RTFPlainAttrMapIds( const SfxItemPool& rPool )
{
- nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, FALSE );
- nBgColor = rPool.GetTrueWhich( SID_ATTR_BRUSH_CHAR, FALSE );
- nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, FALSE );
- nContour = rPool.GetTrueWhich( SID_ATTR_CHAR_CONTOUR, FALSE );
- nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, FALSE );
- nEscapement = rPool.GetTrueWhich( SID_ATTR_CHAR_ESCAPEMENT, FALSE );
- nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, FALSE );
- nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, FALSE );
- nKering = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, FALSE );
- nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, FALSE );
- nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, FALSE );
- nShadowed = rPool.GetTrueWhich( SID_ATTR_CHAR_SHADOWED, FALSE );
- nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, FALSE );
- nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, FALSE );
- nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, FALSE );
- nWordlineMode = rPool.GetTrueWhich( SID_ATTR_CHAR_WORDLINEMODE, FALSE );
- nAutoKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_AUTOKERN, FALSE );
-
- nCJKFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, FALSE );
- nCJKFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, FALSE );
- nCJKLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, FALSE );
- nCJKPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, FALSE );
- nCJKWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, FALSE );
- nCTLFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, FALSE );
- nCTLFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, FALSE );
- nCTLLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, FALSE );
- nCTLPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, FALSE );
- nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, FALSE );
- nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, FALSE );
- nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, FALSE );
- nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, FALSE );
- nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, FALSE );
- nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, FALSE );
- nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, FALSE );
- nHidden = rPool.GetTrueWhich( SID_ATTR_CHAR_HIDDEN, FALSE );
+ nCaseMap = rPool.GetTrueWhich( SID_ATTR_CHAR_CASEMAP, sal_False );
+ nBgColor = rPool.GetTrueWhich( SID_ATTR_BRUSH_CHAR, sal_False );
+ nColor = rPool.GetTrueWhich( SID_ATTR_CHAR_COLOR, sal_False );
+ nContour = rPool.GetTrueWhich( SID_ATTR_CHAR_CONTOUR, sal_False );
+ nCrossedOut = rPool.GetTrueWhich( SID_ATTR_CHAR_STRIKEOUT, sal_False );
+ nEscapement = rPool.GetTrueWhich( SID_ATTR_CHAR_ESCAPEMENT, sal_False );
+ nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, sal_False );
+ nFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_FONTHEIGHT, sal_False );
+ nKering = rPool.GetTrueWhich( SID_ATTR_CHAR_KERNING, sal_False );
+ nLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_LANGUAGE, sal_False );
+ nPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_POSTURE, sal_False );
+ nShadowed = rPool.GetTrueWhich( SID_ATTR_CHAR_SHADOWED, sal_False );
+ nUnderline = rPool.GetTrueWhich( SID_ATTR_CHAR_UNDERLINE, sal_False );
+ nOverline = rPool.GetTrueWhich( SID_ATTR_CHAR_OVERLINE, sal_False );
+ nWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_WEIGHT, sal_False );
+ nWordlineMode = rPool.GetTrueWhich( SID_ATTR_CHAR_WORDLINEMODE, sal_False );
+ nAutoKerning = rPool.GetTrueWhich( SID_ATTR_CHAR_AUTOKERN, sal_False );
+
+ nCJKFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONT, sal_False );
+ nCJKFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_FONTHEIGHT, sal_False );
+ nCJKLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_LANGUAGE, sal_False );
+ nCJKPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_POSTURE, sal_False );
+ nCJKWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_WEIGHT, sal_False );
+ nCTLFont = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONT, sal_False );
+ nCTLFontHeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_FONTHEIGHT, sal_False );
+ nCTLLanguage = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, sal_False );
+ nCTLPosture = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_POSTURE, sal_False );
+ nCTLWeight = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_WEIGHT, sal_False );
+ nEmphasis = rPool.GetTrueWhich( SID_ATTR_CHAR_EMPHASISMARK, sal_False );
+ nTwoLines = rPool.GetTrueWhich( SID_ATTR_CHAR_TWO_LINES, sal_False );
+ nRuby = 0; //rPool.GetTrueWhich( SID_ATTR_CHAR_CJK_RUBY, sal_False );
+ nCharScaleX = rPool.GetTrueWhich( SID_ATTR_CHAR_SCALEWIDTH, sal_False );
+ nHorzVert = rPool.GetTrueWhich( SID_ATTR_CHAR_ROTATED, sal_False );
+ nRelief = rPool.GetTrueWhich( SID_ATTR_CHAR_RELIEF, sal_False );
+ nHidden = rPool.GetTrueWhich( SID_ATTR_CHAR_HIDDEN, sal_False );
}
RTFPardAttrMapIds ::RTFPardAttrMapIds ( const SfxItemPool& rPool )
{
- nLinespacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, FALSE );
- nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, FALSE );
- nTabStop = rPool.GetTrueWhich( SID_ATTR_TABSTOP, FALSE );
- nHyphenzone = rPool.GetTrueWhich( SID_ATTR_PARA_HYPHENZONE, FALSE );
- nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, FALSE );
- nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, FALSE );
- nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, FALSE );
- nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, FALSE );
- nShadow = rPool.GetTrueWhich( SID_ATTR_BORDER_SHADOW, FALSE );
- nOutlineLvl = rPool.GetTrueWhich( SID_ATTR_PARA_OUTLLEVEL, FALSE );
- nSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, FALSE );
- nKeep = rPool.GetTrueWhich( SID_ATTR_PARA_KEEP, FALSE );
- nFontAlign = rPool.GetTrueWhich( SID_PARA_VERTALIGN, FALSE );
- nScriptSpace = rPool.GetTrueWhich( SID_ATTR_PARA_SCRIPTSPACE, FALSE );
- nHangPunct = rPool.GetTrueWhich( SID_ATTR_PARA_HANGPUNCTUATION, FALSE );
- nForbRule = rPool.GetTrueWhich( SID_ATTR_PARA_FORBIDDEN_RULES, FALSE );
- nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, FALSE );
+ nLinespacing = rPool.GetTrueWhich( SID_ATTR_PARA_LINESPACE, sal_False );
+ nAdjust = rPool.GetTrueWhich( SID_ATTR_PARA_ADJUST, sal_False );
+ nTabStop = rPool.GetTrueWhich( SID_ATTR_TABSTOP, sal_False );
+ nHyphenzone = rPool.GetTrueWhich( SID_ATTR_PARA_HYPHENZONE, sal_False );
+ nLRSpace = rPool.GetTrueWhich( SID_ATTR_LRSPACE, sal_False );
+ nULSpace = rPool.GetTrueWhich( SID_ATTR_ULSPACE, sal_False );
+ nBrush = rPool.GetTrueWhich( SID_ATTR_BRUSH, sal_False );
+ nBox = rPool.GetTrueWhich( SID_ATTR_BORDER_OUTER, sal_False );
+ nShadow = rPool.GetTrueWhich( SID_ATTR_BORDER_SHADOW, sal_False );
+ nOutlineLvl = rPool.GetTrueWhich( SID_ATTR_PARA_OUTLLEVEL, sal_False );
+ nSplit = rPool.GetTrueWhich( SID_ATTR_PARA_SPLIT, sal_False );
+ nKeep = rPool.GetTrueWhich( SID_ATTR_PARA_KEEP, sal_False );
+ nFontAlign = rPool.GetTrueWhich( SID_PARA_VERTALIGN, sal_False );
+ nScriptSpace = rPool.GetTrueWhich( SID_ATTR_PARA_SCRIPTSPACE, sal_False );
+ nHangPunct = rPool.GetTrueWhich( SID_ATTR_PARA_HANGPUNCTUATION, sal_False );
+ nForbRule = rPool.GetTrueWhich( SID_ATTR_PARA_FORBIDDEN_RULES, sal_False );
+ nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, sal_False );
}
/* vi:set tabstop=4 shiftwidth=4 expandtab: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 01:12:06 +0000