summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/qa/cppunittests/rtftok/testrtftok.cxx3
-rw-r--r--writerfilter/source/filter/RtfFilter.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfcontrolwords.cxx3
-rw-r--r--writerfilter/source/rtftok/rtfcontrolwords.hxx2
-rw-r--r--writerfilter/source/rtftok/rtfdispatchdestination.cxx1
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx19
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx7
-rw-r--r--writerfilter/source/rtftok/rtffly.hxx2
-rw-r--r--writerfilter/source/rtftok/rtflookahead.cxx2
-rw-r--r--writerfilter/source/rtftok/rtflookahead.hxx3
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx2
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.hxx11
-rw-r--r--writerfilter/source/rtftok/rtfskipdestination.cxx1
-rw-r--r--writerfilter/source/rtftok/rtfskipdestination.hxx4
-rw-r--r--writerfilter/source/rtftok/rtftokenizer.cxx7
-rw-r--r--writerfilter/source/rtftok/rtftokenizer.hxx1
16 files changed, 34 insertions, 36 deletions
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
index 020086a1187e..6396ffefbce4 100644
--- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
@@ -13,9 +13,6 @@
#include <com/sun/star/io/WrongFormatException.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <osl/file.hxx>
-#include <osl/process.h>
-
using namespace ::com::sun::star;
/**
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index b9299d0d3f7d..bb8cea08ac95 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -26,7 +26,7 @@
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implementationentry.hxx>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/supportsservice.hxx>
#include <osl/file.hxx>
#include <unotools/mediadescriptor.hxx>
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.cxx b/writerfilter/source/rtftok/rtfcontrolwords.cxx
index 26e1d4366f2b..1894055baf63 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.cxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.cxx
@@ -7,9 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "rtflistener.hxx"
+#include "rtfcontrolwords.hxx"
#include <oox/token/namespaces.hxx>
-#include <oox/token/tokens.hxx>
#include <cstring>
namespace writerfilter
diff --git a/writerfilter/source/rtftok/rtfcontrolwords.hxx b/writerfilter/source/rtftok/rtfcontrolwords.hxx
index 226359db7bd0..e51cfeb9a2e4 100644
--- a/writerfilter/source/rtftok/rtfcontrolwords.hxx
+++ b/writerfilter/source/rtftok/rtfcontrolwords.hxx
@@ -2013,8 +2013,6 @@ struct RTFMathSymbol
bool operator<(const RTFMathSymbol& rOther) const;
};
-#define M_TOKEN(token) OOX_TOKEN(officeMath, token)
-
extern RTFMathSymbol aRTFMathControlWords[];
extern int nRTFMathControlWords;
diff --git a/writerfilter/source/rtftok/rtfdispatchdestination.cxx b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
index 0f795c7d50e0..b5b347e6e287 100644
--- a/writerfilter/source/rtftok/rtfdispatchdestination.cxx
+++ b/writerfilter/source/rtftok/rtfdispatchdestination.cxx
@@ -24,6 +24,7 @@
#include "rtfreferenceproperties.hxx"
#include "rtfsdrimport.hxx"
#include "rtfskipdestination.hxx"
+#include "rtftokenizer.hxx"
using namespace com::sun::star;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 081efdca95cc..b84e2eb81c4d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -7,24 +7,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
+#include "rtfdocumentimpl.hxx"
#include <memory>
#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/document/DocumentProperties.hpp>
-#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/io/WrongFormatException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/text/HoriOrientation.hpp>
-#include <com/sun/star/text/VertOrientation.hpp>
-#include <com/sun/star/text/RelOrientation.hpp>
#include <com/sun/star/text/WrapTextMode.hpp>
#include <com/sun/star/text/TextContentAnchorType.hpp>
-#include <svl/lngmisc.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
-#include <vcl/wmf.hxx>
-#include <vcl/layout.hxx>
#include <filter/msfilter/util.hxx>
#include <comphelper/string.hxx>
#include <svtools/grfmgr.hxx>
@@ -32,23 +25,19 @@
#include <tools/datetimeutils.hxx>
#include <comphelper/classids.hxx>
#include <comphelper/embeddedobjectcontainer.hxx>
-#include <comphelper/sequenceashashmap.hxx>
-#include <comphelper/sequence.hxx>
#include <sfx2/sfxbasemodel.hxx>
#include <sfx2/classificationhelper.hxx>
-#include <sfx2/sfxresid.hxx>
#include <oox/mathml/import.hxx>
#include <ooxml/resourceids.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
#include <rtl/uri.hxx>
-#include <dmapper/DomainMapperFactory.hxx>
+#include <rtl/tencinfo.h>
+#include <oox/helper/graphichelper.hxx>
#include "rtfsdrimport.hxx"
-#include "rtflookahead.hxx"
-#include "rtfcharsets.hxx"
#include "rtfreferenceproperties.hxx"
#include "rtfskipdestination.hxx"
-#include "rtffly.hxx"
+#include "rtftokenizer.hxx"
using namespace com::sun::star;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index e8d757c41959..386f1950080f 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -10,7 +10,6 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFDOCUMENTIMPL_HXX
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFDOCUMENTIMPL_HXX
-#include <stack>
#include <queue>
#include <tuple>
#include <vector>
@@ -20,9 +19,9 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/text/WrapTextMode.hpp>
-#include <oox/helper/graphichelper.hxx>
#include <oox/mathml/importutils.hxx>
#include <rtl/strbuf.hxx>
+#include <rtl/ustrbuf.hxx>
#include <rtftok/RTFDocument.hxx>
#include "rtfreferencetable.hxx"
@@ -30,6 +29,10 @@
#include "rtflistener.hxx"
class SvStream;
+namespace oox
+{
+class GraphicHelper;
+}
namespace writerfilter
{
diff --git a/writerfilter/source/rtftok/rtffly.hxx b/writerfilter/source/rtftok/rtffly.hxx
index 2482305f25fe..252b6ec3e3b6 100644
--- a/writerfilter/source/rtftok/rtffly.hxx
+++ b/writerfilter/source/rtftok/rtffly.hxx
@@ -14,6 +14,8 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
+#include <osl/endian.h>
+
namespace writerfilter
{
namespace rtftok
diff --git a/writerfilter/source/rtftok/rtflookahead.cxx b/writerfilter/source/rtftok/rtflookahead.cxx
index e99919b8feb4..009155bc8faf 100644
--- a/writerfilter/source/rtftok/rtflookahead.cxx
+++ b/writerfilter/source/rtftok/rtflookahead.cxx
@@ -8,7 +8,9 @@
*/
#include "rtflookahead.hxx"
+#include <com/sun/star/task/XStatusIndicator.hpp>
#include <tools/stream.hxx>
+#include "rtftokenizer.hxx"
using namespace com::sun::star;
diff --git a/writerfilter/source/rtftok/rtflookahead.hxx b/writerfilter/source/rtftok/rtflookahead.hxx
index ebde306a7b94..86de830a2e22 100644
--- a/writerfilter/source/rtftok/rtflookahead.hxx
+++ b/writerfilter/source/rtftok/rtflookahead.hxx
@@ -11,8 +11,8 @@
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFLOOKAHEAD_HXX
#include <memory>
+#include <sal/types.h>
#include "rtflistener.hxx"
-#include "rtftokenizer.hxx"
class SvStream;
@@ -20,6 +20,7 @@ namespace writerfilter
{
namespace rtftok
{
+class RTFTokenizer;
/**
* This acts like an importer, but used for looking ahead, e.g. to
* determine if the current group contains a table, etc.
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index b79d37123399..98fd48aa008e 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -43,6 +43,8 @@
#include <boost/logic/tribool.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <android/compatibility.hxx>
+#include <dmapper/GraphicZOrderHelper.hxx>
+#include "rtfdocumentimpl.hxx"
using namespace com::sun::star;
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index 83d025b918d2..e2923c3a0885 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -11,16 +11,21 @@
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSDRIMPORT_HXX
#include <stack>
-
-#include <com/sun/star/drawing/XShapes.hpp>
+#include <vector>
#include <dmapper/GraphicZOrderHelper.hxx>
-#include "rtfdocumentimpl.hxx"
+#include <com/sun/star/drawing/XShapes.hpp>
+#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
namespace writerfilter
{
namespace rtftok
{
+class RTFDocumentImpl;
+class RTFShape;
+
/// Handles the import of drawings using RTF markup.
class RTFSdrImport final
{
diff --git a/writerfilter/source/rtftok/rtfskipdestination.cxx b/writerfilter/source/rtftok/rtfskipdestination.cxx
index 00ab0a51b0e8..8e17b8c47d6b 100644
--- a/writerfilter/source/rtftok/rtfskipdestination.cxx
+++ b/writerfilter/source/rtftok/rtfskipdestination.cxx
@@ -10,6 +10,7 @@
#include "rtfskipdestination.hxx"
#include <osl/diagnose.h>
#include <sal/log.hxx>
+#include "rtflistener.hxx"
namespace writerfilter
{
diff --git a/writerfilter/source/rtftok/rtfskipdestination.hxx b/writerfilter/source/rtftok/rtfskipdestination.hxx
index b779b1cbcc53..8f8c6aa9d5f2 100644
--- a/writerfilter/source/rtftok/rtfskipdestination.hxx
+++ b/writerfilter/source/rtftok/rtfskipdestination.hxx
@@ -10,12 +10,12 @@
#ifndef INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSKIPDESTINATION_HXX
#define INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSKIPDESTINATION_HXX
-#include "rtflistener.hxx"
-
namespace writerfilter
{
namespace rtftok
{
+class RTFListener;
+
/// Skips a destination after a not parsed control word if it was prefixed with \*
class RTFSkipDestination final
{
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 2299c8d05c57..3026d774a19a 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -9,15 +9,14 @@
#include "rtftokenizer.hxx"
#include <tools/stream.hxx>
-#include <unotools/resmgr.hxx>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <rtl/strbuf.hxx>
-#include "rtfskipdestination.hxx"
+#include <rtl/ustrbuf.hxx>
#include <rtl/character.hxx>
+#include "rtfskipdestination.hxx"
#include <com/sun/star/io/BufferSizeExceededException.hpp>
+#include <osl/diagnose.h>
using namespace com::sun::star;
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index c13ca6c2d282..21046f462942 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -15,7 +15,6 @@
#include <vector>
#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
class SvStream;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 11:44:58 +0000