diff options
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/gallery2/galbrws.cxx | 18 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 13 |
2 files changed, 4 insertions, 27 deletions
diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index bb5c7fb450a1..7bec886eff94 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -34,24 +34,6 @@ #include <boost/bind.hpp> -GalleryChildWindow::GalleryChildWindow( Window* _pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : - SfxChildWindow( _pParent, nId ) -{ - - pWindow = new GalleryBrowser( pBindings, this, _pParent, GAL_RES( RID_SVXDLG_GALLERYBROWSER ) ); - eChildAlignment = SFX_ALIGN_TOP; - ( (GalleryBrowser*) pWindow )->Initialize( pInfo ); -}; - -GalleryChildWindow::~GalleryChildWindow() -{ -} - -SFX_IMPL_DOCKINGWINDOW_WITHID( GalleryChildWindow, SID_GALLERY ) - -// - GalleryBrowser - - - GalleryBrowser::GalleryBrowser( SfxBindings* _pBindings, SfxChildWindow* pCW, diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 5124dc199ef3..4c2e985c6942 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -57,6 +57,7 @@ #include <svx/svxitems.hrc> #include "helpid.hrc" #include <sfx2/htmlmode.hxx> +#include <sfx2/sidebar/Sidebar.hxx> #include <svx/xtable.hxx> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> @@ -363,15 +364,9 @@ void SvxStyleBox_Impl::Select() { SfxViewFrame* pViewFrm = SfxViewFrame::Current(); DBG_ASSERT( pViewFrm, "SvxStyleBox_Impl::Select(): no viewframe" ); - pViewFrm->ShowChildWindow( SID_STYLE_DESIGNER ); - SfxChildWindow* pChildWin = pViewFrm->GetChildWindow( SID_STYLE_DESIGNER ); - if ( pChildWin && pChildWin->GetWindow() ) - { - static_cast< SfxTemplateDialogWrapper* >( pChildWin )->SetParagraphFamily(); - static_cast< SfxDockingWindow* >( pChildWin->GetWindow() )->AutoShow( true ); - Application::PostUserEvent( - STATIC_LINK( 0, SvxStyleBox_Impl, FocusHdl_Impl ), pChildWin->GetWindow() ); - } + pViewFrm->ShowChildWindow( SID_SIDEBAR ); + ::sfx2::sidebar::Sidebar::ShowPanel("StyleListPanel", + pViewFrm->GetFrame().GetFrameInterface()); bDoIt = false; } } |