diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-13 16:07:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-14 08:35:15 +0200 |
| commit | 43c1a3a904e889e4b8660fa28d4f4479c0f267ae (patch) | |
| tree | afe2f98d7adae62268fc470052bad420b15132c1 /sw | |
| parent | cd66852f6dd08631a25d15a1527a647e69ab8ce3 (diff) | |
SvxCharSetColorItem can be removed
and just use SvxColorItem in its stead, all of it's special
functionality has been removed over time
Change-Id: I61a4d1fb92d9dccbdfc5bbb6d1a41692b83eb320
Reviewed-on: https://gerrit.libreoffice.org/58938
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/hintids.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/bastyp/init.cxx | 3 | ||||
| -rw-r--r-- | sw/source/core/doc/doc.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/edit/autofmt.cxx | 1 | ||||
| -rw-r--r-- | sw/source/core/txtnode/swfont.cxx | 1 |
5 files changed, 3 insertions, 7 deletions
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 0e2806b46a9b..a52c6f40a59d 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -35,7 +35,7 @@ class SvXMLAttrContainerItem; class SwMsgPoolItem; class SwPtrMsgPoolItem; class SfxBoolItem; -class SvxCharSetColorItem; +class SvxColorItem; // For SwTextHints without end index the following char is added: @@ -66,7 +66,7 @@ class SvxCharSetColorItem; // Which-values for character-format attributes. #define RES_CHRATR_BEGIN HINT_BEGIN #define RES_CHRATR_CASEMAP TypedWhichId<SvxCaseMapItem>(RES_CHRATR_BEGIN) // 1 -#define RES_CHRATR_CHARSETCOLOR TypedWhichId<SvxCharSetColorItem>(2) +#define RES_CHRATR_CHARSETCOLOR TypedWhichId<SvxColorItem>(2) #define RES_CHRATR_COLOR TypedWhichId<SvxColorItem>(3) #define RES_CHRATR_CONTOUR TypedWhichId<SvxContourItem>(4) #define RES_CHRATR_CROSSEDOUT TypedWhichId<SvxCrossedOutItem>(5) diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx index c747d3da2d99..89e412f174b1 100644 --- a/sw/source/core/bastyp/init.cxx +++ b/sw/source/core/bastyp/init.cxx @@ -35,7 +35,6 @@ #include <editeng/charrotateitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/cmapitem.hxx> -#include <editeng/charsetcoloritem.hxx> #include <editeng/emphasismarkitem.hxx> #include <editeng/escapementitem.hxx> #include <editeng/forbiddenruleitem.hxx> @@ -452,7 +451,7 @@ void InitCore() SfxPoolItem* pItem; aAttrTab[ RES_CHRATR_CASEMAP- POOLATTR_BEGIN ] = new SvxCaseMapItem( SvxCaseMap::NotMapped, RES_CHRATR_CASEMAP); - aAttrTab[ RES_CHRATR_CHARSETCOLOR- POOLATTR_BEGIN ] = new SvxCharSetColorItem(RES_CHRATR_CHARSETCOLOR); + aAttrTab[ RES_CHRATR_CHARSETCOLOR- POOLATTR_BEGIN ] = new SvxColorItem(RES_CHRATR_CHARSETCOLOR); aAttrTab[ RES_CHRATR_COLOR- POOLATTR_BEGIN ] = new SvxColorItem(RES_CHRATR_COLOR); aAttrTab[ RES_CHRATR_CONTOUR- POOLATTR_BEGIN ] = new SvxContourItem( false, RES_CHRATR_CONTOUR ); aAttrTab[ RES_CHRATR_CROSSEDOUT- POOLATTR_BEGIN ] = new SvxCrossedOutItem( STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ); diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index 97ac11dea077..ddcb1734f5a7 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -55,7 +55,6 @@ #include <unotools/syslocale.hxx> #include <sfx2/printer.hxx> #include <editeng/keepitem.hxx> -#include <editeng/charsetcoloritem.hxx> #include <editeng/formatbreakitem.hxx> #include <sfx2/linkmgr.hxx> #include <svx/svdmodel.hxx> diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx index 33a41866af1a..80d7754ef848 100644 --- a/sw/source/core/edit/autofmt.cxx +++ b/sw/source/core/edit/autofmt.cxx @@ -28,7 +28,6 @@ #include <editeng/tstpitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/langitem.hxx> -#include <editeng/charsetcoloritem.hxx> #include <editeng/unolingu.hxx> #include <editeng/acorrcfg.hxx> diff --git a/sw/source/core/txtnode/swfont.cxx b/sw/source/core/txtnode/swfont.cxx index f9c301f59bf6..844e176d35ab 100644 --- a/sw/source/core/txtnode/swfont.cxx +++ b/sw/source/core/txtnode/swfont.cxx @@ -36,7 +36,6 @@ #include <editeng/charreliefitem.hxx> #include <editeng/contouritem.hxx> #include <editeng/colritem.hxx> -#include <editeng/charsetcoloritem.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/wghtitem.hxx> |