diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-01 15:52:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-02 09:54:48 +0100 |
| commit | 7e80b63d8304d435d305ea61988eaf6cf9667886 (patch) | |
| tree | 3332945f671ea07555c4b5d414f6d91fdf4ff6a3 /sw | |
| parent | 1bd9fcafe67cac9404c8c96553a262c048802c25 (diff) | |
use more Color in SfxWatermarkItem
Change-Id: Ifbbce6509c02cf3d93d0500104af7c07c3216266
Reviewed-on: https://gerrit.libreoffice.org/50577
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/uiwriter/uiwriter.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/edit/edfcol.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index d6838d8acf89..a5c9282d3121 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -980,7 +980,7 @@ void SwUiWriterTest::testWatermarkDOCX() CPPUNIT_ASSERT_EQUAL(OUString("CustomWatermark"), pWatermark->GetText()); CPPUNIT_ASSERT_EQUAL(OUString("DejaVu Sans Light"), pWatermark->GetFont()); CPPUNIT_ASSERT_EQUAL(sal_Int16(45), pWatermark->GetAngle()); - CPPUNIT_ASSERT_EQUAL(sal_uInt32(0x548dd4), pWatermark->GetColor()); + CPPUNIT_ASSERT_EQUAL(Color(0x548dd4), pWatermark->GetColor()); CPPUNIT_ASSERT_EQUAL(sal_Int16(50), pWatermark->GetTransparency()); } diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 4a0fcd5e6266..572dc6078de1 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -1442,7 +1442,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& rWatermark, if (xWatermark.is()) { drawing::HomogenMatrix3 aMatrix; - sal_uInt32 nColor = 0xc0c0c0; + Color nColor = 0xc0c0c0; sal_Int16 nTransparency = 50; sal_Int16 nAngle = 45; OUString aFont = ""; @@ -1476,7 +1476,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& rWatermark, OUString sFont = rWatermark.GetFont(); sal_Int16 nAngle = rWatermark.GetAngle(); sal_Int16 nTransparency = rWatermark.GetTransparency(); - sal_uInt32 nColor = rWatermark.GetColor(); + Color nColor = rWatermark.GetColor(); // Calc the ratio. double fRatio = 0; |