diff options
| author | Harri Pitkänen <hatapitk@iki.fi> | 2012-05-24 17:41:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-05-25 13:45:52 +0300 |
| commit | feeb57e0a63cdcd81898050d059e7933f62c5292 (patch) | |
| tree | 609d1cb15b130171b8918e3ee70097a381891945 | |
| parent | 56f450187343688f20f88e68a849c8dcd660b629 (diff) | |
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
| -rw-r--r-- | sw/source/ui/frmdlg/frmdlg.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/frmdlg/wrap.cxx | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index 226614144475..e8a31ef707a1 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -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); } diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 07f04283dc34..696948996883 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -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()) { |