framework/source/uielement/resourcemenucontroller.cxx | 6 ++---
sd/UIConfig_sdraw.mk | 2 +
sd/uiconfig/sdraw/popupmenu/pagepanemaster.xml | 20 ++++++++++++++++++
sd/uiconfig/sdraw/popupmenu/pagepanenoselmaster.xml | 16 ++++++++++++++
4 files changed, 41 insertions(+), 3 deletions(-)
New commits:
commit 2bb209eeb9db2243d4a0e9d460adb210c8bfd0c8
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Fri Nov 11 01:27:49 2016 +0200
tdf#103826 Missing master page pane context menus in Draw
(cherry picked from commit 749fe62b32acc3159cf2756aae16df36f091a862)
changes from master: Removed officecfg part to avoid breaking
string freeze, added nullptr check to be on the safe side.
Change-Id: I355e9507692e770063a91d05efd3ebc3e2671d57
Reviewed-on: https://gerrit.libreoffice.org/30766
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/framework/source/uielement/resourcemenucontroller.cxx
b/framework/source/uielement/resourcemenucontroller.cxx
index 57674a1..2358f1b 100644
--- a/framework/source/uielement/resourcemenucontroller.cxx
+++ b/framework/source/uielement/resourcemenucontroller.cxx
@@ -181,6 +181,9 @@ void ResourceMenuController::updatePopupMenu()
}
}
+ if ( !m_xMenuContainer.is() )
+ return;
+
// Clear previous content.
if ( m_xMenuBarManager.is() )
{
@@ -246,9 +249,6 @@ void ResourceMenuController::addVerbs( const
css::uno::Sequence< css::embed::Ver
void ResourceMenuController::fillToolbarData()
{
- if ( !m_xMenuContainer.is() )
- return;
-
VCLXMenu* pAwtMenu = VCLXMenu::GetImplementation( m_xPopupMenu );
Menu* pVCLMenu = pAwtMenu->GetMenu();
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index b166919..089814d 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -34,6 +34,8 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sdraw,\
sd/uiconfig/sdraw/popupmenu/multiselect \
sd/uiconfig/sdraw/popupmenu/oleobject \
sd/uiconfig/sdraw/popupmenu/outlinetext \
+ sd/uiconfig/sdraw/popupmenu/pagepanemaster \
+ sd/uiconfig/sdraw/popupmenu/pagepanenoselmaster \
sd/uiconfig/sdraw/popupmenu/pagepanenosel \
sd/uiconfig/sdraw/popupmenu/pagepane \
sd/uiconfig/sdraw/popupmenu/pagetab \
diff --git a/sd/uiconfig/sdraw/popupmenu/pagepanemaster.xml
b/sd/uiconfig/sdraw/popupmenu/pagepanemaster.xml
new file mode 100644
index 0000000..bf160df
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/pagepanemaster.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu";>
+ <menu:menuitem menu:id=".uno:Cut"/>
+ <menu:menuitem menu:id=".uno:Copy"/>
+ <menu:menuitem menu:id=".uno:Paste"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertMasterPage"/>
+ <menu:menuitem menu:id=".uno:DeleteMasterPage"/>
+ <menu:menuitem menu:id=".uno:RenameMasterPage"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:PresentationLayout"/>
+</menu:menupopup>
diff --git a/sd/uiconfig/sdraw/popupmenu/pagepanenoselmaster.xml
b/sd/uiconfig/sdraw/popupmenu/pagepanenoselmaster.xml
new file mode 100644
index 0000000..919e3c5
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/pagepanenoselmaster.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+-->
+<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu";>
+ <menu:menuitem menu:id=".uno:Cut"/>
+ <menu:menuitem menu:id=".uno:Copy"/>
+ <menu:menuitem menu:id=".uno:Paste"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertMasterPage"/>
+</menu:menupopup>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
