diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-04 17:22:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-11 17:42:22 +0100 |
| commit | 1653bb9bffaa84a40b7d81a8277e887ea28df4e4 (patch) | |
| tree | 5e56142b7b63ab66fb1dcc781ffeb3ae5afda2ad /sfx2/source/dialog | |
| parent | 40c58f6039fb02cff74e442f6adc5ba38adcff1d (diff) | |
remove intermediate containers in sidebars
tested extension sidebars of:
a) Wollmux extension sidebars
b) Analog Clock Extension demo
https://wiki.openoffice.org/wiki/Sidebar_for_Developers#Example:_Analog_Clock_Extension
Change-Id: If9729e20526681928137989f01a8ae733a9b0cb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112035
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/dialog')
| -rw-r--r-- | sfx2/source/dialog/navigat.cxx | 15 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 12 |
2 files changed, 6 insertions, 21 deletions
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index 1487bcbcc8f3..90116d8a2064 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -48,19 +48,12 @@ void SfxNavigatorWrapper::Initialize(SfxChildWinInfo* pInfo) SfxNavigator::SfxNavigator( SfxBindings* pBind , SfxChildWindow* pChildWin , vcl::Window* pParent ) - : SfxDockingWindow( pBind , - pChildWin , - pParent , - WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK ) + : SfxDockingWindow(pBind , + pChildWin , + pParent , + "Navigator", "sfx/ui/navigator.ui") { SetText(SfxResId(STR_SID_NAVIGATOR)); } -void SfxNavigator::Resize() -{ - SfxDockingWindow::Resize(); - if (vcl::Window *pChild = GetWindow(GetWindowType::FirstChild)) - VclContainer::setLayoutAllocation(*pChild, Point(0, 0), GetSizePixel()); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 27697a46dbfb..608b1790190d 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -364,23 +364,15 @@ IMPL_LINK(SfxCommonTemplateDialog_Impl, PopupTreeMenuHdl, const CommandEvent&, r return true; } -SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, vcl::Window* pParentWindow) - : PanelLayout(pParentWindow, "TemplatePanel", "sfx/ui/templatepanel.ui", nullptr) +SfxTemplatePanelControl::SfxTemplatePanelControl(SfxBindings* pBindings, weld::Widget* pParent) + : PanelLayout(pParent, "TemplatePanel", "sfx/ui/templatepanel.ui") , pImpl(new SfxTemplateDialog_Impl(pBindings, this)) { OSL_ASSERT(pBindings!=nullptr); - m_pInitialFocusWidget = pImpl->m_xActionTbL.get(); } SfxTemplatePanelControl::~SfxTemplatePanelControl() { - disposeOnce(); -} - -void SfxTemplatePanelControl::dispose() -{ - pImpl.reset(); - PanelLayout::dispose(); } static void MakeExpanded_Impl(const weld::TreeView& rBox, std::vector<OUString>& rEntries) |