[Libreoffice-commits] core.git: compilerplugins/clang editeng/inc editeng/source include/editeng solenv/clang-format sw/inc sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Aug 14 06:35:39 UTC 2018
compilerplugins/clang/sfxpoolitem.cxx | 4 --
editeng/inc/pch/precompiled_editeng.hxx | 1
editeng/source/editeng/editattr.cxx | 1
editeng/source/editeng/editdoc.cxx | 1
editeng/source/editeng/editeng.cxx | 1
editeng/source/editeng/editobj.cxx | 1
editeng/source/editeng/eerdll.cxx | 3 -
editeng/source/editeng/impedit3.cxx | 1
editeng/source/items/textitem.cxx | 34 ---------------------
editeng/source/rtf/rtfitem.cxx | 1
include/editeng/charsetcoloritem.hxx | 50 --------------------------------
solenv/clang-format/blacklist | 1
sw/inc/hintids.hxx | 4 +-
sw/source/core/bastyp/init.cxx | 3 -
sw/source/core/doc/doc.cxx | 1
sw/source/core/edit/autofmt.cxx | 1
sw/source/core/txtnode/swfont.cxx | 1
17 files changed, 4 insertions(+), 105 deletions(-)
New commits:
commit 43c1a3a904e889e4b8660fa28d4f4479c0f267ae
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Aug 13 16:07:54 2018 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Aug 14 08:35:15 2018 +0200
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 at collabora.co.uk>
diff --git a/compilerplugins/clang/sfxpoolitem.cxx b/compilerplugins/clang/sfxpoolitem.cxx
index f41a006f30b0..c64e35a33790 100644
--- a/compilerplugins/clang/sfxpoolitem.cxx
+++ b/compilerplugins/clang/sfxpoolitem.cxx
@@ -111,10 +111,6 @@ bool SfxPoolItem::VisitCXXRecordDecl(const CXXRecordDecl* decl)
if (tc.Class("SfxEnumItem").GlobalNamespace() || tc.Class("SfxAllEnumItem").GlobalNamespace())
return true;
- // the new field is only used for reading and writing to storage
- if (tc.Class("SvxCharSetColorItem").GlobalNamespace())
- return true;
-
for (auto it = decl->method_begin(); it != decl->method_end(); ++it) {
if ( endsWith((*it)->getQualifiedNameAsString(), "::operator==") )
return true;
diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx
index 151d38fcaba2..c441fe1ff4ec 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -336,7 +336,6 @@
#include <editeng/brushitem.hxx>
#include <editeng/charreliefitem.hxx>
#include <editeng/charscaleitem.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/cmapitem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/contouritem.hxx>
diff --git a/editeng/source/editeng/editattr.cxx b/editeng/source/editeng/editattr.cxx
index c20e03d21a51..516ca28f9946 100644
--- a/editeng/source/editeng/editattr.cxx
+++ b/editeng/source/editeng/editattr.cxx
@@ -37,7 +37,6 @@
#include <editeng/wrlmitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/crossedoutitem.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/kernitem.hxx>
#include <editeng/autokernitem.hxx>
#include <editeng/langitem.hxx>
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index 76fd0a4d6f01..2e3fcec41184 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -38,7 +38,6 @@
#include <editeng/escapementitem.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/autokernitem.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/emphasismarkitem.hxx>
#include <editeng/charscaleitem.hxx>
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 85bfbfb44a76..e2c4a63f3efd 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -59,7 +59,6 @@
#include <editeng/wghtitem.hxx>
#include <editeng/wrlmitem.hxx>
#include <editeng/brushitem.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/langitem.hxx>
#include <editeng/emphasismarkitem.hxx>
#include <editeng/charscaleitem.hxx>
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 8166f84c6a11..9b7fa07924d6 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -34,7 +34,6 @@
#include <editattr.hxx>
#include <editeng/editeng.hxx>
#include <editeng/fontitem.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/flditem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/tstpitem.hxx>
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index ad574cf9b6a3..1a2a15c4975d 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -49,7 +49,6 @@
#include <editeng/contouritem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/crossedoutitem.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/escapementitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/fontitem.hxx>
@@ -149,7 +148,7 @@ DefItems::DefItems()
// Features
rDefItems[51] = new SfxVoidItem( EE_FEATURE_TAB );
rDefItems[52] = new SfxVoidItem( EE_FEATURE_LINEBR );
- rDefItems[53] = new SvxCharSetColorItem( COL_RED, EE_FEATURE_NOTCONV );
+ rDefItems[53] = new SvxColorItem( COL_RED, EE_FEATURE_NOTCONV );
rDefItems[54] = new SvxFieldItem( SvxFieldData(), EE_FEATURE_FIELD );
assert(EDITITEMCOUNT == 55 && "ITEMCOUNT changed, adjust DefItems!");
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index d10c8ff26feb..6287609944bb 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -34,7 +34,6 @@
#include <editeng/editeng.hxx>
#include <editeng/editview.hxx>
#include <editeng/txtrange.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/colritem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/fhgtitem.hxx>
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index fd6ce05c3970..0b971d71911d 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -76,7 +76,6 @@
#include <editeng/wrlmitem.hxx>
#include <editeng/contouritem.hxx>
#include <editeng/colritem.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/kernitem.hxx>
#include <editeng/cmapitem.hxx>
#include <editeng/escapementitem.hxx>
@@ -1751,39 +1750,6 @@ void SvxColorItem::SetValue( const Color& rNewCol )
mColor = rNewCol;
}
-// class SvxCharSetColorItem ---------------------------------------------
-
-SvxCharSetColorItem::SvxCharSetColorItem( const sal_uInt16 nId ) :
- SvxColorItem( nId )
-{
-}
-
-
-SvxCharSetColorItem::SvxCharSetColorItem( const Color& rCol,
- const sal_uInt16 nId ) :
- SvxColorItem( rCol, nId )
-{
-}
-
-
-SfxPoolItem* SvxCharSetColorItem::Clone( SfxItemPool * ) const
-{
- return new SvxCharSetColorItem( *this );
-}
-
-
-bool SvxCharSetColorItem::GetPresentation
-(
- SfxItemPresentation /*ePres*/,
- MapUnit /*eCoreUnit*/,
- MapUnit /*ePresUnit*/,
- OUString& rText, const IntlWrapper& /*rIntl*/
-) const
-{
- rText.clear();
- return false;
-}
-
// class SvxKerningItem --------------------------------------------------
SvxKerningItem::SvxKerningItem( const short nKern, const sal_uInt16 nId ) :
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 7130793ef8b5..8d12c04e0394 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -30,7 +30,6 @@
#include <editeng/wrlmitem.hxx>
#include <editeng/contouritem.hxx>
#include <editeng/colritem.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/kernitem.hxx>
#include <editeng/cmapitem.hxx>
#include <editeng/escapementitem.hxx>
diff --git a/include/editeng/charsetcoloritem.hxx b/include/editeng/charsetcoloritem.hxx
deleted file mode 100644
index 71f57e9ec611..000000000000
--- a/include/editeng/charsetcoloritem.hxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_EDITENG_CHARSETCOLORITEM_HXX
-#define INCLUDED_EDITENG_CHARSETCOLORITEM_HXX
-
-#include <editeng/colritem.hxx>
-#include <editeng/editengdllapi.h>
-#include <rtl/ustring.hxx>
-
-// class SvxCharSetColorItem ---------------------------------------------
-
-/* [Description]
-
- Is only needed internally in the reader of Writer.
-*/
-
-class EDITENG_DLLPUBLIC SvxCharSetColorItem : public SvxColorItem
-{
-public:
- explicit SvxCharSetColorItem( const sal_uInt16 nId );
- SvxCharSetColorItem( const Color& aColor, const sal_uInt16 nId );
-
- // "pure virtual Methods" from SfxPoolItem
- virtual bool GetPresentation( SfxItemPresentation ePres,
- MapUnit eCoreMetric,
- MapUnit ePresMetric,
- OUString &rText, const IntlWrapper& ) const override;
-
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 2055a40fbd6a..92040f51e2b3 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6313,7 +6313,6 @@ include/editeng/charhiddenitem.hxx
include/editeng/charreliefitem.hxx
include/editeng/charrotateitem.hxx
include/editeng/charscaleitem.hxx
-include/editeng/charsetcoloritem.hxx
include/editeng/cmapitem.hxx
include/editeng/colritem.hxx
include/editeng/contouritem.hxx
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>
More information about the Libreoffice-commits
mailing list