diff options
-rw-r--r-- | include/editeng/editdata.hxx | 3 | ||||
-rw-r--r-- | include/editeng/edtdlg.hxx | 1 | ||||
-rw-r--r-- | include/editeng/outlobj.hxx | 7 | ||||
-rw-r--r-- | include/editeng/paragraphdata.hxx | 7 | ||||
-rw-r--r-- | include/editeng/txtrange.hxx | 9 | ||||
-rw-r--r-- | include/editeng/unoedsrc.hxx | 1 |
6 files changed, 1 insertions, 27 deletions
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx index 5f59e5ddcf29..cf39557b9ae3 100644 --- a/include/editeng/editdata.hxx +++ b/include/editeng/editdata.hxx @@ -22,7 +22,6 @@ #define INCLUDED_EDITENG_EDITDATA_HXX #include <rtl/ustring.hxx> -#include <tools/solar.h> #include <editeng/editengdllapi.h> class SfxItemSet; @@ -210,8 +209,6 @@ struct EDITENG_DLLPUBLIC EFieldInfo EFieldInfo& operator= ( const EFieldInfo& ); }; -// ----------------------------------------------------------------------- - enum ImportState { RTFIMP_START, RTFIMP_END, // only pParser, nPara, nIndex RTFIMP_NEXTTOKEN, RTFIMP_UNKNOWNATTR, // nToken+nTokenValue diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 6476bfec8961..6a2567909330 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -20,7 +20,6 @@ #define INCLUDED_EDITENG_EDTDLG_HXX #include <rtl/ustring.hxx> -#include <tools/solar.h> #include <editeng/editengdllapi.h> #include <i18nlangtag/lang.h> #include <com/sun/star/uno/Reference.hxx> diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx index 23f9a6a39c97..193241c4060f 100644 --- a/include/editeng/outlobj.hxx +++ b/include/editeng/outlobj.hxx @@ -20,19 +20,14 @@ #ifndef INCLUDED_EDITENG_OUTLOBJ_HXX #define INCLUDED_EDITENG_OUTLOBJ_HXX -////////////////////////////////////////////////////////////////////////////// - #include <editeng/paragraphdata.hxx> #include <editeng/editengdllapi.h> #include <rtl/ustring.hxx> #include <rsc/rscsfx.hxx> -#include <tools/solar.h> class EditTextObject; class ImplOutlinerParaObject; -////////////////////////////////////////////////////////////////////////////// - class EDITENG_DLLPUBLIC OutlinerParaObject { private: @@ -84,8 +79,6 @@ public: const SfxStyleFamily& rNewFamily); }; -////////////////////////////////////////////////////////////////////////////// - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/paragraphdata.hxx b/include/editeng/paragraphdata.hxx index 3806e5e931eb..b6dcfeace743 100644 --- a/include/editeng/paragraphdata.hxx +++ b/include/editeng/paragraphdata.hxx @@ -20,10 +20,9 @@ #ifndef INCLUDED_EDITENG_PARAGRAPHDATA_HXX #define INCLUDED_EDITENG_PARAGRAPHDATA_HXX -#include <tools/solar.h> #include <vector> +#include <sal/types.h> -////////////////////////////////////////////////////////////////////////////// // Only for internal use, oder some kind like hPara for the few // functions where you need it outside ( eg. moving paragraphs... ) // @@ -53,12 +52,8 @@ public: sal_Int16 getDepth() const { return nDepth; } }; -////////////////////////////////////////////////////////////////////////////// - typedef ::std::vector< ParagraphData > ParagraphDataVector; -////////////////////////////////////////////////////////////////////////////// - #endif // INCLUDED_EDITENG_PARAGRAPHDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx index dd9af4925930..c072e0976cc4 100644 --- a/include/editeng/txtrange.hxx +++ b/include/editeng/txtrange.hxx @@ -21,9 +21,7 @@ #define INCLUDED_EDITENG_TXTRANGE_HXX #include <editeng/editengdllapi.h> -#include <tools/solar.h> #include <tools/gen.hxx> - #include <deque> class PolyPolygon; @@ -35,11 +33,6 @@ namespace basegfx { typedef std::deque<long>* LongDqPtr; -/************************************************************************* -|* -|* class TextRanger -|* -*************************************************************************/ class EDITENG_DLLPUBLIC TextRanger { //! The RangeCache class is used to cache the result of a single range calculation. @@ -91,8 +84,6 @@ public: void SetVertical( sal_Bool bNew ); }; - - #endif // _TXTRANGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index fb34126ebc9e..671f86b3d5ec 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -25,7 +25,6 @@ #include <i18nlangtag/lang.h> #include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include <tools/solar.h> #include <vcl/mapmod.hxx> #include <tools/color.hxx> #include <svl/poolitem.hxx> |