diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-02-02 09:51:58 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-02-02 09:51:58 +0100 |
| commit | 2ce16eb90db1f085513519fa038caf8594863073 (patch) | |
| tree | 0da2d0f7ecbe7bac8d5d756e0a2cedeef60893a7 /oox/source | |
| parent | 612dfd6ffa0574ba4490aebad518f300b5782eca (diff) | |
rollback last change
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/export/drawingml.cxx | 21 | ||||
| -rw-r--r-- | oox/source/export/preset-definitions-to-shape-types.pl | 2 | ||||
| -rw-r--r-- | oox/source/export/shapes.cxx | 4 |
3 files changed, 12 insertions, 15 deletions
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; |