diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-06-22 16:41:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-07-26 09:41:46 +0200 |
| commit | b032d746a48b8887ccc2330b2fdbf63d701a213f (patch) | |
| tree | b7d2b80a2a614711069f4d814845346ff20df12b /svx | |
| parent | e953ce16d24cff34b97940a6063704cd487fec42 (diff) | |
weld SwTextGridPage
Change-Id: I4f8e5f643126bea5deef7636b6d20f8080cb6662
Reviewed-on: https://gerrit.libreoffice.org/56309
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index e2db0bfbd3a6..7a40126fdd1e 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1370,9 +1370,11 @@ ColorWindow::ColorWindow(std::shared_ptr<PaletteManager> const & rPaletteManager const Reference< XFrame >& rFrame, weld::Window* pParentWindow, weld::MenuButton* pMenuButton, + bool bInterimBuilder, std::function<void(const OUString&, const NamedColor&)> const & aFunction) : ToolbarPopupBase(rFrame) - , m_xBuilder(Application::CreateBuilder(pMenuButton, "svx/ui/colorwindow.ui")) + , m_xBuilder(bInterimBuilder ? Application::CreateInterimBuilder(pMenuButton, "svx/ui/colorwindow.ui") + : Application::CreateBuilder(pMenuButton, "svx/ui/colorwindow.ui")) , theSlotId(nSlotId) , mpParentWindow(pParentWindow) , mpMenuButton(pMenuButton) @@ -3740,11 +3742,12 @@ void SvxColorListBox::SelectEntry(const Color& rColor) ShowPreview(m_aSelectedColor); } -ColorListBox::ColorListBox(weld::MenuButton* pControl, weld::Window* pTopLevel) +ColorListBox::ColorListBox(weld::MenuButton* pControl, weld::Window* pTopLevel, bool bInterimBuilder) : m_xButton(pControl) , m_pTopLevel(pTopLevel) , m_aColorWrapper(this) , m_aAutoDisplayColor(Application::GetSettings().GetStyleSettings().GetDialogColor()) + , m_bInterimBuilder(bInterimBuilder) { m_aSelectedColor = GetAutoColor(0); LockWidthRequest(); @@ -3777,6 +3780,7 @@ void ColorListBox::createColorWindow() xFrame, m_pTopLevel, m_xButton.get(), + m_bInterimBuilder, m_aColorWrapper)); SetNoSelection(); @@ -3796,6 +3800,8 @@ void ColorListBox::Selected(const NamedColor& rColor) { ShowPreview(rColor); m_aSelectedColor = rColor; + if (m_aSelectedLink.IsSet()) + m_aSelectedLink.Call(*this); } //to avoid the box resizing every time the color is changed to |