summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2010-01-08 18:32:51 +0100
committerMathias Bauer <mba@openoffice.org>2010-01-08 18:32:51 +0100
commit1333d05e551a53c9bef60d57031c1d3f5baf8eca (patch)
tree105590ce0d67c46ebc616760115ca63aea3fd6de /editeng
parent67791d91c26061b34a0084ca4011d58a0f8ff3c5 (diff)
#i107450#: build all other modules with new editeng lib
Diffstat (limited to 'editeng')
-rw-r--r--editeng/inc/editeng/measfld.hxx (renamed from editeng/inc/editeng/svdfield.hxx)9
-rw-r--r--editeng/source/items/flditem.cxx2
-rw-r--r--editeng/source/items/svdfield.cxx2
-rw-r--r--editeng/source/uno/unofield.cxx2
4 files changed, 5 insertions, 10 deletions
diff --git a/editeng/inc/editeng/svdfield.hxx b/editeng/inc/editeng/measfld.hxx
index 90736f1b9550..4d81fd698f47 100644
--- a/editeng/inc/editeng/svdfield.hxx
+++ b/editeng/inc/editeng/measfld.hxx
@@ -28,8 +28,8 @@
*
************************************************************************/
-#ifndef _SVDFIELD_HXX
-#define _SVDFIELD_HXX
+#ifndef _EDIT_MEASFIELD_HXX
+#define _EDIT_MEASFIELD_HXX
#include <editeng/eeitem.hxx>
@@ -44,11 +44,6 @@
#endif
#include "editeng/editengdllapi.h"
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// Do not remove this, it is still used in src536a!
-void EDITENG_DLLPUBLIC SdrRegisterFieldClasses();
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
#define SDR_MEASUREFIELD 50
class SdrMeasureObj;
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 380b50f1e793..f8b702109018 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -39,7 +39,7 @@
#include <editeng/flditem.hxx>
-#include <editeng/svdfield.hxx>
+#include <editeng/measfld.hxx>
// #90477#
#include <tools/tenccvt.hxx>
diff --git a/editeng/source/items/svdfield.cxx b/editeng/source/items/svdfield.cxx
index f0d1ddcea741..22befecdaba3 100644
--- a/editeng/source/items/svdfield.cxx
+++ b/editeng/source/items/svdfield.cxx
@@ -31,7 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_editeng.hxx"
-#include <editeng/svdfield.hxx>
+#include <editeng/measfld.hxx>
SV_IMPL_PERSIST1(SdrMeasureField,SvxFieldData);
diff --git a/editeng/source/uno/unofield.cxx b/editeng/source/uno/unofield.cxx
index 2fdd8b8e5046..36c7f5141176 100644
--- a/editeng/source/uno/unofield.cxx
+++ b/editeng/source/uno/unofield.cxx
@@ -42,7 +42,7 @@
#include <editeng/eeitem.hxx>
#include <editeng/flditem.hxx>
-#include <editeng/svdfield.hxx>
+#include <editeng/measfld.hxx>
#include <editeng/unofield.hxx>
#include <editeng/unotext.hxx>
#include <comphelper/serviceinfohelper.hxx>