summaryrefslogtreecommitdiff
path: root/svx
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
commit03b45b76de38f1c79fb7a95ee4780e0ebf1bc38d (patch)
tree17e1f70174923b2218723b374d889c8c9ed8fb96 /svx
parenteaceeb3735e1966676c858e0c372750598d8f783 (diff)
#i107450#: build all other modules with new editeng lib
Diffstat (limited to 'svx')
-rw-r--r--svx/inc/svx/svdfield.hxx39
-rw-r--r--svx/inc/svx/svdomeas.hxx2
-rw-r--r--svx/inc/svx/unoshape.hxx4
-rw-r--r--svx/inc/svx/unoshprp.hxx2
-rw-r--r--svx/source/svdraw/svdomeas.cxx2
-rw-r--r--svx/source/svdraw/svdotxfl.cxx3
6 files changed, 45 insertions, 7 deletions
diff --git a/svx/inc/svx/svdfield.hxx b/svx/inc/svx/svdfield.hxx
new file mode 100644
index 0000000000..ae86abd75d
--- /dev/null
+++ b/svx/inc/svx/svdfield.hxx
@@ -0,0 +1,39 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: measfld.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SVDFIELD_HXX
+#define _SVDFIELD_HXX
+
+#include "svx/svxdllapi.h"
+
+void SVX_DLLPUBLIC SdrRegisterFieldClasses();
+
+#endif //_SVDFIELD_HXX
+
diff --git a/svx/inc/svx/svdomeas.hxx b/svx/inc/svx/svdomeas.hxx
index b21ec019ec..ce56209c69 100644
--- a/svx/inc/svx/svdomeas.hxx
+++ b/svx/inc/svx/svdomeas.hxx
@@ -33,7 +33,7 @@
#include <svx/svdotext.hxx>
#include "svx/svxdllapi.h"
-#include <editeng/svdfield.hxx>
+#include <editeng/measfld.hxx>
//************************************************************
// Vorausdeklarationen
diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx
index 9f1f9a3f4d..35ec7eea1c 100644
--- a/svx/inc/svx/unoshape.hxx
+++ b/svx/inc/svx/unoshape.hxx
@@ -91,10 +91,10 @@ class SvxItemPropertySet;
class SvxItemPropertySimpleEntry;
class SfxItemSet;
-void SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap,
+void SVX_DLLPUBLIC SvxItemPropertySet_setPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap,
const com::sun::star::uno::Any& rVal, SfxItemSet& rSet );
-com::sun::star::uno::Any SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet );
+com::sun::star::uno::Any SVX_DLLPUBLIC SvxItemPropertySet_getPropertyValue( const SvxItemPropertySet& rPropSet, const SfxItemPropertySimpleEntry* pMap, const SfxItemSet& rSet );
// WARNING: if you update the supported interfaces,
diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx
index 459433a06a..bd705c37fb 100644
--- a/svx/inc/svx/unoshprp.hxx
+++ b/svx/inc/svx/unoshprp.hxx
@@ -40,9 +40,7 @@
#include <com/sun/star/drawing/Hatch.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/LineDash.hpp>
-#ifndef _COM_SUN_STAR_DRAWING_LINEJOINT_Hpp_
#include <com/sun/star/drawing/LineJoint.hpp>
-#endif
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/awt/Rectangle.hpp>
diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx
index 84c7938493..6bc92c7951 100644
--- a/svx/source/svdraw/svdomeas.cxx
+++ b/svx/source/svdraw/svdomeas.cxx
@@ -58,7 +58,7 @@
#include <editeng/outlobj.hxx>
#include <editeng/outliner.hxx>
#include <editeng/editobj.hxx>
-#include <editeng/svdfield.hxx>
+#include <editeng/measfld.hxx>
#include <editeng/flditem.hxx>
#include <svx/svdogrp.hxx>
#include <svx/svdopath.hxx>
diff --git a/svx/source/svdraw/svdotxfl.cxx b/svx/source/svdraw/svdotxfl.cxx
index 009b8e42a1..810982c745 100644
--- a/svx/source/svdraw/svdotxfl.cxx
+++ b/svx/source/svdraw/svdotxfl.cxx
@@ -32,8 +32,9 @@
#include "precompiled_svx.hxx"
#include <editeng/eeitem.hxx>
-#include <editeng/svdfield.hxx>
+#include <editeng/measfld.hxx>
#include <svx/svdotext.hxx>
+#include <svx/svdfield.hxx>
static BOOL bInit = FALSE;