summaryrefslogtreecommitdiff
path: root/oox/source
diff options
context:
space:
mode:
Diffstat (limited to 'oox/source')
-rw-r--r--oox/source/export/drawingml.cxx53
-rw-r--r--oox/source/export/shapes.cxx162
2 files changed, 169 insertions, 46 deletions
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index c4adc33e2eef..58decbd92681 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -430,6 +430,30 @@ OUString DrawingML::WriteImage( const OUString& rURL )
return OUString();
}
+const char* DrawingML::GetComponentDir()
+{
+ switch ( meDocumentType )
+ {
+ case DOCUMENT_DOCX: return "word";
+ case DOCUMENT_PPTX: return "ppt";
+ case DOCUMENT_XLSX: return "xl";
+ }
+
+ return "unknown";
+}
+
+const char* DrawingML::GetRelationCompPrefix()
+{
+ switch ( meDocumentType )
+ {
+ case DOCUMENT_DOCX: return "";
+ case DOCUMENT_PPTX:
+ case DOCUMENT_XLSX: return "../";
+ }
+
+ return "unknown";
+}
+
OUString DrawingML::WriteImage( const Graphic& rGraphic )
{
GfxLink aLink = rGraphic.GetLink ();
@@ -491,16 +515,8 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
}
}
- const char *pComponent = "";
- switch ( meDocumentType )
- {
- case DOCUMENT_DOCX: pComponent = "word"; break;
- case DOCUMENT_PPTX: pComponent = "ppt"; break;
- case DOCUMENT_XLSX: pComponent = "xl"; break;
- }
-
Reference< XOutputStream > xOutStream = mpFB->openFragmentStream( OUStringBuffer()
- .appendAscii( pComponent )
+ .appendAscii( GetComponentDir() )
.appendAscii( "/media/image" )
.append( (sal_Int32) mnImageCounter )
.appendAscii( pExtension )
@@ -509,22 +525,11 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
xOutStream->writeBytes( Sequence< sal_Int8 >( (const sal_Int8*) aData, nDataSize ) );
xOutStream->closeOutput();
- const char *pImagePrefix = "";
- switch ( meDocumentType )
- {
- case DOCUMENT_DOCX:
- pImagePrefix = "media/image";
- break;
- case DOCUMENT_PPTX:
- case DOCUMENT_XLSX:
- pImagePrefix = "../media/image";
- break;
- }
-
sRelId = mpFB->addRelation( mpFS->getOutputStream(),
US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" ),
OUStringBuffer()
- .appendAscii( pImagePrefix )
+ .appendAscii( GetRelationCompPrefix() )
+ .appendAscii( "media/image" )
.append( (sal_Int32) mnImageCounter ++ )
.appendAscii( pExtension )
.makeStringAndClear() );
@@ -532,9 +537,9 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic )
return sRelId;
}
-OUString DrawingML::WriteBlip( Reference< XPropertySet > rXPropSet, OUString& rURL )
+OUString DrawingML::WriteBlip( Reference< XPropertySet > rXPropSet, OUString& rURL, Graphic *pGraphic )
{
- OUString sRelId = WriteImage( rURL );
+ OUString sRelId = pGraphic ? WriteImage( *pGraphic ) : WriteImage( rURL );
sal_Int16 nBright = 0;
sal_Int32 nContrast = 0;
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index f71226c62247..6d52d3dc12a8 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -26,6 +26,7 @@
*
************************************************************************/
+#include <comphelper/mediadescriptor.hxx>
#include "oox/core/xmlfilterbase.hxx"
#include "oox/export/shapes.hxx"
#include "oox/export/utils.hxx"
@@ -42,6 +43,7 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/BitmapMode.hpp>
#include <com/sun/star/drawing/ConnectorType.hpp>
@@ -50,8 +52,10 @@
#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/graphic/XGraphic.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
+#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/text/XSimpleText.hpp>
#include <com/sun/star/text/XText.hpp>
@@ -76,6 +80,7 @@
#include <svl/languageoptions.hxx>
#include <filter/msfilter/escherex.hxx>
#include <svx/svdoashp.hxx>
+#include <svx/svdoole2.hxx>
#include <editeng/svxenum.hxx>
#include <svx/unoapi.hxx>
#include <oox/export/chartexport.hxx>
@@ -93,8 +98,12 @@ using ::com::sun::star::beans::XPropertyState;
using ::com::sun::star::container::XEnumeration;
using ::com::sun::star::container::XEnumerationAccess;
using ::com::sun::star::container::XIndexAccess;
+using ::com::sun::star::document::XExporter;
+using ::com::sun::star::document::XFilter;
using ::com::sun::star::drawing::FillStyle;
+using ::com::sun::star::graphic::XGraphic;
using ::com::sun::star::io::XOutputStream;
+using ::com::sun::star::lang::XComponent;
using ::com::sun::star::text::XSimpleText;
using ::com::sun::star::text::XText;
using ::com::sun::star::text::XTextContent;
@@ -103,6 +112,8 @@ using ::com::sun::star::text::XTextRange;
using ::oox::core::XmlFilterBase;
using ::com::sun::star::chart2::XChartDocument;
using ::com::sun::star::frame::XModel;
+using ::com::sun::star::sheet::XSpreadsheetDocument;
+using ::comphelper::MediaDescriptor;
using ::oox::core::XmlFilterBase;
using ::rtl::OString;
using ::rtl::OStringBuffer;
@@ -112,7 +123,6 @@ using ::sax_fastparser::FSHelperPtr;
#define IDS(x) (OString(#x " ") + OString::valueOf( mnShapeIdMax++ )).getStr()
-
struct CustomShapeTypeTranslationTable
{
const char* sOOo;
@@ -565,6 +575,9 @@ namespace oox { namespace drawingml {
if ( GETA(propName) ) \
mAny >>= variable;
+// not thread safe
+int ShapeExport::mnSpreadsheetCounter = 1;
+
ShapeExport::ShapeExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, ShapeHashMap* pShapeMap, XmlFilterBase* pFB, DocumentType eDocumentType )
: DrawingML( pFS, pFB, eDocumentType )
, mnShapeIdMax( 1 )
@@ -811,6 +824,13 @@ ShapeExport& ShapeExport::WriteEllipseShape( Reference< XShape > xShape )
ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
{
+ WriteGraphicObjectShapePart( xShape );
+
+ return *this;
+}
+
+void ShapeExport::WriteGraphicObjectShapePart( Reference< XShape > xShape, Graphic* pGraphic )
+{
DBG(printf("write graphic object shape\n"));
if( NonEmptyText( xShape ) )
@@ -819,17 +839,17 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
//DBG(dump_pset(mXPropSet));
- return *this;
+ return;
}
DBG(printf("graphicObject without text\n"));
OUString sGraphicURL;
Reference< XPropertySet > xShapeProps( xShape, UNO_QUERY );
- if( !xShapeProps.is() || !( xShapeProps->getPropertyValue( S( "GraphicURL" ) ) >>= sGraphicURL ) )
+ if( !pGraphic && ( !xShapeProps.is() || !( xShapeProps->getPropertyValue( S( "GraphicURL" ) ) >>= sGraphicURL ) ) )
{
DBG(printf("no graphic URL found\n"));
- return *this;
+ return;
}
FSHelperPtr pFS = GetFS();
@@ -839,8 +859,12 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
pFS->startElementNS( mnXmlNamespace, XML_nvPicPr, FSEND );
OUString sName, sDescr;
- bool bHaveName = xShapeProps->getPropertyValue( S( "Name" ) ) >>= sName;
- bool bHaveDesc = xShapeProps->getPropertyValue( S( "Description" ) ) >>= sDescr;
+ bool bHaveName, bHaveDesc;
+
+ if ( ( bHaveName= GetProperty( xShapeProps, S( "Name" ) ) ) )
+ mAny >>= sName;
+ if ( ( bHaveDesc = GetProperty( xShapeProps, S( "Description" ) ) ) )
+ mAny >>= sDescr;
pFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
XML_id, I32S( GetNewShapeID( xShape ) ),
@@ -859,13 +883,16 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
pFS->startElementNS( mnXmlNamespace, XML_blipFill, FSEND );
- WriteBlip( xShapeProps, sGraphicURL );
+ WriteBlip( xShapeProps, sGraphicURL, pGraphic );
+ // now we stretch always when we get pGraphic (when changing that
+ // behavior, test n#780830 for regression, where the OLE sheet might get tiled
bool bStretch = false;
- if( ( xShapeProps->getPropertyValue( S( "FillBitmapStretch" ) ) >>= bStretch ) && bStretch )
- {
+ if( !pGraphic && GetProperty( xShapeProps, S( "FillBitmapStretch" ) ) )
+ mAny >>= bStretch;
+
+ if ( pGraphic || bStretch )
WriteStretch();
- }
pFS->endElementNS( mnXmlNamespace, XML_blipFill );
@@ -878,8 +905,6 @@ ShapeExport& ShapeExport::WriteGraphicObjectShape( Reference< XShape > xShape )
pFS->endElementNS( mnXmlNamespace, XML_spPr );
pFS->endElementNS( mnXmlNamespace, XML_pic );
-
- return *this;
}
ShapeExport& ShapeExport::WriteConnectorShape( Reference< XShape > xShape )
@@ -1283,17 +1308,110 @@ ShapeExport& ShapeExport::WriteTextShape( Reference< XShape > xShape )
ShapeExport& ShapeExport::WriteOLE2Shape( Reference< XShape > xShape )
{
Reference< XPropertySet > xPropSet( xShape, UNO_QUERY );
- if( xPropSet.is() && GetProperty( xPropSet, S("Model") ) )
- {
- Reference< XChartDocument > xChartDoc;
- mAny >>= xChartDoc;
- if( xChartDoc.is() )
+ if( xPropSet.is() ) {
+ if( GetProperty( xPropSet, S("Model") ) )
{
- //export the chart
- Reference< XModel > xModel( xChartDoc, UNO_QUERY );
- ChartExport aChartExport( mnXmlNamespace, GetFS(), xModel, GetFB(), GetDocumentType() );
- static sal_Int32 nChartCount = 0;
- aChartExport.WriteChartObj( xShape, ++nChartCount );
+ Reference< XChartDocument > xChartDoc;
+ mAny >>= xChartDoc;
+ if( xChartDoc.is() )
+ {
+ //export the chart
+ Reference< XModel > xModel( xChartDoc, UNO_QUERY );
+ ChartExport aChartExport( mnXmlNamespace, GetFS(), xModel, GetFB(), GetDocumentType() );
+ static sal_Int32 nChartCount = 0;
+ aChartExport.WriteChartObj( xShape, ++nChartCount );
+ }
+ else
+ {
+ // this part now supports only embedded spreadsheets, it can be extended to support remaining ooxml documents
+ // only exporter, counter and object filename are specific to spreadsheet
+ Reference< XSpreadsheetDocument > xSheetDoc( mAny, UNO_QUERY );
+ if( xSheetDoc.is() )
+ {
+ Reference< XComponent > xDocument( mAny, UNO_QUERY );
+ Reference< XExporter > xExporter( mpFB->getServiceFactory()->createInstance( CREATE_OUSTRING( "com.sun.star.comp.oox.ExcelFilterExport" ) ), UNO_QUERY );
+ if( xDocument.is() && xExporter.is() && mpFB )
+ {
+ Reference< XOutputStream > xOutStream = mpFB->openFragmentStream( OUStringBuffer()
+ .appendAscii( GetComponentDir() )
+ .appendAscii( "/embeddings/spreadsheet" )
+ .append( (sal_Int32) mnSpreadsheetCounter )
+ .appendAscii( ".xlsx" )
+ .makeStringAndClear(),
+ S("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") );
+ // export the embedded document
+ Sequence< PropertyValue > rMedia(1);
+
+ rMedia[0].Name = MediaDescriptor::PROP_STREAMFOROUTPUT();
+ rMedia[0].Value <<= xOutStream;
+
+ Reference< XFilter > xFilter( xExporter, UNO_QUERY );
+
+ if( xFilter.is() )
+ {
+ xExporter->setSourceDocument( xDocument );
+ xFilter->filter( rMedia );
+ }
+
+ xOutStream->closeOutput();
+
+ OUString sRelId = mpFB->addRelation( mpFS->getOutputStream(),
+ US( "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package" ),
+ OUStringBuffer()
+ .appendAscii( GetRelationCompPrefix() )
+ .appendAscii( "embeddings/spreadsheet" )
+ .append( (sal_Int32) mnSpreadsheetCounter ++ )
+ .appendAscii( ".xlsx" )
+ .makeStringAndClear() );
+
+ mpFS->startElementNS( mnXmlNamespace, XML_graphicFrame, FSEND );
+
+ mpFS->startElementNS( mnXmlNamespace, XML_nvGraphicFramePr, FSEND );
+
+ mpFS->singleElementNS( mnXmlNamespace, XML_cNvPr,
+ XML_id, I32S( GetNewShapeID( xShape ) ),
+ XML_name, IDS(Object),
+ FSEND );
+
+ mpFS->singleElementNS( mnXmlNamespace, XML_cNvGraphicFramePr,
+ FSEND );
+
+ if( GetDocumentType() == DOCUMENT_PPTX )
+ mpFS->singleElementNS( mnXmlNamespace, XML_nvPr,
+ FSEND );
+ mpFS->endElementNS( mnXmlNamespace, XML_nvGraphicFramePr );
+
+ WriteShapeTransformation( xShape, mnXmlNamespace );
+
+ mpFS->startElementNS( XML_a, XML_graphic, FSEND );
+ mpFS->startElementNS( XML_a, XML_graphicData,
+ XML_uri, "http://schemas.openxmlformats.org/presentationml/2006/ole",
+ FSEND );
+ mpFS->startElementNS( mnXmlNamespace, XML_oleObj,
+ XML_name, "Spreadsheet",
+ FSNS(XML_r, XML_id), USS( sRelId ),
+ FSEND );
+
+ mpFS->singleElementNS( mnXmlNamespace, XML_embed, FSEND );
+
+ // pic element
+ SdrObject* pSdrOLE2( GetSdrObjectFromXShape( xShape ) );
+ if ( pSdrOLE2 && pSdrOLE2->ISA( SdrOle2Obj ) )
+ {
+ Graphic* pGraphic = ((SdrOle2Obj*)pSdrOLE2)->GetGraphic();
+ if ( pGraphic )
+ WriteGraphicObjectShapePart( xShape, pGraphic );
+ }
+
+ mpFS->endElementNS( mnXmlNamespace, XML_oleObj );
+
+ mpFS->endElementNS( XML_a, XML_graphicData );
+ mpFS->endElementNS( XML_a, XML_graphic );
+
+ mpFS->endElementNS( mnXmlNamespace, XML_graphicFrame );
+ }
+ }
+ }
}
}
return *this;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 04:20:25 +0000