diff options
Diffstat (limited to 'include/formula')
-rw-r--r-- | include/formula/FormulaCompiler.hxx | 2 | ||||
-rw-r--r-- | include/formula/FormulaOpCodeMapperObj.hxx | 3 | ||||
-rw-r--r-- | include/formula/IFunctionDescription.hxx | 3 | ||||
-rw-r--r-- | include/formula/formula.hxx | 1 | ||||
-rw-r--r-- | include/formula/funcutl.hxx | 4 | ||||
-rw-r--r-- | include/formula/token.hxx | 1 | ||||
-rw-r--r-- | include/formula/tokenarray.hxx | 4 | ||||
-rw-r--r-- | include/formula/vectortoken.hxx | 2 |
8 files changed, 6 insertions, 14 deletions
diff --git a/include/formula/FormulaCompiler.hxx b/include/formula/FormulaCompiler.hxx index fef6e82e39e1..a2c6f6f3d9c0 100644 --- a/include/formula/FormulaCompiler.hxx +++ b/include/formula/FormulaCompiler.hxx @@ -28,13 +28,11 @@ #include <formula/formuladllapi.h> #include <formula/grammar.hxx> #include <formula/opcode.hxx> -#include <formula/token.hxx> #include <formula/tokenarray.hxx> #include <formula/types.hxx> #include <formula/paramclass.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> -#include <sal/log.hxx> #include <sal/types.h> #include <tools/debug.hxx> diff --git a/include/formula/FormulaOpCodeMapperObj.hxx b/include/formula/FormulaOpCodeMapperObj.hxx index af74100d2165..8804e2488d94 100644 --- a/include/formula/FormulaOpCodeMapperObj.hxx +++ b/include/formula/FormulaOpCodeMapperObj.hxx @@ -20,13 +20,10 @@ #ifndef INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX #define INCLUDED_FORMULA_FORMULAOPCODEMAPPEROBJ_HXX -#include <exception> #include <memory> -#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/implbase.hxx> diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx index 3d03d4e6c069..5d4616b9b9e5 100644 --- a/include/formula/IFunctionDescription.hxx +++ b/include/formula/IFunctionDescription.hxx @@ -25,7 +25,6 @@ #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 <sal/types.h> @@ -36,6 +35,8 @@ namespace com { namespace sun { namespace star { namespace sheet { class XFormulaParser; } } } } +namespace com::sun::star::uno { template <class E> class Sequence; } + namespace formula { class IFunctionCategory; diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index defd1ecfd1a8..873ab04866d7 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -33,7 +33,6 @@ #include <tools/link.hxx> #include <vcl/dialog.hxx> -class Idle; class NotifyEvent; class SfxBindings; class SfxChildWindow; diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx index 51e1b9dbae09..7ab1252e7c97 100644 --- a/include/formula/funcutl.hxx +++ b/include/formula/funcutl.hxx @@ -33,10 +33,6 @@ class KeyEvent; -namespace vcl { - class Window; -} - namespace formula { class IControlReferenceHandler; diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 26643fc08fcd..034b3aa78b6f 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -27,7 +27,6 @@ #include <vector> #include <formula/formuladllapi.h> -#include <formula/IFunctionDescription.hxx> #include <formula/opcode.hxx> #include <formula/types.hxx> #include <formula/paramclass.hxx> diff --git a/include/formula/tokenarray.hxx b/include/formula/tokenarray.hxx index 9f93aa63a9b1..df82ceb1cb22 100644 --- a/include/formula/tokenarray.hxx +++ b/include/formula/tokenarray.hxx @@ -28,7 +28,6 @@ #include <unordered_map> #include <vector> -#include <com/sun/star/uno/Sequence.hxx> #include <formula/ExternalReferenceHelper.hxx> #include <formula/formuladllapi.h> #include <formula/opcode.hxx> @@ -41,6 +40,9 @@ namespace com { namespace sun { namespace star { namespace sheet { struct FormulaToken; } } } } +namespace com::sun::star::uno { template <typename > class Sequence; } +namespace formula { class FormulaTokenArray; } + namespace svl { class SharedString; diff --git a/include/formula/vectortoken.hxx b/include/formula/vectortoken.hxx index 5d995f71a130..853850496975 100644 --- a/include/formula/vectortoken.hxx +++ b/include/formula/vectortoken.hxx @@ -15,7 +15,7 @@ #include <formula/formuladllapi.h> #include <formula/token.hxx> -#include <rtl/ustring.hxx> +#include <rtl/ustring.h> namespace formula { |