diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-01 13:16:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-02 09:18:19 +0100 |
| commit | 477d2ba662cbd716588519419eece2b4f06d8610 (patch) | |
| tree | f3aa77adfcd770e8321738bffed8f8243eb11a98 /reportdesign | |
| parent | add Color method version of OORGBToXLRGB (diff) | |
| download | core-477d2ba662cbd716588519419eece2b4f06d8610.tar.gz core-477d2ba662cbd716588519419eece2b4f06d8610.zip | |
delete colordata.hxx
move what we still need into color.hxx
Change-Id: Ied7e31eb16468aa334c666b1499a6262f16a6350
Reviewed-on: https://gerrit.libreoffice.org/50561
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/inc/pch/precompiled_rpt.hxx | 1 | ||||
| -rw-r--r-- | reportdesign/inc/pch/precompiled_rptui.hxx | 1 | ||||
| -rw-r--r-- | reportdesign/source/ui/dlg/CondFormat.cxx | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index cf5a14a1f734..500aaf0b8ad5 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -321,7 +321,6 @@ #include <svx/xpoly.hxx> #include <svx/xtable.hxx> #include <tools/color.hxx> -#include <tools/colordata.hxx> #include <tools/contnr.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 3ae03c15dbb3..3d6dbb15c71e 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -540,7 +540,6 @@ #include <toolkit/helper/convert.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/color.hxx> -#include <tools/colordata.hxx> #include <tools/contnr.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx b/reportdesign/source/ui/dlg/CondFormat.cxx index 896d9e77b6fe..82668f4a1f09 100644 --- a/reportdesign/source/ui/dlg/CondFormat.cxx +++ b/reportdesign/source/ui/dlg/CondFormat.cxx @@ -384,7 +384,7 @@ namespace rptui aArgs[1].Value <<= VCLUnoHelper::GetInterface(this); aArgs[2].Name = PROPERTY_FONTCOLOR; - aArgs[2].Value <<= static_cast<sal_uInt32>(rColor.GetColor()); + aArgs[2].Value <<= rColor; // we use this way to create undo actions m_rController.executeUnChecked(_nCommandId,aArgs); |