mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#93837 Convert RID_FM_TEXTATTRIBUTE_MENU to xml

Browse Source 
Change-Id: Ic37bfb9e25eba9b03b2c896c904823aec478355e
This commit is contained in:
Maxim Monastirsky
2016-02-21 16:33:30 +02:00
parent 144546b622
commit 69c5252a63
46 changed files with 491 additions and 646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/fmresids.hrc
View File

@@ -75,10 +75,6 @@
#define RID_SVXMNU_CELL (RID_FORMS_START + 3) #define RID_SVXMNU_CELL (RID_FORMS_START + 3)
#define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4) #define RID_FMSHELL_CONVERSIONMENU (RID_FORMS_START + 4)
#define RID_FM_FILTER_MENU (RID_FORMS_START + 5) #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) #define RID_MENU_DATANAVIGATOR (RID_FORMS_START + 10)
// String-Id's ----------------------------------------------------------- // String-Id's -----------------------------------------------------------

53
include/svx/fntctl.hxx
View File

@@ -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: */

52
include/svx/fntszctl.hxx
View File

@@ -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: */

2
include/svx/svxcommands.h
View File

@@ -109,8 +109,6 @@
#define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15" #define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15"
#define CMD_SID_ATTR_PARA_LINESPACE_20 ".uno:SpacePara2" #define CMD_SID_ATTR_PARA_LINESPACE_20 ".uno:SpacePara2"
#define CMD_SID_ATTR_CHAR_STRIKEOUT ".uno:Strikeout" #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_TAB_DIALOG ".uno:TabDialog"
#define CMD_SID_FM_TIMEFIELD ".uno:TimeField" #define CMD_SID_FM_TIMEFIELD ".uno:TimeField"
#define CMD_SID_BEZIER_EDIT ".uno:ToggleObjectBezierMode" #define CMD_SID_BEZIER_EDIT ".uno:ToggleObjectBezierMode"

5
officecfg/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
View File

@@ -60,6 +60,11 @@
<value xml:lang="en-US">Form Control</value> <value xml:lang="en-US">Form Control</value>
</prop> </prop>
</node> </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"> <node oor:name="private:resource/popupmenu/graphic" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string"> <prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Image</value> <value xml:lang="en-US">Image</value>

5
officecfg/registry/data/org/openoffice/Office/UI/DrawWindowState.xcu
View File

@@ -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"> <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="UIElements">
<node oor:name="States"> <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"> <node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string"> <prop oor:name="DockPos" oor:type="xs:string">
<value>1,0</value> <value>1,0</value>

5
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
View File

@@ -5682,6 +5682,11 @@
</node> </node>
</node> </node>
<node oor:name="Popups"> <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"> <node oor:name=".uno:HelpMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string"> <prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Help</value> <value xml:lang="en-US">~Help</value>

5
officecfg/registry/data/org/openoffice/Office/UI/ImpressWindowState.xcu
View File

@@ -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"> <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="UIElements">
<node oor:name="States"> <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"> <node oor:name="private:resource/toolbar/extrusionobjectbar" oor:op="replace">
<prop oor:name="DockPos" oor:type="xs:string"> <prop oor:name="DockPos" oor:type="xs:string">
<value>1,1</value> <value>1,1</value>

5
officecfg/registry/data/org/openoffice/Office/UI/WriterFormWindowState.xcu
View File

@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value> <value xml:lang="en-US">Form Control</value>
</prop> </prop>
</node> </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"> <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string"> <prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value> <value xml:lang="en-US">Text Frame</value>

5
officecfg/registry/data/org/openoffice/Office/UI/WriterGlobalWindowState.xcu
View File

@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value> <value xml:lang="en-US">Form Control</value>
</prop> </prop>
</node> </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"> <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string"> <prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value> <value xml:lang="en-US">Text Frame</value>

5
officecfg/registry/data/org/openoffice/Office/UI/WriterReportWindowState.xcu
View File

@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value> <value xml:lang="en-US">Form Control</value>
</prop> </prop>
</node> </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"> <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string"> <prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value> <value xml:lang="en-US">Text Frame</value>

5
officecfg/registry/data/org/openoffice/Office/UI/WriterWebWindowState.xcu
View File

@@ -30,6 +30,11 @@
<value xml:lang="en-US">Form Control</value> <value xml:lang="en-US">Form Control</value>
</prop> </prop>
</node> </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"> <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string"> <prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value> <value xml:lang="en-US">Text Frame</value>

