diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-12-15 14:18:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-12-15 19:55:56 +0100 |
| commit | 332651107d73b085458fa90906922d004354eb26 (patch) | |
| tree | cd17243afe8bd082b6720474231c61c8a8f08db6 /include | |
| parent | 59cc30be18c06dbcb78a0e98130c086bc34ef2a9 (diff) | |
filter: add BaseURL parameter to SvxMSDffManager::ImportOLE()
... mainly for the (unlikely) case of ODF embedded objects in MSO binary
files, which can be created by toggling the
Tools->Options->Load/Save->Microsoft Office export settings.
Change-Id: I270f1516b70b20ec0b60cfbd17c2c327c3d9efd0
(cherry picked from commit 36a0abed4ab27abd77b502070d4e17e70e6afe7b)
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 28b7b27b74ae..28ae9184c443 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -466,7 +466,8 @@ protected: sal_uInt32 nConvertFlags, SotStorage& rSrcStg, const css::uno::Reference < css::embed::XStorage >& xDestStg, const Graphic& rGrf, - const Rectangle& rVisArea ); + const Rectangle& rVisArea, + OUString const& rBaseURL); // the following methods need to be overridden for Excel imports static bool ProcessClientAnchor( SvStream& rStData, @@ -687,7 +688,8 @@ public: SvStream* pDataStrrm, ErrCode& rError, sal_uInt32 nConvertFlags, - sal_Int64 nAspect ); + sal_Int64 nAspect, + OUString const& rBaseURL); /** Create connections between shapes. This method should be called after a page is imported. |