cui/inc/pch/precompiled_cui.hxx | 1
cui/source/tabpages/tparea.cxx | 1
cui/source/tabpages/tpbitmap.cxx | 1
cui/source/tabpages/tpcolor.cxx | 1
cui/source/tabpages/tpgradnt.cxx | 1
cui/source/tabpages/tphatch.cxx | 1
cui/source/tabpages/tpline.cxx | 3 +
cui/source/tabpages/tplnedef.cxx | 1
cui/source/tabpages/tppattern.cxx | 1
cui/source/tabpages/tpshadow.cxx | 1
cui/source/tabpages/tptrans.cxx | 1
filter/source/msfilter/msdffimp.cxx | 3 +
filter/source/msfilter/svdfppt.cxx | 1
include/svx/xattr.hxx | 34 ----------------------
sd/source/ui/sidebar/SlideBackground.cxx | 1
solenv/clang-format/blacklist | 1
svx/inc/pch/precompiled_svx.hxx | 1
svx/inc/pch/precompiled_svxcore.hxx | 1
svx/source/sidebar/shadow/ShadowPropertyPanel.cxx | 1
svx/source/svdraw/svdcrtv.cxx | 1
svx/source/svdraw/svddrgmt.cxx | 1
svx/source/svdraw/svddrgv.cxx | 1
svx/source/tbxctrls/colrctrl.cxx | 1
svx/source/tbxctrls/fillctrl.cxx | 2 -
svx/source/tbxctrls/linectrl.cxx | 2 -
svx/source/xoutdev/xattr.cxx | 4 +-
svx/source/xoutdev/xattr2.cxx | 3 +
svx/source/xoutdev/xattrbmp.cxx | 1
svx/source/xoutdev/xpool.cxx | 6 +++
29 files changed, 16 insertions(+), 62 deletions(-)
New commits:
commit f0c3fc59e1eefbec202e0a10553dd6581fc2cae5
Author: Gabor Kelemen <kelemen.gab...@nisz.hu>
AuthorDate: Tue Apr 30 21:59:34 2019 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue May 7 10:41:10 2019 +0200
tdf#62699 Drop pass-through header file include/svx/xattr.hxx
Change-Id: I8db9a4de494fbd045a0f4da810c3887ce62dd350
Reviewed-on: https://gerrit.libreoffice.org/71595
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx
index d3e078be0c84..3baac2bbc12d 100644
--- a/cui/inc/pch/precompiled_cui.hxx
+++ b/cui/inc/pch/precompiled_cui.hxx
@@ -405,7 +405,6 @@
#include <svx/svdview.hxx>
#include <svx/svxdlg.hxx>
#include <svx/svxdllapi.h>
-#include <svx/xattr.hxx>
#include <svx/xcolit.hxx>
#include <svx/xdef.hxx>
#include <svx/xenum.hxx>
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 43c078c87285..975279eede8d 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -25,7 +25,6 @@
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
-#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/xflbckit.hxx>
#include <svx/svdattr.hxx>
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index fcab3c124d03..6f894004b297 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -25,7 +25,6 @@
#include <svx/xbtmpit.hxx>
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
-#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <strings.hrc>
#include <svx/xflbckit.hxx>
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index a938bacbe6ff..4264f7cda73a 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -36,7 +36,6 @@
#include <strings.hrc>
#include <svx/xflclit.hxx>
-#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index abc476b14c86..bf437d9753f8 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -31,7 +31,6 @@
#include <strings.hrc>
#include <svx/xflgrit.hxx>
#include <svx/colorbox.hxx>
-#include <svx/xattr.hxx>
#include <svx/xtable.hxx>
#include <svx/xpool.hxx>
#include <svx/drawitem.hxx>
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 8b59d3f2f353..d494d04d1674 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -33,7 +33,6 @@
#include <svx/xflhtit.hxx>
#include <svx/xflclit.hxx>
#include <svx/colorbox.hxx>
-#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
#include <svx/drawitem.hxx>
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 481dee2f39c2..8dd8dc36f527 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -26,7 +26,8 @@
#include <strings.hrc>
#include <svx/colorbox.hxx>
-#include <svx/xattr.hxx>
+#include <svx/xlinjoit.hxx>
+#include <svx/xlncapit.hxx>
#include <svx/xlndsit.hxx>
#include <svx/xlnwtit.hxx>
#include <svx/xlnstwit.hxx>
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 3264719f4809..576b8b06a1b9 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -29,7 +29,6 @@
#include <strings.hrc>
-#include <svx/xattr.hxx>
#include <svx/xlnwtit.hxx>
#include <svx/xlndsit.hxx>
#include <svx/xlnclit.hxx>
diff --git a/cui/source/tabpages/tppattern.cxx
b/cui/source/tabpages/tppattern.cxx
index 65c1a207d4d5..3e6b05df32a7 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -38,7 +38,6 @@
#include <strings.hrc>
#include <svx/xbtmpit.hxx>
-#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/xtable.hxx>
#include <svx/xoutbmp.hxx>
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 6c629122aca7..a35b0cd04aae 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -28,7 +28,6 @@
#include <svx/xflgrit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xbtmpit.hxx>
-#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/svdattr.hxx>
#include <svx/drawitem.hxx>
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 2092d6830e28..f73890384e06 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -30,7 +30,6 @@
#include <svx/xflgrit.hxx>
#include <svx/xflhtit.hxx>
#include <svx/xbtmpit.hxx>
-#include <svx/xattr.hxx>
#include <svx/xpool.hxx>
#include <svx/xflbckit.hxx>
#include <svx/svdattr.hxx>
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 0a1ff5c8bcf5..0d2f2b1fb99a 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -121,7 +121,8 @@
#include <svx/extrud3d.hxx>
#include <svx/svditer.hxx>
#include <svx/xpoly.hxx>
-#include <svx/xattr.hxx>
+#include <svx/xlncapit.hxx>
+#include <svx/xlinjoit.hxx>
#include <svx/xlndsit.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xlnwtit.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx
b/filter/source/msfilter/svdfppt.cxx
index 30d82094bfa2..aae8b9edc140 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -60,7 +60,6 @@
#include <editeng/outlobj.hxx>
#include <editeng/numdef.hxx>
#include <svx/svdattr.hxx>
-#include <svx/xattr.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xlnwtit.hxx>
#include <svx/svdetc.hxx>
diff --git a/include/svx/xattr.hxx b/include/svx/xattr.hxx
deleted file mode 100644
index 04a40f9ba58f..000000000000
--- a/include/svx/xattr.hxx
+++ /dev/null
@@ -1,34 +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_SVX_XATTR_HXX
-#define INCLUDED_SVX_XATTR_HXX
-
-#include <svx/xit.hxx>
-#include <svx/xcolit.hxx>
-#include <svx/xgrad.hxx>
-#include <svx/xhatch.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xtextit0.hxx>
-#include <svx/xlinjoit.hxx>
-#include <svx/xlncapit.hxx>
-
-#endif // INCLUDED_SVX_XATTR_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx
b/sd/source/ui/sidebar/SlideBackground.cxx
index 0e8fe07db9a3..e7e7424a8932 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -56,7 +56,6 @@
#include <svx/xbitmap.hxx>
#include <svx/xflbckit.hxx>
#include <svx/xbtmpit.hxx>
-#include <svx/xattr.hxx>
#include <svx/xflhtit.hxx>
#include <svx/svdpage.hxx>
#include <sfx2/bindings.hxx>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 0d6806032587..03db2abb9b0d 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7418,7 +7418,6 @@ include/svx/verttexttbxctrl.hxx
include/svx/view3d.hxx
include/svx/viewlayoutitem.hxx
include/svx/viewpt3d.hxx
-include/svx/xattr.hxx
include/svx/xbitmap.hxx
include/svx/xbtmpit.hxx
include/svx/xcolit.hxx
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index e5f7944c8a90..71417c0d1bc4 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -498,7 +498,6 @@
#include <svx/unoshape.hxx>
#include <svx/unoshtxt.hxx>
#include <svx/viewpt3d.hxx>
-#include <svx/xattr.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xcolit.hxx>
#include <svx/xdash.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx
b/svx/inc/pch/precompiled_svxcore.hxx
index f69e7facbdf4..ee101da6d5a8 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -561,7 +561,6 @@
#include <svx/unopage.hxx>
#include <svx/unoshape.hxx>
#include <svx/unoshprp.hxx>
-#include <svx/xattr.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xdef.hxx>
#include <svx/xenum.hxx>
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index e17c13476c6d..03f734d708fd 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -21,7 +21,6 @@
#include <svtools/valueset.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/pathoptions.hxx>
-#include <svx/xattr.hxx>
#include <svx/svddef.hxx>
#include <svx/sdooitm.hxx>
#include <svx/sdshitm.hxx>
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 8513b1c7a068..235ad5b4234f 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -19,7 +19,6 @@
#include <svx/svdcrtv.hxx>
-#include <svx/xattr.hxx>
#include <svx/xlnclit.hxx>
#include <svx/svdundo.hxx>
#include <svx/svdocapt.hxx>
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index d5d052e8407b..d96bed18602e 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -25,7 +25,6 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/ptrstyle.hxx>
-#include <svx/xattr.hxx>
#include <svx/xpoly.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdtrans.hxx>
diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx
index 96f92d652cba..b6a5e3b8e6a1 100644
--- a/svx/source/svdraw/svddrgv.cxx
+++ b/svx/source/svdraw/svddrgv.cxx
@@ -20,7 +20,6 @@
#include <svx/svddrgv.hxx>
#include <svx/svdview.hxx>
-#include <svx/xattr.hxx>
#include <svx/xpoly.hxx>
#include <svx/svdetc.hxx>
#include <svx/svdtrans.hxx>
diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx
index 5a738ffbb102..ab6b2ce86b05 100644
--- a/svx/source/tbxctrls/colrctrl.cxx
+++ b/svx/source/tbxctrls/colrctrl.cxx
@@ -36,7 +36,6 @@
#include <svx/drawitem.hxx>
#include <svx/xflclit.hxx>
#include <editeng/colritem.hxx>
-#include <svx/xattr.hxx>
#include <svx/xlnclit.hxx>
#include <svx/xtable.hxx>
#include <svx/dialmgr.hxx>
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index c0ccab558a4e..7a9be740539c 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -34,7 +34,7 @@
#define TMP_STR_END "]"
#include <svx/drawitem.hxx>
-#include <svx/xattr.hxx>
+#include <svx/xfillit0.hxx>
#include <svx/xtable.hxx>
#include <svx/fillctrl.hxx>
#include <svx/itemwin.hxx>
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 2cc9f1bfbdc6..8e510e01a953 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -32,7 +32,7 @@
#include <helpids.h>
#include <svx/drawitem.hxx>
-#include <svx/xattr.hxx>
+#include <svx/xlineit0.hxx>
#include <svx/xlnwtit.hxx>
#include <svx/xlndsit.hxx>
#include <svx/xlnstit.hxx>
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 411a769e9bd3..7f0d0ac54165 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -45,7 +45,9 @@
#include <tools/bigint.hxx>
#include <svl/itemset.hxx>
#include <svx/strings.hrc>
-#include <svx/xattr.hxx>
+#include <svx/xfillit0.hxx>
+#include <svx/xlineit0.hxx>
+#include <svx/xtextit0.hxx>
#include <svx/xtable.hxx>
#include <svx/dialmgr.hxx>
#include <svx/xflclit.hxx>
diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx
index af9181a9dd96..0d0d228249eb 100644
--- a/svx/source/xoutdev/xattr2.cxx
+++ b/svx/source/xoutdev/xattr2.cxx
@@ -25,7 +25,8 @@
#include <i18nutil/unicode.hxx>
#include <svx/strings.hrc>
#include <svx/svxids.hrc>
-#include <svx/xattr.hxx>
+#include <svx/xlinjoit.hxx>
+#include <svx/xlncapit.hxx>
#include <svx/xlntrit.hxx>
#include <svx/xfltrit.hxx>
#include <svx/xftshtit.hxx>
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index a1fbc16c98ac..7d5ebec8c7bf 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -26,7 +26,6 @@
#include <svl/style.hxx>
#include <editeng/memberids.h>
#include <svx/strings.hrc>
-#include <svx/xattr.hxx>
#include <svx/xtable.hxx>
#include <svx/xdef.hxx>
#include <svx/unomid.hxx>
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index a4580f19debe..5d8c7a4f622f 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -38,7 +38,11 @@
#include <svx/xflbmsxy.hxx>
#include <svx/xflbmsli.hxx>
#include <svx/xflbtoxy.hxx>
-#include <svx/xattr.hxx>
+#include <svx/xlineit0.hxx>
+#include <svx/xlinjoit.hxx>
+#include <svx/xlncapit.hxx>
+#include <svx/xfillit0.hxx>
+#include <svx/xtextit0.hxx>
#include <svx/xlndsit.hxx>
#include <svx/xlnwtit.hxx>
#include <svx/xlnclit.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
