From 3e8828508310b1203ca14a87a4d3967d2ef1d30a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 12 Oct 2019 16:34:50 +0100 Subject: no longer need bInterimBuilder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ieff1e34de9665c80ded39d605656fe7d0626aec7 Reviewed-on: https://gerrit.libreoffice.org/80716 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- svx/source/tbxctrls/tbcontrl.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'svx') diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 6dc4292b57ec..510d695ffba0 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1705,11 +1705,9 @@ ColorWindow::ColorWindow(std::shared_ptr const & rPaletteManager const Reference< XFrame >& rFrame, weld::Window* pParentWindow, const MenuOrToolMenuButton& rMenuButton, - bool bInterimBuilder, ColorSelectFunction const & aFunction) : ToolbarPopupBase(rFrame) - , m_xBuilder(bInterimBuilder ? Application::CreateInterimBuilder(rMenuButton.get_widget(), "svx/ui/colorwindow.ui") - : Application::CreateBuilder(rMenuButton.get_widget(), "svx/ui/colorwindow.ui")) + , m_xBuilder(Application::CreateBuilder(rMenuButton.get_widget(), "svx/ui/colorwindow.ui")) , theSlotId(nSlotId) , mpParentWindow(pParentWindow) , maMenuButton(rMenuButton) @@ -4077,7 +4075,6 @@ void ColorListBox::createColorWindow() xFrame, m_pTopLevel, m_xButton.get(), - /*bInterimBuilder*/false, m_aColorWrapper)); SetNoSelection(); -- cgit