Fix the build of oox.

oox/source/export/drawingml.cxx

@@ -60,13 +60,14 @@
 #include <tools/string.hxx>
 #include <vcl/cvtgrf.hxx>
 #include <unotools/fontcvt.hxx>
+#include <unotools/fontdefs.hxx>
 #include <vcl/graph.hxx>
 #include <svtools/grfmgr.hxx>
 #include <rtl/strbuf.hxx>
 #include <sfx2/app.hxx>
 #include <svl/languageoptions.hxx>
-#include <svx/escherex.hxx>
-#include <svx/svxenum.hxx>
+#include <filter/msfilter/escherex.hxx>
+#include <editeng/svxenum.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -473,7 +474,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
             }
 
             aData = aStream.GetData();
-            nDataSize = aStream.GetSize();
+            nDataSize = aStream.GetEndOfData();
             break;
             }
     }

oox/source/export/shapes.cxx

@@ -66,9 +66,9 @@
 #include <rtl/strbuf.hxx>
 #include <sfx2/app.hxx>
 #include <svl/languageoptions.hxx>
-#include <svx/escherex.hxx>
+#include <filter/msfilter/escherex.hxx>
 #include <svx/svdoashp.hxx>
-#include <svx/svxenum.hxx>
+#include <editeng/svxenum.hxx>
 #include <svx/unoapi.hxx>
 
 using namespace ::com::sun::star;

oox/source/export/vmlexport.cxx

@@ -128,7 +128,7 @@ void VMLExport::CloseContainer()
 
 UINT32 VMLExport::EnterGroup( const String& rShapeName, const Rectangle* pRect )
 {
-    UINT32 nShapeId = GetShapeID();
+    sal_uInt32 nShapeId = GenerateShapeId();
 
     OStringBuffer aStyle( 200 );
     FastAttributeList *pAttrList = m_pSerializer->createAttrList();

oox/util/makefile.mk

@@ -75,7 +75,9 @@ SHL1STDLIBS= \
         $(GOODIESLIB)		\
         $(SVTOOLLIB)		\
         $(SVXCORELIB)		\
-        $(SVXMSFILTERLIB)	\
+        $(SVLLIB)	\
+        $(MSFILTERLIB)	\
+        $(UNOTOOLSLIB)	\
         $(TOOLSLIB)
 
 # link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk