tdf#93837 Convert RID_FM_TEXTATTRIBUTE_MENU to xml

Change-Id: Ic37bfb9e25eba9b03b2c896c904823aec478355e

4 files changed, 52 insertions, 6 deletions

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 4d92e3c0fad7..c83b2f8d3340 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 907e768147ad..e83cc1895114 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 acf223bcd00e..98f094b74f90 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 000000000000..f5f8f7a0d209
--- /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>