diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-12 16:34:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-13 16:17:04 +0200 |
| commit | 3e8828508310b1203ca14a87a4d3967d2ef1d30a (patch) | |
| tree | 49a03249405c1b87a4a42480658997d9730a86cc /svx/source/tbxctrls | |
| parent | f7a475dc7c202e1f3e8a905cb7bedbddddf06ec0 (diff) | |
no longer need bInterimBuilder
Change-Id: Ieff1e34de9665c80ded39d605656fe7d0626aec7
Reviewed-on: https://gerrit.libreoffice.org/80716
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx/source/tbxctrls')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
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<PaletteManager> 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(); |