diff options
Diffstat (limited to 'sw/source/filter/html/htmldrawreader.cxx')
| -rw-r--r-- | sw/source/filter/html/htmldrawreader.cxx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index db0fae6876d2..61b69da31619 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -106,15 +106,15 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem); SvxLRSpaceItem aLRItem( *pLRItem ); aLRItem.SetTextFirstLineOfst( 0 ); - if( rCSS1PropInfo.bLeftMargin ) + if( rCSS1PropInfo.m_bLeftMargin ) { nLeftSpace = static_cast< sal_uInt16 >(aLRItem.GetLeft()); - rCSS1PropInfo.bLeftMargin = false; + rCSS1PropInfo.m_bLeftMargin = false; } - if( rCSS1PropInfo.bRightMargin ) + if( rCSS1PropInfo.m_bRightMargin ) { nRightSpace = static_cast< sal_uInt16 >(aLRItem.GetRight()); - rCSS1PropInfo.bRightMargin = false; + rCSS1PropInfo.m_bRightMargin = false; } rCSS1ItemSet.ClearItem( RES_LR_SPACE ); } @@ -131,15 +131,15 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, { // Ggf. den Erstzeilen-Einzug noch plaetten const SvxULSpaceItem *pULItem = static_cast<const SvxULSpaceItem *>(pItem); - if( rCSS1PropInfo.bTopMargin ) + if( rCSS1PropInfo.m_bTopMargin ) { nUpperSpace = pULItem->GetUpper(); - rCSS1PropInfo.bTopMargin = false; + rCSS1PropInfo.m_bTopMargin = false; } - if( rCSS1PropInfo.bBottomMargin ) + if( rCSS1PropInfo.m_bBottomMargin ) { nLowerSpace = pULItem->GetLower(); - rCSS1PropInfo.bBottomMargin = false; + rCSS1PropInfo.m_bBottomMargin = false; } rCSS1ItemSet.ClearItem( RES_UL_SPACE ); @@ -153,9 +153,9 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, } SwFormatAnchor aAnchor( FLY_AS_CHAR ); - if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition && - SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType && - SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType ) + if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.m_ePosition && + SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.m_eLeftType && + SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.m_eTopType ) { const SwStartNode *pFlySttNd = m_pPam->GetPoint()->nNode.GetNode().FindFlyStartNode(); @@ -171,11 +171,11 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj, aAnchor.SetType( FLY_AT_PAGE ); } // #i26791# - direct positioning for <SwDoc::Insert(..)> - pNewDrawObj->SetRelativePos( Point(rCSS1PropInfo.nLeft + nLeftSpace, - rCSS1PropInfo.nTop + nUpperSpace) ); + pNewDrawObj->SetRelativePos( Point(rCSS1PropInfo.m_nLeft + nLeftSpace, + rCSS1PropInfo.m_nTop + nUpperSpace) ); aFrameSet.Put( SwFormatSurround(SURROUND_THROUGHT) ); } - else if( SVX_ADJUST_LEFT == rCSS1PropInfo.eFloat || + else if( SVX_ADJUST_LEFT == rCSS1PropInfo.m_eFloat || text::HoriOrientation::LEFT == eHoriOri ) { aAnchor.SetType( FLY_AT_PARA ); @@ -468,14 +468,14 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable ) ->PixelToLogic( aTwipSz, MapMode( MapUnit::MapTwip ) ); } - if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eWidthType ) + if( SVX_CSS1_LTYPE_TWIP== aPropInfo.m_eWidthType ) { - aTwipSz.Width() = aPropInfo.nWidth; + aTwipSz.Width() = aPropInfo.m_nWidth; nWidth = 1; // != 0; bPrcWidth = false; } - if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eHeightType ) - aTwipSz.Height() = aPropInfo.nHeight; + if( SVX_CSS1_LTYPE_TWIP== aPropInfo.m_eHeightType ) + aTwipSz.Height() = aPropInfo.m_nHeight; m_bFixMarqueeWidth = false; if( !nWidth || bPrcWidth ) |