diff options
author | Harri Pitkänen <hatapitk@iki.fi> | 2015-04-12 13:21:24 +0300 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-04-14 20:08:42 +0000 |
commit | 3791159628d26364c391330d9bfc67d081d291f9 (patch) | |
tree | 979dd3866c67fd6c7da2f2a87c15921f9ec7b345 | |
parent | eece059c1f728059b536763bffd2d4fc3537833e (diff) |
Remove checks for HTMLMODE_SOME_STYLES
HTMLMODE_SOME_STYLES is enabled if we are in HTML mode (it is
enabled for all HTML modes). These checks for conditionally disabling
some table background controls are not needed anymore.
Change-Id: I10fb73a67ac4bba250da4cea79ff6bae427a1613
Reviewed-on: https://gerrit.libreoffice.org/15264
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 7465f02d8bae..795b8b9cb3f9 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1588,8 +1588,6 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox ) nWhich = pTableBck_Impl->nCellWhich; break; case TBL_DEST_ROW: - if((nHtmlMode & HTMLMODE_ON) && !(nHtmlMode & HTMLMODE_SOME_STYLES)) - m_pLbSelect->Disable(); pActItem = pTableBck_Impl->pRowBrush; nWhich = pTableBck_Impl->nRowWhich; break; diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 0f4930909dec..4f9f8a447f85 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1222,10 +1222,7 @@ void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); if (nId == m_nBackgroundId) { - sal_Int32 nFlagType = SVX_SHOW_TBLCTL; - if(!( m_nHtmlMode & HTMLMODE_ON ) || - m_nHtmlMode & HTMLMODE_SOME_STYLES) - nFlagType |= SVX_SHOW_SELECTOR; + sal_Int32 nFlagType = SVX_SHOW_TBLCTL | SVX_SHOW_SELECTOR; aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); rPage.PageCreated(aSet); } |