diff options
author | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-09-04 14:14:39 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-11-28 11:54:17 +0100 |
commit | 082cdbc991a2e31556bab53a5b8214cb89138354 (patch) | |
tree | 44eb08e6298928643455ada1435f7ca9383c331d /include/svx/xmlgrhlp.hxx | |
parent | 913f77dc5af13d5ceabf5c9fac2a870ebb7ccdea (diff) |
tdf#109202: Convert images to desired format in (f)odt filter
Pass down mimetype to SvXMLGraphicHelper
Change-Id: I9c81c06d2a1d6168704440094081e99d0bcbbff9
Reviewed-on: https://gerrit.libreoffice.org/41893
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'include/svx/xmlgrhlp.hxx')
-rw-r--r-- | include/svx/xmlgrhlp.hxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 0c6eaa1d2124..9aff143b3b04 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -59,6 +59,7 @@ class SVX_DLLPUBLIC SvXMLGraphicHelper final : public cppu::WeakComponentImplHel GraphicOutputStreamVector maGrfStms; URLSet maURLSet; SvXMLGraphicHelperMode meCreateMode; + OUString maOutputMimeType; bool mbDirect; SVX_DLLPRIVATE static bool ImplGetStreamNames( const OUString& rURLStr, @@ -82,7 +83,8 @@ class SVX_DLLPUBLIC SvXMLGraphicHelper final : public cppu::WeakComponentImplHel virtual ~SvXMLGraphicHelper() override; void Init( const css::uno::Reference < css::embed::XStorage >& xXMLStorage, SvXMLGraphicHelperMode eCreateMode, - bool bDirect ); + bool bDirect, + const OUString& rGraphicMimeType = OUString() ); virtual void SAL_CALL disposing() override; @@ -91,8 +93,12 @@ public: static rtl::Reference<SvXMLGraphicHelper> Create( const css::uno::Reference < css::embed::XStorage >& rXMLStorage, SvXMLGraphicHelperMode eCreateMode, - bool bDirect = true ); - static rtl::Reference<SvXMLGraphicHelper> Create( SvXMLGraphicHelperMode eCreateMode ); + bool bDirect = true, + const OUString& rGraphicMimeType = OUString() ); + static rtl::Reference<SvXMLGraphicHelper> Create( SvXMLGraphicHelperMode eCreateMode, + const OUString& rMimeType = OUString() ); + +public: // XGraphicObjectResolver virtual OUString SAL_CALL resolveGraphicObjectURL( const OUString& aURL ) override; |