rollback last change

9 files changed, 19 insertions, 36 deletions

diff --git a/oox/inc/oox/export/drawingml.hxx b/oox/inc/oox/export/drawingml.hxx
index dbedb1b519c6..0859b15136d9 100644
--- a/oox/inc/oox/export/drawingml.hxx
+++ b/oox/inc/oox/export/drawingml.hxx
@@ -7,7 +7,7 @@
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/uno/XReference.hpp>
 #include <tools/poly.hxx>
-#include <filter/msfilter/escherex.hxx>
+#include <svx/escherex.hxx>
 
 class Graphic;
 class String;
diff --git a/oox/inc/oox/export/vmlexport.hxx b/oox/inc/oox/export/vmlexport.hxx
index f0fe65e39901..f349b99f466f 100644
--- a/oox/inc/oox/export/vmlexport.hxx
+++ b/oox/inc/oox/export/vmlexport.hxx
@@ -30,7 +30,7 @@
 
 #include <oox/dllapi.h>
 #include <sax/fshelper.hxx>
-#include <filter/msfilter/escherex.hxx>
+#include <svx/escherex.hxx>
 
 namespace rtl {
     class OString;
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index f9a80ac01022..f0bd75046c37 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -33,8 +33,7 @@
 
 #include <map>
 #include <memory>
-
-#include <oox/ole/oleobjecthelper.hxx>
+#include "oox/ole/oleobjecthelper.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Rectangle; }
diff --git a/oox/prj/build.lst b/oox/prj/build.lst
index 416b7e582a38..a1dfa584543c 100644
--- a/oox/prj/build.lst
+++ b/oox/prj/build.lst
@@ -1,4 +1,4 @@
-oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools svx vcl BOOST:boost OPENSSL:openssl NULL
+oox	oox : vos cppu cppuhelper comphelper sal offapi sax basegfx tools vcl BOOST:boost OPENSSL:openssl NULL
 oox	oox				usr1	-   all	oox_mkout NULL
 oox	oox\prj				get	-   all	oox_prj NULL
 oox	oox\source\token		nmake	-   all	oox_token NULL
@@ -15,5 +15,4 @@ oox	oox\source\vml			nmake	-   all	oox_vml oox_token NULL
 oox	oox\source\xls			nmake	-   all	oox_xls oox_token NULL
 oox	oox\source\dump			nmake	-   all	oox_dump oox_token NULL
 oox	oox\source\shape		nmake   -   all oox_shape oox_token NULL
-oox	oox\source\export		nmake   -   all oox_export oox_token NULL
-oox	oox\util			nmake   -   all oox_util oox_token oox_helper oox_core oox_ole oox_vml oox_drawingml oox_diagram oox_chart oox_table oox_ppt oox_xls oox_dump oox_export oox_shape oox_docprop NULL
+oox	oox\util			nmake   -   all oox_util oox_token oox_helper oox_core oox_ole oox_vml oox_drawingml oox_diagram oox_chart oox_table oox_ppt oox_xls oox_dump oox_shape oox_docprop NULL
diff --git a/oox/prj/d.lst b/oox/prj/d.lst
index 04a526dd567c..2c9d8d5bae74 100644
--- a/oox/prj/d.lst
+++ b/oox/prj/d.lst
@@ -4,8 +4,6 @@ mkdir: %_DEST%\inc%_EXT%\oox\core
 mkdir: %_DEST%\inc%_EXT%\oox\drawingml
 mkdir: %_DEST%\inc%_EXT%\oox\drawingml\chart
 mkdir: %_DEST%\inc%_EXT%\oox\drawingml\table
-mkdir: %_DEST%\inc%_EXT%\oox\export
-mkdir: %_DEST%\inc%_EXT%\oox\ole
 mkdir: %_DEST%\inc%_EXT%\oox\vml
 
 ..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
@@ -32,10 +30,8 @@ mkdir: %_DEST%\inc%_EXT%\oox\vml
 ..\inc\oox\core\xmlfilterbase.hxx %_DEST%\inc%_EXT%\oox\core\xmlfilterbase.hxx
 ..\inc\oox\drawingml\chart\chartconverter.hxx %_DEST%\inc%_EXT%\oox\drawingml\chart\chartconverter.hxx
 ..\inc\oox\drawingml\table\tablestylelist.hxx %_DEST%\inc%_EXT%\oox\drawingml\table\tablestylelist.hxx
-..\inc\oox\ole\oleobjecthelper.hxx %_DEST%\inc%_EXT%\oox\ole\oleobjecthelper.hxx
 ..\inc\oox\vml\vmldrawing.hxx %_DEST%\inc%_EXT%\oox\vml\vmldrawing.hxx
 ..\inc\oox\vml\vmlshape.hxx %_DEST%\inc%_EXT%\oox\vml\vmlshape.hxx
-..\inc\oox\export\*.hxx %_DEST%\inc%_EXT%\oox\export\*.hxx
 
 dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib; fi"
 
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 46131e1385f5..d20e05aab927 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -43,7 +43,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/drawing/BitmapMode.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 #include <com/sun/star/drawing/LineDash.hpp>
@@ -51,7 +50,6 @@
 #include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/TextHorizontalAdjust.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
@@ -68,9 +66,8 @@
 #include <rtl/strbuf.hxx>
 #include <sfx2/app.hxx>
 #include <svl/languageoptions.hxx>
-#include <filter/msfilter/escherex.hxx>
-#include <editeng/svxenum.hxx>
-#include <unotools/fontdefs.hxx>
+#include <svx/escherex.hxx>
+#include <svx/svxenum.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -490,13 +487,13 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
         case DOCUMENT_XLSX: pComponent = "xl"; break;
     }
 
