[Libreoffice-commits] core.git: include/editeng
Alexandre Vicenzi
vicenzi.alexandre at gmail.com
Fri Feb 21 01:24:41 PST 2014
include/editeng/editdata.hxx | 3 ---
include/editeng/edtdlg.hxx | 1 -
include/editeng/outlobj.hxx | 7 -------
include/editeng/paragraphdata.hxx | 7 +------
include/editeng/txtrange.hxx | 9 ---------
include/editeng/unoedsrc.hxx | 1 -
6 files changed, 1 insertion(+), 27 deletions(-)
New commits:
commit 682ace7031b8bd0a8ee8d1ba10e95823755895ed
Author: Alexandre Vicenzi <vicenzi.alexandre at gmail.com>
Date: Tue Feb 18 23:36:47 2014 -0300
fdo#63154 Remove unused solar.h reference in editeng
Change-Id: I472cb0dcfcb2d36fab65041acb47bd75d22a7b3f
Reviewed-on: https://gerrit.libreoffice.org/8119
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 5f59e5d..cf39557 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 6476bfe..6a25679 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 23f9a6a..193241c 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 3806e5e..b6dcfea 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 dd9af49..c072e09 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 fb34126..671f86b 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>
More information about the Libreoffice-commits
mailing list