diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-11-09 10:42:47 +0100 |
---|---|---|
committer | Petr Mladek <pmladek@suse.cz> | 2012-11-20 17:54:44 +0100 |
commit | cd134b0e7a6d1ac29dd3543d30cdcec34f5dfe92 (patch) | |
tree | 3ac5038ad31648e5acc1a7ac33fb0a090331bc83 /sw/source/filter/ww8/docxattributeoutput.hxx | |
parent | 0c12d92abcc4c61b64decf3063f6067f78a8d60f (diff) |
fdo#51550 fix DOCX export dataloss on non-math/chart OLE export
This is still not complete, but having the replacement graphic only is
far better than having nothing.
(cherry picked from commit bd6ae389008e110be62a335dfcd82c655d512e63)
Conflicts:
sw/source/filter/ww8/docxattributeoutput.cxx
Change-Id: I141a3de1a449f4261c7086e10f2c141b3f6cdb10
Reviewed-on: https://gerrit.libreoffice.org/1017
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.hxx')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.hxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 7fa6e4be5154..76bbdbe3b5b4 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -301,9 +301,14 @@ private: /// @see InitCollectedRunProperies(), WriteCollectedParagraphProperties() void WriteCollectedRunProperties(); - /// Output graphic fly frames. - void FlyFrameGraphic( const SwGrfNode& rGrfNode, const Size& rSize ); - void WriteOLE2Obj( const SdrObject* pSdrObj, const SwOLENode& rNode, const Size& rSize ); + /// Output graphic fly frames or replacement graphics for OLE nodes. + /// + /// For graphic frames, just use the first two parameters, for OLE + /// replacement graphics, set the first as 0, and pass the remaining three. + /// + /// @see WriteOLE2Obj() + void FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrmFmt* pOLEFrmFmt = 0, SwOLENode* pOLENode = 0); + void WriteOLE2Obj( const SdrObject* pSdrObj, SwOLENode& rNode, const Size& rSize, const SwFlyFrmFmt* pFlyFrmFmt); bool WriteOLEChart( const SdrObject* pSdrObj, const Size& rSize ); bool WriteOLEMath( const SdrObject* pSdrObj, const SwOLENode& rNode, const Size& rSize ); |