From 69c5252a63d6124a90b652c423dbf94d26fe196b Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Sun, 21 Feb 2016 16:33:30 +0200 Subject: tdf#93837 Convert RID_FM_TEXTATTRIBUTE_MENU to xml Change-Id: Ic37bfb9e25eba9b03b2c896c904823aec478355e --- 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 +++++++++++++++++++++++++ 7 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 sd/uiconfig/sdraw/popupmenu/formrichtext.xml create mode 100644 sd/uiconfig/simpress/popupmenu/formrichtext.xml (limited to 'sd') diff --git a/sd/UIConfig_sdraw.mk b/sd/UIConfig_sdraw.mk index cb2c84b84ca7..dc0f1e1a970b 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 a0d70e961cf8..7adf18158047 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 5f26309e3223..2902e5148fff 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 8291d1a44406..b2c67210f48d 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -66,8 +66,6 @@ #include #include #include -#include -#include #include #include #include @@ -91,6 +89,7 @@ #include #include #include +#include #include #include #include @@ -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 f47b0a7ef895..0295166d9964 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 000000000000..f5f8f7a0d209 --- /dev/null +++ b/sd/uiconfig/sdraw/popupmenu/formrichtext.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sd/uiconfig/simpress/popupmenu/formrichtext.xml b/sd/uiconfig/simpress/popupmenu/formrichtext.xml new file mode 100644 index 000000000000..f5f8f7a0d209 --- /dev/null +++ b/sd/uiconfig/simpress/popupmenu/formrichtext.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit