[Libreoffice-commits] core.git: sc/inc sc/IwyuFilter_sc.yaml sc/source
Gabor Kelemen (via logerrit)
logerrit at kemper.freedesktop.org
Tue Jul 9 07:21:49 UTC 2019
sc/IwyuFilter_sc.yaml | 3 ---
sc/inc/TablePivotChart.hxx | 1 +
sc/inc/addruno.hxx | 2 ++
sc/inc/afmtuno.hxx | 2 ++
sc/inc/attrib.hxx | 1 -
sc/inc/autoform.hxx | 20 ++------------------
sc/inc/calcmacros.hxx | 2 --
sc/inc/chartuno.hxx | 1 +
sc/inc/conditio.hxx | 1 -
sc/inc/dociter.hxx | 2 ++
sc/inc/dpobject.hxx | 1 +
sc/inc/dpoutput.hxx | 2 +-
sc/inc/matrixoperators.hxx | 2 ++
sc/inc/orcusxml.hxx | 1 -
sc/inc/refhint.hxx | 2 +-
sc/inc/scerrors.hrc | 1 +
sc/inc/scopetools.hxx | 1 -
sc/inc/sheetdata.hxx | 1 +
sc/inc/unitconv.hxx | 2 ++
sc/inc/units.hrc | 4 ++++
sc/inc/userlist.hxx | 2 ++
sc/inc/viewuno.hxx | 2 ++
sc/inc/waitoff.hxx | 2 ++
sc/source/core/data/global.cxx | 1 +
sc/source/core/tool/autoform.cxx | 18 ++++++++++++++++++
sc/source/ui/docshell/docfunc.cxx | 1 +
sc/source/ui/miscdlgs/autofmt.cxx | 2 ++
sc/source/ui/unoobj/afmtuno.cxx | 4 ++++
sc/source/ui/view/viewfun2.cxx | 1 +
29 files changed, 56 insertions(+), 29 deletions(-)
New commits:
commit f6e72cf4f70ac4f7bc6ace7c0cdb5e2afa13199a
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Tue Jul 2 00:40:24 2019 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Jul 9 09:20:34 2019 +0200
tdf#42949 Fix IWYU warnings in sc/inc
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
New IWYU and recent developments in f-u-i helped to identify
some non self contained files, those were fixed too.
Change-Id: I3b33b0dee7d7c9afc136510898039cab53990ddf
Reviewed-on: https://gerrit.libreoffice.org/74980
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 97ffa6b09a50..9b2bf6629b06 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -32,9 +32,6 @@ blacklist:
- com/sun/star/sheet/XFunctionDescriptions.hpp
- com/sun/star/sheet/XGlobalSheetSettings.hpp
- com/sun/star/sheet/XRecentFunctions.hpp
- sc/inc/autoform.hxx:
- # contains macro definitions
- - scitems.hxx
sc/inc/chartuno.hxx:
# base class has to be a complete type
- com/sun/star/container/XEnumerationAccess.hpp
diff --git a/sc/inc/TablePivotChart.hxx b/sc/inc/TablePivotChart.hxx
index a99711c37845..c357c6fad230 100644
--- a/sc/inc/TablePivotChart.hxx
+++ b/sc/inc/TablePivotChart.hxx
@@ -16,6 +16,7 @@
#include <com/sun/star/container/XNamed.hpp>
#include <svl/lstner.hxx>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include "types.hxx"
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx
index 62a0e7c8b0b8..7503f865677c 100644
--- a/sc/inc/addruno.hxx
+++ b/sc/inc/addruno.hxx
@@ -26,6 +26,8 @@
#include <svl/lstner.hxx>
#include "address.hxx"
+#include <docsh.hxx>
+
class ScAddressConversionObj : public ::cppu::WeakImplHelper<
css::beans::XPropertySet,
css::lang::XServiceInfo >,
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index d39e5e41a294..ff997b6e95ca 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -31,6 +31,8 @@
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
+#include <climits>
+
class ScAutoFormatFieldObj;
class ScAutoFormatObj;
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index 37340e786fe2..a98578abcb23 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SC_INC_ATTRIB_HXX
#include <memory>
-#include <vector>
#include <svl/poolitem.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
diff --git a/sc/inc/autoform.hxx b/sc/inc/autoform.hxx
index 8fad143b8400..43f22b107c62 100644
--- a/sc/inc/autoform.hxx
+++ b/sc/inc/autoform.hxx
@@ -30,25 +30,9 @@
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
**************************************************************************/
-#include "scitems.hxx"
-#include <editeng/adjustitem.hxx>
-#include <svx/algitem.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/brushitem.hxx>
-#include <editeng/contouritem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/crossedoutitem.hxx>
-#include <editeng/fhgtitem.hxx>
-#include <editeng/fontitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/shdditem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <editeng/justifyitem.hxx>
-#include <svx/rotmodit.hxx>
+#include <svl/poolitem.hxx>
#include <svx/autoformathelper.hxx>
-#include <svl/intitem.hxx>
-#include <editeng/lineitem.hxx>
+
#include "scdllapi.h"
#include "zforauto.hxx"
diff --git a/sc/inc/calcmacros.hxx b/sc/inc/calcmacros.hxx
index d5cffd5db88b..ca51c62adb54 100644
--- a/sc/inc/calcmacros.hxx
+++ b/sc/inc/calcmacros.hxx
@@ -30,8 +30,6 @@
DEBUG_FORMULA_COMPILER || \
DEBUG_AREA_BROADCASTER
#include <iostream>
-#include <string>
-#include <cstdio>
using std::cout;
using std::cerr;
using std::endl;
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index 801a9d99db93..3e40ead05d40 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -32,6 +32,7 @@
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XNamed.hpp>
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/sc/inc/conditio.hxx b/sc/inc/conditio.hxx
index 42448174ca52..0ab1d114f8f4 100644
--- a/sc/inc/conditio.hxx
+++ b/sc/inc/conditio.hxx
@@ -31,7 +31,6 @@
#include <svl/listener.hxx>
-#include <comphelper/stl_types.hxx>
#include <com/sun/star/sheet/ConditionOperator.hpp>
#include <rtl/math.hxx>
diff --git a/sc/inc/dociter.hxx b/sc/inc/dociter.hxx
index 8604abcdd453..7e293e4ac3ff 100644
--- a/sc/inc/dociter.hxx
+++ b/sc/inc/dociter.hxx
@@ -26,6 +26,8 @@
#include "scdllapi.h"
#include "cellvalue.hxx"
#include "mtvelements.hxx"
+#include "queryparam.hxx"
+#include <vcl/outdev.hxx>
#include <vcl/vclptr.hxx>
#include <memory>
diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx
index 4d0011c17868..c17cb53e43c9 100644
--- a/sc/inc/dpobject.hxx
+++ b/sc/inc/dpobject.hxx
@@ -23,6 +23,7 @@
#include "scdllapi.h"
#include "global.hxx"
#include "address.hxx"
+#include "dpcache.hxx"
#include "dptypes.hxx"
#include "pivot.hxx"
#include "calcmacros.hxx"
diff --git a/sc/inc/dpoutput.hxx b/sc/inc/dpoutput.hxx
index 18aa7aaa855b..70a5517beb6e 100644
--- a/sc/inc/dpoutput.hxx
+++ b/sc/inc/dpoutput.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/sheet/DataPilotOutputRangeType.hpp>
#include <com/sun/star/sheet/DataPilotFieldOrientation.hpp>
-#include <comphelper/sequence.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
#include "address.hxx"
diff --git a/sc/inc/matrixoperators.hxx b/sc/inc/matrixoperators.hxx
index cadf5541b778..aea82b5bc36a 100644
--- a/sc/inc/matrixoperators.hxx
+++ b/sc/inc/matrixoperators.hxx
@@ -11,6 +11,8 @@
#define INCLUDED_SC_INC_MATRIXOPERATORS_HXX
+#include <functional>
+
namespace sc {
namespace op {
diff --git a/sc/inc/orcusxml.hxx b/sc/inc/orcusxml.hxx
index b635eca2d43d..f0f155882c3e 100644
--- a/sc/inc/orcusxml.hxx
+++ b/sc/inc/orcusxml.hxx
@@ -12,7 +12,6 @@
#include "scdllapi.h"
#include "address.hxx"
-#include <vcl/image.hxx>
#include <vector>
#include <memory>
diff --git a/sc/inc/refhint.hxx b/sc/inc/refhint.hxx
index ef5fc6058fd0..12c804db45ba 100644
--- a/sc/inc/refhint.hxx
+++ b/sc/inc/refhint.hxx
@@ -10,7 +10,7 @@
#ifndef INCLUDED_SC_INC_REFHINT_HXX
#define INCLUDED_SC_INC_REFHINT_HXX
-#include "address.hxx"
+#include "types.hxx"
#include <svl/hint.hxx>
namespace sc {
diff --git a/sc/inc/scerrors.hrc b/sc/inc/scerrors.hrc
index d7095c3be6a2..e585b1147cc2 100644
--- a/sc/inc/scerrors.hrc
+++ b/sc/inc/scerrors.hrc
@@ -22,6 +22,7 @@
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+#include <svtools/ehdl.hxx>
#include "scerrors.hxx"
const ErrMsgCode RID_ERRHDLSC[] =
diff --git a/sc/inc/scopetools.hxx b/sc/inc/scopetools.hxx
index 93f7238ec138..135a7ff5e008 100644
--- a/sc/inc/scopetools.hxx
+++ b/sc/inc/scopetools.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_SC_INC_SCOPETOOLS_HXX
#include "scdllapi.h"
-#include <vcl/vclptr.hxx>
class ScDocument;
namespace vcl { class Window; }
diff --git a/sc/inc/sheetdata.hxx b/sc/inc/sheetdata.hxx
index 1f3ce0793058..5b2265c1d5a1 100644
--- a/sc/inc/sheetdata.hxx
+++ b/sc/inc/sheetdata.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_SC_INC_SHEETDATA_HXX
#include <editeng/editdata.hxx>
+#include <map>
#include <unordered_set>
#include <vector>
diff --git a/sc/inc/unitconv.hxx b/sc/inc/unitconv.hxx
index 01a6a3437846..465aacf4eacd 100644
--- a/sc/inc/unitconv.hxx
+++ b/sc/inc/unitconv.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SC_INC_UNITCONV_HXX
#define INCLUDED_SC_INC_UNITCONV_HXX
+#include <rtl/ustring.hxx>
+
#include <map>
class ScUnitConverterData
diff --git a/sc/inc/units.hrc b/sc/inc/units.hrc
index 1ce44ba00197..19fcb816784b 100644
--- a/sc/inc/units.hrc
+++ b/sc/inc/units.hrc
@@ -22,6 +22,10 @@
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
+#include <tools/fldunit.hxx>
+
+#include <utility>
+
const std::pair<const char*, FieldUnit> SCSTR_UNIT[] =
{
{ NC_("SCSTR_UNIT", "Millimeter") , FieldUnit::MM },
diff --git a/sc/inc/userlist.hxx b/sc/inc/userlist.hxx
index 3c0752aec50a..ae4bec457f7c 100644
--- a/sc/inc/userlist.hxx
+++ b/sc/inc/userlist.hxx
@@ -22,6 +22,8 @@
#include "scdllapi.h"
+#include <rtl/ustring.hxx>
+
#include <memory>
#include <vector>
diff --git a/sc/inc/viewuno.hxx b/sc/inc/viewuno.hxx
index 3546b50fc5ed..04f23006e582 100644
--- a/sc/inc/viewuno.hxx
+++ b/sc/inc/viewuno.hxx
@@ -22,6 +22,8 @@
#include <sfx2/sfxbasecontroller.hxx>
#include <svl/itemprop.hxx>
+#include <svl/lstner.hxx>
+#include <tools/gen.hxx>
#include <com/sun/star/view/XFormLayerAccess.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/sheet/XCellRangeReferrer.hpp>
diff --git a/sc/inc/waitoff.hxx b/sc/inc/waitoff.hxx
index 6c8b5f91bf7f..92eb127ee997 100644
--- a/sc/inc/waitoff.hxx
+++ b/sc/inc/waitoff.hxx
@@ -22,6 +22,8 @@
#include <sal/types.h>
+#include <vcl/vclptr.hxx>
+
namespace vcl { class Window; }
class ScWaitCursorOff
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 33e4ffb13eef..d91222c117bc 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -30,6 +30,7 @@
#include <sfx2/sfxsids.hrc>
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
+#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx
index f9840eb0825c..254db1f14d6b 100644
--- a/sc/source/core/tool/autoform.cxx
+++ b/sc/source/core/tool/autoform.cxx
@@ -23,15 +23,32 @@
#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
#include <unotools/pathoptions.hxx>
+#include <svl/intitem.hxx>
#include <svl/itemset.hxx>
#include <vcl/svapp.hxx>
#include <vcl/outdev.hxx>
+#include <svx/algitem.hxx>
#include <svx/dialmgr.hxx>
#include <svx/dialogs.hrc>
+#include <svx/rotmodit.hxx>
#include <svx/svxids.hrc>
#include <svx/strings.hrc>
+#include <editeng/adjustitem.hxx>
#include <editeng/borderline.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/brushitem.hxx>
+#include <editeng/colritem.hxx>
+#include <editeng/contouritem.hxx>
+#include <editeng/crossedoutitem.hxx>
+#include <editeng/fhgtitem.hxx>
+#include <editeng/fontitem.hxx>
+#include <editeng/justifyitem.hxx>
#include <editeng/langitem.hxx>
+#include <editeng/lineitem.hxx>
+#include <editeng/postitem.hxx>
+#include <editeng/shdditem.hxx>
+#include <editeng/udlnitem.hxx>
+#include <editeng/wghtitem.hxx>
#include <tools/urlobj.hxx>
#include <comphelper/fileformat.h>
#include <unotools/collatorwrapper.hxx>
@@ -40,6 +57,7 @@
#include <osl/diagnose.h>
#include <globstr.hrc>
+#include <scitems.hxx>
#include <scresid.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 76f5a6c49848..adbee4bee4d1 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -22,6 +22,7 @@
#include <comphelper/lok.hxx>
#include <sfx2/app.hxx>
#include <editeng/editobj.hxx>
+#include <editeng/justifyitem.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/bindings.hxx>
#include <vcl/svapp.hxx>
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index 4887523e09c5..f0031987e0c3 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -24,6 +24,8 @@
#include <editeng/colritem.hxx>
#include <editeng/crossedoutitem.hxx>
#include <editeng/fontitem.hxx>
+#include <editeng/justifyitem.hxx>
+#include <editeng/lineitem.hxx>
#include <editeng/postitem.hxx>
#include <editeng/shdditem.hxx>
#include <editeng/udlnitem.hxx>
diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx
index 531a94d24f89..013a5b2c3cbc 100644
--- a/sc/source/ui/unoobj/afmtuno.cxx
+++ b/sc/source/ui/unoobj/afmtuno.cxx
@@ -20,9 +20,13 @@
#include <scitems.hxx>
#include <editeng/memberids.h>
#include <osl/diagnose.h>
+#include <svl/intitem.hxx>
#include <svl/poolitem.hxx>
#include <svl/eitem.hxx>
#include <vcl/svapp.hxx>
+#include <svx/algitem.hxx>
+#include <editeng/boxitem.hxx>
+#include <editeng/justifyitem.hxx>
#include <svx/unomid.hxx>
#include <unowids.hxx>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index f0772bab4aa2..72cd999780f7 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -24,6 +24,7 @@
#include <editeng/borderline.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/fontitem.hxx>
+#include <editeng/lineitem.hxx>
#include <editeng/scripttypeitem.hxx>
#include <svl/srchitem.hxx>
#include <sfx2/linkmgr.hxx>
More information about the Libreoffice-commits
mailing list