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 /cui | |
| parent | include can be first statement now (diff) | |
| download | core-c184419d523a15fd875f0565e268158be27ac703.tar.gz core-c184419d523a15fd875f0565e268158be27ac703.zip | |
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 'cui')
| -rw-r--r-- | cui/source/tabpages/swpossizetabpage.cxx | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 2eb6f25af02b..caa95e0706b4 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -894,14 +894,6 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet& rSet) if(m_bHtmlMode) { - if( 0 == (m_nHtmlMode & HTMLMODE_SOME_ABS_POS)) - { - if(GetAnchorType() == TextContentAnchorType_AT_PAGE) - { - m_aToParaRB.Check(); - } - m_aToPageRB.Enable(sal_False); - } m_aHoriMirrorCB.Show(sal_False); m_aKeepRatioCB.Enable(sal_False); // #i18732# - hide checkbox in HTML mode @@ -1227,8 +1219,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) m_bAtVertPosModified = sal_True; // special treatment for HTML-Mode with horz-vert-dependencies - if(m_bHtmlMode && m_nHtmlMode & HTMLMODE_SOME_ABS_POS && - TextContentAnchorType_AT_CHARACTER == GetAnchorType()) + if(m_bHtmlMode && TextContentAnchorType_AT_CHARACTER == GetAnchorType()) { sal_Bool bSet = sal_False; if(bHori) @@ -1444,7 +1435,7 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, if(m_bHtmlMode) { m_pVMap = aVParaHtmlMap; - m_pHMap = m_nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHParaHtmlAbsMap : aHParaHtmlMap; + m_pHMap = aHParaHtmlAbsMap; } else { @@ -1456,8 +1447,8 @@ void SvxSwPosSizeTabPage::InitPos(short nAnchor, { if(m_bHtmlMode) { - m_pVMap = m_nHtmlMode & HTMLMODE_SOME_ABS_POS ? aVCharHtmlAbsMap : aVCharHtmlMap; - m_pHMap = m_nHtmlMode & HTMLMODE_SOME_ABS_POS ? aHCharHtmlAbsMap : aHCharHtmlMap; + m_pVMap = aVCharHtmlAbsMap; + m_pHMap = aHCharHtmlAbsMap; } else { |