From 38016f9d2260a424369fadab16f5428e4f3dc86f Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 9 Nov 2013 14:04:38 -0600 Subject: fdo#65108 inter-module includes <> Change-Id: I6d9f67e26a213d14aa9114e612781fbd8c223637 --- include/formula/ExternalReferenceHelper.hxx | 2 +- include/formula/FormulaCompiler.hxx | 8 ++++---- include/formula/FormulaOpCodeMapperObj.hxx | 4 ++-- include/formula/IControlReferenceHandler.hxx | 2 +- include/formula/IFunctionDescription.hxx | 2 +- include/formula/formula.hxx | 4 ++-- include/formula/formuladllapi.h | 2 +- include/formula/funcutl.hxx | 2 +- include/formula/grammar.hxx | 4 ++-- include/formula/omoduleclient.hxx | 6 +++--- include/formula/opcode.hxx | 2 +- include/formula/token.hxx | 12 ++++++------ include/formula/tokenarray.hxx | 4 ++-- include/formula/vectortoken.hxx | 2 +- 14 files changed, 28 insertions(+), 28 deletions(-) (limited to 'include') diff --git a/include/formula/ExternalReferenceHelper.hxx b/include/formula/ExternalReferenceHelper.hxx index 25422355b2e2..c83dffd9cf8d 100644 --- a/include/formula/ExternalReferenceHelper.hxx +++ b/include/formula/ExternalReferenceHelper.hxx @@ -21,7 +21,7 @@ #define INCLUDED_FORMULA_EXTERNALREFERENCEHELPER_HXX #include -#include "formula/formuladllapi.h" +#include namespace formula { diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index 4cd4631dcacc..e7ce9208b9c4 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -30,10 +30,10 @@ #include -#include "formula/opcode.hxx" -#include "formula/grammar.hxx" -#include "formula/token.hxx" -#include "formula/ExternalReferenceHelper.hxx" +#include +#include +#include +#include #define FORMULA_MAXJUMPCOUNT 32 /* maximum number of jumps (ocChose) */ #define FORMULA_MAXTOKENS 8192 /* maximum number of tokens in formula */ diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index 2fbdbcf6d8bf..e415acb921dc 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -20,13 +20,13 @@ #ifndef INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX #define INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX -#include "formula/formuladllapi.h" +#include #include #include #include #include #include -#include "formula/FormulaCompiler.hxx" +#include namespace formula diff --git a/include/formula/IControlReferenceHandler.hxx b/include/formula/IControlReferenceHandler.hxx index 57cb134172b7..3a1d84fcdfe8 100644 --- a/include/formula/IControlReferenceHandler.hxx +++ b/include/formula/IControlReferenceHandler.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX #define INCLUDED_FORMULA_ICONTROLREFERENCEHANDLER_HXX -#include "formula/formuladllapi.h" +#include namespace formula { diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx index d8182a9d64cd..a22b71a47303 100644 --- a/include/formula/IFunctionDescription.hxx +++ b/include/formula/IFunctionDescription.hxx @@ -22,7 +22,7 @@ #include #include -#include "formula/formuladllapi.h" +#include #include #include #include diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 4bb48473d108..a7ca1e34fb1c 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -22,8 +22,8 @@ #include #include -#include "formula/formuladllapi.h" -#include "formula/omoduleclient.hxx" +#include +#include #include namespace formula diff --git a/include/formula/formuladllapi.h b/include/formula/formuladllapi.h index e633fd2a1076..7b011a6d7ade 100644 --- a/include/formula/formuladllapi.h +++ b/include/formula/formuladllapi.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_FORMULA_FORMULADLLAPI_H #define INCLUDED_FORMULA_FORMULADLLAPI_H -#include "sal/types.h" +#include #if defined(FORMULA_DLLIMPLEMENTATION) #define FORMULA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 5163da5c65e3..49800ac6da52 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -23,7 +23,7 @@ #include #include #include -#include "formula/formuladllapi.h" +#include namespace formula { diff --git a/include/formula/grammar.hxx b/include/formula/grammar.hxx index 130a5a3fb617..34a0aa619302 100644 --- a/include/formula/grammar.hxx +++ b/include/formula/grammar.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_FORMULA_GRAMMAR_HXX #define INCLUDED_FORMULA_GRAMMAR_HXX -#include "com/sun/star/sheet/FormulaLanguage.hpp" -#include "formula/formuladllapi.h" +#include +#include #include namespace formula diff --git a/include/formula/omoduleclient.hxx b/include/formula/omoduleclient.hxx index 94211e8898cb..258f9f8aebc9 100644 --- a/include/formula/omoduleclient.hxx +++ b/include/formula/omoduleclient.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_FORMULA_OMODULECLIENT_HXX #define INCLUDED_FORMULA_OMODULECLIENT_HXX -#include "sal/config.h" +#include -#include "boost/noncopyable.hpp" -#include "formula/formuladllapi.h" +#include +#include namespace formula { diff --git a/include/formula/opcode.hxx b/include/formula/opcode.hxx index 8dcfbe9ebe13..97298cef9c49 100644 --- a/include/formula/opcode.hxx +++ b/include/formula/opcode.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_FORMULA_OPCODE_HXX #define INCLUDED_FORMULA_OPCODE_HXX -#include "formula/compiler.hrc" +#include #include enum OpCodeEnum diff --git a/include/formula/token.hxx b/include/formula/token.hxx index f5b49cc66839..73f773bcff0e 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -23,13 +23,13 @@ #include #include #include -#include "formula/opcode.hxx" +#include #include -#include "formula/IFunctionDescription.hxx" -#include "formula/formuladllapi.h" -#include "formula/types.hxx" -#include "svl/sharedstring.hxx" -#include "osl/interlck.h" +#include +#include +#include +#include +#include namespace formula { diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index 120a3bb550ff..ddd7d81b5abe 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -21,8 +21,8 @@ #define INCLUDED_FORMULA_TOKENARRAY_HXX #include -#include "formula/token.hxx" -#include "formula/ExternalReferenceHelper.hxx" +#include +#include #include #include diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx index d02f9c5690e3..f04fef4e1b72 100644 --- a/include/formula/vectortoken.hxx +++ b/include/formula/vectortoken.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_FORMULA_VECTORTOKEN_HXX #define INCLUDED_FORMULA_VECTORTOKEN_HXX -#include "formula/token.hxx" +#include namespace formula { -- cgit