Hi, I have submitted a patch for review:
https://gerrit.libreoffice.org/3473 To pull it, you can do: git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3473/1 fdo#62699: Drop wrapper header Change-Id: I21e91ab136c944c6dc77a90500b1bcebbf7cf851 --- M filter/source/msfilter/svdfppt.cxx M svx/Package_inc.mk D svx/inc/svx/svditext.hxx M svx/source/svdraw/svdattr.cxx M svx/source/svdraw/svdedtv1.cxx M svx/source/svdraw/svdedxv.cxx M svx/source/svdraw/svdetc.cxx M svx/source/svdraw/svdfmtf.cxx M svx/source/svdraw/svdibrow.cxx M svx/source/svdraw/svdmodel.cxx M svx/source/svdraw/svdmrkv.cxx M svx/source/svdraw/svdoattr.cxx M svx/source/svdraw/svdomeas.cxx M svx/source/svdraw/svdotext.cxx M svx/source/svdraw/svdotxat.cxx M svx/source/svdraw/svdotxed.cxx M svx/source/svdraw/svdotxln.cxx M svx/source/svdraw/svdotxtr.cxx M svx/source/svdraw/svdundo.cxx M svx/source/svdraw/svdxcgv.cxx 20 files changed, 17 insertions(+), 50 deletions(-) diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 104db58..a39dfe1 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -22,6 +22,7 @@ #include <unotools/tempfile.hxx> #include <math.h> #include <editeng/eeitem.hxx> +#include <editeng/editdata.hxx> #include <sot/storage.hxx> #include <sot/storinfo.hxx> #include <sot/stg.hxx> @@ -51,7 +52,6 @@ #include <editeng/numdef.hxx> #include <svx/svdattr.hxx> #include "svx/xattr.hxx" -#include "svx/svditext.hxx" #include <svx/svdetc.hxx> #include <editeng/bulletitem.hxx> #include <svx/polysc3d.hxx> diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk index cb54894..5b25ac3 100644 --- a/svx/Package_inc.mk +++ b/svx/Package_inc.mk @@ -388,7 +388,6 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fontworkgallery.hxx,svx/fontworkgallery.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/ShapeTypeHandler.hxx,svx/ShapeTypeHandler.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdstr.hrc,svx/svdstr.hrc)) -$(eval $(call gb_Package_add_file,svx_inc,inc/svx/svditext.hxx,svx/svditext.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxekitm.hxx,svx/sxekitm.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxgrahicitem.hxx,svx/svxgrahicitem.hxx)) $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xflbstit.hxx,svx/xflbstit.hxx)) diff --git a/svx/inc/svx/svditext.hxx b/svx/inc/svx/svditext.hxx deleted file mode 100644 index 586d51d..0000000 --- a/svx/inc/svx/svditext.hxx +++ /dev/null @@ -1,30 +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 _SVDITEXT_HXX -#define _SVDITEXT_HXX - -// SvxItem-Mapping. Wird benoetigt um die SvxItem-Header erfolgreich zu includen - -#include <editeng/editdata.hxx> - - -#endif // _SVDITEXT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index d160b73..25e0710 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -39,10 +39,10 @@ #include <svl/solar.hrc> #include "editeng/xmlcnitm.hxx" +#include <editeng/editdata.hxx> #include <svx/svxids.hrc> #include <svx/xtable.hxx> // for RGB_Color() -#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // for DEGREE_CHAR #include <svx/svdtrans.hxx> #include "svx/svdglob.hxx" // string cache diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 50397b4..9a0528c 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -27,7 +27,6 @@ #include <svx/rectenum.hxx> #include <svx/svxids.hrc> // for SID_ATTR_TRANSFORM_... #include <svx/svdattr.hxx> // for Get/SetGeoAttr -#include "svx/svditext.hxx" #include "svx/svditer.hxx" #include <svx/svdtrans.hxx> #include <svx/svdundo.hxx> @@ -39,6 +38,7 @@ #include <svx/svdopath.hxx> // for Crook #include "svx/svdstr.hrc" // names taken from the resource #include "svx/svdglob.hxx" // StringCache +#include <editeng/editdata.hxx> #include <editeng/eeitem.hxx> #include <svl/aeitem.hxx> #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 18e1250..0465319 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -34,11 +34,11 @@ #include <vcl/cursor.hxx> #include <editeng/unotext.hxx> +#include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/editobj.hxx> #include <editeng/outlobj.hxx> #include <editeng/scripttypeitem.hxx> -#include "svx/svditext.hxx" #include <svx/svdoutl.hxx> #include <svx/sdtfchim.hxx> #include <svx/svdotext.hxx> diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 54f89dc..58b6349 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/embed/EmbedStates.hpp> #include "officecfg/Office/Common.hxx" #include <svx/svdetc.hxx> -#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdtrans.hxx> #include "svx/svdglob.hxx" @@ -33,6 +32,7 @@ #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> #include <vcl/bmpacc.hxx> +#include <editeng/editdata.hxx> #include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index dc2f6c8..b6a2f71 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -22,6 +22,7 @@ #include <math.h> #include <svx/xpoly.hxx> #include <vcl/svapp.hxx> +#include <editeng/editdata.hxx> #include <editeng/eeitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/wghtitem.hxx> @@ -47,7 +48,6 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> -#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdorect.hxx> #include <svx/svdocirc.hxx> diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index d42bbea..67e5914 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -23,7 +23,6 @@ #include <stdlib.h> -#include "svx/svditext.hxx" #include <editeng/flditem.hxx> #include <editeng/editdata.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index c5fe053..ab050d8 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -43,7 +43,7 @@ #include <svx/xflhtit.hxx> #include <svx/xlnstit.hxx> -#include "svx/svditext.hxx" +#include <editeng/editdata.hxx> #include <editeng/editeng.hxx> // for EditEngine::CreatePool() #include <svx/xtable.hxx> diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index f593ee4..dbd259f 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -22,7 +22,6 @@ #include <svx/svdetc.hxx> #include <svx/svdoedge.hxx> #include "svx/svdglob.hxx" -#include "svx/svditext.hxx" #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> @@ -49,6 +48,8 @@ #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> +#include <editeng/editdata.hxx> + //////////////////////////////////////////////////////////////////////////////////////////////////// // Migrate Marking of Objects, Points and GluePoints diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 7b20fd9..6806c6d 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -20,7 +20,6 @@ #include <svx/svdoattr.hxx> #include <svx/xpool.hxx> -#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdattr.hxx> @@ -46,7 +45,7 @@ #include <svx/xflbtoxy.hxx> #include <svx/xftshit.hxx> - +#include <editeng/editdata.hxx> #include <editeng/colritem.hxx> #include "editeng/fontitem.hxx" #include <editeng/fhgtitem.hxx> diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index ccd69b8..dc2868c 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -20,7 +20,6 @@ #include <svx/svdomeas.hxx> #include <math.h> -#include "svx/svditext.hxx" // #include <svx/xpoly.hxx> #include <svx/svdtrans.hxx> #include <svx/svdhdl.hxx> @@ -34,6 +33,7 @@ #include "svx/svdstr.hrc" // the object's name #include <svl/style.hxx> #include <svl/smplhint.hxx> +#include <editeng/editdata.hxx> #include <editeng/eeitem.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 6a41d5b..1863dd8 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -20,7 +20,6 @@ #include <comphelper/string.hxx> #include <svx/svdotext.hxx> -#include "svx/svditext.hxx" #include <svx/svdpagv.hxx> // for the request in Paint to see whether #include <svx/svdview.hxx> // the object is currently being edited #include <svx/svdpage.hxx> // and for AnimationHandler (ticker text) @@ -32,6 +31,7 @@ #include <editeng/writingmodeitem.hxx> #include <svx/sdtfchim.hxx> #include <svtools/colorcfg.hxx> +#include <editeng/editdata.hxx> #include <editeng/eeitem.hxx> #include <editeng/editstat.hxx> #include <editeng/outlobj.hxx> diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 30ee13c..c2604d2 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -20,13 +20,13 @@ #include <comphelper/string.hxx> #include <svl/style.hxx> #include <svx/svdotext.hxx> -#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // for GetMaxObjSize and GetStyleSheetPool #include <svx/svdoutl.hxx> #include <svx/svdorect.hxx> // for SetDirty at NbcAdjustTextFrameWidthAndHeight #include <svx/svdocapt.hxx> // for SetDirty at NbcAdjustTextFrameWidthAndHeight #include <svx/svdetc.hxx> #include <editeng/writingmodeitem.hxx> +#include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/eeitem.hxx> #include <editeng/flditem.hxx> diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index eea4907..e498075 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -19,9 +19,9 @@ #include <svx/svdotext.hxx> -#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // for GetMaxObjSize #include <svx/svdoutl.hxx> +#include <editeng/editdata.hxx> #include <editeng/outliner.hxx> #include <editeng/editstat.hxx> #include <svl/itemset.hxx> diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 8086cad..7a8f763 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -25,7 +25,6 @@ #include <ucbhelper/content.hxx> #include <unotools/datetime.hxx> #include <svx/svdotext.hxx> -#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <editeng/editdata.hxx> #include <sfx2/lnkbase.hxx> diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index bffdc25..60706a2 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -19,13 +19,13 @@ #include <svx/svdotext.hxx> -#include "svx/svditext.hxx" #include <svx/svdtrans.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> #include <svx/svdoutl.hxx> #include <svx/svdpage.hxx> // for Convert #include <svx/svdmodel.hxx> // for Convert +#include <editeng/editdata.hxx> #include <editeng/outliner.hxx> #include <svx/sdr/properties/itemsettools.hxx> #include <svx/sdr/properties/properties.hxx> diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 055a94d..284aaca 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -21,7 +21,6 @@ #include <svl/lstner.hxx> #include <svx/svdundo.hxx> -#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> @@ -31,6 +30,7 @@ #include "svx/svdstr.hrc" // names taken from the resource #include "svx/svdglob.hxx" // StringCache #include <svx/scene3d.hxx> +#include <editeng/editdata.hxx> #include <editeng/outlobj.hxx> #include <svx/svdogrp.hxx> #include <svx/sdr/properties/itemsettools.hxx> diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 6ed282d..4d0ee93 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -18,13 +18,13 @@ */ #include <vector> +#include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <rtl/strbuf.hxx> #include <svx/xexch.hxx> #include <svx/xflclit.hxx> #include <svx/svdxcgv.hxx> #include <svx/svdoutl.hxx> -#include <svx/svditext.hxx> #include <svx/svdetc.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> -- To view, visit https://gerrit.libreoffice.org/3473 To unsubscribe, visit https://gerrit.libreoffice.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I21e91ab136c944c6dc77a90500b1bcebbf7cf851 Gerrit-PatchSet: 1 Gerrit-Project: core Gerrit-Branch: master Gerrit-Owner: Marcos Souza <marcos.souza....@gmail.com> _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice