diff options
author | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-04-26 10:41:38 +0200 |
---|---|---|
committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2016-05-04 14:22:15 +0000 |
commit | c4170770def6abdfa4201101b8ca5fd7769135f2 (patch) | |
tree | 2b9f26c1acfc746c490890e05d656bb6f69385e3 | |
parent | e0dd123b3e6fa6e0bccff3bd1fbb132997d3266c (diff) |
tdf#89466: Give those slots a separate GetState method
only SID_ATTR_PAGE_SIZE does anything so far
Change-Id: I30de1b8b72702b0ddd536ed4026b433ed9295bb7
Reviewed-on: https://gerrit.libreoffice.org/24450
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
-rw-r--r-- | sd/sdi/_drvwsh.sdi | 12 | ||||
-rw-r--r-- | sd/source/ui/func/fupage.cxx | 3 | ||||
-rw-r--r-- | sd/source/ui/inc/DrawViewShell.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/view/drviews7.cxx | 6 |
4 files changed, 16 insertions, 6 deletions
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index e74034d730ea..bc5aa27699f7 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2615,32 +2615,32 @@ interface DrawView SID_ATTR_PAGE_SIZE [ ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; + StateMethod = GetPageProperties ; ] SID_ATTR_PAGE_COLOR [ ExecMethod = FuTemporary ; - StateMethod = GetMenuState; + StateMethod = GetPageProperties; ] SID_ATTR_PAGE_GRADIENT [ ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; + StateMethod = GetPageProperties ; ] SID_ATTR_PAGE_HATCH [ ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; + StateMethod = GetPageProperties ; ] SID_ATTR_PAGE_BITMAP [ ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; + StateMethod = GetPageProperties ; ] SID_ATTR_PAGE_FILLSTYLE [ ExecMethod = FuTemporary; - StateMethod = GetMenuState; + StateMethod = GetPageProperties; ] SID_DISPLAY_MASTER_BACKGROUND [ diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index cb2ecda96154..09788815a578 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -147,7 +147,10 @@ void FuPage::DoExecute( SfxRequest& ) // if we now have arguments, apply them to current page if( mpArgs ) + { ApplyItemSet( mpArgs ); + mpView->SetAttributes( *mpArgs ); + } static sal_uInt16 SidArray[] = { SID_ATTR_PAGE_COLOR, diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index 700a2ad35649..b043f18851b3 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -148,6 +148,7 @@ public: void GetCtrlState(SfxItemSet& rSet); void GetDrawAttrState(SfxItemSet& rSet); void GetMenuState(SfxItemSet& rSet); + void GetPageProperties(SfxItemSet& rSet); void GetTableMenuState(SfxItemSet& rSet); /** Set the items of the given item set that are related to switching the editing mode to the correct values. diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index 3a804658b1c2..bd6136774d7d 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -30,6 +30,7 @@ #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> #include <editeng/outlobj.hxx> +#include <editeng/sizeitem.hxx> #include <officecfg/Office/Common.hxx> #include <officecfg/Office/Impress.hxx> #include <svx/svxids.hrc> @@ -1547,6 +1548,11 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) GetModeSwitchingMenuState (rSet); } +void DrawViewShell::GetPageProperties( SfxItemSet &rSet ) +{ + rSet.Put(SvxSizeItem( SID_ATTR_PAGE_SIZE, getCurrentPage()->GetSize())); +} + void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet) { //DrawView |