-    Reference< XOutputStream > xOutStream = mpFB->openFragmentStream( OUStringBuffer()
-                                                                      .appendAscii( pComponent )
-                                                                      .appendAscii( "/media/image" )
-                                                                      .append( (sal_Int32) mnImageCounter )
-                                                                      .appendAscii( sExtension )
-                                                                      .makeStringAndClear(),
-                                                                      sMediaType );
+    Reference< XOutputStream > xOutStream = mpFB->openOutputStream( OUStringBuffer()
+                                                                    .appendAscii( pComponent )
+                                                                    .appendAscii( "/media/image" )
+                                                                    .append( (sal_Int32) mnImageCounter )
+                                                                    .appendAscii( sExtension )
+                                                                    .makeStringAndClear(),
+                                                                    sMediaType );
     xOutStream->writeBytes( Sequence< sal_Int8 >( (const sal_Int8*) aData, nDataSize ) );
     xOutStream->closeOutput();
 
diff --git a/oox/source/export/preset-definitions-to-shape-types.pl b/oox/source/export/preset-definitions-to-shape-types.pl
index bb4089315b8e..a05bff74ab90 100644
--- a/oox/source/export/preset-definitions-to-shape-types.pl
+++ b/oox/source/export/preset-definitions-to-shape-types.pl
@@ -1204,7 +1204,7 @@ print <<EOF;
 //   '$src_text'
 // which are part of the OOXML documentation
 
-#include <filter/msfilter/escherex.hxx>
+#include <svx/escherex.hxx>
 
 const char* pShapeTypes[ ESCHER_ShpInst_COUNT ] =
 {
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 96c3cba40324..b3849c59eeb3 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -69,9 +69,9 @@
 #include <rtl/strbuf.hxx>
 #include <sfx2/app.hxx>
 #include <svl/languageoptions.hxx>
-#include <filter/msfilter/escherex.hxx>
+#include <svx/escherex.hxx>
 #include <svx/svdoashp.hxx>
-#include <editeng/svxenum.hxx>
+#include <svx/svxenum.hxx>
 #include <svx/unoapi.hxx>
 
 using namespace ::com::sun::star;
diff --git a/oox/util/makefile.mk b/oox/util/makefile.mk
index c77eebe6100d..bf12b1addf1b 100644
--- a/oox/util/makefile.mk
+++ b/oox/util/makefile.mk
@@ -57,8 +57,7 @@ LIB1FILES=	\
     $(SLB)$/table.lib\
     $(SLB)$/shape.lib\
     $(SLB)$/dump.lib\
-    $(SLB)$/docprop.lib\
-    $(SLB)$/export.lib
+    $(SLB)$/docprop.lib
 
 # --- Shared-Library -----------------------------------------------
 
@@ -73,14 +72,7 @@ SHL1STDLIBS= \
         $(RTLLIB)		\
         $(SALLIB)		\
         $(BASEGFXLIB)	\
-        $(SAXLIB)		\
-        $(VCLLIB)		\
-        $(SVTOOLLIB)		\
-        $(SVLLIB)		\
-        $(SVXCORELIB)		\
-        $(MSFILTERLIB)	\
-        $(UNOTOOLSLIB) \
-        $(TOOLSLIB)
+        $(SAXLIB)
 
 # link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk
 .IF "$(GUI)"=="WNT"