diff options
Diffstat (limited to 'sw/source/filter/html/swhtml.cxx')
| -rw-r--r-- | sw/source/filter/html/swhtml.cxx | 580 |
1 files changed, 290 insertions, 290 deletions
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 230da033d50c..668d8562935a 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -158,7 +158,7 @@ SV_IMPL_PTRARR( _HTMLAttrs, _HTMLAttrPtr ) HTMLReader::HTMLReader() { - bTmplBrowseMode = TRUE; + bTmplBrowseMode = sal_True; } String HTMLReader::GetTemplateName() const @@ -176,7 +176,7 @@ String HTMLReader::GetTemplateName() const SvtPathOptions aPathOpt; // OpenDocument Writer/Web template (extension .oth) - BOOL bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); + sal_Bool bSet = aPathOpt.SearchFile( sTemplate, SvtPathOptions::PATH_TEMPLATE ); #ifndef MAC_WITHOUT_EXT if( !bSet ) @@ -208,14 +208,14 @@ int HTMLReader::SetStrmStgPtr() if( pMedium->IsRemote() || !pMedium->IsStorage() ) { pStrm = pMedium->GetInStream(); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } // Aufruf fuer die allg. Reader-Schnittstelle -ULONG HTMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const String & rName ) +sal_uLong HTMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const String & rName ) { if( !pStrm ) { @@ -239,7 +239,7 @@ ULONG HTMLReader::Read( SwDoc &rDoc, const String& rBaseURL, SwPaM &rPam, const // damit keiner das Doc klaut! rDoc.acquire(); - ULONG nRet = 0; + sal_uLong nRet = 0; SvParserRef xParser = new SwHTMLParser( &rDoc, rPam, *pStrm, rName, rBaseURL, !bInsertMode, pMedium, IsReadUTF8(), @@ -271,9 +271,9 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, const String& rPath, const String& rBaseURL, int bReadNewDoc, - SfxMedium* pMed, BOOL bReadUTF8, + SfxMedium* pMed, sal_Bool bReadUTF8, sal_Bool bNoHTMLComments ) - : SfxHTMLParser( rIn, static_cast< BOOL >(bReadNewDoc), pMed ), + : SfxHTMLParser( rIn, static_cast< sal_Bool >(bReadNewDoc), pMed ), SwClient( 0 ), aPathToFile( rPath ), sBaseURL( rBaseURL ), @@ -309,33 +309,33 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, nContinue( 0 ), #endif eParaAdjust( SVX_ADJUST_END ), - bDocInitalized( FALSE ), - bSetModEnabled( FALSE ), - bInFloatingFrame( FALSE ), - bInField( FALSE ), - bCallNextToken( FALSE ), - bIgnoreRawData( FALSE ), - bNoParSpace( FALSE ), - bInNoEmbed( FALSE ), - bInTitle( FALSE ), - bUpdateDocStat( FALSE ), - bFixSelectWidth( FALSE ), - bFixSelectHeight( FALSE ), - bTextArea( FALSE ), - bSelect( FALSE ), - bInFootEndNoteAnchor( FALSE ), - bInFootEndNoteSymbol( FALSE ), + bDocInitalized( sal_False ), + bSetModEnabled( sal_False ), + bInFloatingFrame( sal_False ), + bInField( sal_False ), + bCallNextToken( sal_False ), + bIgnoreRawData( sal_False ), + bNoParSpace( sal_False ), + bInNoEmbed( sal_False ), + bInTitle( sal_False ), + bUpdateDocStat( sal_False ), + bFixSelectWidth( sal_False ), + bFixSelectHeight( sal_False ), + bTextArea( sal_False ), + bSelect( sal_False ), + bInFootEndNoteAnchor( sal_False ), + bInFootEndNoteSymbol( sal_False ), // bIgnoreHTMLComments( bNoHTMLComments ) bIgnoreHTMLComments( bNoHTMLComments ), - bRemoveHidden( FALSE ), + bRemoveHidden( sal_False ), pTempViewFrame(0) { nEventId = 0; bUpperSpace = bViewCreated = bChkJumpMark = - bSetCrsr = FALSE; + bSetCrsr = sal_False; eScriptLang = HTML_SL_UNKNOWN; - bAnyStarBasic = TRUE; + bAnyStarBasic = sal_True; pPam = new SwPaM( *rCrsr.GetPoint() ); memset( &aAttrTab, 0, sizeof( _HTMLAttrTable )); @@ -388,7 +388,7 @@ SwHTMLParser::SwHTMLParser( SwDoc* pD, const SwPaM& rCrsr, SvStream& rIn, SwDocShell* pDocSh = pDoc->GetDocShell(); if( pDocSh ) { - bViewCreated = TRUE; // nicht, synchron laden + bViewCreated = sal_True; // nicht, synchron laden // es ist ein Sprungziel vorgegeben. @@ -438,8 +438,8 @@ __EXPORT SwHTMLParser::~SwHTMLParser() #ifdef DBG_UTIL ASSERT( !nContinue, "DTOR im Continue - Das geht schief!!!" ); #endif - BOOL bAsync = pDoc->IsInLoadAsynchron(); - pDoc->SetInLoadAsynchron( FALSE ); + sal_Bool bAsync = pDoc->IsInLoadAsynchron(); + pDoc->SetInLoadAsynchron( sal_False ); pDoc->set(IDocumentSettingAccess::HTML_MODE, bOldIsHTMLMode); if( pDoc->GetDocShell() && nEventId ) @@ -450,11 +450,11 @@ __EXPORT SwHTMLParser::~SwHTMLParser() if( pDoc->GetDocShell() ) { // Gelinkte Bereiche updaten - USHORT nLinkMode = pDoc->getLinkUpdateMode( true ); + sal_uInt16 nLinkMode = pDoc->getLinkUpdateMode( true ); if( nLinkMode != NEVER && bAsync && SFX_CREATE_MODE_INTERNAL!=pDoc->GetDocShell()->GetCreateMode() ) pDoc->GetLinkManager().UpdateAllLinks( nLinkMode == MANUAL, - TRUE, FALSE ); + sal_True, sal_False ); if ( pDoc->GetDocShell()->IsLoading() ) { @@ -561,7 +561,7 @@ SvParserState __EXPORT SwHTMLParser::CallParser() } else { - bViewCreated = TRUE; + bViewCreated = sal_True; nEventId = 0; } } @@ -609,8 +609,8 @@ void __EXPORT SwHTMLParser::Continue( int nToken ) // An dieser Stelle wurde im CallParser gerade mal ein Zeichen // gelesen und ein SaveState(0) gerufen. eState = SVPAR_PENDING; - bViewCreated = TRUE; - pDoc->SetInLoadAsynchron( TRUE ); + bViewCreated = sal_True; + pDoc->SetInLoadAsynchron( sal_True ); #ifdef DBG_UTIL nContinue--; @@ -619,20 +619,20 @@ void __EXPORT SwHTMLParser::Continue( int nToken ) return; } - bSetModEnabled = FALSE; + bSetModEnabled = sal_False; if( pDoc->GetDocShell() && 0 != (bSetModEnabled = pDoc->GetDocShell()->IsEnableSetModified()) ) { - pDoc->GetDocShell()->EnableSetModified( FALSE ); + pDoc->GetDocShell()->EnableSetModified( sal_False ); } // waehrend des einlesens kein OLE-Modified rufen Link aOLELink( pDoc->GetOle2Link() ); pDoc->SetOle2Link( Link() ); - BOOL bModified = pDoc->IsModified(); - BOOL bWasUndo = pDoc->DoesUndo(); - pDoc->DoUndo( FALSE ); + sal_Bool bModified = pDoc->IsModified(); + sal_Bool bWasUndo = pDoc->DoesUndo(); + pDoc->DoUndo( sal_False ); // Wenn der Import abgebrochen wird, kein Continue mehr rufen. // Falls ein Pending-Stack existiert aber durch einen Aufruf @@ -655,7 +655,7 @@ void __EXPORT SwHTMLParser::Continue( int nToken ) // Laufbalken wieder abschalten EndProgress( pDoc->GetDocShell() ); - BOOL bLFStripped = FALSE; + sal_Bool bLFStripped = sal_False; if( SVPAR_PENDING != GetStatus() ) { // noch die letzten Attribute setzen @@ -666,7 +666,7 @@ void __EXPORT SwHTMLParser::Continue( int nToken ) (SwScriptFieldType*)pDoc->GetSysFldType( RES_SCRIPTFLD ); SwScriptField aFld( pType, aScriptType, aScriptSource, - FALSE ); + sal_False ); InsertAttr( SwFmtFld( aFld ) ); } @@ -701,7 +701,7 @@ void __EXPORT SwHTMLParser::Continue( int nToken ) if( aParaAttrs.Count() ) aParaAttrs.Remove( 0, aParaAttrs.Count() ); - SetAttr( FALSE ); + SetAttr( sal_False ); // Noch die erst verzoegert gesetzten Styles setzen pCSS1Parser->SetDelayedStyles(); @@ -724,21 +724,21 @@ void __EXPORT SwHTMLParser::Continue( int nToken ) #ifdef DBG_UTIL // !!! sollte nicht moeglich sein, oder ?? -ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( TRUE ).nNode.GetIndex(), +ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( sal_True ).nNode.GetIndex(), "Pam.Bound1 steht noch im Node" ); -ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( FALSE ).nNode.GetIndex(), +ASSERT( pSttNdIdx->GetIndex()+1 != pPam->GetBound( sal_False ).nNode.GetIndex(), "Pam.Bound2 steht noch im Node" ); -if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( TRUE ).nNode.GetIndex() ) +if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_True ).nNode.GetIndex() ) { - xub_StrLen nCntPos = pPam->GetBound( TRUE ).nContent.GetIndex(); - pPam->GetBound( TRUE ).nContent.Assign( pTxtNode, + xub_StrLen nCntPos = pPam->GetBound( sal_True ).nContent.GetIndex(); + pPam->GetBound( sal_True ).nContent.Assign( pTxtNode, pTxtNode->GetTxt().Len() + nCntPos ); } -if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) +if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( sal_False ).nNode.GetIndex() ) { - xub_StrLen nCntPos = pPam->GetBound( FALSE ).nContent.GetIndex(); - pPam->GetBound( FALSE ).nContent.Assign( pTxtNode, + xub_StrLen nCntPos = pPam->GetBound( sal_False ).nContent.GetIndex(); + pPam->GetBound( sal_False ).nContent.Assign( pTxtNode, pTxtNode->GetTxt().Len() + nCntPos ); } #endif @@ -767,10 +767,10 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) if( !pPos->nContent.GetIndex() && !bLFStripped ) { SwTxtNode* pAktNd; - ULONG nNodeIdx = pPos->nNode.GetIndex(); + sal_uLong nNodeIdx = pPos->nNode.GetIndex(); - BOOL bHasFlysOrMarks = - HasCurrentParaFlys() || HasCurrentParaBookmarks( TRUE ); + sal_Bool bHasFlysOrMarks = + HasCurrentParaFlys() || HasCurrentParaBookmarks( sal_True ); if( IsNewDoc() ) { @@ -796,8 +796,8 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) pCrsrSh->SetMark(); pCrsrSh->ClearMark(); } - pPam->GetBound(TRUE).nContent.Assign( 0, 0 ); - pPam->GetBound(FALSE).nContent.Assign( 0, 0 ); + pPam->GetBound(sal_True).nContent.Assign( 0, 0 ); + pPam->GetBound(sal_False).nContent.Assign( 0, 0 ); pDoc->GetNodes().Delete( pPam->GetPoint()->nNode ); } } @@ -845,10 +845,10 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) if( pPrev->HasSwAttrSet() ) pTxtNode->SetAttr( *pPrev->GetpSwAttrSet() ); - if( &pPam->GetBound(TRUE).nNode.GetNode() == pPrev ) - pPam->GetBound(TRUE).nContent.Assign( pTxtNode, 0 ); - if( &pPam->GetBound(FALSE).nNode.GetNode() == pPrev ) - pPam->GetBound(FALSE).nContent.Assign( pTxtNode, 0 ); + if( &pPam->GetBound(sal_True).nNode.GetNode() == pPrev ) + pPam->GetBound(sal_True).nContent.Assign( pTxtNode, 0 ); + if( &pPam->GetBound(sal_False).nNode.GetNode() == pPrev ) + pPam->GetBound(sal_False).nContent.Assign( pTxtNode, 0 ); pTxtNode->JoinPrev(); } @@ -890,7 +890,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) if( bWasUndo ) { pDoc->DelAllUndoObj(); - pDoc->DoUndo( TRUE ); + pDoc->DoUndo( sal_True ); } else if( !pInitVSh ) { @@ -900,7 +900,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) // wir muessen das Undo noch anschalten. ViewShell *pTmpVSh = CheckActionViewShell(); if( pTmpVSh ) - pDoc->DoUndo( TRUE ); + pDoc->DoUndo( sal_True ); } pDoc->SetOle2Link( aOLELink ); @@ -908,8 +908,8 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) pDoc->ResetModified(); if( bSetModEnabled && pDoc->GetDocShell() ) { - pDoc->GetDocShell()->EnableSetModified( TRUE ); - bSetModEnabled = FALSE; // this is unnecessary here + pDoc->GetDocShell()->EnableSetModified( sal_True ); + bSetModEnabled = sal_False; // this is unnecessary here } } @@ -918,7 +918,7 @@ if( pSttNdIdx->GetIndex()+1 == pPam->GetBound( FALSE ).nNode.GetIndex() ) // offen ist (muss bei Abbruch nicht sein), die Action beenden, // uns von der Shell abmelden und schliesslich die alte Shell // wieder rekonstruieren. - CallEndAction( TRUE ); + CallEndAction( sal_True ); #ifdef DBG_UTIL nContinue--; @@ -943,15 +943,15 @@ void SwHTMLParser::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) void SwHTMLParser::DocumentDetected() { ASSERT( !bDocInitalized, "DocumentDetected mehrfach aufgerufen" ); - bDocInitalized = TRUE; + bDocInitalized = sal_True; if( IsNewDoc() ) { if( IsInHeader() ) - FinishHeader( TRUE ); + FinishHeader( sal_True ); - CallEndAction( TRUE, TRUE ); + CallEndAction( sal_True, sal_True ); - pDoc->DoUndo( FALSE ); + pDoc->DoUndo( sal_False ); // Durch das DocumentDetected wurde im allgemeinen eine // ViewShell angelegt. Es kann aber auch sein, dass sie // erst spaeter angelegt wird, naemlich dann, wenn die UI @@ -1024,7 +1024,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) pDoc->GetDocShell()->SetTitle( sTitle ); } } - bInTitle = FALSE; + bInTitle = sal_False; sTitle.Erase(); break; @@ -1065,9 +1065,9 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) if( !bDocInitalized ) DocumentDetected(); - BOOL bGetIDOption = FALSE, bInsertUnknown = FALSE; - BOOL bUpperSpaceSave = bUpperSpace; - bUpperSpace = FALSE; + sal_Bool bGetIDOption = sal_False, bInsertUnknown = sal_False; + sal_Bool bUpperSpaceSave = bUpperSpace; + bUpperSpace = sal_False; // Die folgenden Speziallfaelle muessen oder koennen nach der // Filter-Detection erfolgen. @@ -1079,7 +1079,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) // Applets ignoriert wird! if( HTML_IFRAME_OFF == nToken ) { - bCallNextToken = FALSE; + bCallNextToken = sal_False; EndFloatingFrame(); } @@ -1093,8 +1093,8 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) aContents.ConvertLineEnd(); InsertComment( aContents, OOO_STRING_SVTOOLS_HTML_noembed ); aContents.Erase(); - bCallNextToken = FALSE; - bInNoEmbed = FALSE; + bCallNextToken = sal_False; + bInNoEmbed = sal_False; break; case HTML_RAWDATA: @@ -1117,11 +1117,11 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_APPLET_OFF: - bCallNextToken = FALSE; + bCallNextToken = sal_False; EndApplet(); break; case HTML_OBJECT_OFF: - bCallNextToken = FALSE; + bCallNextToken = sal_False; EndObject(); break; @@ -1141,7 +1141,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_TEXTAREA_OFF: - bCallNextToken = FALSE; + bCallNextToken = sal_False; EndTextArea(); break; @@ -1158,7 +1158,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_SELECT_OFF: - bCallNextToken = FALSE; + bCallNextToken = sal_False; EndSelect(); return; @@ -1193,7 +1193,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_MARQUEE_OFF: - bCallNextToken = FALSE; + bCallNextToken = sal_False; EndMarquee(); break; @@ -1209,7 +1209,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) switch( nToken ) { case HTML_SDFIELD_OFF: - bCallNextToken = FALSE; + bCallNextToken = sal_False; EndField(); break; @@ -1226,7 +1226,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) { case HTML_ANCHOR_OFF: EndAnchor(); - bCallNextToken = FALSE; + bCallNextToken = sal_False; break; case HTML_TEXTTOKEN: @@ -1292,7 +1292,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_BASE: { const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[ --i ]; switch( pOption->GetToken() ) @@ -1350,7 +1350,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) break; case HTML_TITLE_ON: - bInTitle = TRUE; + bInTitle = sal_True; break; case HTML_SCRIPT_ON: @@ -1363,7 +1363,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_NOSCRIPT_ON: case HTML_NOSCRIPT_OFF: - bInsertUnknown = TRUE; + bInsertUnknown = sal_True; break; case HTML_STYLE_ON: @@ -1416,7 +1416,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) break; } else - bGetIDOption = TRUE; + bGetIDOption = sal_True; // <BR>s in <PRE> aehneln echten LFs, deshalb kein break case HTML_NEWPARA: @@ -1448,7 +1448,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) if( !pTable && !pDoc->IsInHeaderFooter( pPam->GetPoint()->nNode ) ) { NewAttr( &aAttrTab.pBreak, SvxFmtBreakItem(SVX_BREAK_PAGE_BEFORE, RES_BREAK) ); - EndAttr( aAttrTab.pBreak, 0, FALSE ); + EndAttr( aAttrTab.pBreak, 0, sal_False ); } break; @@ -1515,7 +1515,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) break; case HTML_NOEMBED_ON: - bInNoEmbed = TRUE; + bInNoEmbed = sal_True; bCallNextToken = pTable!=0; ReadRawData( OOO_STRING_SVTOOLS_HTML_noembed ); break; @@ -1528,7 +1528,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_DEFLIST_OFF: if( nOpenParaToken ) EndPara(); - EndDefListItem( 0, FALSE, 1==nDefListDeep ); + EndDefListItem( 0, sal_False, 1==nDefListDeep ); EndDefList(); break; @@ -1536,7 +1536,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_DT_ON: if( nOpenParaToken ) EndPara(); - EndDefListItem( 0, FALSE );// <DD>/<DT> beenden und keine Vorl. setzen + EndDefListItem( 0, sal_False );// <DD>/<DT> beenden und keine Vorl. setzen NewDefListItem( nToken ); break; @@ -1546,7 +1546,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) // eigentlich muesste man ein DD/DT jetzt beenden. Da aber sowhl // Netscape als auch Microsoft das nicht tun, machen wir das eben // auch nicht. - EndDefListItem( nToken, FALSE ); + EndDefListItem( nToken, sal_False ); break; // Bereiche @@ -1601,12 +1601,12 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) // Vorlagen: case HTML_PARABREAK_ON: if( nOpenParaToken ) - EndPara( TRUE ); + EndPara( sal_True ); NewPara(); break; case HTML_PARABREAK_OFF: - EndPara( TRUE ); + EndPara( sal_True ); break; case HTML_ADDRESS_ON: @@ -1644,7 +1644,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) break; case HTML_PREFORMTXT_OFF: - bNoParSpace = TRUE; // der letzte PRE-Absatz muss einen Zeilenabstand bekommen + bNoParSpace = sal_True; // der letzte PRE-Absatz muss einen Zeilenabstand bekommen EndTxtFmtColl( HTML_PREFORMTXT_OFF ); break; @@ -1721,7 +1721,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_UNORDERLIST_OFF: if( nOpenParaToken ) EndPara(); - EndNumBulListItem( 0, TRUE, GetNumInfo().GetDepth()==1 ); + EndNumBulListItem( 0, sal_True, GetNumInfo().GetDepth()==1 ); EndNumBulList( nToken ); break; @@ -1735,13 +1735,13 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) EndPara(); } - EndNumBulListItem( 0, FALSE );// <LI>/<LH> beenden und keine Vorl. setzen + EndNumBulListItem( 0, sal_False );// <LI>/<LH> beenden und keine Vorl. setzen NewNumBulListItem( nToken ); break; case HTML_LI_OFF: case HTML_LISTHEADER_OFF: - EndNumBulListItem( nToken, FALSE ); + EndNumBulListItem( nToken, sal_False ); break; // Attribute : @@ -1802,7 +1802,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_BLINK_ON: { NewStdAttr( HTML_BLINK_ON, &aAttrTab.pBlink, - SvxBlinkItem( TRUE, RES_CHRATR_BLINK ) ); + SvxBlinkItem( sal_True, RES_CHRATR_BLINK ) ); } break; @@ -1907,7 +1907,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_HTML_ON: { const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[ --i ]; if( HTML_O_DIR == pOption->GetToken() ) @@ -2008,7 +2008,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) case HTML_NOFRAMES_ON: if( IsInHeader() ) - FinishHeader( TRUE ); + FinishHeader( sal_True ); bInsertUnknown = bKeepUnknown; break; @@ -2053,7 +2053,7 @@ void __EXPORT SwHTMLParser::NextToken( int nToken ) /* */ -extern BOOL lcl_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); +extern sal_Bool lcl_css1atr_equalFontItems( const SfxPoolItem& r1, const SfxPoolItem& r2 ); void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr, sal_Bool& rScriptDependent, sal_Bool& rFont, @@ -2096,7 +2096,7 @@ void lcl_swhtml_getItemInfo( const _HTMLAttr& rAttr, } } -BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) +sal_Bool SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, sal_Bool bUpdateNum ) { // Ein harter Zeilen-Umbruch am Ende muss immer entfernt werden. // Einen zweiten ersetzen wir durch einen Absatz-Abstand. @@ -2116,7 +2116,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) const SvxULSpaceItem& rULSpace = (const SvxULSpaceItem&)pTxtNode->SwCntntNode::GetAttr( RES_UL_SPACE ); - BOOL bChange = AM_NOSPACE==eMode ? rULSpace.GetLower() > 0 + sal_Bool bChange = AM_NOSPACE==eMode ? rULSpace.GetLower() > 0 : rULSpace.GetLower() == 0; if( bChange ) @@ -2124,7 +2124,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) const SvxULSpaceItem& rCollULSpace = pTxtNode->GetAnyFmtColl().GetULSpace(); - BOOL bMayReset = AM_NOSPACE==eMode ? rCollULSpace.GetLower() == 0 + sal_Bool bMayReset = AM_NOSPACE==eMode ? rCollULSpace.GetLower() == 0 : rCollULSpace.GetLower() > 0; if( bMayReset && @@ -2144,7 +2144,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) SwPosition aOldPos( *pPam->GetPoint() ); - BOOL bRet = pDoc->AppendTxtNode( *pPam->GetPoint() ); + sal_Bool bRet = pDoc->AppendTxtNode( *pPam->GetPoint() ); // Zeichen-Attribute aufspalten und ggf keine setzen, die ueber den // ganzen Absatz gesetzt sind @@ -2153,13 +2153,13 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) const SwPosition& rPos = *pPam->GetPoint(); _HTMLAttr** pTbl = (_HTMLAttr**)&aAttrTab; - for( USHORT nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* ); + for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* ); nCnt--; ++pTbl ) { _HTMLAttr *pAttr = *pTbl; if( pAttr && pAttr->GetItem().Which() < RES_PARATR_BEGIN ) { - BOOL bWholePara = FALSE; + sal_Bool bWholePara = sal_False; while( pAttr ) { @@ -2203,7 +2203,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) pSetAttr->ClearPrev(); if( !pNext || bWholePara ) { - USHORT nTmp = pSetAttr->bInsAtStart ? 0 + sal_uInt16 nTmp = pSetAttr->bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pSetAttr, nTmp ); } @@ -2233,7 +2233,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) // wenn Felder ins Rennen kommen (siehe #51020#) if( !pNext || bWholePara ) { - USHORT nTmp = pSetAttr->bInsAtStart ? 0 + sal_uInt16 nTmp = pSetAttr->bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pSetAttr, nTmp ); } @@ -2248,7 +2248,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) // Die Previous-Attribute muessen trotzdem gesetzt werden. if( !pNext || bWholePara ) { - USHORT nTmp = pPrev->bInsAtStart ? 0 : aSetAttrTab.Count(); + sal_uInt16 nTmp = pPrev->bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pPrev, nTmp ); } else @@ -2268,9 +2268,9 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) { if( GetNumInfo().GetDepth() ) { - BYTE nLvl = GetNumInfo().GetLevel(); + sal_uInt8 nLvl = GetNumInfo().GetLevel(); // --> OD 2008-04-02 #refactorlists# -// SetNoNum (&nLvl, TRUE); +// SetNoNum (&nLvl, sal_True); // SetNodeNum( nLvl); SetNodeNum( nLvl, false ); // <-- @@ -2308,7 +2308,7 @@ BOOL SwHTMLParser::AppendTxtNode( SwHTMLAppendMode eMode, BOOL bUpdateNum ) if( RES_CHRATR_CJK_FONT <= nWhich && nWhich <= RES_CHRATR_CTL_WEIGHT ) { - nIdx = static_cast< USHORT >(nWhich - RES_CHRATR_CJK_FONT + 5); + nIdx = static_cast< sal_uInt16 >(nWhich - RES_CHRATR_CJK_FONT + 5); } else switch( nWhich ) { @@ -2371,9 +2371,9 @@ void SwHTMLParser::AddParSpace() if( !bNoParSpace ) return; - bNoParSpace = FALSE; + bNoParSpace = sal_False; - ULONG nNdIdx = pPam->GetPoint()->nNode.GetIndex() - 1; + sal_uLong nNdIdx = pPam->GetPoint()->nNode.GetIndex() - 1; SwTxtNode *pTxtNode = pDoc->GetNodes()[nNdIdx]->GetTxtNode(); if( !pTxtNode ) @@ -2457,13 +2457,13 @@ void SwHTMLParser::ShowStatline() ViewShell *pVSh = CheckActionViewShell(); if( pVSh && pVSh->HasInvalidRect() ) { - CallEndAction( FALSE, FALSE ); - CallStartAction( pVSh, FALSE ); + CallEndAction( sal_False, sal_False ); + CallStartAction( pVSh, sal_False ); } } } -ViewShell *SwHTMLParser::CallStartAction( ViewShell *pVSh, BOOL bChkPtr ) +ViewShell *SwHTMLParser::CallStartAction( ViewShell *pVSh, sal_Bool bChkPtr ) { ASSERT( !pActionViewShell, "CallStartAction: ViewShell schon gesetzt" ); @@ -2492,7 +2492,7 @@ ViewShell *SwHTMLParser::CallStartAction( ViewShell *pVSh, BOOL bChkPtr ) return pActionViewShell; } -ViewShell *SwHTMLParser::CallEndAction( BOOL bChkAction, BOOL bChkPtr ) +ViewShell *SwHTMLParser::CallEndAction( sal_Bool bChkAction, sal_Bool bChkPtr ) { if( bChkPtr ) { @@ -2517,19 +2517,19 @@ ViewShell *SwHTMLParser::CallEndAction( BOOL bChkAction, BOOL bChkPtr ) ViewShell *pSh = pActionViewShell; do { if( pSh->IsA( TYPE( SwCrsrShell ) ) ) - ((SwCrsrShell*)pSh)->SttEndDoc(TRUE); + ((SwCrsrShell*)pSh)->SttEndDoc(sal_True); pSh = (ViewShell *)pSh->GetNext(); } while( pSh != pActionViewShell ); - bSetCrsr = FALSE; + bSetCrsr = sal_False; } if( pActionViewShell->ISA( SwEditShell ) ) { //Schon gescrollt?, dann dafuer sorgen, dass die View sich nicht bewegt! - const BOOL bOldLock = pActionViewShell->IsViewLocked(); - pActionViewShell->LockView( TRUE ); - const BOOL bOldEndActionByVirDev = pActionViewShell->IsEndActionByVirDev(); - pActionViewShell->SetEndActionByVirDev( TRUE );; + const sal_Bool bOldLock = pActionViewShell->IsViewLocked(); + pActionViewShell->LockView( sal_True ); + const sal_Bool bOldEndActionByVirDev = pActionViewShell->IsEndActionByVirDev(); + pActionViewShell->SetEndActionByVirDev( sal_True );; ((SwEditShell*)pActionViewShell)->EndAction(); pActionViewShell->SetEndActionByVirDev( bOldEndActionByVirDev ); pActionViewShell->LockView( bOldLock ); @@ -2541,7 +2541,7 @@ ViewShell *SwHTMLParser::CallEndAction( BOOL bChkAction, BOOL bChkPtr ) if( GetMedium() && aVisSttPos == pActionViewShell->VisArea().Pos() ) ::JumpToSwMark( pActionViewShell, GetMedium()->GetURLObject().GetMark() ); - bChkJumpMark = FALSE; + bChkJumpMark = sal_False; } } else @@ -2578,7 +2578,7 @@ ViewShell *SwHTMLParser::CheckActionViewShell() /* */ -void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, +void SwHTMLParser::_SetAttr( sal_Bool bChkEnd, sal_Bool bBeforeTable, _HTMLAttrs *pPostIts ) { SwPaM* pAttrPam = new SwPaM( *pPam->GetPoint() ); @@ -2586,17 +2586,17 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, xub_StrLen nEndCnt = pPam->GetPoint()->nContent.GetIndex(); _HTMLAttr* pAttr; SwCntntNode* pCNd; - USHORT n; + sal_uInt16 n; _HTMLAttrs aFields( 5, 5 ); for( n = aSetAttrTab.Count(); n; ) { pAttr = aSetAttrTab[ --n ]; - USHORT nWhich = pAttr->pItem->Which(); + sal_uInt16 nWhich = pAttr->pItem->Which(); - ULONG nEndParaIdx = pAttr->GetEndParaIdx(); - BOOL bSetAttr; + sal_uLong nEndParaIdx = pAttr->GetEndParaIdx(); + sal_Bool bSetAttr; if( bChkEnd ) { // fix #42192#: Zechen-Attribute mit Ende moeglich frueh, @@ -2622,7 +2622,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, // Attribiute im Content-Bereich duerfen nicht gesetzt // werden, wenn wir in einem Sonderbereich stehen, aber // umgekekehrt schon. - ULONG nEndOfIcons = pDoc->GetNodes().GetEndOfExtras().GetIndex(); + sal_uLong nEndOfIcons = pDoc->GetNodes().GetEndOfExtras().GetIndex(); bSetAttr = nEndParaIdx < rEndIdx.GetIndex() || rEndIdx.GetIndex() > nEndOfIcons || nEndParaIdx <= nEndOfIcons; @@ -2632,7 +2632,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, { // Das Attribute darf nicht in der liste der vorlaeufigen // Absatz-Attribute stehen, weil es sonst geloescht wurde. - USHORT ii = aParaAttrs.Count(); + sal_uInt16 ii = aParaAttrs.Count(); while( ii-- ) { ASSERT( pAttr != aParaAttrs[ii], @@ -2772,14 +2772,14 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, // jump to bookmark if( JUMPTO_MARK == eJumpTo && pNewMark->GetName() == ::rtl::OUString(sJmpMark) ) { - bChkJumpMark = TRUE; + bChkJumpMark = sal_True; eJumpTo = JUMPTO_NONE; } } break; case RES_TXTATR_FIELD: { - USHORT nFldWhich = + sal_uInt16 nFldWhich = pPostIts ? ((const SwFmtFld *)pAttr->pItem) ->GetFld()->GetTyp()->Which() : 0; if( pPostIts && (RES_POSTITFLD == nFldWhich || @@ -2816,7 +2816,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, JUMPTO_MARK == eJumpTo && sJmpMark == ((SwFmtINetFmt*)pAttr->pItem)->GetName() ) { - bChkJumpMark = TRUE; + bChkJumpMark = sal_True; eJumpTo = JUMPTO_NONE; } @@ -2838,8 +2838,8 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, ASSERT( FLY_AT_PARA == rAnchor.GetAnchorId(), "Nur Auto-Rahmen brauchen eine Spezialbehandlung" ); const SwPosition *pFlyPos = rAnchor.GetCntntAnchor(); - ULONG nFlyParaIdx = pFlyPos->nNode.GetIndex(); - BOOL bMoveFly; + sal_uLong nFlyParaIdx = pFlyPos->nNode.GetIndex(); + sal_Bool bMoveFly; if( bChkEnd ) { bMoveFly = nFlyParaIdx < rEndIdx.GetIndex() || @@ -2848,7 +2848,7 @@ void SwHTMLParser::_SetAttr( BOOL bChkEnd, BOOL bBeforeTable, } else { - ULONG nEndOfIcons = pDoc->GetNodes().GetEndOfExtras().GetIndex(); + sal_uLong nEndOfIcons = pDoc->GetNodes().GetEndOfExtras().GetIndex(); bMoveFly = nFlyParaIdx < rEndIdx.GetIndex() || rEndIdx.GetIndex() > nEndOfIcons || nFlyParaIdx <= nEndOfIcons; @@ -2931,7 +2931,7 @@ void SwHTMLParser::NewAttr( _HTMLAttr **ppAttr, const SfxPoolItem& rItem ) void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, - BOOL bChkEmpty ) + sal_Bool bChkEmpty ) { ASSERT( !ppDepAttr, "SwHTMLParser::EndAttr: ppDepAttr-Feature ungetestet?" ); // Der Listenkopf ist im Attribut gespeichert @@ -2965,8 +2965,8 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, //nEndCnt = pPrev->GetSttCnt(); } - BOOL bMoveBack = FALSE; - USHORT nWhich = pAttr->pItem->Which(); + sal_Bool bMoveBack = sal_False; + sal_uInt16 nWhich = pAttr->pItem->Which(); if( /*!pLast &&*/ !nEndCnt && RES_PARATR_BEGIN <= nWhich && *pEndIdx != pAttr->GetSttPara() ) { @@ -3020,7 +3020,7 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, pNext->InsertPrev( pSetAttr ); else { - USHORT nTmp = pSetAttr->bInsAtStart ? 0 + sal_uInt16 nTmp = pSetAttr->bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pSetAttr, nTmp ); } @@ -3050,7 +3050,7 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, (*ppDepAttr)->InsertPrev( pAttr ); else { - USHORT nTmp = pAttr->bInsAtStart ? 0 : aSetAttrTab.Count(); + sal_uInt16 nTmp = pAttr->bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pAttr, nTmp ); } } @@ -3079,7 +3079,7 @@ void SwHTMLParser::EndAttr( _HTMLAttr* pAttr, _HTMLAttr **ppDepAttr, pNext->InsertPrev( pPrev ); else { - USHORT nTmp = pPrev->bInsAtStart ? 0 : aSetAttrTab.Count(); + sal_uInt16 nTmp = pPrev->bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pPrev, nTmp ); } } @@ -3140,7 +3140,7 @@ void SwHTMLParser::DeleteAttr( _HTMLAttr* pAttr ) pNext->InsertPrev( pPrev ); else { - USHORT nTmp = pPrev->bInsAtStart ? 0 : aSetAttrTab.Count(); + sal_uInt16 nTmp = pPrev->bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pPrev, nTmp ); } } @@ -3165,7 +3165,7 @@ void SwHTMLParser::SaveAttrTab( _HTMLAttrTable& rNewAttrTab ) _HTMLAttr** pTbl = (_HTMLAttr**)&aAttrTab; _HTMLAttr** pSaveTbl = (_HTMLAttr**)&rNewAttrTab; - for( USHORT nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* ); + for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* ); nCnt--; (++pTbl, ++pSaveTbl) ) { *pSaveTbl = *pTbl; @@ -3182,7 +3182,7 @@ void SwHTMLParser::SaveAttrTab( _HTMLAttrTable& rNewAttrTab ) } void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, - BOOL bMoveEndBack ) + sal_Bool bMoveEndBack ) { // Hier darf es keine vorlauefigen Absatz-Attribute geben, den die // koennten jetzt gesetzt werden und dann sind die Zeiger ungueltig!!! @@ -3198,14 +3198,14 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, // neu aufspannen _HTMLAttr** pTbl = (_HTMLAttr**)&aAttrTab; _HTMLAttr** pSaveTbl = (_HTMLAttr**)&rNewAttrTab; - BOOL bSetAttr = TRUE; + sal_Bool bSetAttr = sal_True; xub_StrLen nSttCnt = pPam->GetPoint()->nContent.GetIndex(); xub_StrLen nEndCnt = nSttCnt; if( bMoveEndBack ) { - ULONG nOldEnd = nEndIdx.GetIndex(); - ULONG nTmpIdx; + sal_uLong nOldEnd = nEndIdx.GetIndex(); + sal_uLong nTmpIdx; if( ( nTmpIdx = pDoc->GetNodes().GetEndOfExtras().GetIndex()) >= nOldEnd || ( nTmpIdx = pDoc->GetNodes().GetEndOfAutotext().GetIndex()) >= nOldEnd ) { @@ -3219,7 +3219,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, nEndCnt = (bSetAttr ? pCNd->Len() : 0); } - for( USHORT nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* ); + for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* ); nCnt--; (++pTbl, ++pSaveTbl) ) { _HTMLAttr *pAttr = *pTbl; @@ -3245,7 +3245,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, pNext->InsertPrev( pSetAttr ); else { - USHORT nTmp = pSetAttr->bInsAtStart ? 0 + sal_uInt16 nTmp = pSetAttr->bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pSetAttr, nTmp ); } @@ -3259,7 +3259,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, pNext->InsertPrev( pPrev ); else { - USHORT nTmp = pPrev->bInsAtStart ? 0 : aSetAttrTab.Count(); + sal_uInt16 nTmp = pPrev->bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pPrev, nTmp ); } } @@ -3286,7 +3286,7 @@ void SwHTMLParser::SplitAttrTab( _HTMLAttrTable& rNewAttrTab, } void SwHTMLParser::RestoreAttrTab( const _HTMLAttrTable& rNewAttrTab, - BOOL bSetNewStart ) + sal_Bool bSetNewStart ) { // Hier darf es keine vorlauefigen Absatz-Attribute geben, den die // koennten jetzt gesetzt werden und dann sind die Zeiger ungueltig!!! @@ -3298,7 +3298,7 @@ void SwHTMLParser::RestoreAttrTab( const _HTMLAttrTable& rNewAttrTab, _HTMLAttr** pTbl = (_HTMLAttr**)&aAttrTab; _HTMLAttr** pSaveTbl = (_HTMLAttr**)&rNewAttrTab; - for( USHORT nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* ); + for( sal_uInt16 nCnt = sizeof( _HTMLAttrTable ) / sizeof( _HTMLAttr* ); nCnt--; (++pTbl, ++pSaveTbl) ) { ASSERT( !*pTbl, "Die Attribut-Tabelle ist nicht leer!" ); @@ -3329,14 +3329,14 @@ void SwHTMLParser::RestoreAttrTab( const _HTMLAttrTable& rNewAttrTab, } } -void SwHTMLParser::InsertAttr( const SfxPoolItem& rItem, BOOL bLikePara, - BOOL bInsAtStart ) +void SwHTMLParser::InsertAttr( const SfxPoolItem& rItem, sal_Bool bLikePara, + sal_Bool bInsAtStart ) { _HTMLAttr* pTmp = new _HTMLAttr( *pPam->GetPoint(), rItem ); if( bLikePara ) pTmp->SetLikePara(); - USHORT nTmp = bInsAtStart ? 0 : aSetAttrTab.Count(); + sal_uInt16 nTmp = bInsAtStart ? 0 : aSetAttrTab.Count(); aSetAttrTab.Insert( pTmp, nTmp ); } @@ -3358,7 +3358,7 @@ void SwHTMLParser::NewStdAttr( int nToken ) String aId, aStyle, aClass, aLang, aDir; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -3395,7 +3395,7 @@ void SwHTMLParser::NewStdAttr( int nToken ) if( HTML_SPAN_ON != nToken || !aClass.Len() || !CreateContainer( aClass, aItemSet, aPropInfo, pCntxt ) ) DoPositioning( aItemSet, aPropInfo, pCntxt ); - InsertAttrs( aItemSet, aPropInfo, pCntxt, TRUE ); + InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True ); } } @@ -3411,7 +3411,7 @@ void SwHTMLParser::NewStdAttr( int nToken, String aId, aStyle, aClass, aLang, aDir; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -3452,7 +3452,7 @@ void SwHTMLParser::NewStdAttr( int nToken, if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) ) DoPositioning( aItemSet, aPropInfo, pCntxt ); - InsertAttrs( aItemSet, aPropInfo, pCntxt, TRUE ); + InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True ); } else { @@ -3489,16 +3489,16 @@ void SwHTMLParser::EndTag( int nToken ) void SwHTMLParser::NewBasefontAttr() { String aId, aStyle, aClass, aLang, aDir; - USHORT nSize = 3; + sal_uInt16 nSize = 3; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) { case HTML_O_SIZE: - nSize = (USHORT)pOption->GetNumber(); + nSize = (sal_uInt16)pOption->GetNumber(); break; case HTML_O_ID: aId = pOption->GetString(); @@ -3543,7 +3543,7 @@ void SwHTMLParser::NewBasefontAttr() if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) ) DoPositioning( aItemSet, aPropInfo, pCntxt ); - InsertAttrs( aItemSet, aPropInfo, pCntxt, TRUE ); + InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True ); } else { @@ -3573,23 +3573,23 @@ void SwHTMLParser::EndBasefontAttr() void SwHTMLParser::NewFontAttr( int nToken ) { - USHORT nBaseSize = + sal_uInt16 nBaseSize = ( aBaseFontStack.Count() > nBaseFontStMin ? (aBaseFontStack[aBaseFontStack.Count()-1] & FONTSIZE_MASK) : 3 ); - USHORT nFontSize = + sal_uInt16 nFontSize = ( aFontStack.Count() > nFontStMin ? (aFontStack[aFontStack.Count()-1] & FONTSIZE_MASK) : nBaseSize ); String aFace, aId, aStyle, aClass, aLang, aDir; Color aColor; - ULONG nFontHeight = 0; // tatsaechlich einzustellende Font-Hoehe - USHORT nSize = 0; // Fontgroesse in Netscape-Notation (1-7) - BOOL bColor = FALSE; + sal_uLong nFontHeight = 0; // tatsaechlich einzustellende Font-Hoehe + sal_uInt16 nSize = 0; // Fontgroesse in Netscape-Notation (1-7) + sal_Bool bColor = sal_False; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -3597,19 +3597,19 @@ void SwHTMLParser::NewFontAttr( int nToken ) case HTML_O_SIZE: if( HTML_FONT_ON==nToken && pOption->GetString().Len() ) { - INT32 nSSize; + sal_Int32 nSSize; if( '+' == pOption->GetString().GetChar(0) || '-' == pOption->GetString().GetChar(0) ) nSSize = nBaseSize + pOption->GetSNumber(); else - nSSize = (INT32)pOption->GetNumber(); + nSSize = (sal_Int32)pOption->GetNumber(); if( nSSize < 1 ) nSSize = 1; else if( nSSize > 7 ) nSSize = 7; - nSize = (USHORT)nSSize; + nSize = (sal_uInt16)nSSize; nFontHeight = aFontHeights[nSize-1]; } break; @@ -3617,7 +3617,7 @@ void SwHTMLParser::NewFontAttr( int nToken ) if( HTML_FONT_ON==nToken ) { pOption->GetColor( aColor ); - bColor = TRUE; + bColor = sal_True; } break; case HTML_O_FACE: @@ -3648,14 +3648,14 @@ void SwHTMLParser::NewFontAttr( int nToken ) // in Ueberschriften bestimmt die aktuelle Ueberschrift // die Font-Hoehe und nicht BASEFONT - USHORT nPoolId = GetCurrFmtColl()->GetPoolFmtId(); + sal_uInt16 nPoolId = GetCurrFmtColl()->GetPoolFmtId(); if( (nPoolId>=RES_POOLCOLL_HEADLINE1 && nPoolId<=RES_POOLCOLL_HEADLINE6) ) { // wenn die Schriftgroesse in der Ueberschrift noch // nicht veraendert ist, die aus der Vorlage nehmen if( nFontStHeadStart==aFontStack.Count() ) - nFontSize = static_cast< USHORT >(6 - (nPoolId - RES_POOLCOLL_HEADLINE1)); + nFontSize = static_cast< sal_uInt16 >(6 - (nPoolId - RES_POOLCOLL_HEADLINE1)); } else nPoolId = 0; @@ -3694,7 +3694,7 @@ void SwHTMLParser::NewFontAttr( int nToken ) pFList = pFListItem->GetFontList(); } - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; xub_StrLen nStrPos = 0; while( nStrPos!=STRING_NOTFOUND ) { @@ -3710,7 +3710,7 @@ void SwHTMLParser::NewFontAttr( int nToken ) const FontInfo& rFInfo = pFList->GetFontInfo( hFont ); if( RTL_TEXTENCODING_DONTKNOW != rFInfo.GetCharSet() ) { - bFound = TRUE; + bFound = sal_True; if( RTL_TEXTENCODING_SYMBOL == rFInfo.GetCharSet() ) eEnc = RTL_TEXTENCODING_SYMBOL; } @@ -3758,7 +3758,7 @@ void SwHTMLParser::NewFontAttr( int nToken ) if( ParseStyleOptions( aStyle, aId, aClass, aItemSet, aPropInfo, &aLang, &aDir ) ) DoPositioning( aItemSet, aPropInfo, pCntxt ); - InsertAttrs( aItemSet, aPropInfo, pCntxt, TRUE ); + InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True ); } else { @@ -3812,7 +3812,7 @@ void SwHTMLParser::NewPara() String aId, aStyle, aClass, aLang, aDir; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -3876,7 +3876,7 @@ void SwHTMLParser::NewPara() nOpenParaToken = HTML_PARABREAK_ON; } -void SwHTMLParser::EndPara( BOOL bReal ) +void SwHTMLParser::EndPara( sal_Bool bReal ) { if( HTML_LI_ON==nOpenParaToken && pTable ) { @@ -3932,7 +3932,7 @@ void SwHTMLParser::NewHeading( int nToken ) String aId, aStyle, aClass, aLang, aDir; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -3965,7 +3965,7 @@ void SwHTMLParser::NewHeading( int nToken ) AddParSpace(); // die passende Vorlage suchen - USHORT nTxtColl; + sal_uInt16 nTxtColl; switch( nToken ) { case HTML_HEAD1_ON: nTxtColl = RES_POOLCOLL_HEADLINE1; break; @@ -4020,7 +4020,7 @@ void SwHTMLParser::EndHeading() // Kontext zu dem Token suchen und vom Stack holen _HTMLAttrContext *pCntxt = 0; - USHORT nPos = aContexts.Count(); + sal_uInt16 nPos = aContexts.Count(); while( !pCntxt && nPos>nContextStMin ) { switch( aContexts[--nPos]->GetToken() ) @@ -4053,12 +4053,12 @@ void SwHTMLParser::EndHeading() /* */ -void SwHTMLParser::NewTxtFmtColl( int nToken, USHORT nColl ) +void SwHTMLParser::NewTxtFmtColl( int nToken, sal_uInt16 nColl ) { String aId, aStyle, aClass, aLang, aDir; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -4187,7 +4187,7 @@ void SwHTMLParser::NewDefList() String aId, aStyle, aClass, aLang, aDir; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -4211,7 +4211,7 @@ void SwHTMLParser::NewDefList() } // einen neuen Absatz aufmachen - BOOL bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 0; + sal_Bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 0; if( pPam->GetPoint()->nContent.GetIndex() ) AppendTxtNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE ); else if( bSpace ) @@ -4221,11 +4221,11 @@ void SwHTMLParser::NewDefList() nDefListDeep++; - BOOL bInDD = FALSE, bNotInDD = FALSE; - USHORT nPos = aContexts.Count(); + sal_Bool bInDD = sal_False, bNotInDD = sal_False; + sal_uInt16 nPos = aContexts.Count(); while( !bInDD && !bNotInDD && nPos>nContextStMin ) { - USHORT nCntxtToken = aContexts[--nPos]->GetToken(); + sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken(); switch( nCntxtToken ) { case HTML_DEFLIST_ON: @@ -4233,10 +4233,10 @@ void SwHTMLParser::NewDefList() case HTML_MENULIST_ON: case HTML_ORDERLIST_ON: case HTML_UNORDERLIST_ON: - bNotInDD = TRUE; + bNotInDD = sal_True; break; case HTML_DD_ON: - bInDD = TRUE; + bInDD = sal_True; break; } } @@ -4288,7 +4288,7 @@ void SwHTMLParser::NewDefList() void SwHTMLParser::EndDefList() { - BOOL bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 1; + sal_Bool bSpace = (GetNumInfo().GetDepth() + nDefListDeep) == 1; if( pPam->GetPoint()->nContent.GetIndex() ) AppendTxtNode( bSpace ? AM_SPACE : AM_SOFTNOSPACE ); else if( bSpace ) @@ -4316,21 +4316,21 @@ void SwHTMLParser::EndDefList() void SwHTMLParser::NewDefListItem( int nToken ) { // festellen, ob das DD/DT in einer DL vorkommt - BOOL bInDefList = FALSE, bNotInDefList = FALSE; - USHORT nPos = aContexts.Count(); + sal_Bool bInDefList = sal_False, bNotInDefList = sal_False; + sal_uInt16 nPos = aContexts.Count(); while( !bInDefList && !bNotInDefList && nPos>nContextStMin ) { - USHORT nCntxtToken = aContexts[--nPos]->GetToken(); + sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken(); switch( nCntxtToken ) { case HTML_DEFLIST_ON: - bInDefList = TRUE; + bInDefList = sal_True; break; case HTML_DIRLIST_ON: case HTML_MENULIST_ON: case HTML_ORDERLIST_ON: case HTML_UNORDERLIST_ON: - bNotInDefList = TRUE; + bNotInDefList = sal_True; break; } } @@ -4344,12 +4344,12 @@ void SwHTMLParser::NewDefListItem( int nToken ) nOpenParaToken = static_cast< sal_uInt16 >(nToken); } - NewTxtFmtColl( nToken, static_cast< USHORT >(nToken==HTML_DD_ON ? RES_POOLCOLL_HTML_DD + NewTxtFmtColl( nToken, static_cast< sal_uInt16 >(nToken==HTML_DD_ON ? RES_POOLCOLL_HTML_DD : RES_POOLCOLL_HTML_DT) ); } -void SwHTMLParser::EndDefListItem( int nToken, BOOL bSetColl, - BOOL /*bLastPara*/ ) +void SwHTMLParser::EndDefListItem( int nToken, sal_Bool bSetColl, + sal_Bool /*bLastPara*/ ) { // einen neuen Absatz aufmachen if( !nToken && pPam->GetPoint()->nContent.GetIndex() ) @@ -4358,10 +4358,10 @@ void SwHTMLParser::EndDefListItem( int nToken, BOOL bSetColl, // Kontext zu dem Token suchen und vom Stack holen nToken &= ~1; _HTMLAttrContext *pCntxt = 0; - USHORT nPos = aContexts.Count(); + sal_uInt16 nPos = aContexts.Count(); while( !pCntxt && nPos>nContextStMin ) { - USHORT nCntxtToken = aContexts[--nPos]->GetToken(); + sal_uInt16 nCntxtToken = aContexts[--nPos]->GetToken(); switch( nCntxtToken ) { case HTML_DD_ON: @@ -4399,8 +4399,8 @@ void SwHTMLParser::EndDefListItem( int nToken, BOOL bSetColl, /* */ -BOOL SwHTMLParser::HasCurrentParaFlys( BOOL bNoSurroundOnly, - BOOL bSurroundOnly ) const +sal_Bool SwHTMLParser::HasCurrentParaFlys( sal_Bool bNoSurroundOnly, + sal_Bool bSurroundOnly ) const { // bNoSurroundOnly: Der Absatz enthaelt mindestens einen Rahmen // ohne Umlauf @@ -4411,8 +4411,8 @@ BOOL SwHTMLParser::HasCurrentParaFlys( BOOL bNoSurroundOnly, const SwSpzFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts(); - BOOL bFound = FALSE; - for ( USHORT i=0; i<rFrmFmtTbl.Count(); i++ ) + sal_Bool bFound = sal_False; + for ( sal_uInt16 i=0; i<rFrmFmtTbl.Count(); i++ ) { SwFrmFmt *const pFmt = rFrmFmtTbl[i]; SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor(); @@ -4430,7 +4430,7 @@ BOOL SwHTMLParser::HasCurrentParaFlys( BOOL bNoSurroundOnly, { if( !(bNoSurroundOnly || bSurroundOnly) ) { - bFound = TRUE; + bFound = sal_True; break; } else @@ -4444,7 +4444,7 @@ BOOL SwHTMLParser::HasCurrentParaFlys( BOOL bNoSurroundOnly, { if( SURROUND_NONE==eSurround ) { - bFound = TRUE; + bFound = sal_True; break; } } @@ -4452,12 +4452,12 @@ BOOL SwHTMLParser::HasCurrentParaFlys( BOOL bNoSurroundOnly, { if( SURROUND_NONE==eSurround ) { - bFound = FALSE; + bFound = sal_False; break; } else if( SURROUND_THROUGHT!=eSurround ) { - bFound = TRUE; + bFound = sal_True; // weitersuchen: Es koennten ja noch welche ohne // Umlauf kommen ... } @@ -4484,45 +4484,45 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) { SwTxtFmtColl *pCollToSet = 0; // die zu setzende Vorlage SfxItemSet *pItemSet = 0; // der Set fuer harte Attrs - USHORT nTopColl = pContext ? pContext->GetTxtFmtColl() : 0; + sal_uInt16 nTopColl = pContext ? pContext->GetTxtFmtColl() : 0; const String& rTopClass = pContext ? pContext->GetClass() : (const String&) aEmptyStr; - USHORT nDfltColl = RES_POOLCOLL_TEXT; + sal_uInt16 nDfltColl = RES_POOLCOLL_TEXT; - BOOL bInPRE=FALSE; // etwas Kontext Info + sal_Bool bInPRE=sal_False; // etwas Kontext Info - USHORT nLeftMargin = 0, nRightMargin = 0; // die Einzuege und + sal_uInt16 nLeftMargin = 0, nRightMargin = 0; // die Einzuege und short nFirstLineIndent = 0; // Abstaende - USHORT i; + sal_uInt16 i; for( i = nContextStAttrMin; i < aContexts.Count(); i++ ) { const _HTMLAttrContext *pCntxt = aContexts[i]; - USHORT nColl = pCntxt->GetTxtFmtColl(); + sal_uInt16 nColl = pCntxt->GetTxtFmtColl(); if( nColl ) { // Es gibt eine Vorlage, die zu setzen ist. Dann // muss zunaechst einmal entschieden werden, // ob die Vorlage auch gesetzt werden kann - BOOL bSetThis = TRUE; + sal_Bool bSetThis = sal_True; switch( nColl ) { - case USHORT(RES_POOLCOLL_HTML_PRE): - bInPRE = TRUE; + case sal_uInt16(RES_POOLCOLL_HTML_PRE): + bInPRE = sal_True; break; - case USHORT(RES_POOLCOLL_TEXT): + case sal_uInt16(RES_POOLCOLL_TEXT): // <TD><P CLASS=xxx> muss TD.xxx werden if( nDfltColl==RES_POOLCOLL_TABLE || nDfltColl==RES_POOLCOLL_TABLE_HDLN ) nColl = nDfltColl; break; - case USHORT(RES_POOLCOLL_HTML_HR): + case sal_uInt16(RES_POOLCOLL_HTML_HR): // <HR> auch in <PRE> als Vorlage setzen, sonst kann man sie // nicht mehr exportieren break; default: if( bInPRE ) - bSetThis = FALSE; + bSetThis = sal_False; break; } @@ -4583,7 +4583,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) // ggf. neue Absatz-Einzuege holen if( pCntxt->IsLRSpaceChanged() ) { - USHORT nLeft=0, nRight=0; + sal_uInt16 nLeft=0, nRight=0; pCntxt->GetMargins( nLeft, nRight, nFirstLineIndent ); nLeftMargin = nLeft; @@ -4605,7 +4605,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) pCSS1Parser->GetTxtFmtColl( nTopColl, rTopClass ); const SfxItemSet& rItemSet = pTopColl->GetAttrSet(); const SfxPoolItem *pItem; - if( SFX_ITEM_SET == rItemSet.GetItemState(RES_LR_SPACE,TRUE, &pItem) ) + if( SFX_ITEM_SET == rItemSet.GetItemState(RES_LR_SPACE,sal_True, &pItem) ) { const SvxLRSpaceItem *pLRItem = (const SvxLRSpaceItem *)pItem; @@ -4637,7 +4637,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) pContext->SetMargins( nLeftMargin, nRightMargin, nFirstLineIndent ); } - if( SFX_ITEM_SET == rItemSet.GetItemState(RES_UL_SPACE,TRUE, &pItem) ) + if( SFX_ITEM_SET == rItemSet.GetItemState(RES_UL_SPACE,sal_True, &pItem) ) { const SvxULSpaceItem *pULItem = (const SvxULSpaceItem *)pItem; @@ -4672,7 +4672,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) // ggf. noch den Absatz-Einzug korrigieren const SvxLRSpaceItem& rLRItem = pCollToSet->GetLRSpace(); - BOOL bSetLRSpace; + sal_Bool bSetLRSpace; bSetLRSpace = nLeftMargin != rLRItem.GetTxtLeft() || nFirstLineIndent != rLRItem.GetTxtFirstLineOfst() || @@ -4691,7 +4691,7 @@ void SwHTMLParser::SetTxtCollAttrs( _HTMLAttrContext *pContext ) NewAttr( &aAttrTab.pLRSpace, aLRItem ); aAttrTab.pLRSpace->SetLikePara(); aParaAttrs.Insert( aAttrTab.pLRSpace, aParaAttrs.Count() ); - EndAttr( aAttrTab.pLRSpace, 0, FALSE ); + EndAttr( aAttrTab.pLRSpace, 0, sal_False ); } } @@ -4710,7 +4710,7 @@ void SwHTMLParser::NewCharFmt( int nToken ) String aId, aStyle, aClass, aLang, aDir; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -4752,7 +4752,7 @@ void SwHTMLParser::NewCharFmt( int nToken ) ASSERT( !aClass.Len() || !pCSS1Parser->GetClass( aClass ), "Class wird nicht beruecksichtigt" ); DoPositioning( aItemSet, aPropInfo, pCntxt ); - InsertAttrs( aItemSet, aPropInfo, pCntxt, TRUE ); + InsertAttrs( aItemSet, aPropInfo, pCntxt, sal_True ); } } @@ -4777,12 +4777,12 @@ void SwHTMLParser::InsertSpacer() sal_Int16 eHoriOri = text::HoriOrientation::NONE; Size aSize( 0, 0); long nSize = 0; - BOOL bPrcWidth = FALSE; - BOOL bPrcHeight = FALSE; - USHORT nType = HTML_SPTYPE_HORI; + sal_Bool bPrcWidth = sal_False; + sal_Bool bPrcHeight = sal_False; + sal_uInt16 nType = HTML_SPTYPE_HORI; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -4846,7 +4846,7 @@ void SwHTMLParser::InsertSpacer() // den Inhalt schuetzen SvxProtectItem aProtectItem( RES_PROTECT) ; - aProtectItem.SetCntntProtect( TRUE ); + aProtectItem.SetCntntProtect( sal_True ); aFrmSet.Put( aProtectItem ); // der Rahmen anlegen @@ -4891,13 +4891,13 @@ void SwHTMLParser::InsertSpacer() { SvxULSpaceItem aULSpace( (const SvxULSpaceItem&)pTxtNode ->SwCntntNode::GetAttr( RES_UL_SPACE ) ); - aULSpace.SetLower( aULSpace.GetLower() + (USHORT)nSize ); + aULSpace.SetLower( aULSpace.GetLower() + (sal_uInt16)nSize ); pTxtNode->SetAttr( aULSpace ); } else { - NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, (USHORT)nSize, RES_UL_SPACE ) ); - EndAttr( aAttrTab.pULSpace, 0, FALSE ); + NewAttr( &aAttrTab.pULSpace, SvxULSpaceItem( 0, (sal_uInt16)nSize, RES_UL_SPACE ) ); + EndAttr( aAttrTab.pULSpace, 0, sal_False ); AppendTxtNode(); // nicht am Abstand drehen! } @@ -4918,7 +4918,7 @@ void SwHTMLParser::InsertSpacer() if( !pPam->GetPoint()->nContent.GetIndex() ) { - USHORT nLeft=0, nRight=0; + sal_uInt16 nLeft=0, nRight=0; short nIndent = 0; GetMarginsFromContextWithNumBul( nLeft, nRight, nIndent ); @@ -4930,7 +4930,7 @@ void SwHTMLParser::InsertSpacer() aLRItem.SetTxtFirstLineOfst( nIndent ); NewAttr( &aAttrTab.pLRSpace, aLRItem ); - EndAttr( aAttrTab.pLRSpace, 0, FALSE ); + EndAttr( aAttrTab.pLRSpace, 0, sal_False ); } else { @@ -4943,13 +4943,13 @@ void SwHTMLParser::InsertSpacer() } } -USHORT SwHTMLParser::ToTwips( USHORT nPixel ) const +sal_uInt16 SwHTMLParser::ToTwips( sal_uInt16 nPixel ) const { if( nPixel && Application::GetDefaultDevice() ) { long nTwips = Application::GetDefaultDevice()->PixelToLogic( Size( nPixel, nPixel ), MapMode( MAP_TWIP ) ).Width(); - return nTwips <= USHRT_MAX ? (USHORT)nTwips : USHRT_MAX; + return nTwips <= USHRT_MAX ? (sal_uInt16)nTwips : USHRT_MAX; } else return nPixel; @@ -4987,7 +4987,7 @@ void SwHTMLParser::InsertIDOption() { String aId; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; if( HTML_O_ID==pOption->GetToken() ) @@ -5024,12 +5024,12 @@ void SwHTMLParser::InsertLineBreak() // harter Zeilenumbruch eingefuegt String aId, aStyle, aClass; // die ID der Bookmark - BOOL bClearLeft = FALSE, bClearRight = FALSE; - BOOL bCleared = FALSE; // wurde ein CLEAR ausgefuehrt? + sal_Bool bClearLeft = sal_False, bClearRight = sal_False; + sal_Bool bCleared = sal_False; // wurde ein CLEAR ausgefuehrt? // dann holen wir mal die Optionen const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -5039,13 +5039,13 @@ void SwHTMLParser::InsertLineBreak() const String &aClear = pOption->GetString(); if( aClear.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_all ) ) { - bClearLeft = TRUE; - bClearRight = TRUE; + bClearLeft = sal_True; + bClearRight = sal_True; } else if( aClear.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_left ) ) - bClearLeft = TRUE; + bClearLeft = sal_True; else if( aClear.EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_AL_right ) ) - bClearRight = TRUE; + bClearRight = sal_True; } break; case HTML_O_ID: @@ -5069,7 +5069,7 @@ void SwHTMLParser::InsertLineBreak() { const SwSpzFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts(); - for( USHORT i=0; i<rFrmFmtTbl.Count(); i++ ) + for( sal_uInt16 i=0; i<rFrmFmtTbl.Count(); i++ ) { SwFrmFmt *const pFmt = rFrmFmtTbl[i]; SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor(); @@ -5102,9 +5102,9 @@ void SwHTMLParser::InsertLineBreak() { SwFmtSurround aSurround( eSurround ); if( SURROUND_NONE != eSurround ) - aSurround.SetAnchorOnly( TRUE ); + aSurround.SetAnchorOnly( sal_True ); pFmt->SetFmtAttr( aSurround ); - bCleared = TRUE; + bCleared = sal_True; } } // Anker ist nicht im Node } // Schleife ueber Fly-Frames @@ -5113,7 +5113,7 @@ void SwHTMLParser::InsertLineBreak() // Styles parsen SvxFmtBreakItem aBreakItem( SVX_BREAK_NONE, RES_BREAK ); - BOOL bBreakItem = FALSE; + sal_Bool bBreakItem = sal_False; if( HasStyleOptions( aStyle, aId, aClass ) ) { SfxItemSet aItemSet( pDoc->GetAttrPool(), pCSS1Parser->GetWhichMap() ); @@ -5124,7 +5124,7 @@ void SwHTMLParser::InsertLineBreak() if( pCSS1Parser->SetFmtBreak( aItemSet, aPropInfo ) ) { aBreakItem = (const SvxFmtBreakItem &)aItemSet.Get( RES_BREAK ); - bBreakItem = TRUE; + bBreakItem = sal_True; } if( aPropInfo.aId.Len() ) InsertBookmark( aPropInfo.aId ); @@ -5134,7 +5134,7 @@ void SwHTMLParser::InsertLineBreak() if( bBreakItem && SVX_BREAK_PAGE_AFTER==aBreakItem.GetBreak() ) { NewAttr( &aAttrTab.pBreak, aBreakItem ); - EndAttr( aAttrTab.pBreak, 0, FALSE ); + EndAttr( aAttrTab.pBreak, 0, sal_False ); } if( !bCleared && !bBreakItem ) @@ -5156,27 +5156,27 @@ void SwHTMLParser::InsertLineBreak() if( bBreakItem && SVX_BREAK_PAGE_BEFORE==aBreakItem.GetBreak() ) { NewAttr( &aAttrTab.pBreak, aBreakItem ); - EndAttr( aAttrTab.pBreak, 0, FALSE ); + EndAttr( aAttrTab.pBreak, 0, sal_False ); } } void SwHTMLParser::InsertHorzRule() { - USHORT nSize = 0; - USHORT nWidth = 0; + sal_uInt16 nSize = 0; + sal_uInt16 nWidth = 0; SvxAdjust eAdjust = SVX_ADJUST_END; - BOOL bPrcWidth = FALSE; - BOOL bNoShade = FALSE; - BOOL bColor = FALSE; + sal_Bool bPrcWidth = sal_False; + sal_Bool bNoShade = sal_False; + sal_Bool bColor = sal_False; Color aColor; String aId; // dann holen wir mal die Optionen const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[--i]; switch( pOption->GetToken() ) @@ -5185,16 +5185,16 @@ void SwHTMLParser::InsertHorzRule() aId = pOption->GetString(); break; case HTML_O_SIZE: - nSize = (USHORT)pOption->GetNumber(); + nSize = (sal_uInt16)pOption->GetNumber(); break; case HTML_O_WIDTH: bPrcWidth = (pOption->GetString().Search('%') != STRING_NOTFOUND); - nWidth = (USHORT)pOption->GetNumber(); + nWidth = (sal_uInt16)pOption->GetNumber(); if( bPrcWidth && nWidth>=100 ) { // 100%-Linien sind der default-Fall (keine Attrs neotig) nWidth = 0; - bPrcWidth = FALSE; + bPrcWidth = sal_False; } break; case HTML_O_ALIGN: @@ -5202,11 +5202,11 @@ void SwHTMLParser::InsertHorzRule() (SvxAdjust)pOption->GetEnum( aHTMLPAlignTable, static_cast< sal_uInt16 >(eAdjust) ); break; case HTML_O_NOSHADE: - bNoShade = TRUE; + bNoShade = sal_True; break; case HTML_O_COLOR: pOption->GetColor( aColor ); - bColor = TRUE; + bColor = sal_True; break; } } @@ -5243,7 +5243,7 @@ void SwHTMLParser::InsertHorzRule() long nPWidth = 0; long nPHeight = (long)nSize; SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight ); - SvxCSS1Parser::SetBorderWidth( aBorderLine, (USHORT)nPHeight, + SvxCSS1Parser::SetBorderWidth( aBorderLine, (sal_uInt16)nPHeight, !bNoShade ); } else if( bNoShade ) @@ -5277,8 +5277,8 @@ void SwHTMLParser::InsertHorzRule() { // Laenge und Ausrichtung der Linie ueber Absatz-Einzuege "tuerken" long nBrowseWidth = GetCurrentBrowseWidth(); - nWidth = bPrcWidth ? (USHORT)((nWidth*nBrowseWidth) / 100) - : ToTwips( (USHORT)nBrowseWidth ); + nWidth = bPrcWidth ? (sal_uInt16)((nWidth*nBrowseWidth) / 100) + : ToTwips( (sal_uInt16)nBrowseWidth ); if( nWidth < MINLAY ) nWidth = MINLAY; @@ -5293,16 +5293,16 @@ void SwHTMLParser::InsertHorzRule() switch( eAdjust ) { case SVX_ADJUST_RIGHT: - aLRItem.SetTxtLeft( (USHORT)nDist ); + aLRItem.SetTxtLeft( (sal_uInt16)nDist ); break; case SVX_ADJUST_LEFT: - aLRItem.SetRight( (USHORT)nDist ); + aLRItem.SetRight( (sal_uInt16)nDist ); break; case SVX_ADJUST_CENTER: default: nDist /= 2; - aLRItem.SetTxtLeft( (USHORT)nDist ); - aLRItem.SetRight( (USHORT)nDist ); + aLRItem.SetTxtLeft( (sal_uInt16)nDist ); + aLRItem.SetRight( (sal_uInt16)nDist ); break; } @@ -5337,21 +5337,21 @@ void SwHTMLParser::InsertHorzRule() void SwHTMLParser::ParseMoreMetaOptions() { String aName, aContent; - BOOL bHTTPEquiv = FALSE; + sal_Bool bHTTPEquiv = sal_False; const HTMLOptions *pHTMLOptions = GetOptions(); - for( USHORT i = pHTMLOptions->Count(); i; ) + for( sal_uInt16 i = pHTMLOptions->Count(); i; ) { const HTMLOption *pOption = (*pHTMLOptions)[ --i ]; switch( pOption->GetToken() ) { case HTML_O_NAME: aName = pOption->GetString(); - bHTTPEquiv = FALSE; + bHTTPEquiv = sal_False; break; case HTML_O_HTTPEQUIV: aName = pOption->GetString(); - bHTTPEquiv = TRUE; + bHTTPEquiv = sal_True; break; case HTML_O_CONTENT: aContent = pOption->GetString(); @@ -5415,9 +5415,9 @@ _HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, nEndPara( rPos.nNode ), nSttCntnt( rPos.nContent.GetIndex() ), nEndCntnt(rPos.nContent.GetIndex() ), - bInsAtStart( TRUE ), - bLikePara( FALSE ), - bValid( TRUE ), + bInsAtStart( sal_True ), + bLikePara( sal_False ), + bValid( sal_True ), nCount( 1 ), pNext( 0 ), pPrev( 0 ), @@ -5427,7 +5427,7 @@ _HTMLAttr::_HTMLAttr( const SwPosition& rPos, const SfxPoolItem& rItem, } _HTMLAttr::_HTMLAttr( const _HTMLAttr &rAttr, const SwNodeIndex &rEndPara, - USHORT nEndCnt, _HTMLAttr **ppHd ) : + sal_uInt16 nEndCnt, _HTMLAttr **ppHd ) : nSttPara( rAttr.nSttPara ), nEndPara( rEndPara ), nSttCntnt( rAttr.nSttCntnt ), @@ -5448,7 +5448,7 @@ _HTMLAttr::~_HTMLAttr() delete pItem; } -_HTMLAttr *_HTMLAttr::Clone( const SwNodeIndex& rEndPara, USHORT nEndCnt ) const +_HTMLAttr *_HTMLAttr::Clone( const SwNodeIndex& rEndPara, sal_uInt16 nEndCnt ) const { // das Attribut mit der alten Start-Position neu anlegen _HTMLAttr *pNew = new _HTMLAttr( *this, rEndPara, nEndCnt, ppHead ); @@ -5459,7 +5459,7 @@ _HTMLAttr *_HTMLAttr::Clone( const SwNodeIndex& rEndPara, USHORT nEndCnt ) const return pNew; } -void _HTMLAttr::Reset( const SwNodeIndex& rSttPara, USHORT nSttCnt, +void _HTMLAttr::Reset( const SwNodeIndex& rSttPara, sal_uInt16 nSttCnt, _HTMLAttr **ppHd ) { // den Anfang (und das Ende) neu setzen |