diff options
| author | Harri Pitkänen <hatapitk@iki.fi> | 2012-08-24 18:53:36 +0300 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2012-08-27 08:11:33 +0000 |
| commit | c184419d523a15fd875f0565e268158be27ac703 (patch) | |
| tree | 1c5bd79aa9c8545f2f53a25f70aa22430df06edb /sw/source/ui/frmdlg/frmpage.cxx | |
| parent | 3e9f9e5e4d301fd97a0da8f6625a652fba0ff471 (diff) | |
Remove remaining checks for HTMLMODE_SOME_ABS_POS
This HTML mode is never disabled for any HTML export options. Thus
it is not necessary to check for it. Completes the cleanup started
in commit feeb57e0a63cdcd81898050d059e7933f62c5292
Change-Id: I3ea27ea52cdc355f19d0d2fb33ac92262df5d13f
Reviewed-on: https://gerrit.libreoffice.org/488
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'sw/source/ui/frmdlg/frmpage.cxx')
| -rw-r--r-- | sw/source/ui/frmdlg/frmpage.cxx | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 4f27ffa5c0ff..b05b030db317 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -902,14 +902,6 @@ void SwFrmPage::Reset( const SfxItemSet &rSet ) if(bHtmlMode) { - if( 0 == (nHtmlMode & HTMLMODE_SOME_ABS_POS)) - { - if (GetAnchor() == FLY_AT_PAGE) - { - aAnchorAtParaRB.Check(); - } - aAnchorAtPageRB.Enable(sal_False); - } aAutoHeightCB.Enable(sal_False); aAutoWidthCB.Enable(sal_False); aMirrorPagesCB.Show(sal_False); @@ -1189,7 +1181,7 @@ void SwFrmPage::InitPos(RndStdIds eId, if(bHtmlMode) { pVMap = aVParaHtmlMap; - pHMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHParaHtmlAbsMap : aHParaHtmlMap; + pHMap = aHParaHtmlAbsMap; } else { @@ -1201,8 +1193,8 @@ void SwFrmPage::InitPos(RndStdIds eId, { if(bHtmlMode) { - pVMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap : aVCharHtmlMap; - pHMap = nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap : aHCharHtmlMap; + pVMap = aVCharHtmlAbsMap; + pHMap = aHCharHtmlAbsMap; } else { @@ -1878,8 +1870,7 @@ IMPL_LINK( SwFrmPage, PosHdl, ListBox *, pLB ) bAtVertPosModified = sal_True; // special treatment for HTML-Mode with horizonal-vertical-dependencies - if(bHtmlMode && nHtmlMode&HTMLMODE_SOME_ABS_POS && - (FLY_AT_CHAR == GetAnchor())) + if(bHtmlMode && (FLY_AT_CHAR == GetAnchor())) { sal_Bool bSet = sal_False; if(bHori) |