[Libreoffice-commits] core.git: bin/update_pch include/editeng include/filter reportdesign/source solenv/clang-format svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Jan 5 06:38:29 UTC 2018
bin/update_pch | 4
include/editeng/eeitemid.hxx | 108 ------------------------
include/editeng/measfld.hxx | 8 -
include/filter/msfilter/svdfppt.hxx | 2
reportdesign/source/ui/report/ReportSection.cxx | 3
solenv/clang-format/blacklist | 1
svx/source/svdraw/svdotextdecomposition.cxx | 1
7 files changed, 1 insertion(+), 126 deletions(-)
New commits:
commit c26bdf54e065d4b6424e919fbf1f490e60390120
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Jan 4 16:55:17 2018 +0200
remove dead eeitemid.hxx
and inline the couple of constants still in use from it
Change-Id: Icb9f5690b5649140bc0503a8917e6a0f764e3d9c
Reviewed-on: https://gerrit.libreoffice.org/47404
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/bin/update_pch b/bin/update_pch
index 6522cd169394..ffc0ca3ec700 100755
--- a/bin/update_pch
+++ b/bin/update_pch
@@ -366,10 +366,6 @@ def filter_ignore(line, module):
'com/sun/star/beans/PropertyAttribute.hpp', # OPTIONAL defined via objbase.h
'com/sun/star/sdbcx/Privilege.hpp', # DELETE defined via objbase.h
]
- if module == 'reportdesign':
- ignore_list += [
- 'editeng/eeitemid.hxx', # macro redefined in ui/misc/UITools.cxx
- ]
if module == 'sc':
ignore_list += [
'progress.hxx', # special directives
diff --git a/include/editeng/eeitemid.hxx b/include/editeng/eeitemid.hxx
deleted file mode 100644
index 1c1eee90aff8..000000000000
--- a/include/editeng/eeitemid.hxx
+++ /dev/null
@@ -1,108 +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_EEITEMID_HXX
-#define INCLUDED_EDITENG_EEITEMID_HXX
-
-#include <editeng/eeitem.hxx>
-
-#ifdef ITEMID_FONT
-#undef ITEMID_FONT
-#endif
-#ifdef ITEMID_FONTHEIGHT
-#undef ITEMID_FONTHEIGHT
-#endif
-#ifdef ITEMID_COLOR
-#undef ITEMID_COLOR
-#endif
-#ifdef ITEMID_WEIGHT
-#undef ITEMID_WEIGHT
-#endif
-#ifdef ITEMID_POSTURE
-#undef ITEMID_POSTURE
-#endif
-#ifdef ITEMID_SHADOWED
-#undef ITEMID_SHADOWED
-#endif
-#ifdef ITEMID_CONTOUR
-#undef ITEMID_CONTOUR
-#endif
-#ifdef ITEMID_CROSSEDOUT
-#undef ITEMID_CROSSEDOUT
-#endif
-#ifdef ITEMID_UNDERLINE
-#undef ITEMID_UNDERLINE
-#endif
-#ifdef ITEMID_OVERLINE
-#undef ITEMID_OVERLINE
-#endif
-#ifdef ITEMID_LANGUAGE
-#undef ITEMID_LANGUAGE
-#endif
-#ifdef ITEMID_ADJUST
-#undef ITEMID_ADJUST
-#endif
-#ifdef ITEMID_WORDLINEMODE
-#undef ITEMID_WORDLINEMODE
-#endif
-#ifdef ITEMID_CHARSETCOLOR
-#undef ITEMID_CHARSETCOLOR
-#endif
-#ifdef ITEMID_SEARCH
-#undef ITEMID_SEARCH
-#endif
-#ifdef ITEMID_BRUSH
-#undef ITEMID_BRUSH
-#endif
-
-// Character Attributes....
-#define ITEMID_FONT EE_CHAR_FONTINFO
-#define ITEMID_POSTURE EE_CHAR_ITALIC
-#define ITEMID_WEIGHT EE_CHAR_WEIGHT
-#define ITEMID_SHADOWED EE_CHAR_SHADOW
-#define ITEMID_CONTOUR EE_CHAR_OUTLINE
-#define ITEMID_CROSSEDOUT EE_CHAR_STRIKEOUT
-#define ITEMID_UNDERLINE EE_CHAR_UNDERLINE
-#define ITEMID_OVERLINE EE_CHAR_OVERLINE
-#define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT
-#define ITEMID_CHARSCALE_W EE_CHAR_FONTWIDTH
-#define ITEMID_COLOR EE_CHAR_COLOR
-#define ITEMID_WORDLINEMODE EE_CHAR_WLM
-#define ITEMID_CHARSETCOLOR 0 // EE_FEATURE_NOTCONV
-#define ITEMID_CASEMAP EE_CHAR_CASEMAP
-#define ITEMID_LANGUAGE 0
-#define ITEMID_ESCAPEMENT EE_CHAR_ESCAPEMENT
-#define ITEMID_AUTOKERN EE_CHAR_PAIRKERNING
-#define ITEMID_KERNING EE_CHAR_KERNING
-#define ITEMID_EMPHASISMARK EE_CHAR_EMPHASISMARK
-#define ITEMID_CHARRELIEF EE_CHAR_RELIEF
-
-// Paragraph Attributes
-#define ITEMID_ADJUST EE_PARA_JUST
-
-
-#define ITEMID_BRUSH 0
-
-#define ITEMID_FIELD EE_FEATURE_FIELD
-
-#define ITEMID_SEARCH 0
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx
index 6422afb07753..c7f9107c6a5e 100644
--- a/include/editeng/measfld.hxx
+++ b/include/editeng/measfld.hxx
@@ -21,16 +21,8 @@
#define INCLUDED_EDITENG_MEASFLD_HXX
#include <editeng/eeitem.hxx>
-
-#ifndef _FLDITEM_HXX
-#ifndef ITEMID_FIELD
-#include <editeng/editdata.hxx> /* this include is needed due to EE_FEATURE_FIELD */
-#define ITEMID_FIELD EE_FEATURE_FIELD /* is needed for #include <editeng/flditem.hxx> */
-#endif
#include <editeng/flditem.hxx>
-#endif
#include <editeng/editengdllapi.h>
-
#include <com/sun/star/text/textfield/Type.hpp>
class SdrMeasureObj;
diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx
index eece8dd5df1f..689236766fb9 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -28,9 +28,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <editeng/eeitem.hxx>
-#define ITEMID_FIELD EE_FEATURE_FIELD
#include <editeng/flditem.hxx>
-#undef ITEMID_FIELD
#include <filter/msfilter/dffrecordheader.hxx>
#include <filter/msfilter/msdffimp.hxx>
#include <filter/msfilter/msfilterdllapi.h>
diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx
index 59c6b37b70ca..759b74027a85 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -30,7 +30,6 @@
#include <ViewsWindow.hxx>
#include <svx/svdpagv.hxx>
-#include <editeng/eeitemid.hxx>
#include <editeng/adjustitem.hxx>
#include <svx/sdrpaintwindow.hxx>
#include <svx/unoshape.hxx>
@@ -639,7 +638,7 @@ void OReportSection::createDefault(const OUString& _sType,SdrObject* _pObj)
}
if ( !bAttributesAppliedFromGallery )
{
- _pObj->SetMergedItem( SvxAdjustItem( SvxAdjust::Center ,ITEMID_ADJUST) );
+ _pObj->SetMergedItem( SvxAdjustItem( SvxAdjust::Center, EE_PARA_JUST) );
_pObj->SetMergedItem( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
_pObj->SetMergedItem( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) );
_pObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( false ) );
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index c5e56cefbf4f..eb22dd8114b7 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -6382,7 +6382,6 @@ include/editeng/editview.hxx
include/editeng/edtdlg.hxx
include/editeng/eedata.hxx
include/editeng/eeitem.hxx
-include/editeng/eeitemid.hxx
include/editeng/eerdll.hxx
include/editeng/emphasismarkitem.hxx
include/editeng/escapementitem.hxx
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 7155bd15ab31..2afac1312087 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -39,7 +39,6 @@
#include <drawinglayer/animation/animationtiming.hxx>
#include <basegfx/color/bcolor.hxx>
#include <vcl/svapp.hxx>
-#include <editeng/eeitemid.hxx>
#include <editeng/escapementitem.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/flditem.hxx>
More information about the Libreoffice-commits
mailing list