diff options
author | Caolán McNamara <caolanm@redhat.com> | 2014-03-19 12:28:16 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-19 15:37:57 +0000 |
commit | 69255b7ca8e6c5c6166ae88fe892d64b185cc62a (patch) | |
tree | 0dad05a2ce3e434fcf80e31d4381deff0fb20dec /lotuswordpro | |
parent | 3d1b1eea83703919c43620f9adef05e5b24c4bed (diff) |
fix indent
Change-Id: Ibc1f8cf36730d862cced166e25e306284773f6ad
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwppara.cxx | 143 |
1 files changed, 71 insertions, 72 deletions
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index de58aa65a9db..1dc1ad02bcd6 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -378,7 +378,7 @@ void LwpPara::RegisterStyle() LwpParaProperty* pProps = m_pProps; sal_uInt32 PropType; LwpParaStyle* pParaStyle = dynamic_cast<LwpParaStyle*>(m_ParaStyle.obj()); - while(pProps) + while (pProps) { PropType = pProps->GetType(); switch(PropType) @@ -424,97 +424,96 @@ void LwpPara::RegisterStyle() } } break; - // 01/25/2005 - case PP_LOCAL_BORDER: - { - OverrideParaBorder(pProps, pOverStyle); - break; - } - case PP_LOCAL_BREAKS: - { - OverrideParaBreaks(pProps, pOverStyle); - break; - } - case PP_LOCAL_BULLET: - { - pBulletProps = pProps; -// OverrideParaBullet(pProps); - break; - } - case PP_LOCAL_NUMBERING: - { - pNumberingProps = pProps; -// OverrideParaNumbering(pProps); - break; - } - //end - case PP_LOCAL_TABRACK: - { - //, 01/28/05 - /*LwpTabOverride* pTabOverride=pParaStyle->GetTabOverride(); - if(!pTabOverride) + case PP_LOCAL_BORDER: { - OverrideTab(NULL,static_cast<LwpParaTabRackProperty*>(pProps)->GetTab(),pOverStyle); + OverrideParaBorder(pProps, pOverStyle); + break; } - else + case PP_LOCAL_BREAKS: { - OverrideTab(pTabOverride,static_cast<LwpParaTabRackProperty*>(pProps)->GetTab(),pOverStyle); - }*/ - break; - } - case PP_LOCAL_BACKGROUND: - { -/* LwpBackgroundOverride aBackground; - if (!pParaStyle->GetBackground()) - OverrideBackground(NULL,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle); - else + OverrideParaBreaks(pProps, pOverStyle); + break; + } + case PP_LOCAL_BULLET: { - aBackground = *(pParaStyle->GetaBackground()); - OverrideBackground(&aBackground,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle); + pBulletProps = pProps; + // OverrideParaBullet(pProps); + break; + } + case PP_LOCAL_NUMBERING: + { + pNumberingProps = pProps; + // OverrideParaNumbering(pProps); + break; } -*/ - // modified by , 06/03/2005 - LwpBackgroundOverride* pBGOver = static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(); - if (pBGOver) + //end + case PP_LOCAL_TABRACK: { - LwpBackgroundStuff* pBGStuff = pBGOver->GetBGStuff(); - if (pBGStuff && !pBGStuff->IsTransparent() ) + //, 01/28/05 + /*LwpTabOverride* pTabOverride=pParaStyle->GetTabOverride(); + if(!pTabOverride) { - if (pBGStuff->IsPatternFill()) - { - XFBGImage* pXFBGImage = pBGStuff->GetFillPattern(); - pOverStyle->SetBackImage(pXFBGImage); - } - else + OverrideTab(NULL,static_cast<LwpParaTabRackProperty*>(pProps)->GetTab(),pOverStyle); + } + else + { + OverrideTab(pTabOverride,static_cast<LwpParaTabRackProperty*>(pProps)->GetTab(),pOverStyle); + }*/ + break; + } + case PP_LOCAL_BACKGROUND: + { + /* LwpBackgroundOverride aBackground; + if (!pParaStyle->GetBackground()) + OverrideBackground(NULL,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle); + else + { + aBackground = *(pParaStyle->GetaBackground()); + OverrideBackground(&aBackground,static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(),pOverStyle); + } + */ + // modified by , 06/03/2005 + LwpBackgroundOverride* pBGOver = static_cast<LwpParaBackGroundProperty*>(pProps)->GetBackground(); + if (pBGOver) + { + LwpBackgroundStuff* pBGStuff = pBGOver->GetBGStuff(); + if (pBGStuff && !pBGStuff->IsTransparent() ) { - LwpColor* pColor = pBGStuff->GetFillColor(); - if (pColor && pColor->IsValidColor()) + if (pBGStuff->IsPatternFill()) { - XFColor aXFColor( pColor->To24Color()); - pOverStyle->SetBackColor( aXFColor ); + XFBGImage* pXFBGImage = pBGStuff->GetFillPattern(); + pOverStyle->SetBackImage(pXFBGImage); + } + else + { + LwpColor* pColor = pBGStuff->GetFillColor(); + if (pColor && pColor->IsValidColor()) + { + XFColor aXFColor( pColor->To24Color()); + pOverStyle->SetBackColor( aXFColor ); + } } } } + // end modified + break; + } + default: + break; } - // end modified - break; - } - default: - break; - } pProps = pProps->GetNext(); } if (noIndent && m_pIndentOverride) + { + if (m_pIndentOverride->IsUseRelative() && GetParent()) { - if (m_pIndentOverride->IsUseRelative() && GetParent()) - { OverrideIndent(NULL,m_pIndentOverride,pOverStyle); - } } - if (!m_ParentStyleName.isEmpty()) - pOverStyle->SetParentStyleName(m_ParentStyleName); - m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName(); + } + if (!m_ParentStyleName.isEmpty()) + pOverStyle->SetParentStyleName(m_ParentStyleName); + m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName(); } else //use named style |