summaryrefslogtreecommitdiff
path: root/sw/source/filter/rtf/rtfnum.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/rtf/rtfnum.cxx')
-rw-r--r--sw/source/filter/rtf/rtfnum.cxx118
1 files changed, 59 insertions, 59 deletions
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 2c6b953c2cc0..54c6ef7a6df2 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -64,7 +64,7 @@
void lcl_ExpandNumFmts( SwNumRule& rRule )
{
// dann noch das NumFormat in alle Ebenen setzen
- for( BYTE n = 1; n < MAXLEVEL; ++n )
+ for( sal_uInt8 n = 1; n < MAXLEVEL; ++n )
if( !rRule.GetNumFmt( n ) )
{
SwNumFmt aNumFmt( rRule.Get( 0 ));
@@ -73,7 +73,7 @@ void lcl_ExpandNumFmts( SwNumRule& rRule )
}
}
-SfxItemSet& GetNumChrFmt( SwDoc& rDoc, SwNumRule& rRule, BYTE nNumLvl )
+SfxItemSet& GetNumChrFmt( SwDoc& rDoc, SwNumRule& rRule, sal_uInt8 nNumLvl )
{
SwCharFmt* pChrFmt = rRule.Get( nNumLvl ).GetCharFmt();
if( !pChrFmt )
@@ -88,7 +88,7 @@ SfxItemSet& GetNumChrFmt( SwDoc& rDoc, SwNumRule& rRule, BYTE nNumLvl )
return (SfxItemSet&)pChrFmt->GetAttrSet();
}
-void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
+void SwRTFParser::ReadListLevel( SwNumRule& rRule, sal_uInt8 nNumLvl )
{
int nToken;
int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
@@ -117,7 +117,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
{
if( DelCharAtEnd( sLvlText, ';' ).Len() &&
sLvlText.Len() && sLvlText.Len() ==
- (USHORT)(sLvlText.GetChar( 0 )) + 1 )
+ (sal_uInt16)(sLvlText.GetChar( 0 )) + 1 )
sLvlText.Erase( 0, 1 );
nLvlTxtLevel = 0;
}
@@ -186,7 +186,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
case RTF_LEVELSTARTAT:
if( pCurNumFmt && -1 != nTokenValue )
- pCurNumFmt->SetStart( USHORT( nTokenValue ));
+ pCurNumFmt->SetStart( sal_uInt16( nTokenValue ));
break;
case RTF_LEVELTEXT:
@@ -257,7 +257,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
// values on the numrule format
const SfxPoolItem* pItem;
if( SFX_ITEM_SET == aSet.GetItemState( RES_LR_SPACE,
- FALSE, &pItem ))
+ sal_False, &pItem ))
{
const SvxLRSpaceItem& rLR = *(SvxLRSpaceItem*)pItem;
pCurNumFmt->SetAbsLSpace( static_cast< short >(rLR.GetTxtLeft()) );
@@ -290,11 +290,11 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
// in sLvlText steht der Text, in sLvlNumber die Position
// der Ebenen in sLvlText
pCurNumFmt->SetPrefix(
- sLvlText.Copy( 0, USHORT( sLvlNumber.GetChar( 0 ))-1 ));
+ sLvlText.Copy( 0, sal_uInt16( sLvlNumber.GetChar( 0 ))-1 ));
pCurNumFmt->SetSuffix( sLvlText.Copy(
- USHORT( sLvlNumber.GetChar( sLvlNumber.Len()-1 )) ));
+ sal_uInt16( sLvlNumber.GetChar( sLvlNumber.Len()-1 )) ));
// wieviele Levels stehen im String?
- pCurNumFmt->SetIncludeUpperLevels( (BYTE)sLvlNumber.Len() );
+ pCurNumFmt->SetIncludeUpperLevels( (sal_uInt8)sLvlNumber.Len() );
}
else
{
@@ -321,9 +321,9 @@ void SwRTFParser::ReadListTable()
{
int nToken;
int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
- bNewNumList = TRUE;
+ bNewNumList = sal_True;
- BYTE nNumLvl = 0;
+ sal_uInt8 nNumLvl = 0;
SwNumRule* pCurRule = 0;
SwListEntry aEntry;
@@ -379,11 +379,11 @@ void SwRTFParser::ReadListTable()
aEntry.nListDocPos = pDoc->MakeNumRule( sTmp );
pCurRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
// --> OD 2008-07-08 #i91400#
- pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, FALSE ),
+ pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, sal_False ),
*pDoc );
// <--
- pCurRule->SetAutoRule( FALSE );
- nNumLvl = (BYTE)-1;
+ pCurRule->SetAutoRule( sal_False );
+ nNumLvl = (sal_uInt8)-1;
}
break;
@@ -408,7 +408,7 @@ void SwRTFParser::ReadListTable()
break;
case RTF_LISTSIMPLE:
- pCurRule->SetContinusNum( TRUE );
+ pCurRule->SetContinusNum( sal_True );
break;
case RTF_LISTLEVEL:
@@ -427,16 +427,16 @@ void SwRTFParser::ReadListTable()
SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
}
-BOOL lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule )
+sal_Bool lcl_IsEqual( SwNumRule* pOrigRule, SwNumRule* pRule )
{
- BOOL bRet = 0;
+ sal_Bool bRet = 0;
if( pOrigRule && pRule )
{
bRet = pOrigRule->GetRuleType() == pRule->GetRuleType() &&
pOrigRule->IsContinusNum() == pRule->IsContinusNum() &&
pOrigRule->IsAbsSpaces() == pRule->IsAbsSpaces();
if( bRet )
- for( BYTE n = 0; bRet && n < MAXLEVEL; ++n )
+ for( sal_uInt8 n = 0; bRet && n < MAXLEVEL; ++n )
{
const SwNumFmt* pOFmt = pOrigRule->GetNumFmt( n ),
* pFmt = pRule->GetNumFmt( n );
@@ -472,8 +472,8 @@ void SwRTFParser::ReadListOverrideTable()
int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
SwListEntry aEntry;
SwNumRule* pRule = 0, *pOrigRule = 0;
- BYTE nNumLvl = 0;
- BOOL bOverrideFormat = FALSE, bOverrideStart = FALSE;
+ sal_uInt8 nNumLvl = 0;
+ sal_Bool bOverrideFormat = sal_False, bOverrideStart = sal_False;
while( nNumOpenBrakets && IsParserWorking() )
{
@@ -488,7 +488,7 @@ void SwRTFParser::ReadListOverrideTable()
if( 1 == nNumOpenBrakets )
{
- bOverrideFormat = FALSE, bOverrideStart = FALSE;
+ bOverrideFormat = sal_False, bOverrideStart = sal_False;
if( pRule )
{
if( lcl_IsEqual( pOrigRule, pRule ))
@@ -516,7 +516,7 @@ void SwRTFParser::ReadListOverrideTable()
}
if(nMatch>=0)
{
- USHORT nMatch2 = static_cast< USHORT >(nMatch);
+ sal_uInt16 nMatch2 = static_cast< sal_uInt16 >(nMatch);
if (!aListArr[nMatch2].nListNo )
{
aListArr[nMatch2].nListNo = aEntry.nListNo;
@@ -581,11 +581,11 @@ void SwRTFParser::ReadListOverrideTable()
aEntry.nListDocPos = pDoc->MakeNumRule( sTmp, pRule );
pRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
// --> OD 2008-07-08 #i91400#
- pRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, FALSE ),
+ pRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, sal_False ),
*pDoc );
// <--
- pRule->SetAutoRule( FALSE );
- nNumLvl = (BYTE)-1;
+ pRule->SetAutoRule( sal_False );
+ nNumLvl = (sal_uInt8)-1;
aListArr.push_back( aEntry );
break;
}
@@ -609,11 +609,11 @@ void SwRTFParser::ReadListOverrideTable()
break;
case RTF_LISTOVERRIDESTART:
- bOverrideStart = TRUE;
+ bOverrideStart = sal_True;
break;
case RTF_LISTOVERRIDEFORMAT:
- bOverrideFormat = TRUE;
+ bOverrideFormat = sal_True;
break;
case RTF_LFOLEVEL:
@@ -630,7 +630,7 @@ void SwRTFParser::ReadListOverrideTable()
const SfxPoolItem* pItem( 0 );
const SwTxtFmtColl* pColl( 0 );
- USHORT nRulePos( USHRT_MAX );
+ sal_uInt16 nRulePos( USHRT_MAX );
const SwNumRule *pNumRule = 0;
SvxRTFStyleType* pStyle = GetStyleTbl().First();
do {
@@ -638,20 +638,20 @@ void SwRTFParser::ReadListOverrideTable()
// suppress deletion of outline list style.
// refactoring of code: no assignments in if-condition
// if( MAXLEVEL > pStyle->nOutlineNo &&
-// 0 != ( pColl = aTxtCollTbl.Get( (USHORT)GetStyleTbl().
+// 0 != ( pColl = aTxtCollTbl.Get( (sal_uInt16)GetStyleTbl().
// GetCurKey() )) &&
// SFX_ITEM_SET == pColl->GetItemState( RES_PARATR_NUMRULE,
-// FALSE, &pItem ) &&
+// sal_False, &pItem ) &&
// USHRT_MAX != (nRulePos = pDoc->FindNumRule(
// ((SwNumRuleItem*)pItem)->GetValue() )) &&
// (pNumRule = pDoc->GetNumRuleTbl()[ nRulePos ])->IsAutoRule() )
if ( MAXLEVEL > pStyle->nOutlineNo )
{
- pColl = aTxtCollTbl.Get( (USHORT)GetStyleTbl().GetCurKey() );
+ pColl = aTxtCollTbl.Get( (sal_uInt16)GetStyleTbl().GetCurKey() );
if ( pColl )
{
const SfxItemState eItemState =
- pColl->GetItemState( RES_PARATR_NUMRULE, FALSE, &pItem );
+ pColl->GetItemState( RES_PARATR_NUMRULE, sal_False, &pItem );
if ( eItemState == SFX_ITEM_SET )
{
nRulePos = pDoc->FindNumRule( ((SwNumRuleItem*)pItem)->GetValue() );
@@ -691,7 +691,7 @@ void SwRTFParser::ReadListOverrideTable()
SkipToken( -1 ); // die schliesende Klammer wird "oben" ausgewertet
}
-SwNumRule* SwRTFParser::GetNumRuleOfListNo( long nListNo, BOOL bRemoveFromList )
+SwNumRule* SwRTFParser::GetNumRuleOfListNo( long nListNo, sal_Bool bRemoveFromList )
{
SwNumRule* pRet = 0;
SwListEntry* pEntry;
@@ -702,7 +702,7 @@ SwNumRule* SwRTFParser::GetNumRuleOfListNo( long nListNo, BOOL bRemoveFromList )
aListArr.erase( aListArr.begin()+n );
else
{
- pEntry->bRuleUsed = TRUE;
+ pEntry->bRuleUsed = sal_True;
pRet = pDoc->GetNumRuleTbl()[ pEntry->nListDocPos ];
}
break;
@@ -714,7 +714,7 @@ void SwRTFParser::RemoveUnusedNumRule( SwNumRule* pRule )
{
if( pRule )
{
- for ( BYTE nLvl = 0; nLvl < MAXLEVEL; ++nLvl )
+ for ( sal_uInt8 nLvl = 0; nLvl < MAXLEVEL; ++nLvl )
{
SwNumFmt& rNFmt = (SwNumFmt&)pRule->Get( nLvl );
SwCharFmt* pCFmt = rNFmt.GetCharFmt();
@@ -745,7 +745,7 @@ void SwRTFParser::RemoveUnusedNumRules()
if( !( pEntry = &aListArr[ --n ])->bRuleUsed )
{
// really *NOT* used by anyone else?
- BOOL unused=TRUE;
+ sal_Bool unused=sal_True;
for(size_t j = 0; j < aListArr.size(); ++j)
{
if (aListArr[n].nListNo==aListArr[j].nListNo)
@@ -793,27 +793,27 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
{
// lese die \pnseclvl - Gruppe
// nTokenValue gibt schon den richtigen Level vor 1 - 9!
- BYTE nLevel = 0;
+ sal_uInt8 nLevel = 0;
long nListNo = 0;
- BOOL bContinus = TRUE;
+ sal_Bool bContinus = sal_True;
if( RTF_PNSECLVL == nToken )
{
// suche die Rule - steht unter Nummer 3
nListNo = 3;
- bContinus = FALSE;
+ bContinus = sal_False;
nLevel = MAXLEVEL <= (unsigned long) nTokenValue ? MAXLEVEL - 1
- : (!nTokenValue ? 0 : BYTE( nTokenValue - 1 ));
+ : (!nTokenValue ? 0 : sal_uInt8( nTokenValue - 1 ));
}
else
{
switch( nToken = GetNextToken() )
{
case RTF_PNLVL: nListNo = 3;
- bContinus = FALSE;
+ bContinus = sal_False;
nLevel = MAXLEVEL <= (unsigned long) nTokenValue
? MAXLEVEL - 1
- : (!nTokenValue ? 0 : BYTE( nTokenValue-1 ));
+ : (!nTokenValue ? 0 : sal_uInt8( nTokenValue-1 ));
break;
case RTF_PNLVLBODY:
@@ -832,7 +832,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
}
// suche die Rule - steht unter Nummer 3
- USHORT nNewFlag = static_cast< USHORT >(1 << nListNo);
+ sal_uInt16 nNewFlag = static_cast< sal_uInt16 >(1 << nListNo);
SwNumRule* pCurRule = GetNumRuleOfListNo( nListNo,
0 != ( nNewNumSectDef & nNewFlag ) );
if( !pCurRule )
@@ -846,9 +846,9 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
aListArr.push_back( aEntry );
pCurRule = pDoc->GetNumRuleTbl()[ aEntry.nListDocPos ];
// --> OD 2008-07-08 #i91400#
- pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, FALSE ), *pDoc );
+ pCurRule->SetName( pDoc->GetUniqueNumRuleName( &sTmp, sal_False ), *pDoc );
// <--
- pCurRule->SetAutoRule( FALSE );
+ pCurRule->SetAutoRule( sal_False );
pCurRule->SetContinusNum( bContinus );
}
@@ -866,10 +866,10 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
// dann den akt. Lvl und Rule am Absatz setzen.
// Dieses muss aber in den vorherigen "Kontext", sprich in den vor
// der Klammer offenen Attrset. Darum das SetNewGroup davor und dahinter
- SetNewGroup( FALSE );
+ SetNewGroup( sal_False );
GetAttrSet().Put( SfxUInt16Item( FN_PARAM_NUM_LEVEL, nLevel ));
GetAttrSet().Put( SwNumRuleItem( pCurRule->GetName() ));
- SetNewGroup( TRUE );
+ SetNewGroup( sal_True );
}
FontUnderline eUnderline;
@@ -919,7 +919,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
case RTF_PNF:
{
- const Font& rSVFont = GetFont( USHORT(nTokenValue) );
+ const Font& rSVFont = GetFont( sal_uInt16(nTokenValue) );
GetNumChrFmt( *pDoc, *pCurRule, nLevel ).Put(
SvxFontItem( rSVFont.GetFamily(),
rSVFont.GetName(), rSVFont.GetStyleName(),
@@ -936,7 +936,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
else
nTokenValue *= 10;
GetNumChrFmt( *pDoc, *pCurRule, nLevel ).Put(
- SvxFontHeightItem( (const USHORT)nTokenValue, 100, RES_CHRATR_FONTSIZE ));
+ SvxFontHeightItem( (const sal_uInt16)nTokenValue, 100, RES_CHRATR_FONTSIZE ));
}
break;
@@ -972,7 +972,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
case RTF_PNCF:
{
GetNumChrFmt( *pDoc, *pCurRule, nLevel ).Put( SvxColorItem(
- GetColor( USHORT(nTokenValue) ), RES_CHRATR_COLOR ));
+ GetColor( sal_uInt16(nTokenValue) ), RES_CHRATR_COLOR ));
}
break;
@@ -992,7 +992,7 @@ SwNumRule *SwRTFParser::ReadNumSecLevel( int nToken )
case RTF_PNULW:
{
GetNumChrFmt( *pDoc, *pCurRule, nLevel ).Put(
- SvxWordLineModeItem( TRUE, RES_CHRATR_WORDLINEMODE ));
+ SvxWordLineModeItem( sal_True, RES_CHRATR_WORDLINEMODE ));
}
eUnderline = UNDERLINE_SINGLE;
goto NUMATTR_SETUNDERLINE;
@@ -1008,16 +1008,16 @@ NUMATTR_SETUNDERLINE:
if( 0 > short( nTokenValue ) )
nTokenValue = - (short)nTokenValue;
pCurNumFmt->SetFirstLineOffset( - short( nTokenValue ));
- pCurNumFmt->SetAbsLSpace( (nLevel + 1 ) * USHORT( nTokenValue ));
+ pCurNumFmt->SetAbsLSpace( (nLevel + 1 ) * sal_uInt16( nTokenValue ));
break;
case RTF_PNSP:
- pCurNumFmt->SetCharTextDistance( USHORT( nTokenValue ));
+ pCurNumFmt->SetCharTextDistance( sal_uInt16( nTokenValue ));
break;
case RTF_PNPREV:
if( nLevel )
{
- BYTE nPrev = 2, nLast = nLevel;
+ sal_uInt8 nPrev = 2, nLast = nLevel;
while( nLast && 1 < pCurRule->Get( --nLast ).GetIncludeUpperLevels() )
++nPrev;
pCurNumFmt->SetIncludeUpperLevels( nPrev );
@@ -1029,7 +1029,7 @@ NUMATTR_SETUNDERLINE:
case RTF_PNQR: pCurNumFmt->SetNumAdjust( SVX_ADJUST_RIGHT ); break;
case RTF_PNSTART:
- pCurNumFmt->SetStart( USHORT( nTokenValue ));
+ pCurNumFmt->SetStart( sal_uInt16( nTokenValue ));
break;
case RTF_PNNUMONCE:
@@ -1084,7 +1084,7 @@ NUMATTR_SETUNDERLINE:
pCurNumFmt->SetPrefix( aEmptyStr );
// den Font oder sogar das gesamte CharFormat loeschen?
- if( SFX_ITEM_SET == pChFmt->GetItemState( RES_CHRATR_FONT, FALSE ))
+ if( SFX_ITEM_SET == pChFmt->GetItemState( RES_CHRATR_FONT, sal_False ))
{
if( 1 == pChFmt->GetAttrSet().Count() )
{
@@ -1105,15 +1105,15 @@ NUMATTR_SETUNDERLINE:
// dann noch die Ausgabe-Funktionen (nur fuer WinWord 97)
-BOOL lcl_IsExportNumRule( const SwNumRule& rRule, BYTE* pEnd = 0 )
+sal_Bool lcl_IsExportNumRule( const SwNumRule& rRule, sal_uInt8* pEnd = 0 )
{
- BYTE nEnd = MAXLEVEL;
+ sal_uInt8 nEnd = MAXLEVEL;
while( nEnd-- && !rRule.GetNumFmt( nEnd ))
;
++nEnd;
const SwNumFmt* pNFmt;
- BYTE nLvl;
+ sal_uInt8 nLvl;
for( nLvl = 0; nLvl < nEnd; ++nLvl )
if( SVX_NUM_NUMBER_NONE != ( pNFmt = &rRule.Get( nLvl ))
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-19 22:00:13 +0000