summaryrefslogtreecommitdiff
path: root/sw/source/filter/html/htmlcss1.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/filter/html/htmlcss1.cxx')
-rw-r--r--sw/source/filter/html/htmlcss1.cxx104
1 files changed, 52 insertions, 52 deletions
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index c1f0fcdc93d0..1b8bc8385390 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -134,7 +134,7 @@ bool SwCSS1Parser::SetFormatBreak( SfxItemSet& rItemSet,
bool bKeep = false;
bool bSetKeep = false, bSetBreak = false, bSetPageDesc = false;
const SwPageDesc *pPageDesc = nullptr;
- switch( rPropInfo.ePageBreakBefore )
+ switch( rPropInfo.m_ePageBreakBefore )
{
case SVX_CSS1_PBREAK_ALWAYS:
eBreak = SvxBreak::PageBefore;
@@ -154,7 +154,7 @@ bool SwCSS1Parser::SetFormatBreak( SfxItemSet& rItemSet,
default:
;
}
- switch( rPropInfo.ePageBreakAfter )
+ switch( rPropInfo.m_ePageBreakAfter )
{
case SVX_CSS1_PBREAK_ALWAYS:
case SVX_CSS1_PBREAK_LEFT:
@@ -279,29 +279,29 @@ static void SetTextCollAttrs( SwTextFormatColl *pColl, SfxItemSet& rItemSet,
const SfxPoolItem *pCollItem, *pItem;
// linker, rechter Rand und Erstzeilen-Einzug
- if( (rPropInfo.bLeftMargin || rPropInfo.bRightMargin ||
- rPropInfo.bTextIndent) &&
- (!rPropInfo.bLeftMargin || !rPropInfo.bRightMargin ||
- !rPropInfo.bTextIndent) &&
+ if( (rPropInfo.m_bLeftMargin || rPropInfo.m_bRightMargin ||
+ rPropInfo.m_bTextIndent) &&
+ (!rPropInfo.m_bLeftMargin || !rPropInfo.m_bRightMargin ||
+ !rPropInfo.m_bTextIndent) &&
SfxItemState::SET == rCollItemSet.GetItemState(RES_LR_SPACE,true,&pCollItem) &&
SfxItemState::SET == rItemSet.GetItemState(RES_LR_SPACE,false,&pItem) )
{
const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem *>(pCollItem) );
- if( rPropInfo.bLeftMargin )
+ if( rPropInfo.m_bLeftMargin )
aLRItem.SetTextLeft( pLRItem->GetTextLeft() );
- if( rPropInfo.bRightMargin )
+ if( rPropInfo.m_bRightMargin )
aLRItem.SetRight( pLRItem->GetRight() );
- if( rPropInfo.bTextIndent )
+ if( rPropInfo.m_bTextIndent )
aLRItem.SetTextFirstLineOfst( pLRItem->GetTextFirstLineOfst() );
rItemSet.Put( aLRItem );
}
// oberer und unterer Rand
- if( (rPropInfo.bTopMargin || rPropInfo.bBottomMargin) &&
- (!rPropInfo.bTopMargin || !rPropInfo.bBottomMargin) &&
+ if( (rPropInfo.m_bTopMargin || rPropInfo.m_bBottomMargin) &&
+ (!rPropInfo.m_bTopMargin || !rPropInfo.m_bBottomMargin) &&
SfxItemState::SET == rCollItemSet.GetItemState(RES_UL_SPACE,true,
&pCollItem) &&
SfxItemState::SET == rItemSet.GetItemState(RES_UL_SPACE,false,&pItem) )
@@ -309,9 +309,9 @@ static void SetTextCollAttrs( SwTextFormatColl *pColl, SfxItemSet& rItemSet,
const SvxULSpaceItem *pULItem = static_cast<const SvxULSpaceItem *>(pItem);
SvxULSpaceItem aULItem( *static_cast<const SvxULSpaceItem *>(pCollItem) );
- if( rPropInfo.bTopMargin )
+ if( rPropInfo.m_bTopMargin )
aULItem.SetUpper( pULItem->GetUpper() );
- if( rPropInfo.bBottomMargin )
+ if( rPropInfo.m_bBottomMargin )
aULItem.SetLower( pULItem->GetLower() );
rItemSet.Put( aULItem );
@@ -458,19 +458,19 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
bool bChanged = false;
// linker, rechter Rand und Erstzeilen-Einzug
- if( (rPropInfo.bLeftMargin || rPropInfo.bRightMargin) &&
+ if( (rPropInfo.m_bLeftMargin || rPropInfo.m_bRightMargin) &&
SfxItemState::SET == rItemSet.GetItemState(RES_LR_SPACE,false,&pItem) )
{
- if( (!rPropInfo.bLeftMargin || !rPropInfo.bRightMargin) &&
+ if( (!rPropInfo.m_bLeftMargin || !rPropInfo.m_bRightMargin) &&
SfxItemState::SET == rPageItemSet.GetItemState(RES_LR_SPACE,
true,&pPageItem) )
{
const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem *>(pPageItem) );
- if( rPropInfo.bLeftMargin )
+ if( rPropInfo.m_bLeftMargin )
aLRItem.SetLeft( pLRItem->GetLeft() );
- if( rPropInfo.bRightMargin )
+ if( rPropInfo.m_bRightMargin )
aLRItem.SetRight( pLRItem->GetRight() );
rMaster.SetFormatAttr( aLRItem );
@@ -483,19 +483,19 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
}
// oberer und unterer Rand
- if( (rPropInfo.bTopMargin || rPropInfo.bBottomMargin) &&
+ if( (rPropInfo.m_bTopMargin || rPropInfo.m_bBottomMargin) &&
SfxItemState::SET == rItemSet.GetItemState(RES_UL_SPACE,false,&pItem) )
{
- if( (!rPropInfo.bTopMargin || !rPropInfo.bBottomMargin) &&
+ if( (!rPropInfo.m_bTopMargin || !rPropInfo.m_bBottomMargin) &&
SfxItemState::SET == rPageItemSet.GetItemState(RES_UL_SPACE,
true,&pPageItem) )
{
const SvxULSpaceItem *pULItem = static_cast<const SvxULSpaceItem *>(pItem);
SvxULSpaceItem aULItem( *static_cast<const SvxULSpaceItem *>(pPageItem) );
- if( rPropInfo.bTopMargin )
+ if( rPropInfo.m_bTopMargin )
aULItem.SetUpper( pULItem->GetUpper() );
- if( rPropInfo.bBottomMargin )
+ if( rPropInfo.m_bBottomMargin )
aULItem.SetLower( pULItem->GetLower() );
rMaster.SetFormatAttr( aULItem );
@@ -508,12 +508,12 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
}
// die Groesse
- if( rPropInfo.eSizeType != SVX_CSS1_STYPE_NONE )
+ if( rPropInfo.m_eSizeType != SVX_CSS1_STYPE_NONE )
{
- if( rPropInfo.eSizeType == SVX_CSS1_STYPE_TWIP )
+ if( rPropInfo.m_eSizeType == SVX_CSS1_STYPE_TWIP )
{
- rMaster.SetFormatAttr( SwFormatFrameSize( ATT_FIX_SIZE, rPropInfo.nWidth,
- rPropInfo.nHeight ) );
+ rMaster.SetFormatAttr( SwFormatFrameSize( ATT_FIX_SIZE, rPropInfo.m_nWidth,
+ rPropInfo.m_nHeight ) );
bChanged = true;
}
else
@@ -525,9 +525,9 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
SwFormatFrameSize aFrameSz( rMaster.GetFrameSize() );
bool bLandscape = aNewPageDesc.GetLandscape();
if( ( bLandscape &&
- rPropInfo.eSizeType == SVX_CSS1_STYPE_PORTRAIT ) ||
+ rPropInfo.m_eSizeType == SVX_CSS1_STYPE_PORTRAIT ) ||
( !bLandscape &&
- rPropInfo.eSizeType == SVX_CSS1_STYPE_LANDSCAPE ) )
+ rPropInfo.m_eSizeType == SVX_CSS1_STYPE_LANDSCAPE ) )
{
SwTwips nTmp = aFrameSz.GetHeight();
aFrameSz.SetHeight( aFrameSz.GetWidth() );
@@ -979,7 +979,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
if( !pNext ||
(CSS1_SELTYPE_PSEUDO==eNextType &&
pNext->GetString().equalsIgnoreAsciiCase( "first-letter" ) &&
- SVX_ADJUST_LEFT == rPropInfo.eFloat) )
+ SVX_ADJUST_LEFT == rPropInfo.m_eFloat) )
{
// Entweder kein zusammengesetzter Selektor oder
// ein X:first-line { float: left; ... }
@@ -1063,7 +1063,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
// ggf. angelegte Zeichen-Vorlage spaeter ueber den Namen
// gesucht und gesetzt.
if( aDrop.GetLines() > 1 &&
- (SVX_ADJUST_LEFT == rPropInfo.eFloat ||
+ (SVX_ADJUST_LEFT == rPropInfo.m_eFloat ||
CSS1_SCRIPT_ALL == nScript) )
{
pColl->SetFormatAttr( aDrop );
@@ -1441,15 +1441,15 @@ bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
// gegeben und enthalten auch keine %-Angabe, oder
// - das Tag soll fliessen, und
// - es wurde eine Breite angegeben (in beiden Faellen noetig)
- return ( ( SVX_CSS1_POS_ABSOLUTE == rPropInfo.ePosition &&
- SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.eLeftType &&
- SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.eTopType &&
- (SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType ||
- SVX_CSS1_LTYPE_TWIP != rPropInfo.eTopType) ) ||
- ( SVX_ADJUST_END != rPropInfo.eFloat ) ) &&
+ return ( ( SVX_CSS1_POS_ABSOLUTE == rPropInfo.m_ePosition &&
+ SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.m_eLeftType &&
+ SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.m_eTopType &&
+ (SVX_CSS1_LTYPE_TWIP == rPropInfo.m_eLeftType ||
+ SVX_CSS1_LTYPE_TWIP != rPropInfo.m_eTopType) ) ||
+ ( SVX_ADJUST_END != rPropInfo.m_eFloat ) ) &&
( bAutoWidth ||
- SVX_CSS1_LTYPE_TWIP == rPropInfo.eWidthType ||
- SVX_CSS1_LTYPE_PERCENTAGE == rPropInfo.eWidthType );
+ SVX_CSS1_LTYPE_TWIP == rPropInfo.m_eWidthType ||
+ SVX_CSS1_LTYPE_PERCENTAGE == rPropInfo.m_eWidthType );
}
void SwCSS1Parser::AddClassName( OUString& rFormatName, const OUString& rClass )
@@ -1887,7 +1887,7 @@ bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
SvxCSS1Parser::MergeStyles( pId->GetItemSet(),
pId->GetPropertyInfo(),
rItemSet, rPropInfo, !rClass.isEmpty() );
- rPropInfo.aId = rId;
+ rPropInfo.m_aId = rId;
bRet = true;
}
@@ -1948,10 +1948,10 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
sal_Int16 eVertRel = text::RelOrientation::FRAME;
SwTwips nHoriPos = 0, nVertPos = 0;
SwSurround eSurround = SURROUND_THROUGHT;
- if( SVX_CSS1_POS_ABSOLUTE == rPropInfo.ePosition )
+ if( SVX_CSS1_POS_ABSOLUTE == rPropInfo.m_ePosition )
{
- if( SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType &&
- SVX_CSS1_LTYPE_TWIP == rPropInfo.eTopType )
+ if( SVX_CSS1_LTYPE_TWIP == rPropInfo.m_eLeftType &&
+ SVX_CSS1_LTYPE_TWIP == rPropInfo.m_eTopType )
{
// Absolut positionierte Objekte sind seitengebunden, wenn
// sie nicht schon in einem Rahmen stehen und sonst
@@ -1969,8 +1969,8 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
aAnchor.SetType( FLY_AT_PAGE );
aAnchor.SetPageNum( 1 );
}
- nHoriPos = rPropInfo.nLeft;
- nVertPos = rPropInfo.nTop;
+ nHoriPos = rPropInfo.m_nLeft;
+ nVertPos = rPropInfo.m_nTop;
}
else
{
@@ -1978,11 +1978,11 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
aAnchor.SetAnchor( m_pPam->GetPoint() );
eVertOri = text::VertOrientation::TOP;
eVertRel = text::RelOrientation::CHAR;
- if( SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType )
+ if( SVX_CSS1_LTYPE_TWIP == rPropInfo.m_eLeftType )
{
eHoriOri = text::HoriOrientation::NONE;
eHoriRel = text::RelOrientation::PAGE_FRAME;
- nHoriPos = rPropInfo.nLeft;
+ nHoriPos = rPropInfo.m_nLeft;
}
else
{
@@ -2021,7 +2021,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
short nIndent = 0;
GetMarginsFromContextWithNumBul( nLeftSpace, nRightSpace, nIndent );
- if( SVX_ADJUST_RIGHT==rPropInfo.eFloat )
+ if( SVX_ADJUST_RIGHT==rPropInfo.m_eFloat )
{
eHoriOri = text::HoriOrientation::RIGHT;
eHoriRel = nRightSpace ? text::RelOrientation::PRINT_AREA : text::RelOrientation::FRAME;
@@ -2050,28 +2050,28 @@ void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
SwFrameSize eSize = ATT_MIN_SIZE;
SwTwips nWidth = nDfltWidth, nHeight = MINFLY;
sal_uInt8 nPrcWidth = nDfltPrcWidth, nPrcHeight = 0;
- switch( rPropInfo.eWidthType )
+ switch( rPropInfo.m_eWidthType )
{
case SVX_CSS1_LTYPE_PERCENTAGE:
- nPrcWidth = rPropInfo.nWidth > 0 ? (sal_uInt8)rPropInfo.nWidth : 1;
+ nPrcWidth = rPropInfo.m_nWidth > 0 ? (sal_uInt8)rPropInfo.m_nWidth : 1;
nWidth = MINFLY;
break;
case SVX_CSS1_LTYPE_TWIP:
- nWidth = rPropInfo.nWidth > MINFLY ? rPropInfo.nWidth : MINFLY;
+ nWidth = rPropInfo.m_nWidth > MINFLY ? rPropInfo.m_nWidth : MINFLY;
nPrcWidth = 0;
break;
default:
;
}
- switch( rPropInfo.eHeightType )
+ switch( rPropInfo.m_eHeightType )
{
case SVX_CSS1_LTYPE_PERCENTAGE:
- nPrcHeight = rPropInfo.nHeight > 0 ? (sal_uInt8)rPropInfo.nHeight : 1;
+ nPrcHeight = rPropInfo.m_nHeight > 0 ? (sal_uInt8)rPropInfo.m_nHeight : 1;
break;
case SVX_CSS1_LTYPE_TWIP:
// Netscape und MS-IE interpretieren die Hoehe regelwiedrig
// als Mindest-Hoehe, also machwn wir das auch so.
- nHeight = rPropInfo.nHeight > MINFLY ? rPropInfo.nHeight : MINFLY;
+ nHeight = rPropInfo.m_nHeight > MINFLY ? rPropInfo.m_nHeight : MINFLY;
break;
default:
;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 21:51:14 +0000