diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-12-19 23:55:34 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-12-20 00:56:07 +0100 |
| commit | d60398ff5b42ff77a4002dcd13b7fb8c9a73eade (patch) | |
| tree | 2a4e19b4ba3299dc328e60bd1f865e618fcc0131 /include/oox/ole | |
| parent | 9d0d41f0f3c5215770bc7246a089d54a7244df55 (diff) | |
oox: save ProgId on import, and use it in ShapeExport::WriteOLE2Shape()
Uses the same approach as DOCX import to preserve the ProgID; it would
be much better if the MediaType of the stream were preserved instead and
the other things derived from that, but this here was rather quick to do...
This makes the round-tripping of OOXML OLEs in PPTX work again, which
was broken by an earlier commit.
Change-Id: Ic7d0362f0c14bf0e522185713666bcd58db2cf64
Diffstat (limited to 'include/oox/ole')
| -rw-r--r-- | include/oox/ole/oleobjecthelper.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/oox/ole/oleobjecthelper.hxx b/include/oox/ole/oleobjecthelper.hxx index febd097ae546..35e16b05add6 100644 --- a/include/oox/ole/oleobjecthelper.hxx +++ b/include/oox/ole/oleobjecthelper.hxx @@ -57,7 +57,8 @@ class OleObjectHelper { public: explicit OleObjectHelper( - const css::uno::Reference< css::lang::XMultiServiceFactory >& rxModelFactory ); + const css::uno::Reference<css::lang::XMultiServiceFactory>& rxModelFactory, + const css::uno::Reference<css::frame::XModel>& xModel); ~OleObjectHelper(); bool importOleObject( @@ -66,6 +67,7 @@ public: const css::awt::Size& rObjSize ); private: + css::uno::Reference<css::frame::XModel> m_xModel; css::uno::Reference< css::document::XEmbeddedObjectResolver > mxResolver; const OUString maEmbeddedObjScheme; sal_Int32 mnObjectId; |