5
officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu
View File

@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value> <value xml:lang="en-US">Form Control</value>
</prop> </prop>
</node> </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"> <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string"> <prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value> <value xml:lang="en-US">Text Frame</value>

5
officecfg/registry/data/org/openoffice/Office/UI/XFormsWindowState.xcu
View File

@@ -40,6 +40,11 @@
<value xml:lang="en-US">Form Control</value> <value xml:lang="en-US">Form Control</value>
</prop> </prop>
</node> </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"> <node oor:name="private:resource/popupmenu/frame" oor:op="replace">
<prop oor:name="UIName" oor:type="xs:string"> <prop oor:name="UIName" oor:type="xs:string">
<value xml:lang="en-US">Text Frame</value> <value xml:lang="en-US">Text Frame</value>

1
sc/UIConfig_scalc.mk
View File

@@ -29,6 +29,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/scalc,\
sc/uiconfig/scalc/popupmenu/draw \ sc/uiconfig/scalc/popupmenu/draw \
sc/uiconfig/scalc/popupmenu/drawtext \ sc/uiconfig/scalc/popupmenu/drawtext \
sc/uiconfig/scalc/popupmenu/form \ sc/uiconfig/scalc/popupmenu/form \
sc/uiconfig/scalc/popupmenu/formrichtext \
sc/uiconfig/scalc/popupmenu/freezepanes \ sc/uiconfig/scalc/popupmenu/freezepanes \
sc/uiconfig/scalc/popupmenu/graphic \ sc/uiconfig/scalc/popupmenu/graphic \
sc/uiconfig/scalc/popupmenu/media \ sc/uiconfig/scalc/popupmenu/media \

6
sc/source/ui/app/scdll.cxx
View File

@@ -75,8 +75,6 @@
#include <editeng/flditem.hxx> #include <editeng/flditem.hxx>
#include <svx/modctrl.hxx> #include <svx/modctrl.hxx>
#include <svx/pszctrl.hxx> #include <svx/pszctrl.hxx>
#include <svx/fntctl.hxx>
#include <svx/fntszctl.hxx>
#include <svx/grafctrl.hxx> #include <svx/grafctrl.hxx>
#include <svx/clipboardctl.hxx> #include <svx/clipboardctl.hxx>
#include <svx/lboxctrl.hxx> #include <svx/lboxctrl.hxx>
@@ -204,10 +202,6 @@ void ScDLL::Init()
SvxPosSizeStatusBarControl ::RegisterControl(SID_ATTR_SIZE, pMod); 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 // CustomShape extrusion controller
SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod );

5
sc/source/ui/docshell/docsh4.cxx
View File

@@ -28,6 +28,7 @@ using namespace ::com::sun::star;
#include <math.h> #include <math.h>
#include "scitems.hxx" #include "scitems.hxx"
#include <editeng/flstitem.hxx>
#include <sfx2/fcontnr.hxx> #include <sfx2/fcontnr.hxx>
#include <sfx2/objface.hxx> #include <sfx2/objface.hxx>
#include <sfx2/docfile.hxx> #include <sfx2/docfile.hxx>
@@ -1849,6 +1850,10 @@ void ScDocShell::GetState( SfxItemSet &rSet )
} }
break; break;
case SID_ATTR_CHAR_FONTLIST:
rSet.Put( SvxFontListItem( pImpl->pFontList, nWhich ) );
break;
default: default:
{ {
} }

46
sc/uiconfig/scalc/popupmenu/formrichtext.xml Normal file
View File

@@ -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>

4
sd/UIConfig_sdraw.mk
View File

@@ -13,6 +13,10 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sdraw,\
sd/uiconfig/sdraw/menubar/menubar \ 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,\ $(eval $(call gb_UIConfig_add_statusbarfiles,modules/sdraw,\
sd/uiconfig/sdraw/statusbar/statusbar \ sd/uiconfig/sdraw/statusbar/statusbar \
)) ))

4
sd/UIConfig_simpress.mk
View File

@@ -13,6 +13,10 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/simpress,\
sd/uiconfig/simpress/menubar/menubar \ 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,\ $(eval $(call gb_UIConfig_add_statusbarfiles,modules/simpress,\
sd/uiconfig/simpress/statusbar/statusbar \ sd/uiconfig/simpress/statusbar/statusbar \
)) ))

4
sd/sdi/_docsh.sdi
View File

