From 57f33bfd0c69a4568d1d5840391ab9901d4f4f66 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Sun, 11 Nov 2018 00:28:36 +0200 Subject: Rename BorderColorStatus to ColorStatus Next commit will use this for all color status updates, not just for borders. Change-Id: Ibd95d755a33bfc079fcbffabfd8896b6b777609f Reviewed-on: https://gerrit.libreoffice.org/63498 Tested-by: Jenkins Reviewed-by: Maxim Monastirsky --- reportdesign/source/ui/dlg/Condition.cxx | 2 +- reportdesign/source/ui/dlg/Condition.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'reportdesign') 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::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 m_xPaletteManager; - BorderColorStatus m_aBorderColorStatus; + ColorStatus m_aColorStatus; ConditionColorWrapper m_aColorWrapper; ::rptui::OReportController& m_rController; -- cgit