diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2018-11-11 00:28:36 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2018-11-20 00:10:58 +0100 |
| commit | 05a8d3ce837f6fe488a099fc599b1fe3090d0b23 (patch) | |
| tree | 0b4694e7c90805fc98448297df2353cad09f2cb3 /reportdesign | |
| parent | f918e71d4e615fcc4527051a6e7f6bb4768d1269 (diff) | |
Simplify color status handling
(cherry picked from commit eb5b353b523ec4d7d6588e2fae5b8b4117bfc2b1)
Rename BorderColorStatus to ColorStatus
(cherry picked from commit 57f33bfd0c69a4568d1d5840391ab9901d4f4f66)
Change-Id: I9335fa2ab94f69853b45f070499d7e18aac458c3
Reviewed-on: https://gerrit.libreoffice.org/63607
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/Condition.hxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 5e8194fd7214..48f2a5c3c26c 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -227,7 +227,7 @@ IMPL_LINK(Condition, DropdownClick, ToolBox*, pToolBox, void) m_pColorFloat = VclPtr<SvxColorWindow>::Create( OUString() /*m_aCommandURL*/, m_xPaletteManager, - m_aBorderColorStatus, + m_aColorStatus, nSlotId, nullptr, pToolBox, diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index ceca03281ecc..d94804d35c24 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -88,7 +88,7 @@ namespace rptui sal_uInt16 m_nFontColorId; sal_uInt16 m_nFontDialogId; std::shared_ptr<PaletteManager> m_xPaletteManager; - BorderColorStatus m_aBorderColorStatus; + ColorStatus m_aColorStatus; ConditionColorWrapper m_aColorWrapper; ::rptui::OReportController& m_rController; |