diff options
Diffstat (limited to 'sw/source/filter/html/htmlfly.cxx')
| -rw-r--r-- | sw/source/filter/html/htmlfly.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/filter/html/htmlfly.cxx b/sw/source/filter/html/htmlfly.cxx index 7e67b99c4a62..9045a8a02618 100644 --- a/sw/source/filter/html/htmlfly.cxx +++ b/sw/source/filter/html/htmlfly.cxx @@ -219,7 +219,7 @@ sal_uInt16 SwHTMLWriter::GuessFrmType( const SwFrmFmt& rFrmFmt, const SfxPoolItem* pItem; const SfxItemSet& rItemSet = rFrmFmt.GetAttrSet(); if( SFX_ITEM_SET == rItemSet.GetItemState( RES_COL, - sal_True, &pItem ) && + true, &pItem ) && ((const SwFmtCol *)pItem)->GetNumCols() > 1 ) { // spaltiger Rahmen @@ -589,7 +589,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, if( (nFrmOpts & HTML_FRMOPT_ALIGN) && !pStr && ( (nFrmOpts & HTML_FRMOPT_S_ALIGN) == 0 || (FLY_AS_CHAR == eAnchorId) ) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_VERT_ORIENT, true, &pItem )) { switch( ((SwFmtVertOrient*)pItem)->GetVertOrient() ) { @@ -615,7 +615,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, // HSPACE und VSPACE Size aTwipSpc( 0, 0 ); if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_LR_SPACE, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_LR_SPACE, true, &pItem )) { aTwipSpc.Width() = ( ((SvxLRSpaceItem*)pItem)->GetLeft() + @@ -623,7 +623,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, nDfltLeftMargin = nDfltRightMargin = aTwipSpc.Width(); } if( (nFrmOpts & (HTML_FRMOPT_SPACE|HTML_FRMOPT_MARGINSIZE)) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_UL_SPACE, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_UL_SPACE, true, &pItem )) { aTwipSpc.Height() = ( ((SvxULSpaceItem*)pItem)->GetUpper() + @@ -670,7 +670,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, } if( !(nFrmOpts & HTML_FRMOPT_ABSSIZE) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, true, &pItem )) { const SvxBoxItem* pBoxItem = (const SvxBoxItem*)pItem; @@ -683,7 +683,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, // WIDTH und/oder HEIGHT // ATT_VAR_SIZE/ATT_MIN_SIZE nur ausgeben, wenn ANYSIZE gesezut ist if( (nFrmOpts & HTML_FRMOPT_SIZE) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, sal_True, &pItem ) && + SFX_ITEM_SET == rItemSet.GetItemState( RES_FRM_SIZE, true, &pItem ) && ( (nFrmOpts & HTML_FRMOPT_ANYSIZE) || ATT_FIX_SIZE == ((const SwFmtFrmSize *)pItem)->GetHeightSizeType()) ) { @@ -750,7 +750,7 @@ OString SwHTMLWriter::OutFrmFmtOptions( const SwFrmFmt &rFrmFmt, if( (nFrmOpts & HTML_FRMOPT_BRCLEAR) && ((FLY_AT_PARA == rFrmFmt.GetAnchor().GetAnchorId()) || (FLY_AT_CHAR == rFrmFmt.GetAnchor().GetAnchorId())) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_SURROUND, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_SURROUND, true, &pItem )) { const SwFmtSurround* pSurround = (const SwFmtSurround*)pItem; sal_Int16 eHoriOri = rFrmFmt.GetHoriOrient().GetHoriOrient(); @@ -836,7 +836,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, // das URL-Attribut nur beruecksichtigen, wenn keine Image-Map // uebergeben wurde if( !pAltImgMap && - SFX_ITEM_SET == rItemSet.GetItemState( RES_URL, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_URL, true, &pItem )) { pURLItem = (const SwFmtURL *)pItem; } @@ -973,7 +973,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, // URL -> <A>...<IMG ... >...</A> const SvxMacroItem *pMacItem = 0; - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, sal_True, &pItem )) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, true, &pItem )) pMacItem = (const SvxMacroItem *)pItem; if( pURLItem || pMacItem ) @@ -1048,7 +1048,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, // Umrandung -> <FONT COLOR = ...>...<IMG ... >...</FONT> sal_uInt16 nBorderWidth = 0; if( (nFrmOpts & HTML_FRMOPT_BORDER) && - SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, sal_True, &pItem )) + SFX_ITEM_SET == rItemSet.GetItemState( RES_BOX, true, &pItem )) { Size aTwipBorder( 0, 0 ); const SvxBoxItem* pBoxItem = (const SvxBoxItem*)pItem; @@ -1134,7 +1134,7 @@ Writer& OutHTML_Image( Writer& rWrt, const SwFrmFmt &rFrmFmt, HTMLOutFuncs::Out_String( rWrt.Strm(), aGraphicInBase64, rHTMLWrt.eDestEnc, &rHTMLWrt.aNonConvertableCharacters ).WriteChar( '\"' ); // Events - if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, sal_True, &pItem )) + if( SFX_ITEM_SET == rItemSet.GetItemState( RES_FRMMACRO, true, &pItem )) { const SvxMacroTableDtor& rMacTable = ((const SvxMacroItem *)pItem)->GetMacroTable(); |