@@ -17,6 +17,10 @@
*/ */
interface DrawDocument interface DrawDocument
{ {
SID_ATTR_CHAR_FONTLIST
[
StateMethod = GetState ;
]
SID_PACKNGO // ole : ?, status : ? SID_PACKNGO // ole : ?, status : ?
[ [
ExecMethod = Execute ; ExecMethod = Execute ;

7
sd/source/ui/app/sddll.cxx
View File

@@ -66,8 +66,6 @@
#include <svx/clipboardctl.hxx> #include <svx/clipboardctl.hxx>
#include <svx/f3dchild.hxx> #include <svx/f3dchild.hxx>
#include <svx/fillctrl.hxx> #include <svx/fillctrl.hxx>
#include <svx/fntctl.hxx>
#include <svx/fntszctl.hxx>
#include <svx/fontwork.hxx> #include <svx/fontwork.hxx>
#include <svx/formatpaintbrushctrl.hxx> #include <svx/formatpaintbrushctrl.hxx>
#include <svx/ParaLineSpacingPopup.hxx> #include <svx/ParaLineSpacingPopup.hxx>
@@ -91,6 +89,7 @@
#include <sfx2/docfilt.hxx> #include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx> #include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx> #include <sfx2/fcontnr.hxx>
#include <sfx2/mnuitem.hxx>
#include <sfx2/sidebar/SidebarChildWindow.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <vcl/FilterConfigItem.hxx> #include <vcl/FilterConfigItem.hxx>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
@@ -218,10 +217,6 @@ void SdDLL::RegisterControllers()
SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod ); SvxModifyControl::RegisterControl( SID_DOC_MODIFIED, pMod );
SvxZoomSliderControl::RegisterControl( SID_ATTR_ZOOMSLIDER, 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_SET_SNAPITEM, pMod );
SfxMenuControl::RegisterControl( SID_DELETE_SNAPITEM, pMod ); SfxMenuControl::RegisterControl( SID_DELETE_SNAPITEM, pMod );
SfxMenuControl::RegisterControl( SID_BEZIER_CLOSE, pMod ); SfxMenuControl::RegisterControl( SID_BEZIER_CLOSE, pMod );

4
sd/source/ui/docshell/docshell.cxx
View File

@@ -215,6 +215,10 @@ void DrawDocShell::GetState(SfxItemSet &rSet)
switch ( nSlotId ) switch ( nSlotId )
{ {
case SID_ATTR_CHAR_FONTLIST:
rSet.Put( SvxFontListItem( mpFontList, nSlotId ) );
break;
case SID_SEARCH_ITEM: case SID_SEARCH_ITEM:
{ {
rSet.Put( *SD_MOD()->GetSearchItem() ); rSet.Put( *SD_MOD()->GetSearchItem() );

46
sd/uiconfig/sdraw/popupmenu/formrichtext.xml Normal file
View File

@@ -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>

46
sd/uiconfig/simpress/popupmenu/formrichtext.xml Normal file
View File

@@ -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>

1
svx/AllLangResTarget_svx.mk
View File

@@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/form/filtnav.src \ svx/source/form/filtnav.src \
svx/source/form/fmexpl.src \ svx/source/form/fmexpl.src \
svx/source/form/fmstring.src \ svx/source/form/fmstring.src \
svx/source/form/formshell.src \
svx/source/items/svxerr.src \ svx/source/items/svxerr.src \
svx/source/items/svxitems.src \ svx/source/items/svxitems.src \
svx/source/sidebar/EmptyPanel.src \ svx/source/sidebar/EmptyPanel.src \

2
svx/Library_svx.mk
View File

@@ -163,8 +163,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/items/viewlayoutitem \ svx/source/items/viewlayoutitem \
svx/source/items/zoomslideritem \ svx/source/items/zoomslideritem \
svx/source/mnuctrls/clipboardctl \ svx/source/mnuctrls/clipboardctl \
svx/source/mnuctrls/fntctl \
svx/source/mnuctrls/fntszctl \
svx/source/mnuctrls/smarttagmenu \ svx/source/mnuctrls/smarttagmenu \
svx/source/sidebar/ContextChangeEventMultiplexer \ svx/source/sidebar/ContextChangeEventMultiplexer \
svx/source/sidebar/EmptyPanel \ svx/source/sidebar/EmptyPanel \

3
svx/inc/fmhelp.hrc
View File

@@ -58,9 +58,6 @@
#define HID_FM_NEW_FORM "SVX_HID_FM_NEW_FORM" #define HID_FM_NEW_FORM "SVX_HID_FM_NEW_FORM"
#define HID_FM_NEW_HIDDEN "SVX_HID_FM_NEW_HIDDEN" #define HID_FM_NEW_HIDDEN "SVX_HID_FM_NEW_HIDDEN"
#define HID_FM_RENAME_OBJECT "SVX_HID_FM_RENAME_OBJECT" #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 #endif

25
svx/inc/globlmn_tmpl.hrc
View File

@@ -98,31 +98,6 @@
Command = ".uno:Overline" ; \ Command = ".uno:Overline" ; \
Text [ en-US ] = "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 \ #define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \
Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \
Command = ".uno:LeftPara" ; \ Command = ".uno:LeftPara" ; \

2
svx/source/form/fmtextcontrolshell.cxx
View File

@@ -1355,7 +1355,7 @@ namespace svx
void FmTextControlShell::contextMenuRequested( const css::awt::MouseEvent& /*_rEvent*/ ) void FmTextControlShell::contextMenuRequested( const css::awt::MouseEvent& /*_rEvent*/ )
{ {
m_rBindings.GetDispatcher()->ExecutePopup( SVX_RES( RID_FM_TEXTATTRIBUTE_MENU ) ); m_rBindings.GetDispatcher()->ExecutePopup( "formrichtext" );
} }

153
svx/source/form/formshell.src
View File

@@ -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: */

149
svx/source/mnuctrls/fntctl.cxx
View File

@@ -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: */

184
svx/source/mnuctrls/fntszctl.cxx
View File

@@ -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: */

1
sw/UIConfig_sglobal.mk
View File

@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sglobal,\
sw/uiconfig/sglobal/popupmenu/draw \ sw/uiconfig/sglobal/popupmenu/draw \
sw/uiconfig/sglobal/popupmenu/drawtext \ sw/uiconfig/sglobal/popupmenu/drawtext \
sw/uiconfig/sglobal/popupmenu/form \ sw/uiconfig/sglobal/popupmenu/form \
sw/uiconfig/sglobal/popupmenu/formrichtext \
sw/uiconfig/sglobal/popupmenu/frame \ sw/uiconfig/sglobal/popupmenu/frame \
sw/uiconfig/sglobal/popupmenu/graphic \ sw/uiconfig/sglobal/popupmenu/graphic \
sw/uiconfig/sglobal/popupmenu/insertfield \ sw/uiconfig/sglobal/popupmenu/insertfield \

1
sw/UIConfig_sweb.mk
View File

@@ -16,6 +16,7 @@ $(eval $(call gb_UIConfig_add_menubarfiles,modules/sweb,\
$(eval $(call gb_UIConfig_add_popupmenufiles,modules/sweb,\ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sweb,\
sw/uiconfig/sweb/popupmenu/annotation \ sw/uiconfig/sweb/popupmenu/annotation \
sw/uiconfig/sweb/popupmenu/form \ sw/uiconfig/sweb/popupmenu/form \
sw/uiconfig/sweb/popupmenu/formrichtext \
sw/uiconfig/sweb/popupmenu/frame \ sw/uiconfig/sweb/popupmenu/frame \
sw/uiconfig/sweb/popupmenu/graphic \ sw/uiconfig/sweb/popupmenu/graphic \
sw/uiconfig/sweb/popupmenu/insertfield \ sw/uiconfig/sweb/popupmenu/insertfield \

1
sw/UIConfig_swform.mk
View File

@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swform,\
sw/uiconfig/swform/popupmenu/draw \ sw/uiconfig/swform/popupmenu/draw \
sw/uiconfig/swform/popupmenu/drawtext \ sw/uiconfig/swform/popupmenu/drawtext \
sw/uiconfig/swform/popupmenu/form \ sw/uiconfig/swform/popupmenu/form \
sw/uiconfig/swform/popupmenu/formrichtext \
sw/uiconfig/swform/popupmenu/frame \ sw/uiconfig/swform/popupmenu/frame \
sw/uiconfig/swform/popupmenu/graphic \ sw/uiconfig/swform/popupmenu/graphic \
sw/uiconfig/swform/popupmenu/insertfield \ sw/uiconfig/swform/popupmenu/insertfield \

1
sw/UIConfig_swreport.mk
View File

@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swreport,\
sw/uiconfig/swreport/popupmenu/draw \ sw/uiconfig/swreport/popupmenu/draw \
sw/uiconfig/swreport/popupmenu/drawtext \ sw/uiconfig/swreport/popupmenu/drawtext \
sw/uiconfig/swreport/popupmenu/form \ sw/uiconfig/swreport/popupmenu/form \
sw/uiconfig/swreport/popupmenu/formrichtext \
sw/uiconfig/swreport/popupmenu/frame \ sw/uiconfig/swreport/popupmenu/frame \
sw/uiconfig/swreport/popupmenu/graphic \ sw/uiconfig/swreport/popupmenu/graphic \
sw/uiconfig/swreport/popupmenu/insertfield \ sw/uiconfig/swreport/popupmenu/insertfield \

1
sw/UIConfig_swriter.mk
View File

@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swriter,\
sw/uiconfig/swriter/popupmenu/draw \ sw/uiconfig/swriter/popupmenu/draw \
sw/uiconfig/swriter/popupmenu/drawtext \ sw/uiconfig/swriter/popupmenu/drawtext \
sw/uiconfig/swriter/popupmenu/form \ sw/uiconfig/swriter/popupmenu/form \
sw/uiconfig/swriter/popupmenu/formrichtext \
sw/uiconfig/swriter/popupmenu/frame \ sw/uiconfig/swriter/popupmenu/frame \
sw/uiconfig/swriter/popupmenu/graphic \ sw/uiconfig/swriter/popupmenu/graphic \
sw/uiconfig/swriter/popupmenu/insertfield \ sw/uiconfig/swriter/popupmenu/insertfield \

1
sw/UIConfig_swxform.mk
View File

@@ -18,6 +18,7 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/swxform,\
sw/uiconfig/swxform/popupmenu/draw \ sw/uiconfig/swxform/popupmenu/draw \
sw/uiconfig/swxform/popupmenu/drawtext \ sw/uiconfig/swxform/popupmenu/drawtext \
sw/uiconfig/swxform/popupmenu/form \ sw/uiconfig/swxform/popupmenu/form \
sw/uiconfig/swxform/popupmenu/formrichtext \
sw/uiconfig/swxform/popupmenu/frame \ sw/uiconfig/swxform/popupmenu/frame \
sw/uiconfig/swxform/popupmenu/graphic \ sw/uiconfig/swxform/popupmenu/graphic \
sw/uiconfig/swxform/popupmenu/insertfield \ sw/uiconfig/swxform/popupmenu/insertfield \

5
sw/source/uibase/app/swmodule.cxx
View File

@@ -26,8 +26,6 @@
#include <svtools/ehdl.hxx> #include <svtools/ehdl.hxx>
#include <svx/ParaLineSpacingPopup.hxx> #include <svx/ParaLineSpacingPopup.hxx>
#include <svx/svdobj.hxx> #include <svx/svdobj.hxx>
#include <svx/fntszctl.hxx>
#include <svx/fntctl.hxx>
#include <svx/pszctrl.hxx> #include <svx/pszctrl.hxx>
#include <svx/insctrl.hxx> #include <svx/insctrl.hxx>
#include <svx/selctrl.hxx> #include <svx/selctrl.hxx>
@@ -321,9 +319,6 @@ void SwDLL::RegisterControls()
SvxTableToolBoxControl::RegisterControl(FN_INSERT_TABLE, pMod ); SvxTableToolBoxControl::RegisterControl(FN_INSERT_TABLE, pMod );
SvxTableToolBoxControl::RegisterControl(FN_SHOW_MULTIPLE_PAGES, 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 ); SwZoomControl::RegisterControl(SID_ATTR_ZOOM, pMod );
SwPreviewZoomControl::RegisterControl(FN_PREVIEW_ZOOM, pMod); SwPreviewZoomControl::RegisterControl(FN_PREVIEW_ZOOM, pMod);
SvxPosSizeStatusBarControl::RegisterControl(0, pMod ); SvxPosSizeStatusBarControl::RegisterControl(0, pMod );

46
sw/uiconfig/sglobal/popupmenu/formrichtext.xml Normal file
View File

@@ -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>

43
sw/uiconfig/sweb/popupmenu/formrichtext.xml Normal file
View File

@@ -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>

46
sw/uiconfig/swform/popupmenu/formrichtext.xml Normal file
View File

@@ -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>

46
sw/uiconfig/swreport/popupmenu/formrichtext.xml Normal file
View File

@@ -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>

46
sw/uiconfig/swriter/popupmenu/formrichtext.xml Normal file
View File

@@ -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>

46
sw/uiconfig/swxform/popupmenu/formrichtext.xml Normal file
View File

@@ -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>