Kaydet (Commit) 682ace70 authored tarafından Alexandre Vicenzi's avatar Alexandre Vicenzi Kaydeden (comit) Caolán McNamara

fdo#63154 Remove unused solar.h reference in editeng

Change-Id: I472cb0dcfcb2d36fab65041acb47bd75d22a7b3f
Reviewed-on: https://gerrit.libreoffice.org/8119Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst c6fd5242
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#define INCLUDED_EDITENG_EDITDATA_HXX #define INCLUDED_EDITENG_EDITDATA_HXX
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <editeng/editengdllapi.h> #include <editeng/editengdllapi.h>
class SfxItemSet; class SfxItemSet;
...@@ -210,8 +209,6 @@ struct EDITENG_DLLPUBLIC EFieldInfo ...@@ -210,8 +209,6 @@ struct EDITENG_DLLPUBLIC EFieldInfo
EFieldInfo& operator= ( const EFieldInfo& ); EFieldInfo& operator= ( const EFieldInfo& );
}; };
// -----------------------------------------------------------------------
enum ImportState { enum ImportState {
RTFIMP_START, RTFIMP_END, // only pParser, nPara, nIndex RTFIMP_START, RTFIMP_END, // only pParser, nPara, nIndex
RTFIMP_NEXTTOKEN, RTFIMP_UNKNOWNATTR, // nToken+nTokenValue RTFIMP_NEXTTOKEN, RTFIMP_UNKNOWNATTR, // nToken+nTokenValue
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define INCLUDED_EDITENG_EDTDLG_HXX #define INCLUDED_EDITENG_EDTDLG_HXX
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/solar.h>
#include <editeng/editengdllapi.h> #include <editeng/editengdllapi.h>
#include <i18nlangtag/lang.h> #include <i18nlangtag/lang.h>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
......
...@@ -20,19 +20,14 @@ ...@@ -20,19 +20,14 @@
#ifndef INCLUDED_EDITENG_OUTLOBJ_HXX #ifndef INCLUDED_EDITENG_OUTLOBJ_HXX
#define INCLUDED_EDITENG_OUTLOBJ_HXX #define INCLUDED_EDITENG_OUTLOBJ_HXX
//////////////////////////////////////////////////////////////////////////////
#include <editeng/paragraphdata.hxx> #include <editeng/paragraphdata.hxx>
#include <editeng/editengdllapi.h> #include <editeng/editengdllapi.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <rsc/rscsfx.hxx> #include <rsc/rscsfx.hxx>
#include <tools/solar.h>
class EditTextObject; class EditTextObject;
class ImplOutlinerParaObject; class ImplOutlinerParaObject;
//////////////////////////////////////////////////////////////////////////////
class EDITENG_DLLPUBLIC OutlinerParaObject class EDITENG_DLLPUBLIC OutlinerParaObject
{ {
private: private:
...@@ -84,8 +79,6 @@ public: ...@@ -84,8 +79,6 @@ public:
const SfxStyleFamily& rNewFamily); const SfxStyleFamily& rNewFamily);
}; };
//////////////////////////////////////////////////////////////////////////////
#endif #endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -20,10 +20,9 @@ ...@@ -20,10 +20,9 @@
#ifndef INCLUDED_EDITENG_PARAGRAPHDATA_HXX #ifndef INCLUDED_EDITENG_PARAGRAPHDATA_HXX
#define INCLUDED_EDITENG_PARAGRAPHDATA_HXX #define INCLUDED_EDITENG_PARAGRAPHDATA_HXX
#include <tools/solar.h>
#include <vector> #include <vector>
#include <sal/types.h>
//////////////////////////////////////////////////////////////////////////////
// Only for internal use, oder some kind like hPara for the few // Only for internal use, oder some kind like hPara for the few
// functions where you need it outside ( eg. moving paragraphs... ) // functions where you need it outside ( eg. moving paragraphs... )
// //
...@@ -53,12 +52,8 @@ public: ...@@ -53,12 +52,8 @@ public:
sal_Int16 getDepth() const { return nDepth; } sal_Int16 getDepth() const { return nDepth; }
}; };
//////////////////////////////////////////////////////////////////////////////
typedef ::std::vector< ParagraphData > ParagraphDataVector; typedef ::std::vector< ParagraphData > ParagraphDataVector;
//////////////////////////////////////////////////////////////////////////////
#endif // INCLUDED_EDITENG_PARAGRAPHDATA_HXX #endif // INCLUDED_EDITENG_PARAGRAPHDATA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -21,9 +21,7 @@ ...@@ -21,9 +21,7 @@
#define INCLUDED_EDITENG_TXTRANGE_HXX #define INCLUDED_EDITENG_TXTRANGE_HXX
#include <editeng/editengdllapi.h> #include <editeng/editengdllapi.h>
#include <tools/solar.h>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <deque> #include <deque>
class PolyPolygon; class PolyPolygon;
...@@ -35,11 +33,6 @@ namespace basegfx { ...@@ -35,11 +33,6 @@ namespace basegfx {
typedef std::deque<long>* LongDqPtr; typedef std::deque<long>* LongDqPtr;
/*************************************************************************
|*
|* class TextRanger
|*
*************************************************************************/
class EDITENG_DLLPUBLIC TextRanger class EDITENG_DLLPUBLIC TextRanger
{ {
//! The RangeCache class is used to cache the result of a single range calculation. //! The RangeCache class is used to cache the result of a single range calculation.
...@@ -91,8 +84,6 @@ public: ...@@ -91,8 +84,6 @@ public:
void SetVertical( sal_Bool bNew ); void SetVertical( sal_Bool bNew );
}; };
#endif // _TXTRANGE_HXX #endif // _TXTRANGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <i18nlangtag/lang.h> #include <i18nlangtag/lang.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <tools/solar.h>
#include <vcl/mapmod.hxx> #include <vcl/mapmod.hxx>
#include <tools/color.hxx> #include <tools/color.hxx>
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment