diff options
Diffstat (limited to 'sw/source/core/edit/autofmt.cxx')
| -rw-r--r-- | sw/source/core/edit/autofmt.cxx | 448 |
1 files changed, 224 insertions, 224 deletions
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 639bab3c10c5..7987106cd349 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -101,7 +101,7 @@ SvxSwAutoFmtFlags* SwEditShell::pAutoFmtFlags = 0; // Anzahl von Num-/Bullet-Absatzvorlagen. MAXLEVEL wird demnaechst auf // x erhoeht, die Anzahl Vorlagen aber nicht (Ueberbleibsel aus <= 4.0) -const USHORT cnNumBullColls = 4; +const sal_uInt16 cnNumBullColls = 4; class SwAutoFormat { @@ -115,12 +115,12 @@ class SwAutoFormat SwTxtNode* pAktTxtNd; // der akt. TextNode SwTxtFrm* pAktTxtFrm; // Frame vom akt. TextNode CharClass* pCharClass; // Character classification - ULONG nEndNdIdx; // fuer die Prozent-Anzeige + sal_uLong nEndNdIdx; // fuer die Prozent-Anzeige LanguageType eCharClassLang; - USHORT nLastHeadLvl, nLastCalcHeadLvl; - USHORT nLastEnumLvl, nLastCalcEnumLvl; - USHORT nRedlAutoFmtSeqId; + sal_uInt16 nLastHeadLvl, nLastCalcHeadLvl; + sal_uInt16 nLastEnumLvl, nLastCalcEnumLvl; + sal_uInt16 nRedlAutoFmtSeqId; enum { @@ -150,11 +150,11 @@ class SwAutoFormat IS_ENDE } eStat; - BOOL bEnde : 1; - BOOL bEmptyLine : 1; - BOOL bMoreLines : 1; + sal_Bool bEnde : 1; + sal_Bool bEmptyLine : 1; + sal_Bool bMoreLines : 1; - static BOOL m_bAskForCancelUndoWhileBufferOverflow; + static sal_Bool m_bAskForCancelUndoWhileBufferOverflow; static short m_nActionWhileAutoformatUndoBufferOverflow; @@ -171,25 +171,25 @@ class SwAutoFormat } - BOOL IsSpace( const sal_Unicode c ) const - { return (' ' == c || '\t' == c || 0x0a == c|| 0x3000 == c /* Jap. space */) ? TRUE : FALSE; } + sal_Bool IsSpace( const sal_Unicode c ) const + { return (' ' == c || '\t' == c || 0x0a == c|| 0x3000 == c /* Jap. space */) ? sal_True : sal_False; } - void SetColl( USHORT nId, BOOL bHdLineOrText = FALSE ); + void SetColl( sal_uInt16 nId, sal_Bool bHdLineOrText = sal_False ); String GoNextPara(); - BOOL HasObjects( const SwNode& rNd ); + sal_Bool HasObjects( const SwNode& rNd ); // TxtNode Methoden const SwTxtNode* GetNextNode() const; - BOOL IsEmptyLine( const SwTxtNode& rNd ) const + sal_Bool IsEmptyLine( const SwTxtNode& rNd ) const { return 0 == rNd.GetTxt().Len() || rNd.GetTxt().Len() == GetLeadingBlanks( rNd.GetTxt() ); } - BOOL IsOneLine( const SwTxtNode& ) const; - BOOL IsFastFullLine( const SwTxtNode& ) const; - BOOL IsNoAlphaLine( const SwTxtNode&) const; - BOOL IsEnumericChar( const SwTxtNode&) const; - BOOL IsBlanksInString( const SwTxtNode&) const; - USHORT CalcLevel( const SwTxtNode&, USHORT *pDigitLvl = 0 ) const; + sal_Bool IsOneLine( const SwTxtNode& ) const; + sal_Bool IsFastFullLine( const SwTxtNode& ) const; + sal_Bool IsNoAlphaLine( const SwTxtNode&) const; + sal_Bool IsEnumericChar( const SwTxtNode&) const; + sal_Bool IsBlanksInString( const SwTxtNode&) const; + sal_uInt16 CalcLevel( const SwTxtNode&, sal_uInt16 *pDigitLvl = 0 ) const; xub_StrLen GetBigIndent( xub_StrLen& rAktSpacePos ) const; String& DelLeadingBlanks( String& rStr ) const; @@ -197,8 +197,8 @@ class SwAutoFormat xub_StrLen GetLeadingBlanks( const String& rStr ) const; xub_StrLen GetTrailingBlanks( const String& rStr ) const; - BOOL IsFirstCharCapital( const SwTxtNode& rNd ) const; - USHORT GetDigitLevel( const SwTxtNode& rTxtNd, xub_StrLen& rPos, + sal_Bool IsFirstCharCapital( const SwTxtNode& rNd ) const; + sal_uInt16 GetDigitLevel( const SwTxtNode& rTxtNd, xub_StrLen& rPos, String* pPreFix = 0, String* pPostFix = 0, String* pNumTypes = 0 ) const; // hole den FORMATIERTEN TextFrame @@ -207,26 +207,26 @@ class SwAutoFormat void BuildIndent(); void BuildText(); void BuildTextIndent(); - void BuildEnum( USHORT nLvl, USHORT nDigitLevel ); + void BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ); void BuildNegIndent( SwTwips nSpaces ); - void BuildHeadLine( USHORT nLvl ); + void BuildHeadLine( sal_uInt16 nLvl ); - BOOL HasSelBlanks( SwPaM& rPam ) const; - BOOL HasBreakAttr( const SwTxtNode& ) const; + sal_Bool HasSelBlanks( SwPaM& rPam ) const; + sal_Bool HasBreakAttr( const SwTxtNode& ) const; void DeleteSel( SwPaM& rPam ); - BOOL DeleteAktNxtPara( const String& rNxtPara ); + sal_Bool DeleteAktNxtPara( const String& rNxtPara ); // loesche im Node Anfang oder/und Ende - void DeleteAktPara( BOOL bStart = TRUE, BOOL nEnd = TRUE ); - void DelEmptyLine( BOOL bTstNextPara = TRUE ); + void DeleteAktPara( sal_Bool bStart = sal_True, sal_Bool nEnd = sal_True ); + void DelEmptyLine( sal_Bool bTstNextPara = sal_True ); // loesche bei mehrzeiligen Absaetzen die "linken" und/oder // "rechten" Raender - void DelMoreLinesBlanks( BOOL bWithLineBreaks = FALSE ); + void DelMoreLinesBlanks( sal_Bool bWithLineBreaks = sal_False ); // loesche den vorherigen Absatz void DelPrevPara(); // dann lasse doch mal das AutoCorrect auf den akt. TextNode los void AutoCorrect( xub_StrLen nSttPos = 0 ); - BOOL CanJoin( const SwTxtNode* pTxtNd ) const + sal_Bool CanJoin( const SwTxtNode* pTxtNd ) const { return !bEnde && pTxtNd && !IsEmptyLine( *pTxtNd ) && @@ -238,16 +238,16 @@ class SwAutoFormat } // ist ein Punkt am Ende ?? - BOOL IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const; + sal_Bool IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const; - BOOL DoUnderline(); - BOOL DoTable(); + sal_Bool DoUnderline(); + sal_Bool DoTable(); - void _SetRedlineTxt( USHORT nId ); - BOOL SetRedlineTxt( USHORT nId ) - { if( aFlags.bWithRedlining ) _SetRedlineTxt( nId ); return TRUE; } - BOOL ClearRedlineTxt() - { if( aFlags.bWithRedlining ) pDoc->SetAutoFmtRedlineComment(0); return TRUE; } + void _SetRedlineTxt( sal_uInt16 nId ); + sal_Bool SetRedlineTxt( sal_uInt16 nId ) + { if( aFlags.bWithRedlining ) _SetRedlineTxt( nId ); return sal_True; } + sal_Bool ClearRedlineTxt() + { if( aFlags.bWithRedlining ) pDoc->SetAutoFmtRedlineComment(0); return sal_True; } public: SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, @@ -257,7 +257,7 @@ public: } }; -BOOL SwAutoFormat::m_bAskForCancelUndoWhileBufferOverflow = TRUE; +sal_Bool SwAutoFormat::m_bAskForCancelUndoWhileBufferOverflow = sal_True; short SwAutoFormat::m_nActionWhileAutoformatUndoBufferOverflow = RET_YES; const sal_Unicode* StrChr( const sal_Unicode* pSrc, sal_Unicode c ) @@ -291,10 +291,10 @@ void SwAutoFormat::_GetCharClass( LanguageType eLang ) eCharClassLang = eLang; } -void SwAutoFormat::_SetRedlineTxt( USHORT nActionId ) +void SwAutoFormat::_SetRedlineTxt( sal_uInt16 nActionId ) { String sTxt; - USHORT nSeqNo = 0; + sal_uInt16 nSeqNo = 0; if( STR_AUTOFMTREDL_END > nActionId ) { sTxt = *ViewShell::GetShellRes()->GetAutoFmtNameLst()[ nActionId ]; @@ -334,14 +334,14 @@ String SwAutoFormat::GoNextPara() //has to be checed twice before and after incrementation if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() ) { - bEnde = TRUE; + bEnde = sal_True; return aEmptyStr; } aNdIdx++; if( aNdIdx.GetIndex() >= aEndNdIdx.GetIndex() ) { - bEnde = TRUE; + bEnde = sal_True; return aEmptyStr; } else @@ -353,7 +353,7 @@ String SwAutoFormat::GoNextPara() // EndNode : Ende erreicht, beenden if( pNewNd->IsEndNode() ) { - bEnde = TRUE; + bEnde = sal_True; return aEmptyStr; } else if( pNewNd->IsTableNode() ) @@ -375,20 +375,20 @@ String SwAutoFormat::GoNextPara() return pAktTxtNd->GetTxt(); } -BOOL SwAutoFormat::HasObjects( const SwNode& rNd ) +sal_Bool SwAutoFormat::HasObjects( const SwNode& rNd ) { // haengt irgend etwas absatzgebundenes am Absatz? // z.B. Rahmen, DrawObjecte, .. - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; const SwSpzFrmFmts& rFmts = *pDoc->GetSpzFrmFmts(); - for( USHORT n = 0; n < rFmts.Count(); ++n ) + for( sal_uInt16 n = 0; n < rFmts.Count(); ++n ) { const SwFmtAnchor& rAnchor = rFmts[ n ]->GetAnchor(); if ((FLY_AT_PAGE != rAnchor.GetAnchorId()) && rAnchor.GetCntntAnchor() && &rAnchor.GetCntntAnchor()->nNode.GetNode() == &rNd ) { - bRet = TRUE; + bRet = sal_True; break; } } @@ -403,16 +403,16 @@ const SwTxtNode* SwAutoFormat::GetNextNode() const } -BOOL SwAutoFormat::IsOneLine( const SwTxtNode& rNd ) const +sal_Bool SwAutoFormat::IsOneLine( const SwTxtNode& rNd ) const { SwTxtFrmInfo aFInfo( GetFrm( rNd ) ); return aFInfo.IsOneLine(); } -BOOL SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const +sal_Bool SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const { - BOOL bRet = aFlags.bRightMargin; + sal_Bool bRet = aFlags.bRightMargin; if( bRet ) { SwTxtFrmInfo aFInfo( GetFrm( rNd ) ); @@ -422,24 +422,24 @@ BOOL SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const } -BOOL SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const +sal_Bool SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const { const String& rTxt = rNd.GetTxt(); String sTmp( rTxt ); xub_StrLen nBlnks = GetLeadingBlanks( sTmp ); xub_StrLen nLen = rTxt.Len() - nBlnks; if( !nLen ) - return FALSE; + return sal_False; // -, +, * getrennt durch Blank ?? if( 2 < nLen && IsSpace( rTxt.GetChar( nBlnks + 1 ) ) ) { if( StrChr( pBulletChar, rTxt.GetChar( nBlnks ) ) ) - return TRUE; + return sal_True; // sollte an der Position ein Symbolfont existieren ? SwTxtFrmInfo aFInfo( GetFrm( rNd ) ); if( aFInfo.IsBullet( nBlnks )) - return TRUE; + return sal_True; } // 1.) / 1. / 1.1.1 / (1). / (1) / .... @@ -447,7 +447,7 @@ BOOL SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const } -BOOL SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd ) const +sal_Bool SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd ) const { // suche im String mehr als 5 Blanks/Tabs String sTmp( rNd.GetTxt() ); @@ -463,7 +463,7 @@ BOOL SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd ) const while( *pTmp && IsSpace( *++pTmp )) ; if( 5 <= pTmp - pStt ) - return TRUE; + return sal_True; } else ++pTmp; @@ -471,13 +471,13 @@ BOOL SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd ) const else ++pTmp; } - return FALSE; + return sal_False; } -USHORT SwAutoFormat::CalcLevel( const SwTxtNode& rNd, USHORT *pDigitLvl ) const +sal_uInt16 SwAutoFormat::CalcLevel( const SwTxtNode& rNd, sal_uInt16 *pDigitLvl ) const { - USHORT nLvl = 0, nBlnk = 0; + sal_uInt16 nLvl = 0, nBlnk = 0; const String& rTxt = rNd.GetTxt(); if( pDigitLvl ) *pDigitLvl = USHRT_MAX; @@ -534,11 +534,11 @@ xub_StrLen SwAutoFormat::GetBigIndent( xub_StrLen& rAktSpacePos ) const } -BOOL SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const +sal_Bool SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const { const String& rStr = rNd.GetTxt(); if( !rStr.Len() ) - return FALSE; + return sal_False; // oder besser: ueber die Anzahl von Alpha/Num- und !AN-Zeichen // bestimmen. xub_StrLen nANChar = 0, nBlnk = 0; @@ -550,18 +550,18 @@ BOOL SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const else if( rCC.isLetterNumeric( rStr, n )) ++nANChar; - // sind zu 75% keine Alpha-Nummerische-Zeichen, dann TRUE - ULONG nLen = rStr.Len() - nBlnk; - nLen = ( nLen * 3 ) / 4; // long overflow, if the strlen > USHORT + // sind zu 75% keine Alpha-Nummerische-Zeichen, dann sal_True + sal_uLong nLen = rStr.Len() - nBlnk; + nLen = ( nLen * 3 ) / 4; // long overflow, if the strlen > sal_uInt16 return xub_StrLen(nLen) < (rStr.Len() - nANChar - nBlnk); } -BOOL SwAutoFormat::DoUnderline() +sal_Bool SwAutoFormat::DoUnderline() { if( !aFlags.bSetBorder ) - return FALSE; + return sal_False; const sal_Unicode* pStr = pAktTxtNd->GetTxt().GetBuffer(); int eState = 0; @@ -581,12 +581,12 @@ BOOL SwAutoFormat::DoUnderline() case '~': eTmp = 5; break; case '#': eTmp = 6; break; default: - return FALSE; + return sal_False; } if( 0 == eState ) eState = eTmp; else if( eState != eTmp ) - return FALSE; + return sal_False; ++nCnt; } ++pStr; @@ -595,7 +595,7 @@ BOOL SwAutoFormat::DoUnderline() if( 2 < nCnt ) { // dann unterstreiche mal den vorherigen Absatz, wenn es diesen gibt! - DelEmptyLine( FALSE ); + DelEmptyLine( sal_False ); aDelPam.SetMark(); aDelPam.GetMark()->nContent = 0; //JP 19.03.96: kein Underline sondern eine Umrandung setzen! @@ -635,7 +635,7 @@ BOOL SwAutoFormat::DoUnderline() RES_PARATR_CONNECT_BORDER, RES_PARATR_CONNECT_BORDER, RES_BOX, RES_BOX, 0); - aSet.Put( SwParaConnectBorderItem( FALSE ) ); + aSet.Put( SwParaConnectBorderItem( sal_False ) ); SvxBoxItem aBox( RES_BOX ); aBox.SetLine( &aLine, BOX_LINE_BOTTOM ); aBox.SetDistance( 42 ); // ~0,75 mm @@ -648,11 +648,11 @@ BOOL SwAutoFormat::DoUnderline() } -BOOL SwAutoFormat::DoTable() +sal_Bool SwAutoFormat::DoTable() { if( !aFlags.bCreateTable || !aFlags.bAFmtByInput || pAktTxtNd->FindTableNode() ) - return FALSE; + return sal_False; const String& rTmp = pAktTxtNd->GetTxt(); xub_StrLen nSttPlus = GetLeadingBlanks( rTmp ); @@ -662,7 +662,7 @@ BOOL SwAutoFormat::DoTable() if( 2 > nEndPlus - nSttPlus || ( '+' != ( cChar = rTmp.GetChar( nSttPlus )) && '|' != cChar ) || ( '+' != ( cChar = rTmp.GetChar( nEndPlus - 1)) && '|' != cChar )) - return FALSE; + return sal_False; SwTxtFrmInfo aInfo( pAktTxtFrm ); @@ -683,11 +683,11 @@ BOOL SwAutoFormat::DoTable() case '+': case '|': - aPosArr.Insert( static_cast<USHORT>(aInfo.GetCharPos(n)), aPosArr.Count() ); + aPosArr.Insert( static_cast<sal_uInt16>(aInfo.GetCharPos(n)), aPosArr.Count() ); break; default: - return FALSE; + return sal_False; } if( ++n == nEndPlus ) break; @@ -698,7 +698,7 @@ BOOL SwAutoFormat::DoTable() if( 1 < aPosArr.Count() ) { // Ausrichtung vom Textnode besorgen: - USHORT nColCnt = aPosArr.Count() - 1; + sal_uInt16 nColCnt = aPosArr.Count() - 1; SwTwips nSttPos = aPosArr[ 0 ]; sal_Int16 eHori; switch( pAktTxtNd->GetSwAttrSet().GetAdjust().GetAdjust() ) @@ -712,7 +712,7 @@ BOOL SwAutoFormat::DoTable() eHori = text::HoriOrientation::NONE; // dann muss als letztes noch die akt. FrameBreite // ins Array - aPosArr.Insert( static_cast<USHORT>(pAktTxtFrm->Frm().Width()), aPosArr.Count() ); + aPosArr.Insert( static_cast<sal_uInt16>(pAktTxtFrm->Frm().Width()), aPosArr.Count() ); } else eHori = text::HoriOrientation::LEFT; @@ -782,7 +782,7 @@ xub_StrLen SwAutoFormat::GetTrailingBlanks( const String& rStr ) const } -BOOL SwAutoFormat::IsFirstCharCapital( const SwTxtNode& rNd ) const +sal_Bool SwAutoFormat::IsFirstCharCapital( const SwTxtNode& rNd ) const { const String& rTxt = rNd.GetTxt(); for( xub_StrLen n = 0, nEnd = rTxt.Len(); n < nEnd; ++n ) @@ -795,11 +795,11 @@ BOOL SwAutoFormat::IsFirstCharCapital( const SwTxtNode& rNd ) const 0 != ( i18n::KCharacterType::UPPER & nCharType ); } - return FALSE; + return sal_False; } -USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos, +sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos, String* pPreFix, String* pPostFix, String* pNumTypes ) const { // Teste auf 1.) / 1. / 1.1.1 / (1). / (1) / .... @@ -807,11 +807,11 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos, xub_StrLen nPos = rPos; int eScan = NONE; - USHORT nStart = 0; - BYTE nDigitLvl = 0, nDigitCnt = 0; + sal_uInt16 nStart = 0; + sal_uInt8 nDigitLvl = 0, nDigitCnt = 0; //count number of parenthesis to assure a sensible order is found - USHORT nOpeningParentheses = 0; - USHORT nClosingParentheses = 0; + sal_uInt16 nOpeningParentheses = 0; + sal_uInt16 nClosingParentheses = 0; CharClass& rCC = GetCharClass( rNd.GetSwAttrSet().GetLanguage().GetLanguage() ); @@ -851,7 +851,7 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos, } else if( rCC.isAlpha( rTxt, nPos ) ) { - BOOL bIsUpper = + sal_Bool bIsUpper = 0 != ( i18n::KCharacterType::UPPER & rCC.getCharacterType( rTxt, nPos )); sal_Unicode cLow = rCC.toLower( rTxt, nPos, 1 ).GetChar(0), cNumTyp; @@ -930,8 +930,8 @@ USHORT SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos, else { // roemische Zahlen: checke ob das gueltige Zeichen sind - USHORT nVal; - BOOL bError = FALSE; + sal_uInt16 nVal; + sal_Bool bError = sal_False; switch( cLow ) { case 'm': nVal = 1000; goto CHECK_ROMAN_1; @@ -950,43 +950,43 @@ CHECK_ROMAN_1: if( nMod5 == ((3 * nVal) + n10 ) || nMod5 == ((4 * nVal) + n10 ) || nLast == n10 ) - nStart = static_cast<USHORT>(nStart + (n10 * 8)); + nStart = static_cast<sal_uInt16>(nStart + (n10 * 8)); else if( nMod5 == 0 || nMod5 == (1 * nVal) || nMod5 == (2 * nVal) ) nStart = nStart + nVal; else - bError = TRUE; + bError = sal_True; } break; CHECK_ROMAN_5: { if( ( nStart / nVal ) & 1 ) - bError = TRUE; + bError = sal_True; else { int nMod = nStart % nVal; int n10 = nVal / 5; if( n10 == nMod ) - nStart = static_cast<USHORT>(nStart + (3 * n10)); + nStart = static_cast<sal_uInt16>(nStart + (3 * n10)); else if( 0 == nMod ) nStart = nStart + nVal; else - bError = TRUE; + bError = sal_True; } } break; case 'i': if( nStart % 5 >= 3 ) - bError = TRUE; + bError = sal_True; else nStart += 1; break; default: - bError = TRUE; + bError = sal_True; } if( bError ) @@ -1041,7 +1041,7 @@ CHECK_ROMAN_5: } -void SwAutoFormat::SetColl( USHORT nId, BOOL bHdLineOrText ) +void SwAutoFormat::SetColl( sal_uInt16 nId, sal_Bool bHdLineOrText ) { aDelPam.DeleteMark(); aDelPam.GetPoint()->nNode = aNdIdx; @@ -1064,7 +1064,7 @@ void SwAutoFormat::SetColl( USHORT nId, BOOL bHdLineOrText ) // sonst nur den Blocksatz SvxAdjustItem* pAdj; if( SFX_ITEM_SET == aSet.GetItemState( RES_PARATR_ADJUST, - FALSE, (const SfxPoolItem**)&pAdj )) + sal_False, (const SfxPoolItem**)&pAdj )) { SvxAdjust eAdj = pAdj->GetAdjust(); if( bHdLineOrText ? (SVX_ADJUST_RIGHT != eAdj && @@ -1078,7 +1078,7 @@ void SwAutoFormat::SetColl( USHORT nId, BOOL bHdLineOrText ) } -BOOL SwAutoFormat::HasSelBlanks( SwPaM& rPam ) const +sal_Bool SwAutoFormat::HasSelBlanks( SwPaM& rPam ) const { // noch ein Blank am Anfang oder Ende ? // nicht loeschen, wird wieder eingefuegt. @@ -1101,38 +1101,38 @@ BOOL SwAutoFormat::HasSelBlanks( SwPaM& rPam ) const // ( ' ' == ( cCh = pTxtNd->GetTxt()[ nBlnkPos ] ) || '\t' == cCh )) pPos->nContent++; else - return FALSE; + return sal_False; } - return TRUE; + return sal_True; } -BOOL SwAutoFormat::HasBreakAttr( const SwTxtNode& rTxtNd ) const +sal_Bool SwAutoFormat::HasBreakAttr( const SwTxtNode& rTxtNd ) const { const SfxItemSet* pSet = rTxtNd.GetpSwAttrSet(); if( !pSet ) - return FALSE; + return sal_False; const SfxPoolItem* pItem; - if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, FALSE, &pItem ) + if( SFX_ITEM_SET == pSet->GetItemState( RES_BREAK, sal_False, &pItem ) && SVX_BREAK_NONE != ((SvxFmtBreakItem*)pItem)->GetBreak() ) - return TRUE; + return sal_True; - if( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, FALSE, &pItem ) + if( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, sal_False, &pItem ) && ((SwFmtPageDesc*)pItem)->GetPageDesc() && nsUseOnPage::PD_NONE != ((SwFmtPageDesc*)pItem)->GetPageDesc()->GetUseOn() ) - return TRUE; - return FALSE; + return sal_True; + return sal_False; } // ist ein Punkt am Ende ?? -BOOL SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const +sal_Bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const { const String& rStr = rTxtNd.GetTxt(); xub_StrLen n = rStr.Len(); if( !n ) - return TRUE; + return sal_True; while( --n && IsSpace( rStr.GetChar( n ) ) ) ; @@ -1141,7 +1141,7 @@ BOOL SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const // loesche im Node Anfang oder/und Ende -void SwAutoFormat::DeleteAktPara( BOOL bStart, BOOL bEnd ) +void SwAutoFormat::DeleteAktPara( sal_Bool bStart, sal_Bool bEnd ) { if( aFlags.bAFmtByInput ? aFlags.bAFmtByInpDelSpacesAtSttEnd @@ -1200,7 +1200,7 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam ) pEditShell->DeleteSel( rDelPam ); } -BOOL SwAutoFormat::DeleteAktNxtPara( const String& rNxtPara ) +sal_Bool SwAutoFormat::DeleteAktNxtPara( const String& rNxtPara ) { // Loesche Blanks am Ende vom akt. und am Anfang vom naechsten aDelPam.DeleteMark(); @@ -1223,7 +1223,7 @@ BOOL SwAutoFormat::DeleteAktNxtPara( const String& rNxtPara ) // noch ein Blank am Anfang oder Ende ? // nicht loeschen, wird wieder eingefuegt. - BOOL bHasBlnks = HasSelBlanks( aDelPam ); + sal_Bool bHasBlnks = HasSelBlanks( aDelPam ); if( *aDelPam.GetPoint() != *aDelPam.GetMark() ) DeleteSel( aDelPam ); @@ -1233,7 +1233,7 @@ BOOL SwAutoFormat::DeleteAktNxtPara( const String& rNxtPara ) } -void SwAutoFormat::DelEmptyLine( BOOL bTstNextPara ) +void SwAutoFormat::DelEmptyLine( sal_Bool bTstNextPara ) { SetRedlineTxt( STR_AUTOFMTREDL_DEL_EMPTY_PARA ); // Loesche Blanks den leeren Absatz @@ -1243,7 +1243,7 @@ void SwAutoFormat::DelEmptyLine( BOOL bTstNextPara ) aDelPam.SetMark(); aDelPam.GetMark()->nNode--; - SwTxtNode* pTNd = aDelPam.GetNode( FALSE )->GetTxtNode(); + SwTxtNode* pTNd = aDelPam.GetNode( sal_False )->GetTxtNode(); if( pTNd ) // erstmal den vorherigen Textnode benutzen. aDelPam.GetMark()->nContent.Assign( pTNd, pTNd->GetTxt().Len() ); @@ -1252,7 +1252,7 @@ void SwAutoFormat::DelEmptyLine( BOOL bTstNextPara ) // dann versuche den naechsten (am Anfang vom Dok, Tabellen-Zellen, // Rahmen, ... aDelPam.GetMark()->nNode += 2; - pTNd = aDelPam.GetNode( FALSE )->GetTxtNode(); + pTNd = aDelPam.GetNode( sal_False )->GetTxtNode(); if( pTNd ) { aDelPam.GetMark()->nContent.Assign( pTNd, 0 ); @@ -1273,7 +1273,7 @@ void SwAutoFormat::DelEmptyLine( BOOL bTstNextPara ) } -void SwAutoFormat::DelMoreLinesBlanks( BOOL bWithLineBreaks ) +void SwAutoFormat::DelMoreLinesBlanks( sal_Bool bWithLineBreaks ) { if( aFlags.bAFmtByInput ? aFlags.bAFmtByInpDelSpacesBetweenLines @@ -1292,7 +1292,7 @@ void SwAutoFormat::DelMoreLinesBlanks( BOOL bWithLineBreaks ) pNxt = (SwPaM*)aDelPam.GetNext(); if( pNxt->HasMark() && *pNxt->GetPoint() != *pNxt->GetMark() ) { - BOOL bHasBlnks = HasSelBlanks( *pNxt ); + sal_Bool bHasBlnks = HasSelBlanks( *pNxt ); DeleteSel( *pNxt ); if( !bHasBlnks ) { @@ -1303,7 +1303,7 @@ void SwAutoFormat::DelMoreLinesBlanks( BOOL bWithLineBreaks ) if( pNxt == &aDelPam ) break; delete pNxt; - } while( TRUE ); + } while( sal_True ); aDelPam.DeleteMark(); } @@ -1335,9 +1335,9 @@ void SwAutoFormat::BuildIndent() SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_INDENT ); // lese alle nachfolgenden Absaetze die zu diesem Einzug gehoeren - BOOL bBreak = TRUE; + sal_Bool bBreak = sal_True; if( bMoreLines ) - DelMoreLinesBlanks( TRUE ); + DelMoreLinesBlanks( sal_True ); else bBreak = !IsFastFullLine( *pAktTxtNd ) || IsBlanksInString( *pAktTxtNd ) || @@ -1364,7 +1364,7 @@ void SwAutoFormat::BuildIndent() !CalcLevel( *pNxtNd ) ); } } - DeleteAktPara( TRUE, TRUE ); + DeleteAktPara( sal_True, sal_True ); AutoCorrect(); } @@ -1373,16 +1373,16 @@ void SwAutoFormat::BuildTextIndent() { SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT); // lese alle nachfolgenden Absaetze die zu diesem Einzug gehoeren - BOOL bBreak = TRUE; + sal_Bool bBreak = sal_True; if( bMoreLines ) - DelMoreLinesBlanks( TRUE ); + DelMoreLinesBlanks( sal_True ); else bBreak = !IsFastFullLine( *pAktTxtNd ) || IsBlanksInString( *pAktTxtNd ) || IsSentenceAtEnd( *pAktTxtNd ); if( aFlags.bAFmtByInput ) - pAktTxtNd->SetAutoFmtLvl( (BYTE)CalcLevel( *pAktTxtNd ) ); + pAktTxtNd->SetAutoFmtLvl( (sal_uInt8)CalcLevel( *pAktTxtNd ) ); SetColl( RES_POOLCOLL_TEXT_MOVE ); if( !bBreak ) @@ -1403,7 +1403,7 @@ void SwAutoFormat::BuildTextIndent() pNxtNd = GetNextNode(); } } - DeleteAktPara( TRUE, TRUE ); + DeleteAktPara( sal_True, sal_True ); AutoCorrect(); } @@ -1413,14 +1413,14 @@ void SwAutoFormat::BuildText() SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_TEXT ); // lese alle nachfolgenden Absaetze die zu diesem Text // ohne Einzug gehoeren - BOOL bBreak = TRUE; + sal_Bool bBreak = sal_True; if( bMoreLines ) DelMoreLinesBlanks(); else bBreak = !IsFastFullLine( *pAktTxtNd ) || IsBlanksInString( *pAktTxtNd ) || IsSentenceAtEnd( *pAktTxtNd ); - SetColl( RES_POOLCOLL_TEXT, TRUE ); + SetColl( RES_POOLCOLL_TEXT, sal_True ); if( !bBreak ) { SetRedlineTxt( STR_AUTOFMTREDL_DEL_MORELINES ); @@ -1442,16 +1442,16 @@ void SwAutoFormat::BuildText() break; } } - DeleteAktPara( TRUE, TRUE ); + DeleteAktPara( sal_True, sal_True ); AutoCorrect(); } -void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) +void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel ) { SetRedlineTxt( STR_AUTOFMTREDL_SET_NUMBULET ); - BOOL bBreak = TRUE; + sal_Bool bBreak = sal_True; // als erstes den akt. Einzug bestimmen und die Framebreite bestimmen SwTwips nFrmWidth = pAktTxtFrm->Prt().Width();; @@ -1474,9 +1474,9 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) IsSentenceAtEnd( *pAktTxtNd ); sal_Bool bRTL = pEditShell->IsInRightToLeftText(); // SetColl( RES_POOLCOLL_NUM_LEVEL1 + ( nLvl * 4 ) ); - DeleteAktPara( TRUE, TRUE ); + DeleteAktPara( sal_True, sal_True ); - BOOL bChgBullet = FALSE, bChgEnum = FALSE; + sal_Bool bChgBullet = sal_False, bChgEnum = sal_False; xub_StrLen nAutoCorrPos = 0; // falls die Numerierung gesetzt werden, die akt. besorgen @@ -1506,7 +1506,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) { SwCharFmt* pCFmt = pDoc->GetCharFmtFromPool( RES_POOLCHR_BUL_LEVEL ); - bChgBullet = TRUE; + bChgBullet = sal_True; // wurde das Format schon mal angepasst? if( !aRule.GetNumFmt( nLvl ) ) { @@ -1532,11 +1532,11 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) // <-- } - USHORT nAbsPos = lBullIndent; - USHORT nSpaceSteps = nLvl - ? USHORT(nLeftTxtPos / nLvl) + sal_uInt16 nAbsPos = lBullIndent; + sal_uInt16 nSpaceSteps = nLvl + ? sal_uInt16(nLeftTxtPos / nLvl) : lBullIndent; - for( BYTE n = 0; n < MAXLEVEL; ++n, nAbsPos = nAbsPos + nSpaceSteps ) + for( sal_uInt8 n = 0; n < MAXLEVEL; ++n, nAbsPos = nAbsPos + nSpaceSteps ) { SwNumFmt aFmt( aRule.Get( n ) ); aFmt.SetBulletFont( pBullFnt ); @@ -1553,7 +1553,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) if( n == nLvl && nFrmWidth < ( nSpaceSteps * MAXLEVEL ) ) - nSpaceSteps = static_cast<USHORT>(( nFrmWidth - nLeftTxtPos ) / + nSpaceSteps = static_cast<sal_uInt16>(( nFrmWidth - nLeftTxtPos ) / ( MAXLEVEL - nLvl )); } } @@ -1561,8 +1561,8 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) } else { - bChgBullet = TRUE; - SetColl( static_cast<USHORT>(RES_POOLCOLL_BUL_LEVEL1 + ( Min( nLvl, cnNumBullColls ) * 4 )) ); + bChgBullet = sal_True; + SetColl( static_cast<sal_uInt16>(RES_POOLCOLL_BUL_LEVEL1 + ( Min( nLvl, cnNumBullColls ) * 4 )) ); } } else @@ -1577,13 +1577,13 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) if( USHRT_MAX != ( nDigitLevel = GetDigitLevel( *pAktTxtNd, nTxtStt, &aPreFix, &aPostFix, &aNumTypes )) ) { - bChgEnum = TRUE; + bChgEnum = sal_True; // Ebene 0 und Einrueckung dann wird die Ebene durch den linken // Einzug und der default NumEinrueckung bestimmt. if( !nDigitLevel && nLeftTxtPos ) - nLvl = Min( USHORT( nLeftTxtPos / lNumIndent ), - USHORT( MAXLEVEL - 1 ) ); + nLvl = Min( sal_uInt16( nLeftTxtPos / lNumIndent ), + sal_uInt16( MAXLEVEL - 1 ) ); else nLvl = nDigitLevel; } @@ -1597,7 +1597,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) if( !nDigitLevel ) { SwNumFmt aFmt( aRule.Get( nLvl ) ); - aFmt.SetStart( static_cast<USHORT>(aPreFix.GetToken( 1, + aFmt.SetStart( static_cast<sal_uInt16>(aPreFix.GetToken( 1, (sal_Unicode)1 ).ToInt32())); aFmt.SetPrefix( aPreFix.GetToken( 0, (sal_Unicode)1 )); aFmt.SetSuffix( aPostFix.GetToken( 0, (sal_Unicode)1 )); @@ -1615,13 +1615,13 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) } else { - USHORT nSpaceSteps = nLvl ? USHORT(nLeftTxtPos / nLvl) : 0; - BYTE n; + sal_uInt16 nSpaceSteps = nLvl ? sal_uInt16(nLeftTxtPos / nLvl) : 0; + sal_uInt8 n; for( n = 0; n <= nLvl; ++n ) { SwNumFmt aFmt( aRule.Get( n ) ); - aFmt.SetStart( static_cast<USHORT>(aPreFix.GetToken( n+1, + aFmt.SetStart( static_cast<sal_uInt16>(aPreFix.GetToken( n+1, (sal_Unicode)1 ).ToInt32() )); if( !n ) aFmt.SetPrefix( aPreFix.GetToken( n, (sal_Unicode)1 )); @@ -1630,7 +1630,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) if( n < aNumTypes.Len() ) aFmt.SetNumberingType((aNumTypes.GetChar( n ) - '0')); - aFmt.SetAbsLSpace( USHORT( nSpaceSteps * n ) + aFmt.SetAbsLSpace( sal_uInt16( nSpaceSteps * n ) + lNumIndent ); if( !aFmt.GetCharFmt() ) @@ -1642,16 +1642,16 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) } // passt alles vollstaendig in den Frame? - BOOL bDefStep = nFrmWidth < (nSpaceSteps * MAXLEVEL); + sal_Bool bDefStep = nFrmWidth < (nSpaceSteps * MAXLEVEL); for( ; n < MAXLEVEL; ++n ) { SwNumFmt aFmt( aRule.Get( n ) ); aFmt.SetIncludeUpperLevels( MAXLEVEL ); if( bDefStep ) - aFmt.SetAbsLSpace( USHORT( (nLeftTxtPos + - SwNumRule::GetNumIndent(static_cast<BYTE>(n-nLvl))))); + aFmt.SetAbsLSpace( sal_uInt16( (nLeftTxtPos + + SwNumRule::GetNumIndent(static_cast<sal_uInt8>(n-nLvl))))); else - aFmt.SetAbsLSpace( USHORT( nSpaceSteps * n ) + aFmt.SetAbsLSpace( sal_uInt16( nSpaceSteps * n ) + lNumIndent ); aRule.Set( n, aFmt ); } @@ -1659,9 +1659,9 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) } } else if( !aFlags.bAFmtByInput ) - SetColl( static_cast<USHORT>(RES_POOLCOLL_NUM_LEVEL1 + ( Min( nLvl, cnNumBullColls ) * 4 ) )); + SetColl( static_cast<sal_uInt16>(RES_POOLCOLL_NUM_LEVEL1 + ( Min( nLvl, cnNumBullColls ) * 4 ) )); else - bChgEnum = FALSE; + bChgEnum = sal_False; } if( bChgEnum || bChgBullet ) @@ -1675,11 +1675,11 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) { aDelPam.SetMark(); aDelPam.GetMark()->nNode++; - aDelPam.GetNode(FALSE)->GetTxtNode()->SetAttrListLevel( nLvl ); + aDelPam.GetNode(sal_False)->GetTxtNode()->SetAttrListLevel( nLvl ); } pAktTxtNd->SetAttrListLevel(nLvl); - pAktTxtNd->SetNumLSpace( TRUE ); + pAktTxtNd->SetNumLSpace( sal_True ); // --> OD 2008-03-17 #refactorlists# // start new list @@ -1758,7 +1758,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel ) if(!pNxtNd || pCurrNode == pNxtNd) break; } - DeleteAktPara( FALSE, TRUE ); + DeleteAktPara( sal_False, sal_True ); AutoCorrect( nAutoCorrPos ); } @@ -1771,28 +1771,28 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) // Einrueckung in der 2.Zeile) // lese alle nachfolgenden Absaetze die zu dieser Aufzaehlung gehoeren - BOOL bBreak = TRUE; + sal_Bool bBreak = sal_True; xub_StrLen nSpacePos, nTxtPos = GetBigIndent( nSpacePos ); if( bMoreLines ) - DelMoreLinesBlanks( TRUE ); + DelMoreLinesBlanks( sal_True ); else bBreak = !IsFastFullLine( *pAktTxtNd ) || ( !nTxtPos && IsBlanksInString( *pAktTxtNd )) || IsSentenceAtEnd( *pAktTxtNd ); - SetColl( static_cast<USHORT>( nTxtPos + SetColl( static_cast<sal_uInt16>( nTxtPos ? RES_POOLCOLL_CONFRONTATION : RES_POOLCOLL_TEXT_NEGIDENT ) ); if( nTxtPos ) { const String& rStr = pAktTxtNd->GetTxt(); - BOOL bInsTab = TRUE; + sal_Bool bInsTab = sal_True; if( '\t' == rStr.GetChar( nSpacePos+1 )) // ein Tab, das belassen wir { --nSpacePos; - bInsTab = FALSE; + bInsTab = sal_False; } xub_StrLen nSpaceStt = nSpacePos; @@ -1803,7 +1803,7 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) if( bInsTab && '\t' == rStr.GetChar( nSpaceStt ) ) // ein Tab, das belassen wir { ++nSpaceStt; - bInsTab = FALSE; + bInsTab = sal_False; } @@ -1846,12 +1846,12 @@ void SwAutoFormat::BuildNegIndent( SwTwips nSpaces ) pNxtNd = GetNextNode(); } } - DeleteAktPara( TRUE, TRUE ); + DeleteAktPara( sal_True, sal_True ); AutoCorrect(); } -void SwAutoFormat::BuildHeadLine( USHORT nLvl ) +void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl ) { if( aFlags.bWithRedlining ) { @@ -1863,14 +1863,14 @@ void SwAutoFormat::BuildHeadLine( USHORT nLvl ) pDoc->SetAutoFmtRedlineComment( &sTxt ); } - SetColl( static_cast<USHORT>(RES_POOLCOLL_HEADLINE1 + nLvl ), TRUE ); + SetColl( static_cast<sal_uInt16>(RES_POOLCOLL_HEADLINE1 + nLvl ), sal_True ); if( aFlags.bAFmtByInput ) { SwTxtFmtColl& rNxtColl = pAktTxtNd->GetTxtColl()->GetNextTxtFmtColl(); DelPrevPara(); - DeleteAktPara( TRUE, FALSE ); + DeleteAktPara( sal_True, sal_False ); DeleteAktNxtPara( aEmptyStr ); aDelPam.DeleteMark(); @@ -1880,7 +1880,7 @@ void SwAutoFormat::BuildHeadLine( USHORT nLvl ) } else { - DeleteAktPara( TRUE, TRUE ); + DeleteAktPara( sal_True, sal_True ); AutoCorrect(); } } @@ -1906,7 +1906,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) if( nPos >= pTxt->Len() ) return; - BOOL bGetLanguage = aFlags.bChgOrdinalNumber || + sal_Bool bGetLanguage = aFlags.bChgOrdinalNumber || aFlags.bChgToEnEmDash || aFlags.bSetINetAttr || aFlags.bCptlSttWrd || aFlags.bCptlSttSntnc || aFlags.bAddNonBrkSpace; @@ -1921,7 +1921,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) SwTxtFrmInfo aFInfo( 0 ); xub_StrLen nSttPos, nLastBlank = nPos; - BOOL bFirst = aFlags.bCptlSttSntnc, bFirstSent = bFirst; + sal_Bool bFirst = aFlags.bCptlSttSntnc, bFirstSent = bFirst; sal_Unicode cChar = 0; CharClass& rAppCC = GetAppCharClass(); @@ -1944,17 +1944,17 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) { SetRedlineTxt( STR_AUTOFMTREDL_TYPO ); aDelPam.GetPoint()->nContent = nPos; - BOOL bSetHardBlank = FALSE; + sal_Bool bSetHardBlank = sal_False; String sReplace( pATst->GetQuote( aACorrDoc, - nPos, cChar, TRUE )); + nPos, cChar, sal_True )); aDelPam.SetMark(); aDelPam.GetPoint()->nContent = nPos+1; if( 2 == sReplace.Len() && ' ' == sReplace.GetChar( 1 )) { sReplace.Erase( 1 ); - bSetHardBlank = TRUE; + bSetHardBlank = sal_True; } pDoc->ReplaceRange( aDelPam, sReplace, false ); @@ -1977,7 +1977,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) } } - int bCallACorr = FALSE; + int bCallACorr = sal_False; int bBreak = 0; if( nPos && IsSpace( pTxt->GetChar( nPos-1 ))) nLastBlank = nPos; @@ -1995,15 +1995,15 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) if( !aFInfo.IsBullet( nPos )) { SetRedlineTxt( STR_AUTOFMTREDL_TYPO ); - BOOL bSetHardBlank = FALSE; + sal_Bool bSetHardBlank = sal_False; aDelPam.GetPoint()->nContent = nPos; String sReplace( pATst->GetQuote( aACorrDoc, - nPos, cChar, FALSE )); + nPos, cChar, sal_False )); if( 2 == sReplace.Len() && ' ' == sReplace.GetChar( 0 )) { sReplace.Erase( 0, 1 ); - bSetHardBlank = TRUE; + bSetHardBlank = sal_True; } aDelPam.SetMark(); @@ -2088,7 +2088,7 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) case '!': case '?': if( aFlags.bCptlSttSntnc ) - bFirstSent = TRUE; + bFirstSent = sal_True; //alle Wortrenner loesen die Autokorrektur aus! // break; default: @@ -2107,15 +2107,15 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) if( nPos == nSttPos ) { if( ++nPos == pTxt->Len() ) - bCallACorr = TRUE; + bCallACorr = sal_True; } else - bCallACorr = TRUE; + bCallACorr = sal_True; if( bCallACorr ) { - bCallACorr = FALSE; + bCallACorr = sal_False; aDelPam.GetPoint()->nContent = nPos; SetRedlineTxt( STR_AUTOFMTREDL_USE_REPLACE ); if( aFlags.bAutoCorrect && @@ -2168,12 +2168,12 @@ void SwAutoFormat::AutoCorrect( xub_StrLen nPos ) if( aFlags.bCptlSttSntnc && bFirst ) { SetRedlineTxt( STR_AUTOFMTREDL_CPTL_STT_SENT ); - pATst->FnCptlSttSntnc( aACorrDoc, *pTxt, TRUE, nSttPos, nPos, eLang); - bFirst = FALSE; + pATst->FnCptlSttSntnc( aACorrDoc, *pTxt, sal_True, nSttPos, nPos, eLang); + bFirst = sal_False; } bFirst = bFirstSent; - bFirstSent = FALSE; + bFirstSent = sal_False; if( aFlags.bWithRedlining ) { @@ -2206,14 +2206,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, "Kein Bereich angegeben" ); if( aFlags.bSetNumRule && !aFlags.bAFmtByInput ) - aFlags.bSetNumRule = FALSE; + aFlags.bSetNumRule = sal_False; - BOOL bReplaceStyles = !aFlags.bAFmtByInput || aFlags.bReplaceStyles; + sal_Bool bReplaceStyles = !aFlags.bAFmtByInput || aFlags.bReplaceStyles; const SwTxtNode* pNxtNd = 0; - BOOL bNxtEmpty = FALSE; - BOOL bNxtAlpha = FALSE; - USHORT nNxtLevel = 0; + sal_Bool bNxtEmpty = sal_False; + sal_Bool bNxtAlpha = sal_False; + sal_uInt16 nNxtLevel = 0; // setze den Bereich zum Autoformatieren if( pSttNd ) @@ -2230,9 +2230,9 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, IsNoAlphaLine( *pNxtNd ); } else - bEmptyLine = TRUE; // am Dokument Anfang + bEmptyLine = sal_True; // am Dokument Anfang - bEnde = FALSE; + bEnde = sal_False; // setze die Werte fuer die Prozent-Anzeige nEndNdIdx = aEndNdIdx.GetIndex(); @@ -2245,7 +2245,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, RedlineMode_t eRedlMode = pDoc->GetRedlineMode(), eOldMode = eRedlMode; if( aFlags.bWithRedlining ) { - pDoc->SetAutoFmtRedline( TRUE ); + pDoc->SetAutoFmtRedline( sal_True ); eRedlMode = (RedlineMode_t)(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_INSERT); } else @@ -2257,12 +2257,12 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, // wenn mehrere Zeilen, dann erstmal nicht mit // dem nachfolgenden Absatz zusammenfassen. - bMoreLines = FALSE; + bMoreLines = sal_False; nLastCalcHeadLvl = nLastCalcEnumLvl = 0; nLastHeadLvl = nLastEnumLvl = USHRT_MAX; - USHORT nLevel = 0; - USHORT nDigitLvl = 0; + sal_uInt16 nLevel = 0; + sal_uInt16 nDigitLvl = 0; // defaulten SwTxtFrmInfo aFInfo( 0 ); @@ -2284,7 +2284,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, Window* pParent = pEditShell?pEditShell->GetWin():NULL; WarningBox aWarning( pParent,SW_RES(MSG_DISABLE_UNDO_QUESTION)); aWarning.SetDefaultCheckBoxText(); - USHORT nDefaultButton = nResult==RET_YES?BUTTONID_YES:(nResult==RET_NO?BUTTONID_NO:BUTTONID_CANCEL); + sal_uInt16 nDefaultButton = nResult==RET_YES?BUTTONID_YES:(nResult==RET_NO?BUTTONID_NO:BUTTONID_CANCEL); aWarning.SetFocusButton(nDefaultButton); nResult = aWarning.Execute(); m_bAskForCancelUndoWhileBufferOverflow = !aWarning.GetCheckBoxState(); @@ -2330,8 +2330,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, { if( aFlags.bDelEmptyNode && !HasObjects( *pAktTxtNd ) ) { - bEmptyLine = TRUE; - ULONG nOldCnt = pDoc->GetNodes().Count(); + bEmptyLine = sal_True; + sal_uLong nOldCnt = pDoc->GetNodes().Count(); DelEmptyLine(); // wurde wiklich ein Node geloescht ? if( nOldCnt != pDoc->GetNodes().Count() ) @@ -2351,7 +2351,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, { //JP 30.09.96: das DoTable() verlaesst sich auf das // Pop und Move - Crsr nach dem AutoFormat! - pEdShell->Pop( FALSE ); + pEdShell->Pop( sal_False ); *pEdShell->GetCrsr() = aDelPam; pEdShell->Push(); @@ -2364,8 +2364,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, // geloescht werden! if( !DoUnderline() && bReplaceStyles ) { - SetColl( RES_POOLCOLL_STANDARD, TRUE ); - bEmptyLine = TRUE; + SetColl( RES_POOLCOLL_STANDARD, sal_True ); + bEmptyLine = sal_True; } eStat = READ_NEXT_PARA; } @@ -2378,12 +2378,12 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, if( pAktTxtNd->GetNumRule() ) { // in Numerierung nichts machen, zum naechsten - bEmptyLine = FALSE; + bEmptyLine = sal_False; eStat = READ_NEXT_PARA; // loesche alle Blanks am Anfang/Ende // und alle mitten drin //JP 29.04.98: erstmal nur alle "mitten drin". - DelMoreLinesBlanks( FALSE ); + DelMoreLinesBlanks( sal_False ); break; } @@ -2392,7 +2392,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, // erstmal: wurden schon mal entsprechende Vorlagen // vergeben, so behalte die bei, gehe zum // naechsten Node. - USHORT nPoolId = pAktTxtNd->GetTxtColl()->GetPoolFmtId(); + sal_uInt16 nPoolId = pAktTxtNd->GetTxtColl()->GetPoolFmtId(); if( IsPoolUserFmt( nPoolId ) ? !aFlags.bChgUserColl : ( RES_POOLCOLL_STANDARD != nPoolId && @@ -2411,7 +2411,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, short nSz; SvxLRSpaceItem* pLRSpace; if( SFX_ITEM_SET == pAktTxtNd->GetSwAttrSet(). - GetItemState( RES_LR_SPACE, TRUE, + GetItemState( RES_LR_SPACE, sal_True, (const SfxPoolItem**)&pLRSpace ) && ( 0 != (nSz = pLRSpace->GetTxtFirstLineOfst()) || 0 != pLRSpace->GetTxtLeft() ) ) @@ -2431,7 +2431,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, // nie zusammenfassen, so belassen // (Opt. vielleicht als Ausnahmen nur Einzug) - bMoreLines = TRUE; + bMoreLines = sal_True; if( bReplaceStyles ) { @@ -2458,9 +2458,9 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, nNxtLevel = CalcLevel( *pNxtNd ); if( !bEmptyLine && HasBreakAttr( *pAktTxtNd ) ) - bEmptyLine = TRUE; + bEmptyLine = sal_True; if( !bNxtEmpty && HasBreakAttr( *pNxtNd ) ) - bNxtEmpty = TRUE; + bNxtEmpty = sal_True; // fuer z.B. selbst definierte Einzuege oder // rechts/zentierte Ausrichtung @@ -2469,8 +2469,8 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, } else { - bNxtEmpty = FALSE; // TRUE; - bNxtAlpha = FALSE; + bNxtEmpty = sal_False; // sal_True; + bNxtAlpha = sal_False; nNxtLevel = 0; } eStat = !bMoreLines ? IS_ONE_LINE : TST_ENUMERIC; @@ -2487,7 +2487,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, if( !DelLeadingBlanks( sClrStr ).Len() ) { - bEmptyLine = TRUE; + bEmptyLine = sal_True; eStat = READ_NEXT_PARA; break; // naechsten Absatz lesen } @@ -2497,7 +2497,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, IsBlanksInString( *pAktTxtNd ) ) break; - bEmptyLine = FALSE; + bEmptyLine = sal_False; String sEndClrStr( sClrStr ); xub_StrLen nLen = DelTrailingBlanks( sEndClrStr ).Len(); @@ -2566,7 +2566,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, case TST_ENUMERIC: { - bEmptyLine = FALSE; + bEmptyLine = sal_False; if( IsEnumericChar( *pAktTxtNd )) { if( nLevel >= MAXLEVEL ) @@ -2663,12 +2663,12 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, // erstmal: wurden schon mal entsprechende Vorlagen // vergeben, so behalte die bei, gehe zum // naechsten Node. - bEmptyLine = FALSE; + bEmptyLine = sal_False; eStat = READ_NEXT_PARA; // loesche alle Blanks am Anfang/Ende // und alle mitten drin //JP 29.04.98: erstmal nur alle "mitten drin". - DelMoreLinesBlanks( FALSE ); + DelMoreLinesBlanks( sal_False ); // behandel die harte Attributierung if( pAktTxtNd->HasSwAttrSet() ) @@ -2677,7 +2677,7 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, SvxLRSpaceItem* pLRSpace; if( bReplaceStyles && SFX_ITEM_SET == pAktTxtNd->GetSwAttrSet(). - GetItemState( RES_LR_SPACE, FALSE, + GetItemState( RES_LR_SPACE, sal_False, (const SfxPoolItem**)&pLRSpace ) && ( 0 != (nSz = pLRSpace->GetTxtFirstLineOfst()) || 0 != pLRSpace->GetTxtLeft() ) ) @@ -2699,13 +2699,13 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags, break; case IS_ENDE: - bEnde = TRUE; + bEnde = sal_True; break; } } if( aFlags.bWithRedlining ) - pDoc->SetAutoFmtRedline( FALSE ); + pDoc->SetAutoFmtRedline( sal_False ); pDoc->SetRedlineMode( eOldMode ); // restore undo (in case it has been changed) @@ -2729,7 +2729,7 @@ void SwEditShell::AutoFormat( const SvxSwAutoFmtFlags* pAFlags ) { aAFFlags = *pAFlags; if( !aAFFlags.bAFmtByInput ) - pWait = new SwWait( *GetDoc()->GetDocShell(), TRUE ); + pWait = new SwWait( *GetDoc()->GetDocShell(), sal_True ); } SwPaM* pCrsr = GetCrsr(); @@ -2765,13 +2765,13 @@ void SwEditShell::AutoFmtBySplitNode() StartAllAction(); StartUndo( UNDO_AUTOFORMAT ); - BOOL bRange = FALSE; + sal_Bool bRange = sal_False; pCrsr->SetMark(); SwIndex* pCntnt = &pCrsr->GetMark()->nContent; if( pCntnt->GetIndex() ) { *pCntnt = 0; - bRange = TRUE; + bRange = sal_True; } else { @@ -2782,7 +2782,7 @@ void SwEditShell::AutoFmtBySplitNode() { pCntnt->Assign( pTxtNd, 0 ); pCrsr->GetMark()->nNode = aNdIdx; - bRange = TRUE; + bRange = sal_True; } } @@ -2797,7 +2797,7 @@ void SwEditShell::AutoFmtBySplitNode() //JP 30.09.96: das DoTable() verlaesst sich auf das PopCrsr // und MoveCrsr! - Pop( FALSE ); + Pop( sal_False ); pCrsr = GetCrsr(); } pCrsr->DeleteMark(); |