diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-04-28 10:32:43 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-30 12:27:04 +0200 |
commit | e1a928f28ac70c4b13cf4b6fe73e7b33e2e86d2f (patch) | |
tree | ae7b7b82aa986368406b19ddea45983c54b849be | |
parent | 60095b481d9663f7bcfe8078d669030ab2bc6a05 (diff) |
tdf#62699 Drop pass-through header file include/svx/xlineit.hxx
Change-Id: I3ae76558f476934dffc2b43b19af848b5ad5015e
Reviewed-on: https://gerrit.libreoffice.org/71454
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
-rw-r--r-- | cui/source/dialogs/cuiimapwnd.cxx | 1 | ||||
-rw-r--r-- | cui/source/tabpages/tpline.cxx | 11 | ||||
-rw-r--r-- | cui/source/tabpages/tplnedef.cxx | 3 | ||||
-rw-r--r-- | cui/source/tabpages/tplneend.cxx | 6 | ||||
-rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 9 | ||||
-rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 | ||||
-rw-r--r-- | include/svx/tabline.hxx | 1 | ||||
-rw-r--r-- | include/svx/xattr.hxx | 1 | ||||
-rw-r--r-- | include/svx/xlineit.hxx | 46 | ||||
-rw-r--r-- | solenv/clang-format/blacklist | 1 | ||||
-rw-r--r-- | svx/source/dialog/imapwnd.cxx | 3 | ||||
-rw-r--r-- | svx/source/svdraw/svdcrtv.cxx | 1 | ||||
-rw-r--r-- | svx/source/tbxctrls/colrctrl.cxx | 1 | ||||
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/xoutdev/xattr.cxx | 9 | ||||
-rw-r--r-- | svx/source/xoutdev/xpool.cxx | 9 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8graf.cxx | 10 |
17 files changed, 66 insertions, 52 deletions
diff --git a/cui/source/dialogs/cuiimapwnd.cxx b/cui/source/dialogs/cuiimapwnd.cxx index 7634ea091aed..c4b41afcad54 100644 --- a/cui/source/dialogs/cuiimapwnd.cxx +++ b/cui/source/dialogs/cuiimapwnd.cxx @@ -34,7 +34,6 @@ #include <svx/xfltrit.hxx> #include <svx/svdpagv.hxx> #include <svl/urihelper.hxx> -#include <svx/xlineit.hxx> #include <sot/formats.hxx> diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index e2aad7f8f8a9..481dee2f39c2 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -27,6 +27,17 @@ #include <strings.hrc> #include <svx/colorbox.hxx> #include <svx/xattr.hxx> +#include <svx/xlndsit.hxx> +#include <svx/xlnwtit.hxx> +#include <svx/xlnstwit.hxx> +#include <svx/xlnedwit.hxx> +#include <svx/xlnclit.hxx> +#include <svx/xlnstit.hxx> +#include <svx/xlnedit.hxx> +#include <svx/xlnstcit.hxx> +#include <svx/xlnedcit.hxx> + + #include <svx/xpool.hxx> #include <svx/xtable.hxx> #include <svx/drawitem.hxx> diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 1888b4b46b31..3264719f4809 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -30,6 +30,9 @@ #include <strings.hrc> #include <svx/xattr.hxx> +#include <svx/xlnwtit.hxx> +#include <svx/xlndsit.hxx> +#include <svx/xlnclit.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index b97636815e25..5b5359aa6d77 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -33,6 +33,12 @@ #include <svx/drawitem.hxx> #include <svx/xpool.hxx> #include <svx/xtable.hxx> +#include <svx/xlnwtit.hxx> +#include <svx/xlnclit.hxx> +#include <svx/xlnstwit.hxx> +#include <svx/xlnedwit.hxx> +#include <svx/xlnstit.hxx> +#include <svx/xlnedit.hxx> #include <cuitabline.hxx> #include <cuitabarea.hxx> #include <svx/svxdlg.hxx> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 4caf50622d7f..0a1ff5c8bcf5 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -122,6 +122,15 @@ #include <svx/svditer.hxx> #include <svx/xpoly.hxx> #include <svx/xattr.hxx> +#include <svx/xlndsit.hxx> +#include <svx/xlnclit.hxx> +#include <svx/xlnwtit.hxx> +#include <svx/xlnstwit.hxx> +#include <svx/xlnedwit.hxx> +#include <svx/xlnstit.hxx> +#include <svx/xlnedit.hxx> +#include <svx/xlnstcit.hxx> +#include <svx/xlnedcit.hxx> #include <filter/msfilter/classids.hxx> #include <filter/msfilter/msdffimp.hxx> #include <editeng/outliner.hxx> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index b714abf001ea..30d82094bfa2 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -61,6 +61,8 @@ #include <editeng/numdef.hxx> #include <svx/svdattr.hxx> #include <svx/xattr.hxx> +#include <svx/xlnclit.hxx> +#include <svx/xlnwtit.hxx> #include <svx/svdetc.hxx> #include <editeng/bulletitem.hxx> #include <editeng/hngpnctitem.hxx> diff --git a/include/svx/tabline.hxx b/include/svx/tabline.hxx index ed9a8bb2f20a..dda8a85bccd5 100644 --- a/include/svx/tabline.hxx +++ b/include/svx/tabline.hxx @@ -22,7 +22,6 @@ #include <vcl/button.hxx> #include <svx/svdpage.hxx> #include <svx/xlineit0.hxx> -#include <svx/xlineit.hxx> #include <svx/dlgctrl.hxx> #include <vcl/menubtn.hxx> diff --git a/include/svx/xattr.hxx b/include/svx/xattr.hxx index ee814da03efe..04a40f9ba58f 100644 --- a/include/svx/xattr.hxx +++ b/include/svx/xattr.hxx @@ -23,7 +23,6 @@ #include <svx/xcolit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> -#include <svx/xlineit.hxx> #include <svx/xlineit0.hxx> #include <svx/xfillit0.hxx> #include <svx/xtextit0.hxx> diff --git a/include/svx/xlineit.hxx b/include/svx/xlineit.hxx deleted file mode 100644 index 0f364c20a31a..000000000000 --- a/include/svx/xlineit.hxx +++ /dev/null @@ -1,46 +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_XLINEIT_HXX -#define INCLUDED_SVX_XLINEIT_HXX - -#include <svx/xit.hxx> -#include <svx/xcolit.hxx> -#include <svx/xpoly.hxx> -#include <svx/xenum.hxx> -#include <svl/metitem.hxx> -#include <svl/eitem.hxx> - -class XDash; -class SvStream; - -#include <svx/xdash.hxx> -#include <svx/xlndsit.hxx> -#include <svx/xlnwtit.hxx> -#include <svx/xlnclit.hxx> -#include <svx/xlnstit.hxx> -#include <svx/xlnedit.hxx> -#include <svx/xlnstwit.hxx> -#include <svx/xlnedwit.hxx> -#include <svx/xlnstcit.hxx> -#include <svx/xlnedcit.hxx> - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 80a084c9b117..a928834cbe55 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7454,7 +7454,6 @@ include/svx/xgrad.hxx include/svx/xgrscit.hxx include/svx/xhatch.hxx include/svx/xit.hxx -include/svx/xlineit.hxx include/svx/xlineit0.hxx include/svx/xlinjoit.hxx include/svx/xlnasit.hxx diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index cbb58f1c8161..504f93a4d93f 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -37,7 +37,8 @@ #include <svx/svdpagv.hxx> #include <svl/urihelper.hxx> #include <svx/xflclit.hxx> -#include <svx/xlineit.hxx> +#include <svx/xlnclit.hxx> + #include <sfx2/evntconf.hxx> #include <sot/formats.hxx> diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index fccc95faa8de..8513b1c7a068 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -20,6 +20,7 @@ #include <svx/svdcrtv.hxx> #include <svx/xattr.hxx> +#include <svx/xlnclit.hxx> #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> #include <svx/svdoedge.hxx> diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 45c52420ad78..5a738ffbb102 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -37,6 +37,7 @@ #include <svx/xflclit.hxx> #include <editeng/colritem.hxx> #include <svx/xattr.hxx> +#include <svx/xlnclit.hxx> #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> #include <helpids.h> diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 309d905ff160..2cc9f1bfbdc6 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -33,6 +33,10 @@ #include <svx/drawitem.hxx> #include <svx/xattr.hxx> +#include <svx/xlnwtit.hxx> +#include <svx/xlndsit.hxx> +#include <svx/xlnstit.hxx> +#include <svx/xlnedit.hxx> #include <svx/xtable.hxx> #include <svx/linectrl.hxx> #include <svx/itemwin.hxx> diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index d181639661e1..411a769e9bd3 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -54,6 +54,15 @@ #include <svx/xsflclit.hxx> #include <svx/xflhtit.hxx> #include <svx/xbtmpit.hxx> +#include <svx/xlndsit.hxx> +#include <svx/xlnwtit.hxx> +#include <svx/xlnclit.hxx> +#include <svx/xlnstit.hxx> +#include <svx/xlnedit.hxx> +#include <svx/xlnstwit.hxx> +#include <svx/xlnedwit.hxx> +#include <svx/xlnstcit.hxx> +#include <svx/xlnedcit.hxx> #include <editeng/itemtype.hxx> #include <editeng/editrids.hrc> #include <editeng/eerdll.hxx> diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index f569d10c3bc8..a4580f19debe 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -39,6 +39,15 @@ #include <svx/xflbmsli.hxx> #include <svx/xflbtoxy.hxx> #include <svx/xattr.hxx> +#include <svx/xlndsit.hxx> +#include <svx/xlnwtit.hxx> +#include <svx/xlnclit.hxx> +#include <svx/xlnstit.hxx> +#include <svx/xlnedit.hxx> +#include <svx/xlnstwit.hxx> +#include <svx/xlnedwit.hxx> +#include <svx/xlnstcit.hxx> +#include <svx/xlnedcit.hxx> #include <svx/xpool.hxx> #include <svx/svdattr.hxx> #include <svx/svxids.hrc> diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 7db149746c7a..49440291710a 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -26,7 +26,15 @@ #include <svx/sdtaitm.hxx> #include <editeng/lrspitem.hxx> #include <editeng/udlnitem.hxx> -#include <svx/xlineit.hxx> +#include <svx/xlnclit.hxx> +#include <svx/xlnwtit.hxx> +#include <svx/xlndsit.hxx> +#include <svx/xlnstit.hxx> +#include <svx/xlnedit.hxx> +#include <svx/xlnstwit.hxx> +#include <svx/xlnedwit.hxx> +#include <svx/xlnstcit.hxx> +#include <svx/xlnedcit.hxx> #include <svx/xflclit.hxx> #include <svx/xbtmpit.hxx> #include <svx/svdmodel.hxx> |