diff options
author | David Ostrovsky <david@ostrovsky.org> | 2013-10-05 23:07:24 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-14 12:21:39 +0200 |
commit | 2aa5d13ed09c1cbad9f1da315442edfa6f9f3b60 (patch) | |
tree | 58a3d348f244247434c21eb9606b8a38726dad2c /sd | |
parent | a979956012a277c9cb85147605b9671ace12aa0a (diff) |
fdo#61950 De-extensionize presentation minimizer
Change-Id: I87805ceacf184d5aa5faae68e8bb932391ace7fb
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/inc/app.hrc | 2 | ||||
-rw-r--r-- | sd/inc/sdcommands.h | 1 | ||||
-rw-r--r-- | sd/sdi/_drvwsh.sdi | 4 | ||||
-rw-r--r-- | sd/sdi/sdraw.sdi | 25 | ||||
-rw-r--r-- | sd/source/ui/view/drviews2.cxx | 26 | ||||
-rw-r--r-- | sd/uiconfig/simpress/menubar/menubar.xml | 2 |
6 files changed, 60 insertions, 0 deletions
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index f82d11e38fdf..1c63092e1788 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -455,6 +455,8 @@ #define SID_ADD_MOTION_PATH (SID_SD_START+442) #define SID_TABLE_TOOLBOX (SID_SD_START+443) +// free +#define SID_PRESENTATION_MINIMIZER (SID_SD_START+450) #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h index abd03ce5a4e4..d30139294edb 100644 --- a/sd/inc/sdcommands.h +++ b/sd/inc/sdcommands.h @@ -118,6 +118,7 @@ #define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster" #define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage" #define CMD_SID_PHOTOALBUM ".uno:PhotoAlbumDialog" +#define CMD_SID_PRESENTATION_MINIMIZER ".uno:PresentationMinimizer" #endif diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index b06113e33dcd..857b30e7d30c 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2739,4 +2739,8 @@ interface DrawView ExecMethod = ExecutePropPanelAttr ; StateMethod = GetStatePropPanelAttr ; ] + SID_PRESENTATION_MINIMIZER + [ + ExecMethod = FuTemporary ; + ] } diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 4fee33c88f4e..19e03d757c26 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -7251,3 +7251,28 @@ SfxVoidItem PhotoAlbumDialog SID_PHOTOALBUM ToolBoxConfig = TRUE, GroupId = GID_OPTIONS; ] + +//-------------------------------------------------------------------------- +SfxVoidItem PresentationMinimizer SID_PRESENTATION_MINIMIZER +() +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = TRUE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerItem; + Synchron; + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_OPTIONS; +] diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 969a17b55245..003835e1feec 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -26,6 +26,9 @@ #include <com/sun/star/drawing/XDrawPages.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/ui/dialogs/XSLTFilterDialog.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/util/URLTransformer.hpp> +#include <com/sun/star/util/XURLTransformer.hpp> #include <comphelper/processfactory.hxx> @@ -167,6 +170,8 @@ #include "unmodpg.hxx" #include <sfx2/sidebar/Sidebar.hxx> +#include "ViewShellBase.hxx" + namespace { const char CustomAnimationPanelId[] = "CustomAnimationPanel"; const char SlideTransitionPanelId[] = "SlideTransitionPanel"; @@ -2799,6 +2804,27 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } break; + case SID_PRESENTATION_MINIMIZER: + { + Reference<XComponentContext> xContext(::comphelper::getProcessComponentContext()); + Reference<util::XURLTransformer> xParser(util::URLTransformer::create(xContext)); + Reference<frame::XDispatchProvider> xProvider(GetViewShellBase().GetController()->getFrame(), UNO_QUERY); + if (xProvider.is()) + { + util::URL aURL; + aURL.Complete = "vnd.com.sun.star.comp.PresentationMinimizer:execute"; + xParser->parseStrict(aURL); + uno::Reference<frame::XDispatch> xDispatch(xProvider->queryDispatch(aURL, OUString(), 0)); + if (xDispatch.is()) + { + xDispatch->dispatch(aURL, uno::Sequence< beans::PropertyValue >()); + } + } + Cancel(); + rReq.Ignore(); + } + break; + case SID_LAYER_DIALOG_WIN: { if ( rReq.GetArgs() ) diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index a9ef76a12b06..b2d5ae6459d6 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -286,6 +286,8 @@ <menu:menuitem menu:id=".uno:BmpMask"/> <menu:menuitem menu:id=".uno:AVMediaPlayer"/> <menu:menuseparator/> + <menu:menuitem menu:id=".uno:PresentationMinimizer"/> + <menu:menuseparator/> <menu:menu menu:id=".uno:MacrosMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:MacroRecorder"/> |