diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-07-03 15:16:58 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-07-06 14:22:48 +0200 |
| commit | 34c1d80d91b62afa74d0566d88b7f4fbd0dcb433 (patch) | |
| tree | 31d2078adf60cb6289277ff08dd8dde444491e99 /include | |
| parent | 07f66a2bdbd50dc4e3c2318a88e7684f67f494d2 (diff) | |
tdf#117901 Write signature line images as emf to ooxml
Change-Id: Idbf60be3cef2d9dde454da0279d2810488b1e157
Reviewed-on: https://gerrit.libreoffice.org/56871
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit 7bafb7ca8ef9467f5c55766d2a38ba0d0a60837c)
Reviewed-on: https://gerrit.libreoffice.org/56986
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/graphicmimetype.hxx | 2 | ||||
| -rw-r--r-- | include/svx/xoutbmp.hxx | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/comphelper/graphicmimetype.hxx b/include/comphelper/graphicmimetype.hxx index ad081c46e2e5..6b8ed4293805 100644 --- a/include/comphelper/graphicmimetype.hxx +++ b/include/comphelper/graphicmimetype.hxx @@ -12,6 +12,7 @@ #include <comphelper/comphelperdllapi.h> #include <rtl/ustring.hxx> +#include <vcl/salctype.hxx> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -26,6 +27,7 @@ public: static OUString GetMimeTypeForXGraphic(css::uno::Reference<css::graphic::XGraphic> xGraphic); static OUString GetMimeTypeForImageStream(css::uno::Reference<css::io::XInputStream> xInputStream); + static OUString GetMimeTypeForConvertDataFormat(ConvertDataFormat convertDataFormat); }; } diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx index ba33ed989746..5a02045da52f 100644 --- a/include/svx/xoutbmp.hxx +++ b/include/svx/xoutbmp.hxx @@ -25,6 +25,8 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <svx/svxdllapi.h> #include <o3tl/typed_flags_set.hxx> +#include <vcl/salctype.hxx> + enum class XOutFlags { NONE = 0x00000000, @@ -62,7 +64,9 @@ public: const OUString& rFilterName, const XOutFlags nFlags, const Size* pMtfSize_100TH_MM = nullptr, const css::uno::Sequence< css::beans::PropertyValue >* pFilterData = nullptr); - static bool GraphicToBase64(const Graphic& rGraphic, OUString& rOUString, bool bAddPrefix=true); + static bool GraphicToBase64(const Graphic& rGraphic, OUString& rOUString, + bool bAddPrefix = true, + ConvertDataFormat aTargetFormat = ConvertDataFormat::Unknown); static ErrCode ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL, GraphicFilter& rFilter, const sal_uInt16 nFormat, |