diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-21 16:33:30 +0200 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-02-21 16:41:40 +0200 |
commit | 69c5252a63d6124a90b652c423dbf94d26fe196b (patch) | |
tree | 6995b842b5e06bd3ae30a9b601de5e94c38a284e /sw | |
parent | 144546b622fd6146e023efe27b74f1271ff47008 (diff) |
tdf#93837 Convert RID_FM_TEXTATTRIBUTE_MENU to xml
Change-Id: Ic37bfb9e25eba9b03b2c896c904823aec478355e
Diffstat (limited to 'sw')
-rw-r--r-- | sw/UIConfig_sglobal.mk | 1 | ||||
-rw-r--r-- | sw/UIConfig_sweb.mk | 1 | ||||
-rw-r--r-- | sw/UIConfig_swform.mk | 1 | ||||
-rw-r--r-- | sw/UIConfig_swreport.mk | 1 | ||||
-rw-r--r-- | sw/UIConfig_swriter.mk | 1 | ||||
-rw-r--r-- | sw/UIConfig_swxform.mk | 1 | ||||
-rw-r--r-- | sw/source/uibase/app/swmodule.cxx | 5 | ||||
-rw-r--r-- | sw/uiconfig/sglobal/popupmenu/formrichtext.xml | 46 | ||||
-rw-r--r-- | sw/uiconfig/sweb/popupmenu/formrichtext.xml | 43 | ||||
-rw-r--r-- | sw/uiconfig/swform/popupmenu/formrichtext.xml | 46 | ||||
-rw-r--r-- | sw/uiconfig/swreport/popupmenu/formrichtext.xml | 46 | ||||
-rw-r--r-- | sw/uiconfig/swriter/popupmenu/formrichtext.xml | 46 | ||||
-rw-r--r-- | sw/uiconfig/swxform/popupmenu/formrichtext.xml | 46 |
13 files changed, 279 insertions, 5 deletions
diff --git a/sw/UIConfig_sglobal.mk b/sw/UIConfig_sglobal.mk index a0124baa9a4e..e373e72aa33e 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 38b2c190320c..588a043be465 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 9d3fc8b25ec1..b733cb9c930f 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 598f90ed4fee..b1286f89685d 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 a8636f53f9a6..5df03ca4dff9 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 86673b792fa9..2fa8e2413d5e 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 5930ec5f7f01..e65313a5bcb3 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 000000000000..f5f8f7a0d209 --- /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 000000000000..b5dab11c336a --- /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 000000000000..f5f8f7a0d209 --- /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 000000000000..f5f8f7a0d209 --- /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 000000000000..f5f8f7a0d209 --- /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 000000000000..f5f8f7a0d209 --- /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> |