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 /sw | |
| parent | 82d42fa2c05e8d53ec2c21733a2a9f53412dd2d1 (diff) | |
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 'sw')
| -rw-r--r-- | sw/inc/pch/precompiled_msword.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/pch/precompiled_swui.hxx | 1 | ||||
| -rw-r--r-- | sw/inc/pch/precompiled_vbaswobj.hxx | 1 | ||||
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 2 |
5 files changed, 1 insertions, 5 deletions
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index c7dcc9fa9c85..faa6ba21b06d 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -657,7 +657,6 @@ #include <swtypes.hxx> #include <tblsel.hxx> #include <tools/color.hxx> -#include <tools/colordata.hxx> #include <tools/contnr.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index f2fe8c7b4001..61baf2411795 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -531,7 +531,6 @@ #include <tgrditem.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/color.hxx> -#include <tools/colordata.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> #include <tools/datetimeutils.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index aef3030fd050..deee95c725bf 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -638,7 +638,6 @@ #include <tblenum.hxx> #include <tblsel.hxx> #include <tools/color.hxx> -#include <tools/colordata.hxx> #include <tools/contnr.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 59bda3e0b690..41c16901d910 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -433,7 +433,6 @@ #include <tblenum.hxx> #include <tblsel.hxx> #include <tools/color.hxx> -#include <tools/colordata.hxx> #include <tools/date.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index 4e5c1a2838fa..43457576b0d6 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2009,7 +2009,7 @@ sal_Int32 SwBasicEscherEx::WriteFlyFrameAttr(const SwFrameFormat& rFormat, const sal_uInt16 nCstScale = 635; // unit scale between AOO and MS Word const sal_uInt32 nShadowType = 131074; // shadow type of ms word. need to set the default value. - sal_uInt32 nColor = static_cast<sal_uInt32>(pSI->GetColor().GetColor()) ; + sal_uInt32 nColor = sal_uInt32(pSI->GetColor()); sal_Int32 nOffX = pSI->GetWidth() * nCstScale; sal_Int32 nOffY = pSI->GetWidth() * nCstScale; |