summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--filter/source/config/fragments/filters/MS_Word_2007_XML.xcu2
-rw-r--r--oox/inc/oox/vml/vmldrawing.hxx3
-rw-r--r--oox/prj/build.lst5
-rw-r--r--oox/prj/d.lst3
-rw-r--r--oox/source/export/drawingml.cxx16
-rw-r--r--oox/util/makefile.mk11
6 files changed, 27 insertions, 13 deletions
diff --git a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
index d8a37406fe93..c8c9f00ccbd2 100644
--- a/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2007_XML.xcu
@@ -1,5 +1,5 @@
<node oor:name="MS Word 2007 XML" oor:op="replace">
- <prop oor:name="Flags"><value>IMPORT ALIEN 3RDPARTYFILTER</value></prop>
+ <prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.WriterFilter</value></prop>
<prop oor:name="UserData"><value>OXML</value></prop>
diff --git a/oox/inc/oox/vml/vmldrawing.hxx b/oox/inc/oox/vml/vmldrawing.hxx
index c2f8432dca6f..ff8751a58f72 100644
--- a/oox/inc/oox/vml/vmldrawing.hxx
+++ b/oox/inc/oox/vml/vmldrawing.hxx
@@ -30,7 +30,8 @@
#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 345c72e00558..14585dfeb84a 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 xmlscript tools vcl BOOST:boost OPENSSL:openssl NULL
+oox oox : vos cppu cppuhelper comphelper sal offapi sax basegfx svx xmlscript 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,4 +15,5 @@ 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\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
+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
diff --git a/oox/prj/d.lst b/oox/prj/d.lst
index f20db064d7b2..70c7c1ea52ef 100644
--- a/oox/prj/d.lst
+++ b/oox/prj/d.lst
@@ -4,6 +4,7 @@ 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
mkdir: %_DEST%\inc%_EXT%\oox\xls
@@ -34,8 +35,10 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls
..\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\vbaproject.hxx %_DEST%\inc%_EXT%\oox\ole\vbaproject.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 5aeb56883d2d..c3fce8e269fc 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -40,6 +40,7 @@
#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>
@@ -47,6 +48,7 @@
#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>
@@ -484,13 +486,13 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
case DOCUMENT_XLSX: pComponent = "xl"; break;
}
- Reference< XOutputStream > xOutStream = mpFB->openOutputStream( OUStringBuffer()
- .appendAscii( pComponent )
- .appendAscii( "/media/image" )
- .append( (sal_Int32) mnImageCounter )
- .appendAscii( sExtension )
- .makeStringAndClear(),
- sMediaType );
+ Reference< XOutputStream > xOutStream = mpFB->openFragmentStream( 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/util/makefile.mk b/oox/util/makefile.mk
index 8bbf8a3650f2..deb8dbb6a0e7 100644
--- a/oox/util/makefile.mk
+++ b/oox/util/makefile.mk
@@ -53,7 +53,8 @@ LIB1FILES= \
$(SLB)$/table.lib\
$(SLB)$/shape.lib\
$(SLB)$/dump.lib\
- $(SLB)$/docprop.lib
+ $(SLB)$/docprop.lib\
+ $(SLB)$/export.lib
# --- Shared-Library -----------------------------------------------
@@ -69,7 +70,13 @@ SHL1STDLIBS= \
$(SALLIB) \
$(BASEGFXLIB) \
$(SAXLIB) \
- $(XMLSCRIPTLIB)
+ $(XMLSCRIPTLIB) \
+ $(VCLLIB) \
+ $(GOODIESLIB) \
+ $(SVTOOLLIB) \
+ $(SVXCORELIB) \
+ $(SVXMSFILTERLIB) \
+ $(TOOLSLIB)
# link openssl, copied this bit from ucb/source/ucp/webdav/makefile.mk
.IF "$(GUI)"=="WNT"
generated by cgit (git 2.34.1) at 2025-03-01 06:22:51 +0000