summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2017-01-15 21:02:49 +0200
committerMaxim Monastirsky <momonasmon@gmail.com>2017-01-16 13:07:58 +0000
commit535f2b2b0a21407c4412d14149d271a199c3e6b8 (patch)
tree934fbcebf62de9ace52d160f34ae018c99304058 /cui
parentc5555c1698665011457147b1f15ea00f04665a05 (diff)
Convert RID_MENU_NOTEBOOKBAR to xml
Brings a lot of features (icons, keyboard shortcuts, customization, context menu interception etc.) Other changes: - Make SfxDispatcher::ExecutePopup take PopupMenuFlags arg, to be able to pass NoMouseUpClose, so that the menu won't close on mouse-up under anything != gtk3. - Make .uno:OpenFromWriter and .uno:OpenFromCalc async slots, to avoid crash under gtk3 when recycling the current frame. - Don't show the menu in customization dialog, if experimental mode disabled. Change-Id: Ieea2f73f6b48fbaf4bdfc4acf1a33d25422357cb Reviewed-on: https://gerrit.libreoffice.org/33101 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/customize/cfg.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 695a51c64219..a3406f2f10e0 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1358,6 +1358,8 @@ SvxEntries* ContextMenuSaveInData::GetEntries()
{
if ( !m_pRootEntry )
{
+ bool bExperimental = SvtMiscOptions().IsExperimentalMode();
+
typedef std::unordered_map< OUString, bool, OUStringHash > MenuInfo;
MenuInfo aMenuInfo;
@@ -1382,6 +1384,9 @@ SvxEntries* ContextMenuSaveInData::GetEntries()
}
}
+ if ( !bExperimental && aUrl.endsWith("notebookbar") )
+ continue;
+
css::uno::Reference< css::container::XIndexAccess > xPopupMenu;
try
{
@@ -1430,6 +1435,9 @@ SvxEntries* ContextMenuSaveInData::GetEntries()
}
}
+ if ( !bExperimental && aUrl.endsWith("notebookbar") )
+ continue;
+
css::uno::Reference< css::container::XIndexAccess > xPopupMenu;
try
{