[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - sfx2/source

Caolán McNamara caolanm at redhat.com
Sat Feb 11 10:26:58 UTC 2017


 sfx2/source/dialog/templdlg.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit a60a6f514c59e4a7e7fee239823d2e932c499bf6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Feb 9 16:33:28 2017 +0000

    Resolves: tdf#101648 disable new/modify of table styles
    
    cause there is no ui for it at the moment, so it crashes
    
    Change-Id: I703449ff69f93b6385d3bf9225abe81682d3b893
    (cherry picked from commit 5f8b6166115cd92bed202d3d8f2ce2d3f74256d4)
    Reviewed-on: https://gerrit.libreoffice.org/34099
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Heiko Tietze <tietze.heiko at googlemail.com>

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index bb25c2b..7ffe615 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -2147,6 +2147,13 @@ VclPtr<PopupMenu> SfxCommonTemplateDialog_Impl::CreateContextMenu()
     pMenu->EnableItem( ID_HIDE, bCanHide );
     pMenu->EnableItem( ID_SHOW, bCanShow );
 
+    const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
+    if (pItem && pItem->GetFamily() == SfxStyleFamily::Table) //tdf#101648, no ui for this yet
+    {
+        pMenu->EnableItem(ID_EDIT, false);
+        pMenu->EnableItem(ID_NEW, false);
+    }
+
     return pMenu;
 }
 


More information about the Libreoffice-commits mailing list