[Libreoffice-commits] core.git: cui/source sw/source

[Harri Pitkänen]

 cui/source/tabpages/backgrnd.cxx |    2 --
 sw/source/ui/table/tabledlg.cxx  |    5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

New commits:
commit 3791159628d26364c391330d9bfc67d081d291f9
Author: Harri Pitkänen <hatapitk at iki.fi>
Date:   Sun Apr 12 13:21:24 2015 +0300

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 7465f02..795b8b9 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 0f49309..4f9f8a4 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);
     }