[Libreoffice-commits] core.git: formula/source include/formula sc/source
Jorenz Paragas
j.paragas.237 at gmail.com
Tue Jun 21 07:59:20 UTC 2016
formula/source/core/api/FormulaOpCodeMapperObj.cxx | 1
formula/source/core/api/token.cxx | 1
formula/source/ui/dlg/FormulaHelper.cxx | 1
formula/source/ui/dlg/formula.cxx | 2 +
formula/source/ui/dlg/funcutl.cxx | 1
include/formula/ExternalReferenceHelper.hxx | 5 +++-
include/formula/FormulaCompiler.hxx | 21 ++++++++--------
include/formula/FormulaOpCodeMapperObj.hxx | 26 ++++++++++++++++-----
include/formula/IControlReferenceHandler.hxx | 1
include/formula/IFunctionDescription.hxx | 18 +++++++++-----
include/formula/errorcodes.hxx | 2 +
include/formula/formdata.hxx | 2 +
include/formula/formula.hxx | 20 +++++++++++++---
include/formula/formulahelper.hxx | 12 ++++++---
include/formula/funcutl.hxx | 15 ++++++++++--
include/formula/grammar.hxx | 1
include/formula/token.hxx | 14 +++++------
include/formula/tokenarray.hxx | 23 ++++++++++++------
include/formula/vectortoken.hxx | 5 ++++
sc/source/core/tool/token.cxx | 1
20 files changed, 126 insertions(+), 46 deletions(-)
New commits:
commit 8a6bffd2fefcc81dc34951ba2e178d9938b59fb3
Author: Jorenz Paragas <j.paragas.237 at gmail.com>
Date: Thu Jun 16 18:59:35 2016 -0700
tdf#42949: clean up includes in include/formula with iwyu
Change-Id: Ieb601d98be80aeb2239d4f0a330d90e63f1abc43
Reviewed-on: https://gerrit.libreoffice.org/26398
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index 55bdc9e..c034b64 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -21,6 +21,7 @@
#include <utility>
+#include <formula/FormulaCompiler.hxx>
#include "formula/FormulaOpCodeMapperObj.hxx"
#include "formula/opcode.hxx"
#include <comphelper/sequence.hxx>
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx
index 9c16870..3c3bdc5 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -27,6 +27,7 @@
#include <tools/debug.hxx>
#include <osl/diagnose.h>
+#include <com/sun/star/sheet/FormulaToken.hpp>
#include "formula/token.hxx"
#include "formula/tokenarray.hxx"
#include "formula/FormulaCompiler.hxx"
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 2ffe25e..4e6c6c8 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -20,6 +20,7 @@
#include <algorithm>
#include "formula/formulahelper.hxx"
+#include <formula/IFunctionDescription.hxx>
#include <unotools/charclass.hxx>
#include <unotools/syslocale.hxx>
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index b0925fb..1174677 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -57,6 +57,8 @@
#include <com/sun/star/sheet/FormulaLanguage.hpp>
#include <com/sun/star/sheet/FormulaMapGroup.hpp>
#include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp>
+#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
+#include <com/sun/star/sheet/XFormulaParser.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 9052d7c..d67bb00 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -21,6 +21,7 @@
#include <vcl/svapp.hxx>
#include <vcl/scrbar.hxx>
#include <vcl/builderfactory.hxx>
+#include <vcl/fixed.hxx>
#include "formula/funcutl.hxx"
#include "formula/IControlReferenceHandler.hxx"
diff --git a/include/formula/ExternalReferenceHelper.hxx b/include/formula/ExternalReferenceHelper.hxx
index 6c93286..364307f 100644
--- a/include/formula/ExternalReferenceHelper.hxx
+++ b/include/formula/ExternalReferenceHelper.hxx
@@ -20,8 +20,11 @@
#ifndef INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX
#define INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX
-#include <rtl/ustring.hxx>
+#include <cstddef>
+
#include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace formula
{
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx
index fc912fc..adad03f 100644
--- a/include/formula/FormulaCompiler.hxx
+++ b/include/formula/FormulaCompiler.hxx
@@ -20,20 +20,21 @@
#ifndef INCLUDED_FORMULA_FORMULACOMPILER_HXX
#define INCLUDED_FORMULA_FORMULACOMPILER_HXX
-#include <formula/formuladllapi.h>
-#include <rtl/ustrbuf.hxx>
-#include <rtl/ustring.hxx>
-#include <tools/debug.hxx>
+#include <memory>
+#include <unordered_map>
+#include <vector>
#include <com/sun/star/uno/Sequence.hxx>
-
-#include <formula/opcode.hxx>
+#include <formula/formuladllapi.h>
#include <formula/grammar.hxx>
+#include <formula/opcode.hxx>
#include <formula/token.hxx>
-#include <formula/ExternalReferenceHelper.hxx>
-
-#include <memory>
-#include <unordered_map>
+#include <formula/types.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/log.hxx>
+#include <sal/types.h>
+#include <tools/debug.hxx>
#define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChoose) */
#define FORMULA_MAXTOKENS 8192 /* maximum number of tokens in formula */
diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx
index 1cfc40c..fdf28eb 100644
--- a/include/formula/FormulaOpCodeMapperObj.hxx
+++ b/include/formula/FormulaOpCodeMapperObj.hxx
@@ -20,18 +20,32 @@
#ifndef INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX
#define INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX
-#include <formula/formuladllapi.h>
-#include <cppuhelper/implbase2.hxx>
-#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
+#include <exception>
#include <memory>
-#include <formula/FormulaCompiler.hxx>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
+#include <cppuhelper/implbase2.hxx>
+#include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace sheet { struct FormulaOpCodeMapEntry; }
+ namespace sheet { struct FormulaToken; }
+ namespace uno { class XComponentContext; }
+ namespace uno { class XInterface; }
+} } }
namespace formula
{
+class FormulaCompiler;
+
class FORMULA_DLLPUBLIC FormulaOpCodeMapperObj : public ::cppu::WeakImplHelper2<
css::sheet::XFormulaOpCodeMapper,
css::lang::XServiceInfo >
diff --git a/include/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx
index 595eb13..38586f1 100644
--- a/include/formula/IControlReferenceHandler.hxx
+++ b/include/formula/IControlReferenceHandler.hxx
@@ -21,6 +21,7 @@
#include <formula/formuladllapi.h>
#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace formula
{
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx
index 42aaa99..40820eb 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -20,15 +20,21 @@
#ifndef INCLUDED_FORMULA_IFUNCTIONDESCRIPTION_HXX
#define INCLUDED_FORMULA_IFUNCTIONDESCRIPTION_HXX
-#include <vector>
#include <memory>
-#include <formula/formuladllapi.h>
+#include <vector>
+
+#include <com/sun/star/table/CellAddress.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
-#include <tools/solar.h>
-#include <com/sun/star/sheet/XFormulaParser.hpp>
-#include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
+#include <sal/types.h>
-class SvTreeListEntry;
+namespace com { namespace sun { namespace star {
+ namespace sheet { struct FormulaToken; }
+ namespace sheet { class XFormulaOpCodeMapper; }
+ namespace sheet { class XFormulaParser; }
+} } }
namespace formula
{
diff --git a/include/formula/errorcodes.hxx b/include/formula/errorcodes.hxx
index 13597b9..1157415 100644
--- a/include/formula/errorcodes.hxx
+++ b/include/formula/errorcodes.hxx
@@ -21,6 +21,8 @@
#define INCLUDED_FORMULA_ERRORCODES_HXX
#include <rtl/math.hxx>
+#include <sal/mathconf.h>
+#include <sal/types.h>
namespace formula {
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index 2e16b80..eb66e59 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -22,7 +22,9 @@
#include <formula/formuladllapi.h>
#include <rtl/ustring.hxx>
+#include <sal/types.h>
#include <tools/gen.hxx>
+#include <vcl/vclptr.hxx>
#include <vcl/window.hxx>
namespace formula
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 5cf4c95..94b12c3 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -20,11 +20,27 @@
#ifndef INCLUDED_FORMULA_FORMULA_HXX
#define INCLUDED_FORMULA_FORMULA_HXX
-#include <sfx2/basedlgs.hxx>
#include <memory>
+#include <utility>
+
#include <formula/formuladllapi.h>
#include <formula/omoduleclient.hxx>
#include <formula/IFunctionDescription.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <sfx2/basedlgs.hxx>
+#include <tools/gen.hxx>
+#include <tools/link.hxx>
+#include <vcl/dialog.hxx>
+
+class Idle;
+class NotifyEvent;
+class SfxBindings;
+class SfxChildWindow;
+
+namespace vcl {
+ class Window;
+}
namespace formula
{
@@ -38,8 +54,6 @@ enum FormulaDlgMode { FORMULA_FORMDLG_FORMULA, FORMULA_FORMDLG_ARGS, FORMULA_FOR
class FormulaDlg_Impl;
class IControlReferenceHandler;
-class IFunctionDescription;
-class IFunctionManager;
class FormulaHelper;
class RefEdit;
class RefButton;
diff --git a/include/formula/formulahelper.hxx b/include/formula/formulahelper.hxx
index afb7b34..58371f1 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -20,17 +20,21 @@
#ifndef INCLUDED_FORMULA_FORMULAHELPER_HXX
#define INCLUDED_FORMULA_FORMULAHELPER_HXX
-#include <formula/IFunctionDescription.hxx>
+#include <memory>
+#include <vector>
+
#include <formula/formuladllapi.h>
#include <rtl/ustring.hxx>
-#include <vector>
-#include <memory>
+#include <sal/types.h>
+#include <unotools/syslocale.hxx>
-class SvtSysLocale;
class CharClass;
namespace formula
{
+ class IFunctionDescription;
+ class IFunctionManager;
+
class FORMULA_DLLPUBLIC FormulaHelper
{
::std::unique_ptr<SvtSysLocale> m_pSysLocale;
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index e6d03be..494543e 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -20,11 +20,22 @@
#ifndef INCLUDED_FORMULA_FUNCUTL_HXX
#define INCLUDED_FORMULA_FUNCUTL_HXX
-#include <vcl/fixed.hxx>
+#include <formula/formuladllapi.h>
+#include <rtl/ustring.hxx>
+#include <tools/link.hxx>
+#include <tools/wintypes.hxx>
#include <vcl/button.hxx>
#include <vcl/edit.hxx>
#include <vcl/idle.hxx>
-#include <formula/formuladllapi.h>
+#include <vcl/image.hxx>
+#include <vcl/vclptr.hxx>
+
+class KeyEvent;
+class ResId;
+
+namespace vcl {
+ class Window;
+}
namespace formula {
diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx
index 6500d68..9dea4fb 100644
--- a/include/formula/grammar.hxx
+++ b/include/formula/grammar.hxx
@@ -22,6 +22,7 @@
#include <com/sun/star/sheet/FormulaLanguage.hpp>
#include <formula/formuladllapi.h>
+#include <sal/types.h>
namespace formula
{
diff --git a/include/formula/token.hxx b/include/formula/token.hxx
index f195b68..6bbda35 100644
--- a/include/formula/token.hxx
+++ b/include/formula/token.hxx
@@ -22,16 +22,18 @@
#include <sal/config.h>
+#include <cstring>
#include <vector>
-#include <string.h>
-#include <formula/opcode.hxx>
-#include <tools/mempool.hxx>
-#include <formula/IFunctionDescription.hxx>
#include <formula/formuladllapi.h>
+#include <formula/IFunctionDescription.hxx>
+#include <formula/opcode.hxx>
#include <formula/types.hxx>
-#include <svl/sharedstring.hxx>
#include <osl/interlck.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+#include <svl/sharedstring.hxx>
+#include <tools/mempool.hxx>
class ScJumpMatrix;
class ScMatrix;
@@ -89,8 +91,6 @@ typedef sal_uInt8 StackVar;
typedef StackVarEnum StackVar;
#endif
-class FormulaTokenArray;
-
class FORMULA_DLLPUBLIC FormulaToken : public IFormulaToken
{
OpCode eOp;
diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx
index 81b8558..6ba48fe 100644
--- a/include/formula/tokenarray.hxx
+++ b/include/formula/tokenarray.hxx
@@ -20,14 +20,25 @@
#ifndef INCLUDED_FORMULA_TOKENARRAY_HXX
#define INCLUDED_FORMULA_TOKENARRAY_HXX
-#include <com/sun/star/sheet/FormulaToken.hpp>
-#include <formula/token.hxx>
+#include <climits>
+#include <memory>
+#include <type_traits>
+#include <unordered_set>
+#include <unordered_map>
+#include <vector>
+
+#include <com/sun/star/uno/Sequence.hxx>
#include <formula/ExternalReferenceHelper.hxx>
+#include <formula/formuladllapi.h>
+#include <formula/opcode.hxx>
+#include <formula/token.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
-#include <limits.h>
-#include <type_traits>
-#include <unordered_set>
+namespace com { namespace sun { namespace star {
+ namespace sheet { struct FormulaToken; }
+} } }
namespace svl {
@@ -59,8 +70,6 @@ namespace o3tl
namespace formula
{
-class FormulaMissingContext;
-
class FORMULA_DLLPUBLIC MissingConvention
{
public:
diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx
index 56b61d3..61d4725 100644
--- a/include/formula/vectortoken.hxx
+++ b/include/formula/vectortoken.hxx
@@ -10,7 +10,12 @@
#ifndef INCLUDED_FORMULA_VECTORTOKEN_HXX
#define INCLUDED_FORMULA_VECTORTOKEN_HXX
+#include <cstddef>
+#include <vector>
+
+#include <formula/formuladllapi.h>
#include <formula/token.hxx>
+#include <rtl/ustring.hxx>
namespace formula {
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 6f7396d..50c6591 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -52,6 +52,7 @@ using ::std::vector;
#include <com/sun/star/sheet/ComplexReference.hpp>
#include <com/sun/star/sheet/ExternalReference.hpp>
+#include <com/sun/star/sheet/FormulaToken.hpp>
#include <com/sun/star/sheet/ReferenceFlags.hpp>
#include <com/sun/star/sheet/NameToken.hpp>
More information about the Libreoffice-commits
mailing list