Kaydet (Commit) feeb57e0 authored tarafından Harri Pitkänen's avatar Harri Pitkänen Kaydeden (comit) Tor Lillqvist

Cleanup related to always enabled HTMLMODE_SOME_ABS_POS

HTMLMODE_SOME_ABS_POS is enabled in all HTML export modes and thus
code checking for it is not needed anymore.

Change-Id: I416adc2fc6242daf9fa4ccaa9b2634138c5e17d0
üst 56f45018
......@@ -109,8 +109,6 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
switch( m_nDlgType )
{
case DLG_FRM_STD:
if(0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS))
RemoveTabPage(TP_BORDER);
RemoveTabPage(TP_COLUMN);
// no break
case DLG_FRM_OLE:
......@@ -121,8 +119,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame,
RemoveTabPage(RID_SVXPAGE_GRFCROP);
break;
}
if( 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS) ||
m_nDlgType != DLG_FRM_STD )
if( m_nDlgType != DLG_FRM_STD )
RemoveTabPage(TP_BACKGROUND);
}
......
......@@ -519,7 +519,6 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
aWrapTransparentCB.Enable( bEnable && !bHtmlMode && nSur == SURROUND_THROUGHT );
if(bHtmlMode)
{
sal_Bool bSomeAbsPos = 0 != (nHtmlMode & HTMLMODE_SOME_ABS_POS);
const SwFmtHoriOrient& rHori = (const SwFmtHoriOrient&)rSet.Get(RES_HORI_ORIENT);
sal_Int16 eHOrient = rHori.GetHoriOrient();
sal_Int16 eHRelOrient = rHori.GetRelationOrient();
......@@ -551,7 +550,6 @@ void SwWrapTabPage::ActivatePage(const SfxItemSet& rSet)
|| ( (FLY_AT_CHAR == nAnchorId)
&& (eHRelOrient != text::RelOrientation::PRINT_AREA))
|| (FLY_AT_PARA == nAnchorId))
&& bSomeAbsPos
&& (eHOrient != text::HoriOrientation::RIGHT));
if(aNoWrapRB.IsChecked() && !aNoWrapRB.IsEnabled())
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment