[Libreoffice-commits] core.git: 2 commits - configure.ac sc/IwyuFilter_sc.yaml sc/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Mar 11 11:44:07 UTC 2019
configure.ac | 3 +++
sc/IwyuFilter_sc.yaml | 7 +++++++
sc/source/ui/formdlg/dwfunctr.cxx | 9 ---------
sc/source/ui/formdlg/formula.cxx | 10 +++-------
sc/source/ui/inc/dataproviderdlg.hxx | 2 +-
sc/source/ui/inc/namemgrtable.hxx | 1 +
sc/source/ui/inc/tpview.hxx | 2 +-
sc/source/ui/miscdlgs/acredlin.cxx | 2 --
sc/source/ui/miscdlgs/anyrefdg.cxx | 3 ---
sc/source/ui/miscdlgs/autofmt.cxx | 7 -------
sc/source/ui/miscdlgs/datafdlg.cxx | 2 --
sc/source/ui/miscdlgs/dataproviderdlg.cxx | 2 +-
sc/source/ui/miscdlgs/datastreamdlg.cxx | 1 -
sc/source/ui/miscdlgs/filldlg.cxx | 1 -
sc/source/ui/miscdlgs/highred.cxx | 2 --
sc/source/ui/miscdlgs/instbdlg.cxx | 1 -
sc/source/ui/miscdlgs/linkarea.cxx | 3 ---
sc/source/ui/miscdlgs/mvtabdlg.cxx | 1 -
sc/source/ui/miscdlgs/optsolver.cxx | 7 +++----
sc/source/ui/miscdlgs/protectiondlg.cxx | 2 --
sc/source/ui/miscdlgs/redcom.cxx | 5 +++--
sc/source/ui/miscdlgs/scuiautofmt.cxx | 19 ++-----------------
sc/source/ui/miscdlgs/sharedocdlg.cxx | 1 -
sc/source/ui/miscdlgs/simpref.cxx | 4 ----
sc/source/ui/miscdlgs/solveroptions.cxx | 4 ----
sc/source/ui/miscdlgs/solvrdlg.cxx | 1 -
sc/source/ui/miscdlgs/strindlg.cxx | 1 -
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 7 -------
sc/source/ui/miscdlgs/tabopdlg.cxx | 2 --
sc/source/ui/miscdlgs/textdlgs.cxx | 1 -
sc/source/ui/miscdlgs/warnbox.cxx | 1 -
sc/source/ui/namedlg/namedefdlg.cxx | 1 -
sc/source/ui/namedlg/namedlg.cxx | 2 --
sc/source/ui/namedlg/namemgrtable.cxx | 12 ++++++------
sc/source/ui/navipi/content.cxx | 7 -------
sc/source/ui/navipi/navcitem.cxx | 1 -
sc/source/ui/navipi/navipi.cxx | 8 --------
sc/source/ui/optdlg/calcoptionsdlg.cxx | 17 -----------------
sc/source/ui/optdlg/calcoptionsdlg.hxx | 1 -
sc/source/ui/optdlg/opredlin.cxx | 11 +----------
sc/source/ui/optdlg/tpcalc.cxx | 8 +-------
sc/source/ui/optdlg/tpcompatibility.cxx | 5 +++--
sc/source/ui/optdlg/tpdefaults.cxx | 1 -
sc/source/ui/optdlg/tpformula.cxx | 4 +---
sc/source/ui/optdlg/tpview.cxx | 9 +--------
45 files changed, 38 insertions(+), 163 deletions(-)
New commits:
commit b8a0f8c6f34c7f916e53935e410a5a68931bb739
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Thu Mar 7 07:51:39 2019 +0100
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Mar 11 12:43:48 2019 +0100
tdf#42949 Fix IWYU warnings in sc/source/ui/[f-o]*/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I56e32029f40a7c440143e395d851396fb2740fa8
Reviewed-on: https://gerrit.libreoffice.org/68837
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index dc3b4ab96723..d04da62d06f1 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -521,6 +521,9 @@ blacklist:
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx:
# base class has to be a complete type
- viewdata.hxx
+ sc/source/ui/inc/tpview.hxx:
+ # Needed for VclPtr type
+ - svx/colorbox.hxx
sc/source/ui/unoobj/exceldetect.hxx:
# base class has to be a complete type
- com/sun/star/document/XExtendedFilterDetection.hpp
@@ -860,3 +863,7 @@ blacklist:
sc/source/ui/drawfunc/futext3.cxx:
# Needed for direct member access
- svx/svdocapt.hxx
+ sc/source/ui/formdlg/formula.cxx:
+ # Complete type is needed
+ - com/sun/star/sheet/XFormulaParser.hpp
+ - com/sun/star/sheet/XFormulaOpCodeMapper.hpp
diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index f2c52f45fad7..bc99704c9dbc 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -19,23 +19,14 @@
#include <comphelper/string.hxx>
#include <editeng/editview.hxx>
-#include <sfx2/bindings.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
#include <formula/funcvarargs.h>
#include <vcl/fixed.hxx>
-#include <sc.hrc>
#include <global.hxx>
-#include <reffact.hxx>
-#include <document.hxx>
-#include <formulacell.hxx>
#include <scmod.hxx>
#include <inputhdl.hxx>
#include <tabvwsh.hxx>
-#include <appoptio.hxx>
-#include <compiler.hxx>
#include <funcdesc.hxx>
#include <dwfunctr.hxx>
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 23f4479722ee..56d96a456ea9 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -24,17 +24,13 @@
#include <sfx2/objsh.hxx>
#include <svl/zforlist.hxx>
#include <svl/stritem.hxx>
-#include <vcl/treelistbox.hxx>
#include <sfx2/viewfrm.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/mnemonic.hxx>
-#include <unotools/charclass.hxx>
#include <tools/urlobj.hxx>
#include <formula/formulahelper.hxx>
#include <formula/IFunctionDescription.hxx>
#include <formula/errorcodes.hxx>
-#include <tokenuno.hxx>
+#include <compiler.hxx>
#include <formula.hxx>
#include <formdata.hxx>
#include <reffact.hxx>
@@ -43,10 +39,8 @@
#include <scmod.hxx>
#include <inputhdl.hxx>
#include <tabvwsh.hxx>
-#include <appoptio.hxx>
#include <docsh.hxx>
#include <funcdesc.hxx>
-#include <formula/token.hxx>
#include <tokenarray.hxx>
#include <sc.hrc>
#include <servuno.hxx>
@@ -54,6 +48,8 @@
#include <externalrefmgr.hxx>
#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
+#include <com/sun/star/sheet/XFormulaParser.hpp>
using namespace formula;
using namespace com::sun::star;
diff --git a/sc/source/ui/inc/dataproviderdlg.hxx b/sc/source/ui/inc/dataproviderdlg.hxx
index 7a3a98bfed55..441c4929abbb 100644
--- a/sc/source/ui/inc/dataproviderdlg.hxx
+++ b/sc/source/ui/inc/dataproviderdlg.hxx
@@ -15,12 +15,12 @@
#include <vcl/dialog.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/listctrl.hxx>
+#include <vcl/menu.hxx>
#include "datatableview.hxx"
#include <memory>
-class Menu;
class ScDocument;
class ScDataProviderBaseControl;
class ScDBData;
diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx
index f407a9c3a1a5..623e0cf13c60 100644
--- a/sc/source/ui/inc/namemgrtable.hxx
+++ b/sc/source/ui/inc/namemgrtable.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_SC_SOURCE_UI_INC_NAMEMGRTABLE_HXX
#include <svtools/simptabl.hxx>
+#include <vcl/weld.hxx>
#include <address.hxx>
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index c0985e2a7260..15b30184e149 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -21,11 +21,11 @@
#define INCLUDED_SC_SOURCE_UI_INC_TPVIEW_HXX
#include <sfx2/tabdlg.hxx>
+#include <svx/colorbox.hxx>
#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
class ScViewOptions;
-class SvxColorListBox;
class ScTpContentOptions : public SfxTabPage
{
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 0c769df17cd2..540ccff0f291 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -21,7 +21,6 @@
#include <unotools/textsearch.hxx>
#include <unotools/localedatawrapper.hxx>
#include <unotools/collatorwrapper.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/basedlgs.hxx>
@@ -32,7 +31,6 @@
#include <docsh.hxx>
#include <scresid.hxx>
#include <strings.hrc>
-#include <simpref.hxx>
#include <scmod.hxx>
#include <tabvwsh.hxx>
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index 64b00df333ad..eef896e6e05e 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -22,7 +22,6 @@
#include <sfx2/app.hxx>
#include <sfx2/viewsh.hxx>
#include <vcl/accel.hxx>
-#include <vcl/wrkwin.hxx>
#include <vcl/mnemonic.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
@@ -36,8 +35,6 @@
#include <docsh.hxx>
#include <rfindlst.hxx>
#include <compiler.hxx>
-#include <formulacell.hxx>
-#include <global.hxx>
#include <inputopt.hxx>
#include <rangeutl.hxx>
#include <tokenarray.hxx>
diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx
index ae3978f70f07..e031ccbca417 100644
--- a/sc/source/ui/miscdlgs/autofmt.cxx
+++ b/sc/source/ui/miscdlgs/autofmt.cxx
@@ -18,7 +18,6 @@
*/
#include <scitems.hxx>
-#include <svx/algitem.hxx>
#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
#include <editeng/contouritem.hxx>
@@ -29,27 +28,21 @@
#include <editeng/shdditem.hxx>
#include <editeng/udlnitem.hxx>
#include <editeng/wghtitem.hxx>
-#include <vcl/svapp.hxx>
#include <svl/zforlist.hxx>
#include <svtools/scriptedtext.hxx>
#include <vcl/settings.hxx>
#include <vcl/builderfactory.hxx>
#include <vcl/virdev.hxx>
-#include <sfx2/viewfrm.hxx>
#include <comphelper/processfactory.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
#include <strings.hrc>
-#include <scmod.hxx>
-#include <attrib.hxx>
#include <zforauto.hxx>
#include <global.hxx>
#include <autoform.hxx>
#include <autofmt.hxx>
#include <scresid.hxx>
#include <document.hxx>
-#include <docsh.hxx>
-#include <tabvwsh.hxx>
#include <viewdata.hxx>
#define FRAME_OFFSET 4
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index efd37d8acd4e..8f7e4043a6ab 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -12,8 +12,6 @@
#include <datafdlg.hxx>
#include <viewdata.hxx>
#include <docsh.hxx>
-#include <refundo.hxx>
-#include <undodat.hxx>
#include <tabvwsh.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
index 38c9d6b4cabd..726e4f264d4a 100644
--- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx
+++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx
@@ -14,7 +14,6 @@
#include <datatransformation.hxx>
#include <datamapper.hxx>
#include <dbdata.hxx>
-#include <docsh.hxx>
#include <comphelper/string.hxx>
#include <sal/log.hxx>
@@ -24,6 +23,7 @@
#include <vcl/lstbox.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
+#include <vcl/layout.hxx>
constexpr int MENU_START = 0;
constexpr int MENU_COLUMN = 1;
diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index a270844da2bb..db07c124fdbd 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -11,7 +11,6 @@
#include <sfx2/filedlghelper.hxx>
#include <svtools/inettbc.hxx>
-#include <vcl/layout.hxx>
#include <address.hxx>
#include <docsh.hxx>
#include <datastream.hxx>
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index b0133f593487..09108cc64332 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -22,7 +22,6 @@
#include <svl/zforlist.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
-#include <limits.h>
#include <scresid.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 9030ee1f2b66..d59ee0713c79 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -17,14 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <global.hxx>
#include <reffact.hxx>
#include <document.hxx>
#include <docsh.hxx>
#include <chgtrack.hxx>
#include <highred.hxx>
-#include <sfx2/app.hxx>
// class ScHighlightChgDlg
diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx
index 64142daf5355..a4e2fe7b7833 100644
--- a/sc/source/ui/miscdlgs/instbdlg.cxx
+++ b/sc/source/ui/miscdlgs/instbdlg.cxx
@@ -19,7 +19,6 @@
#undef SC_DLLIMPLEMENTATION
-#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docinsert.hxx>
#include <sfx2/filedlghelper.hxx>
diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx
index c941ef38699a..8e8d820ed52d 100644
--- a/sc/source/ui/miscdlgs/linkarea.cxx
+++ b/sc/source/ui/miscdlgs/linkarea.cxx
@@ -19,7 +19,6 @@
#undef SC_DLLIMPLEMENTATION
-#include <sfx2/app.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docinsert.hxx>
@@ -28,10 +27,8 @@
#include <svtools/ehdl.hxx>
#include <svtools/inettbc.hxx>
#include <svtools/sfxecode.hxx>
-#include <vcl/waitobj.hxx>
#include <linkarea.hxx>
-#include <sc.hrc>
#include <rangeutl.hxx>
#include <docsh.hxx>
#include <tablink.hxx>
diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx
index ab594ee8bf9f..12652b6b7e9c 100644
--- a/sc/source/ui/miscdlgs/mvtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx
@@ -22,7 +22,6 @@
#include <mvtabdlg.hxx>
#include <document.hxx>
#include <docsh.hxx>
-#include <global.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx
index 2f4232d2f4f7..239591ac28ba 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -18,7 +18,6 @@
*/
#include <rangelst.hxx>
-#include <scitems.hxx>
#include <sfx2/bindings.hxx>
#include <svl/zforlist.hxx>
#include <vcl/builderfactory.hxx>
@@ -26,11 +25,9 @@
#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
-#include <uiitems.hxx>
#include <reffact.hxx>
#include <docsh.hxx>
#include <docfunc.hxx>
-#include <formulacell.hxx>
#include <rangeutl.hxx>
#include <convuno.hxx>
#include <unonames.hxx>
@@ -41,8 +38,10 @@
#include <optsolver.hxx>
-#include <com/sun/star/sheet/Solver.hpp>
+#include <com/sun/star/sheet/SolverConstraint.hpp>
+#include <com/sun/star/sheet/SolverConstraintOperator.hpp>
#include <com/sun/star/sheet/XSolverDescription.hpp>
+#include <com/sun/star/sheet/XSolver.hpp>
using namespace com::sun::star;
diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx
index 61fe3de16211..3dc47081562c 100644
--- a/sc/source/ui/miscdlgs/protectiondlg.cxx
+++ b/sc/source/ui/miscdlgs/protectiondlg.cxx
@@ -19,9 +19,7 @@
#include <protectiondlg.hxx>
#include <tabprotection.hxx>
-#include <vcl/fixed.hxx>
-#include <sal/macros.h>
#include <vector>
namespace {
diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx
index cccab8df1097..d63b5a529091 100644
--- a/sc/source/ui/miscdlgs/redcom.cxx
+++ b/sc/source/ui/miscdlgs/redcom.cxx
@@ -22,9 +22,10 @@
#include <chgtrack.hxx>
#include <redcom.hxx>
#include <docsh.hxx>
-#include <tabvwsh.hxx>
+#include <dbfunc.hxx>
+#include <tabview.hxx>
+#include <viewutil.hxx>
#include <svx/svxdlg.hxx>
-#include <svx/dialogs.hrc>
ScRedComDialog::ScRedComDialog( weld::Window* pParent, const SfxItemSet& rCoreSet,
ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext)
diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx
index f4a1828cdd7b..4593ef712e17 100644
--- a/sc/source/ui/miscdlgs/scuiautofmt.cxx
+++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx
@@ -19,35 +19,20 @@
#undef SC_DLLIMPLEMENTATION
-#include <scitems.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/fontitem.hxx>
-#include <editeng/postitem.hxx>
-#include <editeng/shdditem.hxx>
-#include <editeng/udlnitem.hxx>
-#include <editeng/wghtitem.hxx>
-#include <svl/zforlist.hxx>
+#include <vcl/button.hxx>
+#include <vcl/dialog.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sfx2/strings.hrc>
#include <sfx2/sfxresid.hxx>
#include <strings.hrc>
-#include <scmod.hxx>
-#include <attrib.hxx>
-#include <zforauto.hxx>
#include <global.hxx>
#include <globstr.hrc>
#include <autoform.hxx>
#include <strindlg.hxx>
#include <scuiautofmt.hxx>
#include <scresid.hxx>
-#include <document.hxx>
#include <helpids.h>
// AutoFormat-Dialog:
diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx
index 261cd5505550..ee8a93171afd 100644
--- a/sc/source/ui/miscdlgs/sharedocdlg.cxx
+++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx
@@ -21,7 +21,6 @@
#include <sfx2/dialoghelper.hxx>
#include <svl/sharecontrolfile.hxx>
#include <unotools/useroptions.hxx>
-#include <svtools/simptabl.hxx>
#include <docsh.hxx>
diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx
index 9416c01fffb0..def1babab0f9 100644
--- a/sc/source/ui/miscdlgs/simpref.cxx
+++ b/sc/source/ui/miscdlgs/simpref.cxx
@@ -17,13 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sfx2/app.hxx>
-
#include <reffact.hxx>
#include <document.hxx>
-#include <rangenam.hxx>
#include <simpref.hxx>
-#include <scmod.hxx>
ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent)
: ScAnyRefDlg(pB, pCW, pParent, "SimpleRefDialog", "modules/scalc/ui/simplerefdialog.ui")
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 5830a207f3fa..072595f023a9 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -26,16 +26,12 @@
#include <rtl/math.hxx>
#include <unotools/collatorwrapper.hxx>
#include <unotools/localedatawrapper.hxx>
-#include <vcl/svlbitm.hxx>
-#include <vcl/treelistentry.hxx>
#include <osl/diagnose.h>
#include <algorithm>
-#include <com/sun/star/sheet/Solver.hpp>
#include <com/sun/star/sheet/XSolverDescription.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
using namespace com::sun::star;
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 4ed6da3b7d1c..fe5af2fb8f7a 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <rangelst.hxx>
#include <scitems.hxx>
#include <sfx2/dispatch.hxx>
#include <svl/zforlist.hxx>
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index 5ecb5f575244..61ba77534401 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -20,7 +20,6 @@
#undef SC_DLLIMPLEMENTATION
#include <strindlg.hxx>
-#include <vcl/svapp.hxx>
ScStringInputDlg::ScStringInputDlg(weld::Window* pParent,
const OUString& rTitle,
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index 061e949e62d3..bc9301c21c31 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -20,16 +20,9 @@
#undef SC_DLLIMPLEMENTATION
#include <tabbgcolordlg.hxx>
-#include <sc.hrc>
#include <tools/color.hxx>
-#include <sfx2/objsh.hxx>
-#include <svx/xtable.hxx>
-#include <svx/drawitem.hxx>
-#include <unotools/pathoptions.hxx>
-#include <vcl/builderfactory.hxx>
#include <vcl/event.hxx>
-#include <osl/diagnose.h>
#include <officecfg/Office/Common.hxx>
diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx
index bb9e456bf822..901376a7c72e 100644
--- a/sc/source/ui/miscdlgs/tabopdlg.cxx
+++ b/sc/source/ui/miscdlgs/tabopdlg.cxx
@@ -17,12 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <scitems.hxx>
#include <sfx2/dispatch.hxx>
#include <vcl/weld.hxx>
#include <uiitems.hxx>
-#include <global.hxx>
#include <document.hxx>
#include <scresid.hxx>
#include <sc.hrc>
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index 02c67a80cfcd..1cbd139a24f2 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -27,7 +27,6 @@
#include <svl/cjkoptions.hxx>
#include <textdlgs.hxx>
-#include <sc.hrc>
#include <svl/intitem.hxx>
#include <svx/flagsdef.hxx>
diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx
index 740fa0c3bd3c..4c53b658e691 100644
--- a/sc/source/ui/miscdlgs/warnbox.cxx
+++ b/sc/source/ui/miscdlgs/warnbox.cxx
@@ -21,7 +21,6 @@
#include <scmod.hxx>
#include <inputopt.hxx>
-#include <helpids.h>
ScReplaceWarnBox::ScReplaceWarnBox(weld::Window* pParent)
: MessageDialogController(pParent, "modules/scalc/ui/checkwarningdialog.ui",
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index 0520d9172f29..2b3e6ce45545 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -24,7 +24,6 @@
#include <undorangename.hxx>
#include <tabvwsh.hxx>
#include <tokenarray.hxx>
-#include <sc.hrc>
ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pParent,
const ScViewData* pViewData, const std::map<OUString, ScRangeName*>& aRangeMap,
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index f32732c2f4c6..4be3d82a439f 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -32,8 +32,6 @@
#include <globalnames.hxx>
#include <tokenarray.hxx>
-#include <sfx2/app.hxx>
-
#include <vcl/settings.hxx>
#include <formula/errorcodes.hxx>
#include <unotools/charclass.hxx>
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 51d727963ff5..0268fd31120a 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -10,17 +10,17 @@
//ScRangeManagerTable
#include <memory>
#include <global.hxx>
-#include <reffact.hxx>
-#include <document.hxx>
-#include <docfunc.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <namedlg.hxx>
-#include <viewdata.hxx>
#include <globalnames.hxx>
+#include <namemgrtable.hxx>
+#include <rangenam.hxx>
-#include <sfx2/app.hxx>
#include <unotools/charclass.hxx>
+#include <svtools/simptabl.hxx>
+#include <vcl/weld.hxx>
+#include <vcl/layout.hxx>
+#include <tools/link.hxx>
#define ITEMID_NAME 1
#define ITEMID_RANGE 2
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 07874893daa5..4ecbdf314376 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -19,20 +19,15 @@
#include <svx/svditer.hxx>
#include <svx/svdobj.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/svdpagv.hxx>
#include <svx/svdview.hxx>
-#include <svx/svdxcgv.hxx>
#include <sfx2/linkmgr.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/viewfrm.hxx>
#include <vcl/help.hxx>
#include <vcl/svapp.hxx>
#include <tools/urlobj.hxx>
-#include <svl/urlbmk.hxx>
#include <vcl/svlbitm.hxx>
#include <vcl/treelistentry.hxx>
-#include <stdlib.h>
#include <sal/log.hxx>
#include <unotools/charclass.hxx>
@@ -48,8 +43,6 @@
#include <transobj.hxx>
#include <drwtrans.hxx>
#include <lnktrans.hxx>
-#include <formulacell.hxx>
-#include <dociter.hxx>
#include <strings.hrc>
#include <scresid.hxx>
#include <bitmaps.hlst>
diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx
index 3778fdd6766c..7e0ac94b241b 100644
--- a/sc/source/ui/navipi/navcitem.cxx
+++ b/sc/source/ui/navipi/navcitem.cxx
@@ -22,7 +22,6 @@
#include <osl/diagnose.h>
#include <navcitem.hxx>
-#include <global.hxx>
#include <navipi.hxx>
#include <sc.hrc>
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index b74176410920..755856c6a961 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -17,25 +17,19 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <rangelst.hxx>
#include <sfx2/app.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/event.hxx>
#include <sfx2/navigat.hxx>
#include <svl/stritem.hxx>
-#include <svl/urlbmk.hxx>
#include <vcl/builderfactory.hxx>
-#include <vcl/settings.hxx>
#include <unotools/charclass.hxx>
-#include <stdlib.h>
#include <viewdata.hxx>
#include <tabvwsh.hxx>
#include <docsh.hxx>
#include <document.hxx>
-#include <dbdata.hxx>
-#include <rangenam.hxx>
#include <rangeutl.hxx>
#include <sc.hrc>
#include <strings.hrc>
@@ -48,8 +42,6 @@
#include <navsett.hxx>
#include <markdata.hxx>
-#include <algorithm>
-
#include <com/sun/star/uno/Reference.hxx>
using namespace com::sun::star;
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index a5b2a9f225c1..43533c4df530 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -9,25 +9,8 @@
#include <sal/config.h>
-#include <algorithm>
-#include <cmath>
-
#include <calcconfig.hxx>
#include "calcoptionsdlg.hxx"
-#include <docfunc.hxx>
-#include <docsh.hxx>
-#include <interpre.hxx>
-#include <sc.hrc>
-#include <scopetools.hxx>
-#include <viewdata.hxx>
-
-#include <vcl/svlbitm.hxx>
-#include <vcl/treelistentry.hxx>
-
-#if HAVE_FEATURE_OPENCL
-#include <formulagroup.hxx>
-#include <globalnames.hxx>
-#endif
namespace {
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx
index 2baae9d8c6b2..1f26e6489619 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.hxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx
@@ -10,7 +10,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_OPTDLG_CALCOPTIONSDLG_HXX
#define INCLUDED_SC_SOURCE_UI_OPTDLG_CALCOPTIONSDLG_HXX
-#include <config_features.h>
#include <vcl/weld.hxx>
#include <calcconfig.hxx>
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index b64670dce78e..49e952dc18e9 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -20,20 +20,11 @@
#undef SC_DLLIMPLEMENTATION
#include <svx/colorbox.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/xtable.hxx>
#include <appoptio.hxx>
#include <scmod.hxx>
-#include <scitems.hxx>
-#include <tpview.hxx>
-#include <global.hxx>
-#include <viewopti.hxx>
-#include <tabvwsh.hxx>
-#include <uiitems.hxx>
#include <docsh.hxx>
-#include <sc.hrc>
+#include <svx/svxids.hrc>
#include <opredlin.hxx>
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 3f7f11da2d60..cc29f7ce7789 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -19,23 +19,17 @@
#undef SC_DLLIMPLEMENTATION
-#include <scitems.hxx>
#include <vcl/weld.hxx>
+#include <svl/zforlist.hxx>
-#include <global.hxx>
#include <globstr.hrc>
#include <scresid.hxx>
-#include <uiitems.hxx>
-#include <docsh.hxx>
-#include <document.hxx>
#include <docoptio.hxx>
#include <sc.hrc>
#include <officecfg/Office/Calc.hxx>
#include <tpcalc.hxx>
-#include <math.h>
-
ScTpCalcOptions::ScTpCalcOptions(vcl::Window* pParent, const SfxItemSet& rCoreAttrs)
: SfxTabPage(pParent, "OptCalculatePage",
"modules/scalc/ui/optcalculatepage.ui", &rCoreAttrs)
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 593ac69610be..efd464e4750d 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -9,10 +9,11 @@
#undef SC_DLLIMPLEMENTATION
-#include <scmod.hxx>
+#include <svl/intitem.hxx>
+
#include <tpcompatibility.hxx>
#include <sc.hrc>
-#include <appoptio.hxx>
+#include <optutil.hxx>
ScTpCompatOptions::ScTpCompatOptions(vcl::Window *pParent, const SfxItemSet &rCoreAttrs) :
SfxTabPage(pParent, "OptCompatibilityPage","modules/scalc/ui/optcompatibilitypage.ui", &rCoreAttrs)
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index c252b96edf9d..cc4642d61bd9 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -11,7 +11,6 @@
#include <tpdefaults.hxx>
#include <sc.hrc>
-#include <scmod.hxx>
#include <defaultsoptions.hxx>
#include <document.hxx>
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 95553d13bf8a..fff31c327635 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -19,9 +19,7 @@
#undef SC_DLLIMPLEMENTATION
-#include <scmod.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
+#include <global.hxx>
#include <tpformula.hxx>
#include <formulaopt.hxx>
#include <sc.hrc>
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 77e89cda1c72..d16b9b2e3e6a 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -19,24 +19,17 @@
#undef SC_DLLIMPLEMENTATION
-#include <scitems.hxx>
#include <tpview.hxx>
#include <global.hxx>
#include <viewopti.hxx>
-#include <tabvwsh.hxx>
-#include <uiitems.hxx>
#include <scresid.hxx>
#include <docsh.hxx>
#include <sc.hrc>
-#include <strings.hrc>
-#include <globstr.hrc>
#include <units.hrc>
#include <appoptio.hxx>
#include <scmod.hxx>
#include <svx/colorbox.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/drawitem.hxx>
-#include <svx/xtable.hxx>
+#include <svtools/unitconv.hxx>
ScTpContentOptions::ScTpContentOptions( vcl::Window* pParent,
const SfxItemSet& rArgSet ) :
commit 05fbcb47684eaffc23f5fc3dda52690baf629aaa
Author: Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sat Mar 9 11:32:07 2019 +0100
Commit: Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Mar 11 12:43:41 2019 +0100
AC_CHECK_HEADER uses both CXX and CXXCPP
Because it does both a compile and a preprocessor check.
Change-Id: I2f144ea63ae1481822bb239127f0f5a934e22e73
Reviewed-on: https://gerrit.libreoffice.org/68971
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
diff --git a/configure.ac b/configure.ac
index 7f63ecd0f7db..40dac2f7fa0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6887,9 +6887,11 @@ if test "$COM_IS_CLANG" = "TRUE"; then
AC_LANG_PUSH([C++])
save_CPPFLAGS=$CPPFLAGS
save_CXX=$CXX
+ save_CXXCPP=$CXXCPP
# compiler plugins must be built with "native" compiler that was used to build Clang itself:
: "${COMPILER_PLUGINS_CXX=g++ -std=c++11}"
CXX=$COMPILER_PLUGINS_CXX
+ CXXCPP="$COMPILER_PLUGINS_CXX -E"
CPPFLAGS="$CPPFLAGS -I$CLANGDIR/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
AC_CHECK_HEADER(clang/AST/RecursiveASTVisitor.h,
[COMPILER_PLUGINS=TRUE],
@@ -6902,6 +6904,7 @@ if test "$COM_IS_CLANG" = "TRUE"; then
fi
])
CXX=$save_CXX
+ CXXCPP=$save_CXXCPP
CPPFLAGS=$save_CPPFLAGS
AC_LANG_POP([C++])
fi
More information about the Libreoffice-commits
mailing list