[Libreoffice-commits] core.git: 4 commits - basctl/inc basctl/source basctl/uiconfig basctl/UIConfig_basicide.mk include/svx officecfg/registry sc/source sc/uiconfig sc/UIConfig_scalc.mk sd/sdi sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk svx/AllLangResTarget_svx.mk svx/inc svx/Library_svx.mk svx/source sw/inc sw/source sw/uiconfig sw/UIConfig_sglobal.mk sw/UIConfig_sweb.mk sw/UIConfig_swform.mk sw/UIConfig_swreport.mk sw/UIConfig_swriter.mk sw/UIConfig_swxform.mk
Maxim Monastirsky
momonasmon at gmail.com
Sun Feb 21 14:43:12 UTC 2016
basctl/UIConfig_basicide.mk | 4
basctl/inc/basidesh.hrc | 1
basctl/source/basicide/baside3.cxx | 6
basctl/source/basicide/basidesh.cxx | 2
basctl/source/basicide/basidesh.src | 14
basctl/uiconfig/basicide/popupmenu/dialog.xml | 16
include/svx/fmresids.hrc | 4
include/svx/fntctl.hxx | 53 --
include/svx/fntszctl.hxx | 52 --
include/svx/svxcommands.h | 3
officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu | 25 +
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 3
officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 5
officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu | 5
sc/UIConfig_scalc.mk | 1
sc/source/ui/app/scdll.cxx | 6
sc/source/ui/docshell/docsh4.cxx | 5
sc/uiconfig/scalc/popupmenu/chart.xml | 4
sc/uiconfig/scalc/popupmenu/draw.xml | 4
sc/uiconfig/scalc/popupmenu/form.xml | 4
sc/uiconfig/scalc/popupmenu/formrichtext.xml | 46 ++
sc/uiconfig/scalc/popupmenu/graphic.xml | 4
sc/uiconfig/scalc/popupmenu/media.xml | 4
sc/uiconfig/scalc/popupmenu/oleobject.xml | 4
sd/UIConfig_sdraw.mk | 4
sd/UIConfig_simpress.mk | 4
sd/sdi/_docsh.sdi | 4
sd/source/ui/app/sddll.cxx | 7
sd/source/ui/docshell/docshell.cxx | 4
sd/uiconfig/sdraw/popupmenu/formrichtext.xml | 46 ++
sd/uiconfig/simpress/popupmenu/formrichtext.xml | 46 ++
svx/AllLangResTarget_svx.mk | 1
svx/Library_svx.mk | 2
svx/inc/fmhelp.hrc | 3
svx/inc/globlmn_tmpl.hrc | 25 -
svx/source/form/fmtextcontrolshell.cxx | 2
svx/source/form/formshell.src | 153 --------
svx/source/mnuctrls/fntctl.cxx | 149 --------
svx/source/mnuctrls/fntszctl.cxx | 184 ----------
sw/UIConfig_sglobal.mk | 2
sw/UIConfig_sweb.mk | 2
sw/UIConfig_swform.mk | 2
sw/UIConfig_swreport.mk | 2
sw/UIConfig_swriter.mk | 2
sw/UIConfig_swxform.mk | 2
sw/inc/swcommands.h | 8
sw/source/uibase/app/swmodule.cxx | 6
sw/source/uibase/inc/ribbar.hrc | 1
sw/source/uibase/inc/workctrl.hxx | 14
sw/source/uibase/ribbar/workctrl.cxx | 61 ---
sw/source/uibase/ribbar/workctrl.src | 58 ---
sw/uiconfig/sglobal/menubar/menubar.xml | 14
sw/uiconfig/sglobal/popupmenu/formrichtext.xml | 46 ++
sw/uiconfig/sglobal/popupmenu/insertfield.xml | 20 +
sw/uiconfig/sweb/menubar/menubar.xml | 12
sw/uiconfig/sweb/popupmenu/formrichtext.xml | 43 ++
sw/uiconfig/sweb/popupmenu/insertfield.xml | 18
sw/uiconfig/swform/menubar/menubar.xml | 14
sw/uiconfig/swform/popupmenu/formrichtext.xml | 46 ++
sw/uiconfig/swform/popupmenu/insertfield.xml | 20 +
sw/uiconfig/swreport/menubar/menubar.xml | 14
sw/uiconfig/swreport/popupmenu/formrichtext.xml | 46 ++
sw/uiconfig/swreport/popupmenu/insertfield.xml | 20 +
sw/uiconfig/swriter/menubar/menubar.xml | 14
sw/uiconfig/swriter/popupmenu/formrichtext.xml | 46 ++
sw/uiconfig/swriter/popupmenu/insertfield.xml | 20 +
sw/uiconfig/swxform/menubar/menubar.xml | 14
sw/uiconfig/swxform/popupmenu/formrichtext.xml | 46 ++
sw/uiconfig/swxform/popupmenu/insertfield.xml | 20 +
78 files changed, 690 insertions(+), 897 deletions(-)
New commits:
commit 69c5252a63d6124a90b652c423dbf94d26fe196b
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun Feb 21 16:33:30 2016 +0200
tdf#93837 Convert RID_FM_TEXTATTRIBUTE_MENU to xml
Change-Id: Ic37bfb9e25eba9b03b2c896c904823aec478355e
diff --git a/include/svx/fmresids.hrc b/include/svx/fmresids.hrc
index c2174af..a6d8788 100644
--- a/include/svx/fmresids.hrc
+++ b/include/svx/fmresids.hrc
@@ -75,10 +75,6 @@
#define RID_SVXMNU_CELL (RID_FORMS_START + 3)
#define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4)
#define RID_FM_FILTER_MENU (RID_FORMS_START + 5)
-#define RID_FM_TEXTATTRIBUTE_MENU (RID_FORMS_START + 6)
-#define MENU_FM_TEXTATTRIBITES_STYLE (RID_FORMS_START + 7)
-#define MENU_FM_TEXTATTRIBITES_ALIGNMENT (RID_FORMS_START + 8)
-#define MENU_FM_TEXTATTRIBITES_SPACING (RID_FORMS_START + 9)
#define RID_MENU_DATANAVIGATOR (RID_FORMS_START + 10)
// String-Id's -----------------------------------------------------------
diff --git a/include/svx/fntctl.hxx b/include/svx/fntctl.hxx
deleted file mode 100644
index e570508..0000000
--- a/include/svx/fntctl.hxx
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_FNTCTL_HXX
-#define INCLUDED_SVX_FNTCTL_HXX
-
-#include <sfx2/mnuitem.hxx>
-#include <svl/lstner.hxx>
-#include <svx/svxdllapi.h>
-
-
-class FontNameMenu;
-class SfxBindings;
-
-// class SvxFontMenuControl ----------------------------------------------
-
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontMenuControl : public SfxMenuControl, public SfxListener
-{
-private:
- FontNameMenu* pMenu;
- Menu& rParent;
-
- SVX_DLLPRIVATE void FillMenu();
- DECL_LINK_TYPED( MenuSelect, FontNameMenu *, void);
- SVX_DLLPRIVATE virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState ) override;
- SVX_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
-
-public:
- SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& );
- virtual ~SvxFontMenuControl();
-
- SFX_DECL_MENU_CONTROL();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fntszctl.hxx b/include/svx/fntszctl.hxx
deleted file mode 100644
index 2919f8e..0000000
--- a/include/svx/fntszctl.hxx
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_SVX_FNTSZCTL_HXX
-#define INCLUDED_SVX_FNTSZCTL_HXX
-
-#include <sfx2/mnuitem.hxx>
-#include <svx/svxdllapi.h>
-
-
-class SfxBindings;
-class FontSizeMenu;
-
-// class SvxFontSizeMenuControl ------------------------------------------
-
-class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxFontSizeMenuControl : public SfxMenuControl
-{
-private:
- FontSizeMenu* pMenu;
- Menu& rParent;
-
- DECL_LINK_TYPED( MenuSelect, FontSizeMenu *, void );
-
-protected:
- virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
- const SfxPoolItem* pState ) override;
-
-public:
- SvxFontSizeMenuControl( sal_uInt16 nId, Menu&, SfxBindings& );
- virtual ~SvxFontSizeMenuControl();
-
- SFX_DECL_MENU_CONTROL();
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index 4d2cb3b..7ecdaa0 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -109,8 +109,6 @@
#define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15"
#define CMD_SID_ATTR_PARA_LINESPACE_20 ".uno:SpacePara2"
#define CMD_SID_ATTR_CHAR_STRIKEOUT ".uno:Strikeout"
-#define CMD_SID_SET_SUB_SCRIPT ".uno:SubScript"
-#define CMD_SID_SET_SUPER_SCRIPT ".uno:SuperScript"
#define CMD_SID_FM_TAB_DIALOG ".uno:TabDialog"
#define CMD_SID_FM_TIMEFIELD ".uno:TimeField"
#define CMD_SID_BEZIER_EDIT ".uno:ToggleObjectBezierMode"
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index 2ec5c22..6b798c5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -60,6 +60,11 @@
<value xml:lang="en-US">Form Control</value>
</prop>
</node>
+ <node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box Formatting</value>
+ </prop>
+ </node>
<node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Image</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
index d6ca109..fde167d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
@@ -20,6 +20,11 @@
<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="DrawWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box Formatting</value>
+ </prop>
+ </node>
<node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>1,0</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 24dc9ba..940a77b 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5682,6 +5682,11 @@
</node>
</node>
<node oor:name="Popups">
+ <node oor:name=".uno:StyleMenu" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">St~yle</value>
+ </prop>
+ </node>
<node oor:name=".uno:HelpMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Help</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
index c23ad34..f67882d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
@@ -20,6 +20,11 @@
<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="ImpressWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box Formatting</value>
+ </prop>
+ </node>
<node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>1,1</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
index e65812d..e273ec0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value>
</prop>
</node>
+ <node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box Formatting</value>
+ </prop>
+ </node>
<node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
index c3b4c20..7d1baa4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value>
</prop>
</node>
+ <node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box Formatting</value>
+ </prop>
+ </node>
<node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
index 7846594..8d7cae8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value>
</prop>
</node>
+ <node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box Formatting</value>
+ </prop>
+ </node>
<node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
index b6eca80..ccbc3ca 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
@@ -30,6 +30,11 @@
<value xml:lang="en-US">Form Control</value>
</prop>
</node>
+ <node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box Formatting</value>
+ </prop>
+ </node>
<node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
index 7ae2339c..7a01aa3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value>
</prop>
</node>
+ <node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box Formatting</value>
+ </prop>
+ </node>
<node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
index 1c71f75..1f8294a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value>
</prop>
</node>
+ <node oor:name="private:resource/popupmenu/formrichtext" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Text Box Formatting</value>
+ </prop>
+ </node>
<node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value>
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 4d92e3c..c83b2f8 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
sc/uiconfig/scalc/popupmenu/draw \
sc/uiconfig/scalc/popupmenu/drawtext \
sc/uiconfig/scalc/popupmenu/form \
+ sc/uiconfig/scalc/popupmenu/formrichtext \
sc/uiconfig/scalc/popupmenu/freezepanes \
sc/uiconfig/scalc/popupmenu/graphic \
sc/uiconfig/scalc/popupmenu/media \
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 907e768..e83cc18 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -75,8 +75,6 @@
#include <editeng/flditem.hxx>
#include <svx/modctrl.hxx>
#include <svx/pszctrl.hxx>
-#include <svx/fntctl.hxx>
-#include <svx/fntszctl.hxx>
#include <svx/grafctrl.hxx>
#include <svx/clipboardctl.hxx>
#include <svx/lboxctrl.hxx>
@@ -204,10 +202,6 @@ void ScDLL::Init()
SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod);
- // SvxMenu Controller
- SvxFontMenuControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);
- SvxFontSizeMenuControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
-
// CustomShape extrusion controller
SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod );
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index acf223b..98f094b 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -28,6 +28,7 @@ using namespace ::com::sun::star;
#include <math.h>
#include "scitems.hxx"
+#include <editeng/flstitem.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/docfile.hxx>
@@ -1849,6 +1850,10 @@ void ScDocShell::GetState( SfxItemSet &rSet )
}
break;
+ case SID_ATTR_CHAR_FONTLIST:
+ rSet.Put( SvxFontListItem( pImpl->pFontList, nWhich ) );
+ break;
+
default:
{
}
diff --git a/sc/uiconfig/scalc/popupmenu/formrichtext.xml b/sc/uiconfig/scalc/popupmenu/formrichtext.xml
new file mode 100644
index 0000000..f5f8f7a
--- /dev/null
+++ b/sc/uiconfig/scalc/popupmenu/formrichtext.xml
@@ -0,0 +1,46 @@
+<?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:CharFontName"/>
+ <menu:menuitem menu:id=".uno:FontHeight"/>
+ <menu:menu menu:id=".uno:StyleMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:Bold"/>
+ <menu:menuitem menu:id=".uno:Italic"/>
+ <menu:menuitem menu:id=".uno:Overline"/>
+ <menu:menuitem menu:id=".uno:Underline"/>
+ <menu:menuitem menu:id=".uno:Strikeout"/>
+ <menu:menuitem menu:id=".uno:Shadowed"/>
+ <menu:menuitem menu:id=".uno:OutlineFont"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SuperScript"/>
+ <menu:menuitem menu:id=".uno:SubScript"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:TextAlign">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:FormatSpacingMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara15"/>
+ <menu:menuitem menu:id=".uno:SpacePara2"/>
+ </menu:menupopup>
+ </menu:menu>
+</menu:menupopup>
diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk
index cb2c84b..dc0f1e1 100644
--- a/sd/UIConfig_sdraw.mk
+++ b/sd/UIConfig_sdraw.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sdraw,\
sd/uiconfig/sdraw/menubar/menubar \
))
+$(eval $(call gb_UIConfig_add_popupmenufiles,modules/sdraw,\
+ sd/uiconfig/sdraw/popupmenu/formrichtext \
+))
+
$(eval $(call gb_UIConfig_add_statusbarfiles,modules/sdraw,\
sd/uiconfig/sdraw/statusbar/statusbar \
))
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index a0d70e9..7adf181 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -13,6 +13,10 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/simpress,\
sd/uiconfig/simpress/menubar/menubar \
))
+$(eval $(call gb_UIConfig_add_popupmenufiles,modules/simpress,\
+ sd/uiconfig/simpress/popupmenu/formrichtext \
+))
+
$(eval $(call gb_UIConfig_add_statusbarfiles,modules/simpress,\
sd/uiconfig/simpress/statusbar/statusbar \
))
diff --git a/sd/sdi/_docsh.sdi b/sd/sdi/_docsh.sdi
index 5f26309..2902e51 100644
--- a/sd/sdi/_docsh.sdi
+++ b/sd/sdi/_docsh.sdi
@@ -17,6 +17,10 @@
*/
interface DrawDocument
{
+ SID_ATTR_CHAR_FONTLIST
+ [
+ StateMethod = GetState ;
+ ]
SID_PACKNGO // ole : ?, status : ?
[
ExecMethod = Execute ;
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index 8291d1a..b2c6721 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -66,8 +66,6 @@
#include <svx/clipboardctl.hxx>
#include <svx/f3dchild.hxx>
#include <svx/fillctrl.hxx>
-#include <svx/fntctl.hxx>
-#include <svx/fntszctl.hxx>
#include <svx/fontwork.hxx>
#include <svx/formatpaintbrushctrl.hxx>
#include <svx/ParaLineSpacingPopup.hxx>
@@ -91,6 +89,7 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
+#include <sfx2/mnuitem.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <vcl/FilterConfigItem.hxx>
#include <comphelper/processfactory.hxx>
@@ -218,10 +217,6 @@ void SdDLL::RegisterControllers()
SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, pMod );
- // MenuControls for PopupMenu
- SvxFontMenuControl::RegisterControl( SID_ATTR_CHAR_FONT, pMod );
- SvxFontSizeMenuControl::RegisterControl( SID_ATTR_CHAR_FONTHEIGHT, pMod );
-
SfxMenuControl::RegisterControl( SID_SET_SNAPITEM, pMod );
SfxMenuControl::RegisterControl( SID_DELETE_SNAPITEM, pMod );
SfxMenuControl::RegisterControl( SID_BEZIER_CLOSE, pMod );
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index f47b0a7..0295166 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -215,6 +215,10 @@ void DrawDocShell::GetState(SfxItemSet &rSet)
switch ( nSlotId )
{
+ case SID_ATTR_CHAR_FONTLIST:
+ rSet.Put( SvxFontListItem( mpFontList, nSlotId ) );
+ break;
+
case SID_SEARCH_ITEM:
{
rSet.Put( *SD_MOD()->GetSearchItem() );
diff --git a/sd/uiconfig/sdraw/popupmenu/formrichtext.xml b/sd/uiconfig/sdraw/popupmenu/formrichtext.xml
new file mode 100644
index 0000000..f5f8f7a
--- /dev/null
+++ b/sd/uiconfig/sdraw/popupmenu/formrichtext.xml
@@ -0,0 +1,46 @@
+<?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:CharFontName"/>
+ <menu:menuitem menu:id=".uno:FontHeight"/>
+ <menu:menu menu:id=".uno:StyleMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:Bold"/>
+ <menu:menuitem menu:id=".uno:Italic"/>
+ <menu:menuitem menu:id=".uno:Overline"/>
+ <menu:menuitem menu:id=".uno:Underline"/>
+ <menu:menuitem menu:id=".uno:Strikeout"/>
+ <menu:menuitem menu:id=".uno:Shadowed"/>
+ <menu:menuitem menu:id=".uno:OutlineFont"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SuperScript"/>
+ <menu:menuitem menu:id=".uno:SubScript"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:TextAlign">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:FormatSpacingMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara15"/>
+ <menu:menuitem menu:id=".uno:SpacePara2"/>
+ </menu:menupopup>
+ </menu:menu>
+</menu:menupopup>
diff --git a/sd/uiconfig/simpress/popupmenu/formrichtext.xml b/sd/uiconfig/simpress/popupmenu/formrichtext.xml
new file mode 100644
index 0000000..f5f8f7a
--- /dev/null
+++ b/sd/uiconfig/simpress/popupmenu/formrichtext.xml
@@ -0,0 +1,46 @@
+<?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:CharFontName"/>
+ <menu:menuitem menu:id=".uno:FontHeight"/>
+ <menu:menu menu:id=".uno:StyleMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:Bold"/>
+ <menu:menuitem menu:id=".uno:Italic"/>
+ <menu:menuitem menu:id=".uno:Overline"/>
+ <menu:menuitem menu:id=".uno:Underline"/>
+ <menu:menuitem menu:id=".uno:Strikeout"/>
+ <menu:menuitem menu:id=".uno:Shadowed"/>
+ <menu:menuitem menu:id=".uno:OutlineFont"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SuperScript"/>
+ <menu:menuitem menu:id=".uno:SubScript"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:TextAlign">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:FormatSpacingMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara15"/>
+ <menu:menuitem menu:id=".uno:SpacePara2"/>
+ </menu:menupopup>
+ </menu:menu>
+</menu:menupopup>
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 70d165a..bb104d6 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/form/filtnav.src \
svx/source/form/fmexpl.src \
svx/source/form/fmstring.src \
- svx/source/form/formshell.src \
svx/source/items/svxerr.src \
svx/source/items/svxitems.src \
svx/source/sidebar/EmptyPanel.src \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index c26c036..296312d 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -163,8 +163,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/items/viewlayoutitem \
svx/source/items/zoomslideritem \
svx/source/mnuctrls/clipboardctl \
- svx/source/mnuctrls/fntctl \
- svx/source/mnuctrls/fntszctl \
svx/source/mnuctrls/smarttagmenu \
svx/source/sidebar/ContextChangeEventMultiplexer \
svx/source/sidebar/EmptyPanel \
diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc
index 35eb10d..bb9db34 100644
--- a/svx/inc/fmhelp.hrc
+++ b/svx/inc/fmhelp.hrc
@@ -58,9 +58,6 @@
#define HID_FM_NEW_FORM "SVX_HID_FM_NEW_FORM"
#define HID_FM_NEW_HIDDEN "SVX_HID_FM_NEW_HIDDEN"
#define HID_FM_RENAME_OBJECT "SVX_HID_FM_RENAME_OBJECT"
-#define HID_MENU_FM_TEXTATTRIBUTES_STYLE "SVX_HID_MENU_FM_TEXTATTRIBUTES_STYLE"
-#define HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT "SVX_HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT"
-#define HID_MENU_FM_TEXTATTRIBUTES_SPACING "SVX_HID_MENU_FM_TEXTATTRIBUTES_SPACING"
#endif
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 5701b99..300f4e9 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -98,31 +98,6 @@
Command = ".uno:Overline" ; \
Text [ en-US ] = "Overline" ;\
-#define ITEM_FORMAT_ATTR_CHAR_STRIKEOUT \
- Identifier = SID_ATTR_CHAR_STRIKEOUT ; \
- Command = ".uno:Strikeout" ; \
- Text [ en-US ] = "Strikethrough" ;\
-
-#define ITEM_FORMAT_ATTR_CHAR_SHADOWED \
- Identifier = SID_ATTR_CHAR_SHADOWED ; \
- Command = ".uno:Shadowed" ; \
- Text [ en-US ] = "Shadow" ;\
-
-#define ITEM_FORMAT_ATTR_CHAR_CONTOUR \
- Identifier = SID_ATTR_CHAR_CONTOUR ; \
- Command = ".uno:OutlineFont" ; \
- Text [ en-US ] = "Outline" ;\
-
-#define ITEM_FORMAT_SET_SUPER_SCRIPT \
- Identifier = SID_SET_SUPER_SCRIPT; \
- Command = CMD_SID_SET_SUPER_SCRIPT; \
- Text [ en-US ] = "Su~perscript"; \
-
-#define ITEM_FORMAT_SET_SUB_SCRIPT \
- Identifier = SID_SET_SUB_SCRIPT; \
- Command = CMD_SID_SET_SUB_SCRIPT; \
- Text [ en-US ] = "Su~bscript"; \
-
#define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \
Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \
Command = ".uno:LeftPara" ; \
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index 97a8b99..e5c8aa5 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -1355,7 +1355,7 @@ namespace svx
void FmTextControlShell::contextMenuRequested( const css::awt::MouseEvent& /*_rEvent*/ )
{
- m_rBindings.GetDispatcher()->ExecutePopup( SVX_RES( RID_FM_TEXTATTRIBUTE_MENU ) );
+ m_rBindings.GetDispatcher()->ExecutePopup( "formrichtext" );
}
diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src
deleted file mode 100644
index 339cb17..0000000
--- a/svx/source/form/formshell.src
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "svx/fmresids.hrc"
-#include <svx/svxids.hrc>
-#include <svx/dialogs.hrc>
-#include <sfx2/sfxsids.hrc>
-#include "globlmn.hrc"
-#include "helpid.hrc"
-#include "fmhelp.hrc"
-
-Menu RID_FM_TEXTATTRIBUTE_MENU
-{
- ItemList =
- {
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_FONT
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT
- };
- MenuItem
- {
- Identifier = MENU_FM_TEXTATTRIBITES_STYLE;
- HelpID = HID_MENU_FM_TEXTATTRIBUTES_STYLE;
- Text [ en-US ] = "St~yle";
- SubMenu = Menu
- {
- ItemList =
- {
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_WEIGHT
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_POSTURE
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_OVERLINE
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_UNDERLINE
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_STRIKEOUT
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_SHADOWED
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_CHAR_CONTOUR
- };
- MenuItem { Separator = TRUE; };
- MenuItem
- {
- ITEM_FORMAT_SET_SUPER_SCRIPT
- };
- MenuItem
- {
- ITEM_FORMAT_SET_SUB_SCRIPT
- };
- };
- };
- };
- MenuItem
- {
- Identifier = MENU_FM_TEXTATTRIBITES_ALIGNMENT;
- HelpID = HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT;
- Text [ en-US ] = "~Alignment";
- RadioCheck = TRUE;
- SubMenu = Menu
- {
- ItemList =
- {
- MenuItem
- {
- RadioCheck = TRUE;
- ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT
- };
- MenuItem
- {
- RadioCheck = TRUE;
- ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT
- };
- MenuItem
- {
- RadioCheck = TRUE;
- ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER
- };
- MenuItem
- {
- ITEM_FORMAT_ATTR_PARA_ADJUST_BLOCK
- RadioCheck = TRUE;
- };
- };
- };
- };
- MenuItem
- {
- Identifier = MENU_FM_TEXTATTRIBITES_SPACING;
- HelpID = HID_MENU_FM_TEXTATTRIBUTES_SPACING;
- Text [ en-US ] = "~Line Spacing";
- _MenuItemFlags = MIB_RADIOCHECK;
- SubMenu = Menu
- {
- ItemList =
- {
- MenuItem
- {
- RadioCheck = TRUE;
- ITEM_FORMAT_PARA_LINESPACE_10
- };
- MenuItem
- {
- RadioCheck = TRUE;
- ITEM_FORMAT_PARA_LINESPACE_15
- };
- MenuItem
- {
- RadioCheck = TRUE;
- ITEM_FORMAT_PARA_LINESPACE_20
- };
- };
- };
- };
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/mnuctrls/fntctl.cxx b/svx/source/mnuctrls/fntctl.cxx
deleted file mode 100644
index ea92075..0000000
--- a/svx/source/mnuctrls/fntctl.cxx
+++ /dev/null
@@ -1,149 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <string>
-#include <svtools/stdmenu.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/dispatch.hxx>
-
-#include <svx/fntctl.hxx>
-#include <svx/svxids.hrc>
-#include "editeng/flstitem.hxx"
-#include "editeng/fontitem.hxx"
-
-SFX_IMPL_MENU_CONTROL(SvxFontMenuControl, SvxFontItem);
-
-
-/* [Beschreibung]
-
- Ctor; setzt den Select-Handler am Men"u und tr"agt das Men"u
- in seinen Parent ein.
-*/
-
-SvxFontMenuControl::SvxFontMenuControl
-(
- sal_uInt16 _nId,
- Menu& rMenu,
- SfxBindings& rBindings
-) :
- pMenu ( new FontNameMenu ),
- rParent ( rMenu )
-{
- rMenu.SetPopupMenu( _nId, pMenu );
- pMenu->SetSelectHdl( LINK( this, SvxFontMenuControl, MenuSelect ) );
- StartListening( rBindings );
- FillMenu();
-}
-
-
-/* [Beschreibung]
-
- F"ullt das Men"u mit den aktuellen Fonts aus der Fontlist
- der DocumentShell.
-*/
-
-void SvxFontMenuControl::FillMenu()
-{
- SfxObjectShell *pDoc = SfxObjectShell::Current();
-
- if ( pDoc )
- {
- const SvxFontListItem* pFonts =
- static_cast<const SvxFontListItem*>(pDoc->GetItem( SID_ATTR_CHAR_FONTLIST ));
- const FontList* pList = pFonts ? pFonts->GetFontList(): nullptr;
- DBG_ASSERT( pList, "Kein Fonts gefunden" );
- pMenu->Fill( pList );
- }
-}
-
-
-/* [Beschreibung]
-
- Statusbenachrichtigung;
- f"ullt ggf. das Men"u mit den aktuellen Fonts aus der Fontlist
- der DocumentShell.
- Ist die Funktionalit"at disabled, wird der entsprechende
- Men"ueintrag im Parentmen"u disabled, andernfalls wird er enabled.
- Der aktuelle Font wird mit einer Checkmark versehen.
-*/
-
-void SvxFontMenuControl::StateChanged(
-
- sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
-
-{
- rParent.EnableItem( GetId(), SfxItemState::DISABLED != eState );
-
- if ( SfxItemState::DEFAULT == eState )
- {
- if ( !pMenu->GetItemCount() )
- FillMenu();
- const SvxFontItem* pFontItem = dynamic_cast<const SvxFontItem*>( pState );
- OUString aFont;
-
- if ( pFontItem )
- aFont = pFontItem->GetFamilyName();
- pMenu->SetCurName( aFont );
- }
-}
-
-
-/* [Beschreibung]
-
- Statusbenachrichtigung "uber Bindings; bei DOCCHANGED
- wird das Men"u mit den aktuellen Fonts aus der Fontlist
- der DocumentShell gef"ullt.
-*/
-
-void SvxFontMenuControl::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
- const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint );
- if ( pSimpleHint &&
- pSimpleHint->GetId() == SFX_HINT_DOCCHANGED )
- FillMenu();
-}
-
-
-/* [Beschreibung]
-
- Select-Handler des Men"us; der Name des selektierten Fonts
- wird in einem SvxFontItem verschickt. Das F"ullen mit den
- weiteren Fontinformationen mu\s durch die Applikation geschehen.
-*/
-
-IMPL_LINK_TYPED( SvxFontMenuControl, MenuSelect, FontNameMenu *, pMen, void )
-{
- SvxFontItem aItem( GetId() );
- aItem.SetFamilyName(pMen->GetCurName());
- GetBindings().GetDispatcher()->Execute( GetId(), SfxCallMode::RECORD, &aItem, 0L );
-}
-
-/* [Beschreibung]
-
- Dtor; gibt das Men"u frei.
-*/
-
-SvxFontMenuControl::~SvxFontMenuControl()
-{
- delete pMenu;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx
deleted file mode 100644
index f4bc31e..0000000
--- a/svx/source/mnuctrls/fntszctl.cxx
+++ /dev/null
@@ -1,184 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <string>
-#include <svl/itempool.hxx>
-#include <svtools/stdmenu.hxx>
-#include <svtools/ctrltool.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/dispatch.hxx>
-
-#include <svx/fntszctl.hxx>
-#include <svx/dialogs.hrc>
-#include <editeng/fhgtitem.hxx>
-#include "editeng/fontitem.hxx"
-#include "editeng/flstitem.hxx"
-
-#include "svx/dlgutil.hxx"
-#include <svx/dialmgr.hxx>
-
-#define LOGIC OutputDevice::LogicToLogic
-
-SFX_IMPL_MENU_CONTROL(SvxFontSizeMenuControl, SvxFontHeightItem);
-
-
-/* [Beschreibung]
-
- Select-Handler des Men"us; die aktuelle Fontgr"o\se
- wird in einem SvxFontHeightItem verschickt.
-*/
-
-IMPL_LINK_TYPED( SvxFontSizeMenuControl, MenuSelect, FontSizeMenu*, pMen, void )
-{
- SfxViewFrame* pFrm = SfxViewFrame::Current();
- SfxShell* pSh = pFrm ? pFrm->GetDispatcher()->GetShell( 0 ) : nullptr;
-
- if ( !pSh )
- return;
-
- const SfxItemPool& rPool = pSh->GetPool();
- sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
- const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
- long nH = LOGIC( pMen->GetCurHeight(), MAP_POINT, (MapUnit)eUnit ) / 10;
- SvxFontHeightItem aItem( nH, 100, GetId() );
- GetBindings().GetDispatcher()->Execute( GetId(), SfxCallMode::RECORD, &aItem, 0L );
-}
-
-
-/* [Beschreibung]
-
- Statusbenachrichtigung;
- Ist die Funktionalit"at disabled, wird der entsprechende
- Men"ueintrag im Parentmenu disabled, andernfalls wird er enabled.
- die aktuelle Fontgr"o\se wird mit einer Checkmark versehen.
-*/
-
-void SvxFontSizeMenuControl::StateChanged(
-
- sal_uInt16, SfxItemState eState, const SfxPoolItem* pState )
-
-{
- rParent.EnableItem( GetId(), SfxItemState::DISABLED != eState );
-
- if ( SfxItemState::DEFAULT == eState )
- {
- if ( dynamic_cast<const SvxFontHeightItem*>( pState) != nullptr )
- {
- const SvxFontHeightItem* pItem =
- dynamic_cast<const SvxFontHeightItem*>( pState );
- long nVal = 0;
-
- if ( pItem )
- {
- SfxViewFrame* pFrm = SfxViewFrame::Current();
- SfxShell* pSh = pFrm ? pFrm->GetDispatcher()->GetShell( 0 )
- : nullptr;
-
- if ( !pSh )
- return;
-
- const SfxItemPool& rPool = pSh->GetPool();
- sal_uInt16 nWhich = rPool.GetWhich( SID_ATTR_CHAR_FONTHEIGHT );
- const SfxMapUnit eUnit = rPool.GetMetric( nWhich );
- long nH = pItem->GetHeight() * 10;
- nVal = LOGIC( nH, (MapUnit)eUnit, MAP_POINT );
- }
- pMenu->SetCurHeight( nVal );
- }
- else if ( dynamic_cast<const SvxFontItem*>( pState) != nullptr )
- {
- const SvxFontItem* pItem = dynamic_cast<const SvxFontItem*>( pState );
-
- if ( pItem )
- {
- SfxObjectShell *pDoc = SfxObjectShell::Current();
-
- if ( pDoc )
- {
- const SvxFontListItem* pFonts = static_cast<const SvxFontListItem*>(
- pDoc->GetItem( SID_ATTR_CHAR_FONTLIST ));
- const FontList* pList = pFonts ? pFonts->GetFontList(): nullptr;
-
- if ( pList )
- {
- FontMetric aFontMetric = pList->Get( pItem->GetFamilyName(),
- pItem->GetStyleName() );
- pMenu->Fill( aFontMetric, pList );
- }
- // else manche Shells haben keine Fontliste (z.B. Image)
- }
- }
- }
- }
- else
- {
- // irgendwie muss man ja das Men"u f"ullen
- SfxObjectShell* pSh = SfxObjectShell::Current();
-
- if ( pSh )
- {
- // daf"ur von der Shell eine Fontliste besorgen
- const SvxFontListItem* pFonts =
- static_cast<const SvxFontListItem*>(pSh->GetItem( SID_ATTR_CHAR_FONTLIST ));
- const FontList* pList = pFonts ? pFonts->GetFontList(): nullptr;
- if ( pList )
- pMenu->Fill( pList->GetFontName(0), pList );
- }
- }
-}
-
-
-/* [Beschreibung]
-
- Ctor; setzt den Select-Handler am Men"u und tr"agt Men"u
- in seinen Parent ein.
-*/
-
-SvxFontSizeMenuControl::SvxFontSizeMenuControl
-(
- sal_uInt16 _nId,
- Menu& rMenu,
- SfxBindings& rBindings
-) :
- SfxMenuControl( _nId, rBindings ),
-
- pMenu ( new FontSizeMenu ),
- rParent ( rMenu )
-
-{
- rMenu.SetPopupMenu( _nId, pMenu );
- pMenu->SetSelectHdl( LINK( this, SvxFontSizeMenuControl, MenuSelect ) );
-}
-
-
-/* [Beschreibung]
-
- Dtor; gibt das Men"u frei.
-*/
-
-SvxFontSizeMenuControl::~SvxFontSizeMenuControl()
-{
- delete pMenu;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk
index a0124ba..e373e72 100644
--- a/sw/UIConfig_sglobal.mk
+++ b/sw/UIConfig_sglobal.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sglobal,\
sw/uiconfig/sglobal/popupmenu/draw \
sw/uiconfig/sglobal/popupmenu/drawtext \
sw/uiconfig/sglobal/popupmenu/form \
+ sw/uiconfig/sglobal/popupmenu/formrichtext \
sw/uiconfig/sglobal/popupmenu/frame \
sw/uiconfig/sglobal/popupmenu/graphic \
sw/uiconfig/sglobal/popupmenu/insertfield \
diff --git a/sw/UIConfig_sweb.mk b/sw/UIConfig_sweb.mk
index 38b2c19..588a043 100644
--- a/sw/UIConfig_sweb.mk
+++ b/sw/UIConfig_sweb.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sweb,\
$(eval $(call gb_UIConfig_add_popupmenufiles,modules/sweb,\
sw/uiconfig/sweb/popupmenu/annotation \
sw/uiconfig/sweb/popupmenu/form \
+ sw/uiconfig/sweb/popupmenu/formrichtext \
sw/uiconfig/sweb/popupmenu/frame \
sw/uiconfig/sweb/popupmenu/graphic \
sw/uiconfig/sweb/popupmenu/insertfield \
diff --git a/sw/UIConfig_swform.mk b/sw/UIConfig_swform.mk
index 9d3fc8b..b733cb9 100644
--- a/sw/UIConfig_swform.mk
+++ b/sw/UIConfig_swform.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swform,\
sw/uiconfig/swform/popupmenu/draw \
sw/uiconfig/swform/popupmenu/drawtext \
sw/uiconfig/swform/popupmenu/form \
+ sw/uiconfig/swform/popupmenu/formrichtext \
sw/uiconfig/swform/popupmenu/frame \
sw/uiconfig/swform/popupmenu/graphic \
sw/uiconfig/swform/popupmenu/insertfield \
diff --git a/sw/UIConfig_swreport.mk b/sw/UIConfig_swreport.mk
index 598f90e..b1286f8 100644
--- a/sw/UIConfig_swreport.mk
+++ b/sw/UIConfig_swreport.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swreport,\
sw/uiconfig/swreport/popupmenu/draw \
sw/uiconfig/swreport/popupmenu/drawtext \
sw/uiconfig/swreport/popupmenu/form \
+ sw/uiconfig/swreport/popupmenu/formrichtext \
sw/uiconfig/swreport/popupmenu/frame \
sw/uiconfig/swreport/popupmenu/graphic \
sw/uiconfig/swreport/popupmenu/insertfield \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index a8636f5..5df03ca 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swriter,\
sw/uiconfig/swriter/popupmenu/draw \
sw/uiconfig/swriter/popupmenu/drawtext \
sw/uiconfig/swriter/popupmenu/form \
+ sw/uiconfig/swriter/popupmenu/formrichtext \
sw/uiconfig/swriter/popupmenu/frame \
sw/uiconfig/swriter/popupmenu/graphic \
sw/uiconfig/swriter/popupmenu/insertfield \
diff --git a/sw/UIConfig_swxform.mk b/sw/UIConfig_swxform.mk
index 86673b7..2fa8e24 100644
--- a/sw/UIConfig_swxform.mk
+++ b/sw/UIConfig_swxform.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swxform,\
sw/uiconfig/swxform/popupmenu/draw \
sw/uiconfig/swxform/popupmenu/drawtext \
sw/uiconfig/swxform/popupmenu/form \
+ sw/uiconfig/swxform/popupmenu/formrichtext \
sw/uiconfig/swxform/popupmenu/frame \
sw/uiconfig/swxform/popupmenu/graphic \
sw/uiconfig/swxform/popupmenu/insertfield \
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 5930ec5..e65313a 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -26,8 +26,6 @@
#include <svtools/ehdl.hxx>
#include <svx/ParaLineSpacingPopup.hxx>
#include <svx/svdobj.hxx>
-#include <svx/fntszctl.hxx>
-#include <svx/fntctl.hxx>
#include <svx/pszctrl.hxx>
#include <svx/insctrl.hxx>
#include <svx/selctrl.hxx>
@@ -321,9 +319,6 @@ void SwDLL::RegisterControls()
SvxTableToolBoxControl::RegisterControl(FN_INSERT_TABLE, pMod );
SvxTableToolBoxControl::RegisterControl(FN_SHOW_MULTIPLE_PAGES, pMod );
- SvxFontMenuControl::RegisterControl(SID_ATTR_CHAR_FONT, pMod );
- SvxFontSizeMenuControl::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod );
-
SwZoomControl::RegisterControl(SID_ATTR_ZOOM, pMod );
SwPreviewZoomControl::RegisterControl(FN_PREVIEW_ZOOM, pMod);
SvxPosSizeStatusBarControl::RegisterControl(0, pMod );
diff --git a/sw/uiconfig/sglobal/popupmenu/formrichtext.xml b/sw/uiconfig/sglobal/popupmenu/formrichtext.xml
new file mode 100644
index 0000000..f5f8f7a
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/formrichtext.xml
@@ -0,0 +1,46 @@
+<?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:CharFontName"/>
+ <menu:menuitem menu:id=".uno:FontHeight"/>
+ <menu:menu menu:id=".uno:StyleMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:Bold"/>
+ <menu:menuitem menu:id=".uno:Italic"/>
+ <menu:menuitem menu:id=".uno:Overline"/>
+ <menu:menuitem menu:id=".uno:Underline"/>
+ <menu:menuitem menu:id=".uno:Strikeout"/>
+ <menu:menuitem menu:id=".uno:Shadowed"/>
+ <menu:menuitem menu:id=".uno:OutlineFont"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SuperScript"/>
+ <menu:menuitem menu:id=".uno:SubScript"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:TextAlign">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:FormatSpacingMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara15"/>
+ <menu:menuitem menu:id=".uno:SpacePara2"/>
+ </menu:menupopup>
+ </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/formrichtext.xml b/sw/uiconfig/sweb/popupmenu/formrichtext.xml
new file mode 100644
index 0000000..b5dab11
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/formrichtext.xml
@@ -0,0 +1,43 @@
+<?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:CharFontName"/>
+ <menu:menuitem menu:id=".uno:FontHeight"/>
+ <menu:menu menu:id=".uno:StyleMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:Bold"/>
+ <menu:menuitem menu:id=".uno:Italic"/>
+ <menu:menuitem menu:id=".uno:Overline"/>
+ <menu:menuitem menu:id=".uno:Underline"/>
+ <menu:menuitem menu:id=".uno:Strikeout"/>
+ <menu:menuitem menu:id=".uno:Shadowed"/>
+ <menu:menuitem menu:id=".uno:OutlineFont"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:TextAlign">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:FormatSpacingMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara15"/>
+ <menu:menuitem menu:id=".uno:SpacePara2"/>
+ </menu:menupopup>
+ </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/formrichtext.xml b/sw/uiconfig/swform/popupmenu/formrichtext.xml
new file mode 100644
index 0000000..f5f8f7a
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/formrichtext.xml
@@ -0,0 +1,46 @@
+<?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:CharFontName"/>
+ <menu:menuitem menu:id=".uno:FontHeight"/>
+ <menu:menu menu:id=".uno:StyleMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:Bold"/>
+ <menu:menuitem menu:id=".uno:Italic"/>
+ <menu:menuitem menu:id=".uno:Overline"/>
+ <menu:menuitem menu:id=".uno:Underline"/>
+ <menu:menuitem menu:id=".uno:Strikeout"/>
+ <menu:menuitem menu:id=".uno:Shadowed"/>
+ <menu:menuitem menu:id=".uno:OutlineFont"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SuperScript"/>
+ <menu:menuitem menu:id=".uno:SubScript"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:TextAlign">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:FormatSpacingMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara15"/>
+ <menu:menuitem menu:id=".uno:SpacePara2"/>
+ </menu:menupopup>
+ </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/swreport/popupmenu/formrichtext.xml b/sw/uiconfig/swreport/popupmenu/formrichtext.xml
new file mode 100644
index 0000000..f5f8f7a
--- /dev/null
+++ b/sw/uiconfig/swreport/popupmenu/formrichtext.xml
@@ -0,0 +1,46 @@
+<?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:CharFontName"/>
+ <menu:menuitem menu:id=".uno:FontHeight"/>
+ <menu:menu menu:id=".uno:StyleMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:Bold"/>
+ <menu:menuitem menu:id=".uno:Italic"/>
+ <menu:menuitem menu:id=".uno:Overline"/>
+ <menu:menuitem menu:id=".uno:Underline"/>
+ <menu:menuitem menu:id=".uno:Strikeout"/>
+ <menu:menuitem menu:id=".uno:Shadowed"/>
+ <menu:menuitem menu:id=".uno:OutlineFont"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SuperScript"/>
+ <menu:menuitem menu:id=".uno:SubScript"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:TextAlign">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:FormatSpacingMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara15"/>
+ <menu:menuitem menu:id=".uno:SpacePara2"/>
+ </menu:menupopup>
+ </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/swriter/popupmenu/formrichtext.xml b/sw/uiconfig/swriter/popupmenu/formrichtext.xml
new file mode 100644
index 0000000..f5f8f7a
--- /dev/null
+++ b/sw/uiconfig/swriter/popupmenu/formrichtext.xml
@@ -0,0 +1,46 @@
+<?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:CharFontName"/>
+ <menu:menuitem menu:id=".uno:FontHeight"/>
+ <menu:menu menu:id=".uno:StyleMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:Bold"/>
+ <menu:menuitem menu:id=".uno:Italic"/>
+ <menu:menuitem menu:id=".uno:Overline"/>
+ <menu:menuitem menu:id=".uno:Underline"/>
+ <menu:menuitem menu:id=".uno:Strikeout"/>
+ <menu:menuitem menu:id=".uno:Shadowed"/>
+ <menu:menuitem menu:id=".uno:OutlineFont"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SuperScript"/>
+ <menu:menuitem menu:id=".uno:SubScript"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:TextAlign">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:FormatSpacingMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara15"/>
+ <menu:menuitem menu:id=".uno:SpacePara2"/>
+ </menu:menupopup>
+ </menu:menu>
+</menu:menupopup>
diff --git a/sw/uiconfig/swxform/popupmenu/formrichtext.xml b/sw/uiconfig/swxform/popupmenu/formrichtext.xml
new file mode 100644
index 0000000..f5f8f7a
--- /dev/null
+++ b/sw/uiconfig/swxform/popupmenu/formrichtext.xml
@@ -0,0 +1,46 @@
+<?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:CharFontName"/>
+ <menu:menuitem menu:id=".uno:FontHeight"/>
+ <menu:menu menu:id=".uno:StyleMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:Bold"/>
+ <menu:menuitem menu:id=".uno:Italic"/>
+ <menu:menuitem menu:id=".uno:Overline"/>
+ <menu:menuitem menu:id=".uno:Underline"/>
+ <menu:menuitem menu:id=".uno:Strikeout"/>
+ <menu:menuitem menu:id=".uno:Shadowed"/>
+ <menu:menuitem menu:id=".uno:OutlineFont"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:SuperScript"/>
+ <menu:menuitem menu:id=".uno:SubScript"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:TextAlign">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:LeftPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:CenterPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:RightPara" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:JustifyPara" menu:style="radio"/>
+ </menu:menupopup>
+ </menu:menu>
+ <menu:menu menu:id=".uno:FormatSpacingMenu">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:SpacePara1"/>
+ <menu:menuitem menu:id=".uno:SpacePara15"/>
+ <menu:menuitem menu:id=".uno:SpacePara2"/>
+ </menu:menupopup>
+ </menu:menu>
+</menu:menupopup>
commit 144546b622fd6146e023efe27b74f1271ff47008
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun Feb 21 02:21:06 2016 +0200
tdf#93837 Convert RID_POPUP_DLGED to xml
Change-Id: I0588063aef397ee95923ad5acd332bc6052fafc7
diff --git a/basctl/UIConfig_basicide.mk b/basctl/UIConfig_basicide.mk
index e556374..31b0334 100644
--- a/basctl/UIConfig_basicide.mk
+++ b/basctl/UIConfig_basicide.mk
@@ -9,6 +9,10 @@
$(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE))
+$(eval $(call gb_UIConfig_add_popupmenufiles,modules/BasicIDE,\
+ basctl/uiconfig/basicide/popupmenu/dialog \
+))
+
$(eval $(call gb_UIConfig_add_menubarfiles,modules/BasicIDE,\
basctl/uiconfig/basicide/menubar/menubar \
))
diff --git a/basctl/inc/basidesh.hrc b/basctl/inc/basidesh.hrc
index df9f997..d90497e 100644
--- a/basctl/inc/basidesh.hrc
+++ b/basctl/inc/basidesh.hrc
@@ -30,7 +30,6 @@
#define RID_POPUP_BRKDLG ( RID_BASICIDE_START + 10 )
#define RID_POPUP_BRKPROPS ( RID_BASICIDE_START + 11 )
#define RID_POPUP_TABBAR ( RID_BASICIDE_START + 12 )
-#define RID_POPUP_DLGED ( RID_BASICIDE_START + 62 )
#define RID_PRINTDLG_STRLIST ( RID_BASICIDE_START + 78 )
#define RID_IMGBTN_REMOVEWATCH ( RID_BASICIDE_START + 8 )
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index 72a7ab7..36855cb 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -195,7 +195,7 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
}
else if ( rCEvt.GetCommand() == CommandEventId::ContextMenu )
{
- if (SfxDispatcher* pDispatcher = GetDispatcher())
+ if (GetDispatcher())
{
SdrView& rView = GetView();
if( !rCEvt.IsMouseEvent() && rView.AreObjectsMarked() )
@@ -203,11 +203,11 @@ void DialogWindow::Command( const CommandEvent& rCEvt )
Rectangle aMarkedRect( rView.GetMarkedRect() );
Point MarkedCenter( aMarkedRect.Center() );
Point PosPixel( LogicToPixel( MarkedCenter ) );
- pDispatcher->ExecutePopup( IDEResId(RID_POPUP_DLGED), this, &PosPixel );
+ SfxDispatcher::ExecutePopup( this, &PosPixel );
}
else
{
- pDispatcher->ExecutePopup( IDEResId(RID_POPUP_DLGED) );
+ SfxDispatcher::ExecutePopup();
}
}
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 5758dec..54c92e6 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -139,7 +139,7 @@ void basctl_Shell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SID_SHOW_PROPERTYBROWSER, false, BASICIDE_UI_FEATURE_SHOW_BROWSER);
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
- GetStaticInterface()->RegisterPopupMenu(IDEResId(RID_POPUP_DLGED));
+ GetStaticInterface()->RegisterPopupMenu("dialog");
}
unsigned Shell::nShellCount = 0;
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 65c7066..357c006 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -444,20 +444,6 @@ Menu RID_POPUP_TABBAR
};
};
-Menu RID_POPUP_DLGED
-{
- DefaultItemId = SID_SHOW_PROPERTYBROWSER ;
- ItemList =
- {
- MenuItem
- {
- Identifier = SID_SHOW_PROPERTYBROWSER ;
- HelpId = CMD_SID_SHOW_PROPERTYBROWSER ;
- Text [ en-US ] = "Properties...";
- };
- };
-};
-
ImageList RID_IMGLST_LAYOUT
{
Prefix = "im";
diff --git a/basctl/uiconfig/basicide/popupmenu/dialog.xml b/basctl/uiconfig/basicide/popupmenu/dialog.xml
new file mode 100644
index 0000000..17f96b8
--- /dev/null
+++ b/basctl/uiconfig/basicide/popupmenu/dialog.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:ShowPropBrowser"/>
+</menu:menupopup>
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index 1149e3d..4d2cb3b 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -104,7 +104,6 @@
#define CMD_SID_FRAME_TO_BOTTOM ".uno:SendToBack"
#define CMD_SID_SET_DEFAULT ".uno:SetDefault"
#define CMD_SID_ATTR_CHAR_SHADOWED ".uno:Shadowed"
-#define CMD_SID_SHOW_PROPERTYBROWSER ".uno:ShowPropBrowser"
#define CMD_SID_FM_SHOW_PROPERTY_BROWSER ".uno:ShowPropertyBrowser"
#define CMD_SID_ATTR_PARA_LINESPACE_10 ".uno:SpacePara1"
#define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15"
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
index 0a61577..df5a35d 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/BasicIDEWindowState.xcu
@@ -20,6 +20,11 @@
<oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="BasicIDEWindowState" oor:package="org.openoffice.Office.UI">
<node oor:name="UIElements">
<node oor:name="States">
+ <node oor:name="private:resource/popupmenu/dialog" oor:op="replace">
+ <prop oor:name="UIName" oor:type="xs:string">
+ <value xml:lang="en-US">Dialog</value>
+ </prop>
+ </node>
<node oor:name="private:resource/toolbar/standardbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string">
<value>0,0</value>
commit c1f275055e9577749345ccf6cb4771861f7557a7
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun Feb 21 00:52:51 2016 +0200
Convert RID_INSERT_FIELD_CTRL to xml
Change-Id: I1bc72c3dfdb20fd538e297a70f5ccbd355d1dbcd
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
index 267177e..d0366d8 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
@@ -319,6 +319,20 @@
<value>freezepanes</value>
</prop>
</node>
+ <node oor:name="c27" oor:op="replace">
+ <prop oor:name="Command">
+ <value>.uno:InsertFieldCtrl</value>
+ </prop>
+ <prop oor:name="Module">
+ <value/>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.comp.framework.ResourceMenuController</value>
+ </prop>
+ <prop oor:name="Value">
+ <value>insertfield</value>
+ </prop>
+ </node>
</node>
<node oor:name="ToolBar">
<node oor:name="ZoomToolBox" oor:op="replace">
@@ -1082,6 +1096,17 @@
<value>.uno:FreezePanesMenu</value>
</prop>
</node>
+ <node oor:name="InsertFieldController" oor:op="replace">
+ <prop oor:name="Command">
+ <value>.uno:InsertFieldCtrl</value>
+ </prop>
+ <prop oor:name="Module">
+ <value/>
+ </prop>
+ <prop oor:name="Controller">
+ <value>com.sun.star.comp.framework.GenericPopupToolbarController</value>
+ </prop>
+ </node>
<node oor:name="org.apache.openoffice.comp.framework.NewToolbarController" oor:op="replace">
<prop oor:name="Command">
<value>.uno:AddDirect</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 7d6bf53..05a9b93 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -570,6 +570,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Insert Field</value>
</prop>
+ <prop oor:name="ContextLabel" oor:type="xs:string">
+ <value xml:lang="en-US">Fiel~d</value>
+ </prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
</prop>
diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk
index 8d831d3..a0124ba 100644
--- a/sw/UIConfig_sglobal.mk
+++ b/sw/UIConfig_sglobal.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sglobal,\
sw/uiconfig/sglobal/popupmenu/form \
sw/uiconfig/sglobal/popupmenu/frame \
sw/uiconfig/sglobal/popupmenu/graphic \
+ sw/uiconfig/sglobal/popupmenu/insertfield \
sw/uiconfig/sglobal/popupmenu/media \
sw/uiconfig/sglobal/popupmenu/oleobject \
sw/uiconfig/sglobal/popupmenu/preview \
diff --git a/sw/UIConfig_sweb.mk b/sw/UIConfig_sweb.mk
index 7b7b809..38b2c19 100644
--- a/sw/UIConfig_sweb.mk
+++ b/sw/UIConfig_sweb.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sweb,\
sw/uiconfig/sweb/popupmenu/form \
sw/uiconfig/sweb/popupmenu/frame \
sw/uiconfig/sweb/popupmenu/graphic \
+ sw/uiconfig/sweb/popupmenu/insertfield \
sw/uiconfig/sweb/popupmenu/oleobject \
sw/uiconfig/sweb/popupmenu/preview \
sw/uiconfig/sweb/popupmenu/source \
diff --git a/sw/UIConfig_swform.mk b/sw/UIConfig_swform.mk
index 11dd732..9d3fc8b 100644
--- a/sw/UIConfig_swform.mk
+++ b/sw/UIConfig_swform.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swform,\
sw/uiconfig/swform/popupmenu/form \
sw/uiconfig/swform/popupmenu/frame \
sw/uiconfig/swform/popupmenu/graphic \
+ sw/uiconfig/swform/popupmenu/insertfield \
sw/uiconfig/swform/popupmenu/media \
sw/uiconfig/swform/popupmenu/oleobject \
sw/uiconfig/swform/popupmenu/preview \
diff --git a/sw/UIConfig_swreport.mk b/sw/UIConfig_swreport.mk
index aafac33..598f90e 100644
--- a/sw/UIConfig_swreport.mk
+++ b/sw/UIConfig_swreport.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swreport,\
sw/uiconfig/swreport/popupmenu/form \
sw/uiconfig/swreport/popupmenu/frame \
sw/uiconfig/swreport/popupmenu/graphic \
+ sw/uiconfig/swreport/popupmenu/insertfield \
sw/uiconfig/swreport/popupmenu/media \
sw/uiconfig/swreport/popupmenu/oleobject \
sw/uiconfig/swreport/popupmenu/preview \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 1457d21..a8636f5 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swriter,\
sw/uiconfig/swriter/popupmenu/form \
sw/uiconfig/swriter/popupmenu/frame \
sw/uiconfig/swriter/popupmenu/graphic \
+ sw/uiconfig/swriter/popupmenu/insertfield \
sw/uiconfig/swriter/popupmenu/media \
sw/uiconfig/swriter/popupmenu/oleobject \
sw/uiconfig/swriter/popupmenu/preview \
diff --git a/sw/UIConfig_swxform.mk b/sw/UIConfig_swxform.mk
index 8c79944..86673b7 100644
--- a/sw/UIConfig_swxform.mk
+++ b/sw/UIConfig_swxform.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swxform,\
sw/uiconfig/swxform/popupmenu/form \
sw/uiconfig/swxform/popupmenu/frame \
sw/uiconfig/swxform/popupmenu/graphic \
+ sw/uiconfig/swxform/popupmenu/insertfield \
sw/uiconfig/swxform/popupmenu/media \
sw/uiconfig/swxform/popupmenu/oleobject \
sw/uiconfig/swxform/popupmenu/preview \
diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h
index 6a235d8..1a4d957 100644
--- a/sw/inc/swcommands.h
+++ b/sw/inc/swcommands.h
@@ -25,14 +25,6 @@
#define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop"
#define CMD_FN_TABLE_SELECT_COL ".uno:EntireColumn"
#define CMD_FN_TABLE_SELECT_ROW ".uno:EntireRow"
-#define CMD_FN_INSERT_FLD_AUTHOR ".uno:InsertAuthorField"
-#define CMD_FN_INSERT_FLD_DATE ".uno:InsertDateField"
-#define CMD_FN_INSERT_FIELD ".uno:InsertField"
-#define CMD_FN_INSERT_FLD_PGCOUNT ".uno:InsertPageCountField"
-#define CMD_FN_INSERT_FLD_PGNUMBER ".uno:InsertPageNumberField"
-#define CMD_FN_INSERT_FLD_TIME ".uno:InsertTimeField"
-#define CMD_FN_INSERT_FLD_TITLE ".uno:InsertTitleField"
-#define CMD_FN_INSERT_FLD_TOPIC ".uno:InsertTopicField"
#define CMD_FN_TABLE_MERGE_TABLE ".uno:MergeTable"
#define CMD_FN_FRAME_DOWN ".uno:ObjectBackOne"
#define CMD_FN_TABLE_SET_READ_ONLY_CELLS ".uno:Protect"
diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx
index 2c3559b..5930ec5 100644
--- a/sw/source/uibase/app/swmodule.cxx
+++ b/sw/source/uibase/app/swmodule.cxx
@@ -287,7 +287,6 @@ void SwDLL::RegisterControls()
SvxTbxCtlDraw::RegisterControl(SID_INSERT_DRAW, pMod );
SvxTbxCtlDraw::RegisterControl(SID_TRACK_CHANGES_BAR, pMod );
SwTbxAnchor::RegisterControl(FN_TOOL_ANCHOR, pMod );
- SwTbxFieldCtrl::RegisterControl(FN_INSERT_FIELD_CTRL, pMod );
SwTbxAutoTextCtrl::RegisterControl(FN_GLOSSARY_DLG, pMod );
svx::ParaLineSpacingPopup::RegisterControl(SID_ATTR_PARA_LINESPACE, pMod);
diff --git a/sw/source/uibase/inc/ribbar.hrc b/sw/source/uibase/inc/ribbar.hrc
index 4973d81..fcfe877 100644
--- a/sw/source/uibase/inc/ribbar.hrc
+++ b/sw/source/uibase/inc/ribbar.hrc
@@ -32,7 +32,6 @@
//Resourcen fuer Inputwin (Rechenleiste)
#define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 12)
-#define RID_INSERT_FIELD_CTRL (RC_RIBBAR_BEGIN + 13)
#define ST_TBL (RC_RIBBAR_BEGIN + 14)
#define ST_FRM (RC_RIBBAR_BEGIN + 15)
#define ST_PGE (RC_RIBBAR_BEGIN + 16)
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 2331682..7abe8a6 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -71,20 +71,6 @@ public:
DECL_STATIC_LINK_TYPED(SwTbxAutoTextCtrl, PopupHdl, Menu*, bool);
};
-class SwTbxFieldCtrl : public SfxToolBoxControl
-{
-public:
- SFX_DECL_TOOLBOX_CONTROL();
-
- SwTbxFieldCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
- virtual ~SwTbxFieldCtrl();
-
- virtual VclPtr<SfxPopupWindow> CreatePopupWindow() override;
- virtual void StateChanged( sal_uInt16 nSID,
- SfxItemState eState,
- const SfxPoolItem* pState ) override;
-};
-
class SwScrollNaviPopup;
class SwScrollNaviToolBox : public ToolBox
diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx
index 1a17634..420df7e 100644
--- a/sw/source/uibase/ribbar/workctrl.cxx
+++ b/sw/source/uibase/ribbar/workctrl.cxx
@@ -65,7 +65,6 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
SFX_IMPL_TOOLBOX_CONTROL( SwTbxAutoTextCtrl, SfxVoidItem );
-SFX_IMPL_TOOLBOX_CONTROL( SwTbxFieldCtrl, SfxBoolItem );
SwTbxAutoTextCtrl::SwTbxAutoTextCtrl(
sal_uInt16 nSlotId,
@@ -176,66 +175,6 @@ void SwTbxAutoTextCtrl::DelPopup()
}
}
-SwTbxFieldCtrl::SwTbxFieldCtrl(
- sal_uInt16 nSlotId,
- sal_uInt16 nId,
- ToolBox& rTbx ) :
- SfxToolBoxControl( nSlotId, nId, rTbx )
-{
- rTbx.SetItemBits( nId, ToolBoxItemBits::DROPDOWNONLY | rTbx.GetItemBits( nId ) );
-}
-
-SwTbxFieldCtrl::~SwTbxFieldCtrl()
-{
-}
-
-VclPtr<SfxPopupWindow> SwTbxFieldCtrl::CreatePopupWindow()
-{
- SwView* pView = ::GetActiveView();
- if(pView && !pView->GetDocShell()->IsReadOnly() &&
- !pView->GetWrtShell().HasReadonlySel() )
- {
- PopupMenu* pPopup = new PopupMenu(SW_RES(RID_INSERT_FIELD_CTRL));
-
- if (::GetHtmlMode(pView->GetDocShell()) & HTMLMODE_ON)
- {
- pPopup->RemoveItem(pPopup->GetItemPos(FN_INSERT_FLD_PGCOUNT));
- pPopup->RemoveItem(pPopup->GetItemPos(FN_INSERT_FLD_TOPIC));
- }
-
- ToolBox* pToolBox = &GetToolBox();
- sal_uInt16 nId = GetId();
- SfxDispatcher *rDispat = pView->GetViewFrame()->GetDispatcher();
-
- // set the icons in the Popup-Menu, delete the pPopup
- SfxPopupMenuManager aPop( pPopup, rDispat->GetFrame()->GetBindings() );
-
- pToolBox->SetItemDown( nId, true );
-
- pPopup->Execute( pToolBox, pToolBox->GetItemRect( nId ),
- (pToolBox->GetAlign() == WindowAlign::Top || pToolBox->GetAlign() == WindowAlign::Bottom) ?
- PopupMenuFlags::ExecuteDown : PopupMenuFlags::ExecuteRight );
-
- pToolBox->SetItemDown( nId, false );
- }
-
- GetToolBox().EndSelection();
-
- return nullptr;
-}
-
-void SwTbxFieldCtrl::StateChanged( sal_uInt16,
- SfxItemState eState,
- const SfxPoolItem* pState )
-{
- GetToolBox().EnableItem( GetId(), (GetItemState(pState) != SfxItemState::DISABLED) );
- if (eState >= SfxItemState::DEFAULT)
- {
- GetToolBox().CheckItem( GetId(), static_cast<const SfxBoolItem*>(pState)->GetValue() );
- }
-}
-
-
// Navigation-Popup
// determine the order of the toolbox items
static sal_uInt16 aNavigationInsertIds[ NAVI_ENTRIES ] =
diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src
index 0ea858d..4c4b2a9c 100644
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@@ -24,64 +24,6 @@
#include "helpid.h"
#include "cmdid.h"
-Menu RID_INSERT_FIELD_CTRL
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = FN_INSERT_FLD_PGNUMBER ;
- HelpId = CMD_FN_INSERT_FLD_PGNUMBER ;
- Text [ en-US ] = "Page Number" ;
- };
- MenuItem
- {
- Identifier = FN_INSERT_FLD_PGCOUNT ;
- HelpId = CMD_FN_INSERT_FLD_PGCOUNT ;
- Text [ en-US ] = "Page Count" ;
- };
- MenuItem
- {
- Identifier = FN_INSERT_FLD_DATE ;
- HelpId = CMD_FN_INSERT_FLD_DATE ;
- Text [ en-US ] = "Date" ;
- };
- MenuItem
- {
- Identifier = FN_INSERT_FLD_TIME ;
- HelpId = CMD_FN_INSERT_FLD_TIME ;
- Text [ en-US ] = "Time" ;
- };
- MenuItem
- {
- Identifier = FN_INSERT_FLD_TITLE ;
- HelpId = CMD_FN_INSERT_FLD_TITLE ;
- Text [ en-US ] = "Title" ;
- };
- MenuItem
- {
- Identifier = FN_INSERT_FLD_AUTHOR ;
- HelpId = CMD_FN_INSERT_FLD_AUTHOR ;
- Text [ en-US ] = "Author" ;
- };
- MenuItem
- {
- Identifier = FN_INSERT_FLD_TOPIC ;
- HelpId = CMD_FN_INSERT_FLD_TOPIC ;
- Text [ en-US ] = "Subject" ;
- };
- MenuItem
- {
- Separator = TRUE ;
- };
- MenuItem
- {
- Identifier = FN_INSERT_FIELD ;
- HelpId = CMD_FN_INSERT_FIELD ;
- Text [ en-US ] = "More Fields..." ;
- };
- };
-};
#define SCROLL_IMAGE_IDLIST \
IdList = \
{ \
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml b/sw/uiconfig/sglobal/menubar/menubar.xml
index 7c6e1a2..0e015ab 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -166,19 +166,7 @@
<menu:menu menu:id=".uno:InsertMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertBreak"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
+ <menu:menuitem menu:id=".uno:InsertFieldCtrl"/>
<menu:menuitem menu:id=".uno:InsertSymbol"/>
<menu:menu menu:id=".uno:FormattingMarkMenu">
<menu:menupopup>
diff --git a/sw/uiconfig/sglobal/popupmenu/insertfield.xml b/sw/uiconfig/sglobal/popupmenu/insertfield.xml
new file mode 100644
index 0000000..6e58153
--- /dev/null
+++ b/sw/uiconfig/sglobal/popupmenu/insertfield.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:InsertPageNumberField"/>
+ <menu:menuitem menu:id=".uno:InsertPageCountField"/>
+ <menu:menuitem menu:id=".uno:InsertDateField"/>
+ <menu:menuitem menu:id=".uno:InsertTimeField"/>
+ <menu:menuitem menu:id=".uno:InsertTitleField"/>
+ <menu:menuitem menu:id=".uno:InsertAuthorField"/>
+ <menu:menuitem menu:id=".uno:InsertTopicField"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertField"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml b/sw/uiconfig/sweb/menubar/menubar.xml
index 41f8257..8929f9c 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -134,17 +134,7 @@
</menu:menu>
<menu:menu menu:id=".uno:InsertMenu">
<menu:menupopup>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
+ <menu:menuitem menu:id=".uno:InsertFieldCtrl"/>
<menu:menuitem menu:id=".uno:InsertSymbol"/>
<menu:menu menu:id=".uno:FormattingMarkMenu">
<menu:menupopup>
diff --git a/sw/uiconfig/sweb/popupmenu/insertfield.xml b/sw/uiconfig/sweb/popupmenu/insertfield.xml
new file mode 100644
index 0000000..4b42ce7
--- /dev/null
+++ b/sw/uiconfig/sweb/popupmenu/insertfield.xml
@@ -0,0 +1,18 @@
+<?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:InsertPageNumberField"/>
+ <menu:menuitem menu:id=".uno:InsertDateField"/>
+ <menu:menuitem menu:id=".uno:InsertTimeField"/>
+ <menu:menuitem menu:id=".uno:InsertTitleField"/>
+ <menu:menuitem menu:id=".uno:InsertAuthorField"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertField"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swform/menubar/menubar.xml b/sw/uiconfig/swform/menubar/menubar.xml
index e824b00..17c8cd4 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -165,19 +165,7 @@
<menu:menu menu:id=".uno:InsertMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertBreak"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
+ <menu:menuitem menu:id=".uno:InsertFieldCtrl"/>
<menu:menuitem menu:id=".uno:InsertSymbol"/>
<menu:menu menu:id=".uno:FormattingMarkMenu">
<menu:menupopup>
diff --git a/sw/uiconfig/swform/popupmenu/insertfield.xml b/sw/uiconfig/swform/popupmenu/insertfield.xml
new file mode 100644
index 0000000..6e58153
--- /dev/null
+++ b/sw/uiconfig/swform/popupmenu/insertfield.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:InsertPageNumberField"/>
+ <menu:menuitem menu:id=".uno:InsertPageCountField"/>
+ <menu:menuitem menu:id=".uno:InsertDateField"/>
+ <menu:menuitem menu:id=".uno:InsertTimeField"/>
+ <menu:menuitem menu:id=".uno:InsertTitleField"/>
+ <menu:menuitem menu:id=".uno:InsertAuthorField"/>
+ <menu:menuitem menu:id=".uno:InsertTopicField"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertField"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml b/sw/uiconfig/swreport/menubar/menubar.xml
index 3b090bd..89857cf 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -166,19 +166,7 @@
<menu:menu menu:id=".uno:InsertMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertBreak"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
+ <menu:menuitem menu:id=".uno:InsertFieldCtrl"/>
<menu:menuitem menu:id=".uno:InsertSymbol"/>
<menu:menu menu:id=".uno:FormattingMarkMenu">
<menu:menupopup>
diff --git a/sw/uiconfig/swreport/popupmenu/insertfield.xml b/sw/uiconfig/swreport/popupmenu/insertfield.xml
new file mode 100644
index 0000000..6e58153
--- /dev/null
+++ b/sw/uiconfig/swreport/popupmenu/insertfield.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:InsertPageNumberField"/>
+ <menu:menuitem menu:id=".uno:InsertPageCountField"/>
+ <menu:menuitem menu:id=".uno:InsertDateField"/>
+ <menu:menuitem menu:id=".uno:InsertTimeField"/>
+ <menu:menuitem menu:id=".uno:InsertTitleField"/>
+ <menu:menuitem menu:id=".uno:InsertAuthorField"/>
+ <menu:menuitem menu:id=".uno:InsertTopicField"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertField"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index a9f9de9..784d186 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -289,19 +289,7 @@
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
+ <menu:menuitem menu:id=".uno:InsertFieldCtrl"/>
<menu:menu menu:id=".uno:InsertHeaderFooterMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertPageHeader"/>
diff --git a/sw/uiconfig/swriter/popupmenu/insertfield.xml b/sw/uiconfig/swriter/popupmenu/insertfield.xml
new file mode 100644
index 0000000..6e58153
--- /dev/null
+++ b/sw/uiconfig/swriter/popupmenu/insertfield.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:InsertPageNumberField"/>
+ <menu:menuitem menu:id=".uno:InsertPageCountField"/>
+ <menu:menuitem menu:id=".uno:InsertDateField"/>
+ <menu:menuitem menu:id=".uno:InsertTimeField"/>
+ <menu:menuitem menu:id=".uno:InsertTitleField"/>
+ <menu:menuitem menu:id=".uno:InsertAuthorField"/>
+ <menu:menuitem menu:id=".uno:InsertTopicField"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertField"/>
+</menu:menupopup>
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml b/sw/uiconfig/swxform/menubar/menubar.xml
index 883ec24..be99fe4 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -167,19 +167,7 @@
<menu:menu menu:id=".uno:InsertMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:InsertBreak"/>
- <menu:menu menu:id=".uno:FieldMenu">
- <menu:menupopup>
- <menu:menuitem menu:id=".uno:InsertPageNumberField"/>
- <menu:menuitem menu:id=".uno:InsertPageCountField"/>
- <menu:menuitem menu:id=".uno:InsertDateField"/>
- <menu:menuitem menu:id=".uno:InsertTimeField"/>
- <menu:menuitem menu:id=".uno:InsertTitleField"/>
- <menu:menuitem menu:id=".uno:InsertAuthorField"/>
- <menu:menuitem menu:id=".uno:InsertTopicField"/>
- <menu:menuseparator/>
- <menu:menuitem menu:id=".uno:InsertField"/>
- </menu:menupopup>
- </menu:menu>
+ <menu:menuitem menu:id=".uno:InsertFieldCtrl"/>
<menu:menuitem menu:id=".uno:InsertSymbol"/>
<menu:menu menu:id=".uno:FormattingMarkMenu">
<menu:menupopup>
diff --git a/sw/uiconfig/swxform/popupmenu/insertfield.xml b/sw/uiconfig/swxform/popupmenu/insertfield.xml
new file mode 100644
index 0000000..6e58153
--- /dev/null
+++ b/sw/uiconfig/swxform/popupmenu/insertfield.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:InsertPageNumberField"/>
+ <menu:menuitem menu:id=".uno:InsertPageCountField"/>
+ <menu:menuitem menu:id=".uno:InsertDateField"/>
+ <menu:menuitem menu:id=".uno:InsertTimeField"/>
+ <menu:menuitem menu:id=".uno:InsertTitleField"/>
+ <menu:menuitem menu:id=".uno:InsertAuthorField"/>
+ <menu:menuitem menu:id=".uno:InsertTopicField"/>
+ <menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:InsertField"/>
+</menu:menupopup>
commit ccd34b510c4ca0a2d9912d63ff2bc7bc4c307a0c
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date: Sun Feb 21 00:04:20 2016 +0200
sc: Add forgotten radio style bits
Change-Id: Iaa088c1c0591b7e8fbdf6e668d86adbbfb77ba71
diff --git a/sc/uiconfig/scalc/popupmenu/chart.xml b/sc/uiconfig/scalc/popupmenu/chart.xml
index 8fa7235..d811cd9 100644
--- a/sc/uiconfig/scalc/popupmenu/chart.xml
+++ b/sc/uiconfig/scalc/popupmenu/chart.xml
@@ -45,8 +45,8 @@
</menu:menu>
<menu:menu menu:id=".uno:AnchorMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
- <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToCell" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
diff --git a/sc/uiconfig/scalc/popupmenu/draw.xml b/sc/uiconfig/scalc/popupmenu/draw.xml
index 92b7e71..54f3fa5 100644
--- a/sc/uiconfig/scalc/popupmenu/draw.xml
+++ b/sc/uiconfig/scalc/popupmenu/draw.xml
@@ -50,8 +50,8 @@
</menu:menu>
<menu:menu menu:id=".uno:AnchorMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
- <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToCell" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:AssignMacro"/>
diff --git a/sc/uiconfig/scalc/popupmenu/form.xml b/sc/uiconfig/scalc/popupmenu/form.xml
index 89ce018..f2367ba 100644
--- a/sc/uiconfig/scalc/popupmenu/form.xml
+++ b/sc/uiconfig/scalc/popupmenu/form.xml
@@ -45,8 +45,8 @@
</menu:menu>
<menu:menu menu:id=".uno:AnchorMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
- <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToCell" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
diff --git a/sc/uiconfig/scalc/popupmenu/graphic.xml b/sc/uiconfig/scalc/popupmenu/graphic.xml
index 98735c8..4a17aa2 100644
--- a/sc/uiconfig/scalc/popupmenu/graphic.xml
+++ b/sc/uiconfig/scalc/popupmenu/graphic.xml
@@ -51,8 +51,8 @@
</menu:menu>
<menu:menu menu:id=".uno:AnchorMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
- <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToCell" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:AssignMacro"/>
diff --git a/sc/uiconfig/scalc/popupmenu/media.xml b/sc/uiconfig/scalc/popupmenu/media.xml
index c6c1b4b..1ff8c23 100644
--- a/sc/uiconfig/scalc/popupmenu/media.xml
+++ b/sc/uiconfig/scalc/popupmenu/media.xml
@@ -47,8 +47,8 @@
</menu:menu>
<menu:menu menu:id=".uno:AnchorMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
- <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToCell" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
diff --git a/sc/uiconfig/scalc/popupmenu/oleobject.xml b/sc/uiconfig/scalc/popupmenu/oleobject.xml
index 13b4caf..fcaf473 100644
--- a/sc/uiconfig/scalc/popupmenu/oleobject.xml
+++ b/sc/uiconfig/scalc/popupmenu/oleobject.xml
@@ -45,8 +45,8 @@
</menu:menu>
<menu:menu menu:id=".uno:AnchorMenu">
<menu:menupopup>
- <menu:menuitem menu:id=".uno:SetAnchorToPage"/>
- <menu:menuitem menu:id=".uno:SetAnchorToCell"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToPage" menu:style="radio"/>
+ <menu:menuitem menu:id=".uno:SetAnchorToCell" menu:style="radio"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
More information about the Libreoffice-commits
mailing list