diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-01-02 14:45:32 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-01-06 16:44:21 +0100 |
| commit | 40fe5b93bc0838e04b46bfc7942d1ee6a2482ce0 (patch) | |
| tree | 151814d0863c9912d18722732beb13b1e22e0ff1 /reportdesign | |
| parent | d1133d71a6109d1999121fd6a91573d12dc4852b (diff) | |
weld AreaPropertyPanel
Change-Id: I5f4c4b43067b99cd57f8ea941002481ef5977e09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86144
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 6 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.hxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index f76fe4935d69..b2add1cb3709 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -166,6 +166,7 @@ Condition::~Condition() void Condition::SetBackgroundDropdownClick() { m_xBackColorFloat.reset(new ColorWindow( + OUString() /*m_aCommandURL*/, m_xPaletteManager, m_aColorStatus, SID_BACKGROUND_COLOR, @@ -174,12 +175,13 @@ void Condition::SetBackgroundDropdownClick() MenuOrToolMenuButton(m_xActions.get(), "background"), m_aBackColorWrapper)); - m_xActions->set_item_popover("background", m_xBackColorFloat->GetWidget()); + m_xActions->set_item_popover("background", m_xBackColorFloat->getTopLevel()); } void Condition::SetForegroundDropdownClick() { m_xForeColorFloat.reset(new ColorWindow( + OUString() /*m_aCommandURL*/, m_xPaletteManager, m_aColorStatus, SID_ATTR_CHAR_COLOR2, @@ -188,7 +190,7 @@ void Condition::SetForegroundDropdownClick() MenuOrToolMenuButton(m_xActions.get(), "foreground"), m_aForeColorWrapper)); - m_xActions->set_item_popover("foreground", m_xForeColorFloat->GetWidget()); + m_xActions->set_item_popover("foreground", m_xForeColorFloat->getTopLevel()); } diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 4f263f815ba6..641c1a2bf5dc 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -32,8 +32,6 @@ #include <memory> -namespace svx { class ToolboxButtonColorUpdater; } - namespace rptui { class OColorPopup; |