summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2014-07-22 17:51:51 +0200
committerMatteo Casalin <matteo.casalin@yahoo.com>2014-07-22 23:50:44 +0200
commit5f0967a6345f602f787901eeff25fd61b57b780e (patch)
tree605bf0f6342701a1d16bebb1e1286e87a1edacc5
parent2a6b9c93af295a6746372bc6ce462a02492f616d (diff)
Do not include txttypes.hxx unnecessarily
Change-Id: I557019995975b24062fd346a7cc0cae872cab308
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx3
-rw-r--r--sw/source/core/inc/txtfly.hxx1
-rw-r--r--sw/source/core/text/frmcrsr.cxx2
-rw-r--r--sw/source/core/text/guess.hxx2
-rw-r--r--sw/source/core/text/inftxt.hxx1
-rw-r--r--sw/source/core/text/itratr.hxx2
-rw-r--r--sw/source/core/text/noteurl.cxx1
-rw-r--r--sw/source/core/text/porlin.hxx1
-rw-r--r--sw/source/core/text/possiz.hxx2
-rw-r--r--sw/source/core/text/wrong.cxx1
-rw-r--r--sw/source/core/txtnode/txtedt.cxx1
11 files changed, 6 insertions, 11 deletions
diff --git a/sw/source/core/inc/SwPortionHandler.hxx b/sw/source/core/inc/SwPortionHandler.hxx
index a4d56c113885..63a668583086 100644
--- a/sw/source/core/inc/SwPortionHandler.hxx
+++ b/sw/source/core/inc/SwPortionHandler.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_SWPORTIONHANDLER_HXX
-#include <tools/solar.h>
-#include <txttypes.hxx>
+#include <swtypes.hxx>
/** The SwPortionHandler interface implements a visitor for the layout
* engine's text portions. This can be used to gather information of
diff --git a/sw/source/core/inc/txtfly.hxx b/sw/source/core/inc/txtfly.hxx
index 9352755b404b..a7500dfffc5a 100644
--- a/sw/source/core/inc/txtfly.hxx
+++ b/sw/source/core/inc/txtfly.hxx
@@ -22,7 +22,6 @@
#include "swtypes.hxx"
#include "swrect.hxx"
#include <fmtsrndenum.hxx>
-#include <txttypes.hxx>
#include <vector>
class OutputDevice;
diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index c02754c8d2eb..53c13fdbcfd2 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -25,7 +25,7 @@
#include "rootfrm.hxx"
#include "pagefrm.hxx"
#include "colfrm.hxx"
-#include "txttypes.hxx"
+#include "swtypes.hxx"
#include <sfx2/printer.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/tstpitem.hxx>
diff --git a/sw/source/core/text/guess.hxx b/sw/source/core/text/guess.hxx
index 6cba5a4aca94..4d33c6bf4ce0 100644
--- a/sw/source/core/text/guess.hxx
+++ b/sw/source/core/text/guess.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_CORE_TEXT_GUESS_HXX
#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
-#include "txttypes.hxx"
+#include "swtypes.hxx"
#include "breakit.hxx"
#include "porrst.hxx"
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index d0b4c065523f..e039a769497f 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -24,7 +24,6 @@
#include <map>
#include "swtypes.hxx"
-#include "txttypes.hxx"
#include "swrect.hxx"
#include "txtfly.hxx"
#include "swfont.hxx"
diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx
index 4d0c06a8b25b..edd51dcd9ecd 100644
--- a/sw/source/core/text/itratr.hxx
+++ b/sw/source/core/text/itratr.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_CORE_TEXT_ITRATR_HXX
#include <atrhndl.hxx>
-#include "txttypes.hxx"
+#include "swtypes.hxx"
#include "swfont.hxx"
#include "porlay.hxx"
diff --git a/sw/source/core/text/noteurl.cxx b/sw/source/core/text/noteurl.cxx
index 3d9c0650ac2c..36fb723c39f3 100644
--- a/sw/source/core/text/noteurl.cxx
+++ b/sw/source/core/text/noteurl.cxx
@@ -22,7 +22,6 @@
#include <svtools/imaprect.hxx>
#include <svtools/imap.hxx>
-#include "txttypes.hxx"
#include "noteurl.hxx"
// Global variable
diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx
index cb866570d355..567b4080a20b 100644
--- a/sw/source/core/text/porlin.hxx
+++ b/sw/source/core/text/porlin.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_CORE_TEXT_PORLIN_HXX
#include "possiz.hxx"
+#include <txttypes.hxx>
#ifdef DBG_UTIL
#include <libxml/xmlwriter.h>
diff --git a/sw/source/core/text/possiz.hxx b/sw/source/core/text/possiz.hxx
index 20b7bc279755..f7a5e45de7c2 100644
--- a/sw/source/core/text/possiz.hxx
+++ b/sw/source/core/text/possiz.hxx
@@ -20,7 +20,7 @@
#define INCLUDED_SW_SOURCE_CORE_TEXT_POSSIZ_HXX
#include <tools/gen.hxx>
-#include "txttypes.hxx"
+#include <sal/types.h>
// Compared to the SV sizes SwPosSize is always positive
class SwPosSize
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index bc8ce1de3b55..c82d05fac17f 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -18,7 +18,6 @@
*/
#include "swtypes.hxx"
-#include "txttypes.hxx"
#include "SwGrammarMarkUp.hxx"
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 71def8c09203..260c697db767 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -49,7 +49,6 @@
#include <SwGrammarMarkUp.hxx>
#include <rootfrm.hxx>
-#include <txttypes.hxx>
#include <breakit.hxx>
#include <crstate.hxx>
#include <UndoOverwrite.hxx>