mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove checks for HTMLMODE_SOME_STYLES

Browse Source 
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>
This commit is contained in:
Harri Pitkänen
2015-04-12 13:21:24 +03:00
committed by Caolán McNamara
parent eece059c1f
commit 3791159628
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cui/source/tabpages/backgrnd.cxx
View File

@@ -1588,8 +1588,6 @@ IMPL_LINK( SvxBackgroundTabPage, TblDestinationHdl_Impl, ListBox*, pBox )
nWhich = pTableBck_Impl->nCellWhich; nWhich = pTableBck_Impl->nCellWhich;
break; break;
case TBL_DEST_ROW: case TBL_DEST_ROW:
if((nHtmlMode & HTMLMODE_ON) && !(nHtmlMode & HTMLMODE_SOME_STYLES))
m_pLbSelect->Disable();
pActItem = pTableBck_Impl->pRowBrush; pActItem = pTableBck_Impl->pRowBrush;
nWhich = pTableBck_Impl->nRowWhich; nWhich = pTableBck_Impl->nRowWhich;
break; break;

5
sw/source/ui/table/tabledlg.cxx
View File

@@ -1222,10 +1222,7 @@ void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
if (nId == m_nBackgroundId) if (nId == m_nBackgroundId)
{ {
sal_Int32 nFlagType = SVX_SHOW_TBLCTL; sal_Int32 nFlagType = SVX_SHOW_TBLCTL | SVX_SHOW_SELECTOR;
if(!( m_nHtmlMode & HTMLMODE_ON ) ||
m_nHtmlMode & HTMLMODE_SOME_STYLES)
nFlagType |= SVX_SHOW_SELECTOR;
aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType)); aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, nFlagType));
rPage.PageCreated(aSet); rPage.PageCreated(aSet);
} }