From 5838b62e7ba2312f41a4c8a43d53036476bfce1d Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 24 Apr 2020 13:41:51 +0100 Subject: final ctor arg of PanelLayout ctor is always true now MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I40cb888c13cb49aa0e20b5be5ceb1c15cf7a346c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92858 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- svx/source/gallery2/GalleryControl.cxx | 2 +- svx/source/sidebar/EmptyPanel.cxx | 2 +- svx/source/sidebar/PanelLayout.cxx | 22 ++++++---------------- svx/source/sidebar/area/AreaPropertyPanelBase.cxx | 2 +- svx/source/sidebar/glow/GlowPropertyPanel.cxx | 2 +- .../sidebar/graphic/GraphicPropertyPanel.cxx | 2 +- svx/source/sidebar/line/LinePropertyPanel.hxx | 2 +- svx/source/sidebar/line/LinePropertyPanelBase.cxx | 2 +- svx/source/sidebar/lists/ListsPropertyPanel.cxx | 2 +- svx/source/sidebar/media/MediaPlaybackPanel.cxx | 2 +- svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2 +- svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 1 + .../sidebar/possize/PosSizePropertyPanel.cxx | 3 ++- .../sidebar/possize/PosSizePropertyPanel.hxx | 1 + svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 2 +- svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 2 +- svx/source/sidebar/styles/StylesPropertyPanel.cxx | 2 +- svx/source/sidebar/text/TextPropertyPanel.cxx | 2 +- 18 files changed, 24 insertions(+), 31 deletions(-) (limited to 'svx') diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index e934cc0d9974..a25d178d4ad7 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -26,7 +26,7 @@ namespace svx::sidebar { GalleryControl::GalleryControl(vcl::Window* pParent) - : PanelLayout(pParent, "GalleryPanel", "svx/ui/sidebargallery.ui", nullptr, true) + : PanelLayout(pParent, "GalleryPanel", "svx/ui/sidebargallery.ui", nullptr) , mpGallery(Gallery::GetGalleryInstance()) , mxBrowser1(new GalleryBrowser1( *m_xBuilder, diff --git a/svx/source/sidebar/EmptyPanel.cxx b/svx/source/sidebar/EmptyPanel.cxx index 0265032b0e0e..116b1c3e8071 100644 --- a/svx/source/sidebar/EmptyPanel.cxx +++ b/svx/source/sidebar/EmptyPanel.cxx @@ -22,7 +22,7 @@ namespace svx::sidebar { EmptyPanel::EmptyPanel (vcl::Window* pParent) - : PanelLayout(pParent, "EmptyPanel", "svx/ui/sidebarempty.ui", nullptr, true) + : PanelLayout(pParent, "EmptyPanel", "svx/ui/sidebarempty.ui", nullptr) , mxMessageControl(m_xBuilder->weld_label("message")) { } diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 78a0f95e90bf..fe0ffbee12f7 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -16,7 +16,7 @@ using namespace sfx2::sidebar; PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, - const css::uno::Reference &rFrame, bool bInterimBuilder) + const css::uno::Reference &rFrame) : Control(pParent) , m_bInClose(false) , mxFrame(rFrame) @@ -26,20 +26,11 @@ PanelLayout::PanelLayout(vcl::Window* pParent, const OString& rID, const OUStrin m_aPanelLayoutIdle.SetInvokeHandler( LINK( this, PanelLayout, ImplHandlePanelLayoutTimerHdl ) ); m_aPanelLayoutIdle.SetDebugName("svx::PanelLayout m_aPanelLayoutIdle"); - // VclBuilder will trigger resize and start Idle - if (!bInterimBuilder) - { - m_pUIBuilder.reset(new VclBuilder(this, getUIRootDir(), rUIXMLDescription, rID, rFrame)); - if (GetSettings().GetStyleSettings().GetAutoMnemonic()) - Accelerator::GenerateAutoMnemonicsOnHierarchy(this); - } - else - { - m_xVclContentArea = VclPtr::Create(this); - m_xVclContentArea->Show(); - m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, rUIXMLDescription)); - m_xContainer = m_xBuilder->weld_container(rID); - } + // Builder will trigger resize and start Idle + m_xVclContentArea = VclPtr::Create(this); + m_xVclContentArea->Show(); + m_xBuilder.reset(Application::CreateInterimBuilder(m_xVclContentArea, rUIXMLDescription)); + m_xContainer = m_xBuilder->weld_container(rID); } PanelLayout::~PanelLayout() @@ -54,7 +45,6 @@ void PanelLayout::dispose() m_xContainer.reset(); m_xBuilder.reset(); m_xVclContentArea.disposeAndClear(); - disposeBuilder(); Control::dispose(); } diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index 4a09525fa158..c51ae522792c 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -61,7 +61,7 @@ const sal_Int32 AreaPropertyPanelBase::DEFAULT_BORDER = 0; AreaPropertyPanelBase::AreaPropertyPanelBase( vcl::Window* pParent, const css::uno::Reference& rxFrame) - : PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame, true), + : PanelLayout(pParent, "AreaPropertyPanel", "svx/ui/sidebararea.ui", rxFrame), meLastXFS(static_cast(-1)), mnLastPosHatch(0), mnLastPosBitmap(0), diff --git a/svx/source/sidebar/glow/GlowPropertyPanel.cxx b/svx/source/sidebar/glow/GlowPropertyPanel.cxx index 07e10e916fff..82df3ee5fe17 100644 --- a/svx/source/sidebar/glow/GlowPropertyPanel.cxx +++ b/svx/source/sidebar/glow/GlowPropertyPanel.cxx @@ -34,7 +34,7 @@ namespace svx::sidebar GlowPropertyPanel::GlowPropertyPanel(vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings) - : PanelLayout(pParent, "GlowPropertyPanel", "svx/ui/sidebarglow.ui", rxFrame, true) + : PanelLayout(pParent, "GlowPropertyPanel", "svx/ui/sidebarglow.ui", rxFrame) , maGlowController(SID_ATTR_GLOW, *pBindings, *this) , maGlowColorController(SID_ATTR_GLOW_COLOR, *pBindings, *this) , maGlowRadiusController(SID_ATTR_GLOW_RADIUS, *pBindings, *this) diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index c29142c1415d..5ab60aff01ae 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -39,7 +39,7 @@ GraphicPropertyPanel::GraphicPropertyPanel( vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings) -: PanelLayout(pParent, "GraphicPropertyPanel", "svx/ui/sidebargraphic.ui", rxFrame, true), +: PanelLayout(pParent, "GraphicPropertyPanel", "svx/ui/sidebargraphic.ui", rxFrame), maBrightControl(SID_ATTR_GRAF_LUMINANCE, *pBindings, *this), maContrastControl(SID_ATTR_GRAF_CONTRAST, *pBindings, *this), maTransparenceControl(SID_ATTR_GRAF_TRANSPARENCE, *pBindings, *this), diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index aea19a5643c1..767564fe69a8 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -22,7 +22,7 @@ #include #include #include - +#include class XLineStyleItem; class XLineDashItem; diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index bdb776decf61..d78e2358436a 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -73,7 +73,7 @@ namespace LinePropertyPanelBase::LinePropertyPanelBase( vcl::Window* pParent, const uno::Reference& rxFrame) -: PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline.ui", rxFrame, true), +: PanelLayout(pParent, "LinePropertyPanel", "svx/ui/sidebarline.ui", rxFrame), mxTBColor(m_xBuilder->weld_toolbar("color")), mxColorDispatch(new ToolbarUnoDispatcher(*mxTBColor, *m_xBuilder, rxFrame)), mxLineStyleTB(m_xBuilder->weld_toolbar("linestyle")), diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.cxx b/svx/source/sidebar/lists/ListsPropertyPanel.cxx index cf9d94cc42bd..2b579b4979b1 100644 --- a/svx/source/sidebar/lists/ListsPropertyPanel.cxx +++ b/svx/source/sidebar/lists/ListsPropertyPanel.cxx @@ -40,7 +40,7 @@ ListsPropertyPanel::Create(vcl::Window* pParent, ListsPropertyPanel::ListsPropertyPanel(vcl::Window* pParent, const css::uno::Reference& rxFrame) - : PanelLayout(pParent, "ListsPropertyPanel", "svx/ui/sidebarlists.ui", rxFrame, true) + : PanelLayout(pParent, "ListsPropertyPanel", "svx/ui/sidebarlists.ui", rxFrame) , mxTBxNumBullet(m_xBuilder->weld_toolbar("numberbullet")) , mxNumBulletDispatcher(new ToolbarUnoDispatcher(*mxTBxNumBullet, *m_xBuilder, rxFrame)) , mxTBxOutline(m_xBuilder->weld_toolbar("outline")) diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx index 63626aaa777d..b62eb3292b91 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx @@ -32,7 +32,7 @@ MediaPlaybackPanel::MediaPlaybackPanel ( vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings) - : PanelLayout(pParent, "MediaPlaybackPanel", "svx/ui/mediaplayback.ui", rxFrame, true), + : PanelLayout(pParent, "MediaPlaybackPanel", "svx/ui/mediaplayback.ui", rxFrame), MediaControlBase(), maMediaController(SID_AVMEDIA_TOOLBOX, *pBindings, *this), maIdle("MediaPlaybackPanel"), diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index dd39f050d4bd..324a2e587916 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -403,7 +403,7 @@ ParaPropertyPanel::ParaPropertyPanel(vcl::Window* pParent, const css::uno::Reference& rxFrame, SfxBindings* pBindings, const css::uno::Reference& rxSidebar) - : PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui", rxFrame, true), + : PanelLayout(pParent, "ParaPropertyPanel", "svx/ui/sidebarparagraph.ui", rxFrame), //Alignment mxTBxHorzAlign(m_xBuilder->weld_toolbar("horizontalalignment")), mxHorzAlignDispatch(new ToolbarUnoDispatcher(*mxTBxHorzAlign, *m_xBuilder, rxFrame)), diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index db1ecd9bae7a..5fe8095ad061 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -29,6 +29,7 @@ #include #include +#include class ToolbarUnoDispatcher; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index 0ca21527d89e..24737369d2db 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -22,6 +22,7 @@ #include #include "PosSizePropertyPanel.hxx" +#include #include #include #include @@ -55,7 +56,7 @@ PosSizePropertyPanel::PosSizePropertyPanel( const css::uno::Reference& rxFrame, SfxBindings* pBindings, const css::uno::Reference& rxSidebar) -: PanelLayout(pParent, "PosSizePropertyPanel", "svx/ui/sidebarpossize.ui", rxFrame, true), +: PanelLayout(pParent, "PosSizePropertyPanel", "svx/ui/sidebarpossize.ui", rxFrame), mxFtPosX(m_xBuilder->weld_label("horizontallabel")), mxMtrPosX(m_xBuilder->weld_metric_spin_button("horizontalpos", FieldUnit::CM)), mxFtPosY(m_xBuilder->weld_label("verticallabel")), diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index bf5f1ff7e8ae..0defd5292a52 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index b0f135519030..4fec06b5bcc5 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -31,7 +31,7 @@ ShadowPropertyPanel::ShadowPropertyPanel( vcl::Window* pParent, const uno::Reference& rxFrame, SfxBindings* pBindings) -: PanelLayout(pParent, "ShadowPropertyPanel", "svx/ui/sidebarshadow.ui", rxFrame, true), +: PanelLayout(pParent, "ShadowPropertyPanel", "svx/ui/sidebarshadow.ui", rxFrame), maShadowController(SID_ATTR_FILL_SHADOW, *pBindings, *this), maShadowTransController(SID_ATTR_SHADOW_TRANSPARENCE, *pBindings, *this), maShadowColorController(SID_ATTR_SHADOW_COLOR, *pBindings, *this), diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index e0aeb0df2b69..33704bf90f30 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -28,7 +28,7 @@ namespace svx::sidebar { DefaultShapesPanel::DefaultShapesPanel ( vcl::Window* pParent, const css::uno::Reference& rxFrame) - : PanelLayout(pParent, "DefaultShapesPanel", "svx/ui/defaultshapespanel.ui", rxFrame, true) + : PanelLayout(pParent, "DefaultShapesPanel", "svx/ui/defaultshapespanel.ui", rxFrame) , SvxShapeCommandsMap() , mxLineArrowSet(new SvtValueSet(nullptr)) , mxLineArrowSetWin(new weld::CustomWeld(*m_xBuilder, "LinesArrows", *mxLineArrowSet)) diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.cxx b/svx/source/sidebar/styles/StylesPropertyPanel.cxx index 931862f4f1ed..a583e0603f67 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.cxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.cxx @@ -22,7 +22,7 @@ VclPtr StylesPropertyPanel::Create ( } StylesPropertyPanel::StylesPropertyPanel ( vcl::Window* pParent, const css::uno::Reference& rxFrame ) - : PanelLayout(pParent, "SidebarStylesPanel", "svx/ui/sidebarstylespanel.ui", rxFrame, true) + : PanelLayout(pParent, "SidebarStylesPanel", "svx/ui/sidebarstylespanel.ui", rxFrame) , m_xFontStyle(m_xBuilder->weld_toolbar("fontstyletoolbox")) , m_xFontStyleDispatch(new ToolbarUnoDispatcher(*m_xFontStyle, *m_xBuilder, rxFrame)) , m_xStyle(m_xBuilder->weld_toolbar("style")) diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx index 8944f85530f5..8b6a48f44f43 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.cxx +++ b/svx/source/sidebar/text/TextPropertyPanel.cxx @@ -40,7 +40,7 @@ VclPtr TextPropertyPanel::Create ( } TextPropertyPanel::TextPropertyPanel ( vcl::Window* pParent, const css::uno::Reference& rxFrame ) - : PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame, true) + : PanelLayout(pParent, "SidebarTextPanel", "svx/ui/sidebartextpanel.ui", rxFrame) , mxFont(m_xBuilder->weld_toolbar("font")) , mxFontDispatch(new ToolbarUnoDispatcher(*mxFont, *m_xBuilder, rxFrame)) , mxFontHeight(m_xBuilder->weld_toolbar("fontheight")) -- cgit