diff options
| author | Andre Fischer <af@apache.org> | 2013-06-05 15:40:56 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-20 16:35:29 +0100 |
| commit | 50cbbc7f3afdd077e98f416f97390fe93428e8cf (patch) | |
| tree | f1f0bdfa883202bd8fe382f8f99afda454c3e30e /sd/source/ui/table | |
| parent | d023339c2f85555212bdb9804854dcc2c403b50e (diff) | |
Resolves: #i122470# Fixed programmatic triggered switching of sidebar decks
(cherry picked from commit 7b26aba94e5544937f1e37e34915bcb276bc3c27)
Conflicts:
sd/sdi/sdraw.sdi
sd/source/ui/framework/tools/FrameworkHelper.cxx
sd/source/ui/inc/framework/FrameworkHelper.hxx
sd/source/ui/view/ViewShellBase.cxx
sd/source/ui/view/drviews6.cxx
sfx2/Package_inc.mk
sfx2/inc/sfx2/sidebar/Sidebar.hxx
Change-Id: Ic6b518e734fe59a7b713e85e934487347b847c5a
Diffstat (limited to 'sd/source/ui/table')
| -rw-r--r-- | sd/source/ui/table/tablefunction.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index 634bb79a0701..7944ed96b8ef 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -49,6 +49,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> +#include <sfx2/sidebar/Sidebar.hxx> #include <svl/style.hxx> #include "framework/FrameworkHelper.hxx" @@ -195,10 +196,11 @@ void DrawViewShell::FuTable(SfxRequest& rReq) } else { - // Make the slide transition panel visible (expand it) in the - // tool pane. - framework::FrameworkHelper::Instance(GetViewShellBase())->RequestSidebarPanel( - framework::FrameworkHelper::msTableDesignPanelURL); + // Make the table design panel visible (expand it) in the + // sidebar. + ::sfx2::sidebar::Sidebar::ShowPanel( + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImpressTableDesignPanel")), + GetViewFrame()->GetFrame().GetFrameInterface()); } Cancel(); |