summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2021-06-04 15:58:01 +0200
committerMiklos Vajna <vmiklos@collabora.com>2021-06-04 18:03:10 +0200
commit04716690f6c5193f15868bc71e7d17c53e085a54 (patch)
tree3bab71a0ff00553023b4fab9635dc37e7b235bd5 /include
parent5ffcf2fa69aa6c79b07b1cf04c8cf6c85c5f6b83 (diff)
sw HTML export: allow custom DPI for the bitmaps of shapes
But leave the CSS pixel size of them unchanged in the HTML markup. Also add some documentation on the various options, so one doesn't have to dig them out from testcases. Change-Id: I6c6ee4e9c98d674f44e7c5835f2e6a6737e13f34 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116722 Reviewed-by: Miklos Vajna <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'include')
-rw-r--r--include/svx/svdxcgv.hxx2
-rw-r--r--include/vcl/vectorgraphicdata.hxx4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index ea96eefe180d..0afaa7c6ad6f 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -58,7 +58,7 @@ public:
// Draw all marked objects onto a bitmap, with the display's color depth
// and resolution
- BitmapEx GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked = false) const;
+ BitmapEx GetMarkedObjBitmapEx(bool bNoVDevIfOneBmpMarked = false, const std::optional<Size>& rTargetDPI = std::nullopt) const;
// Copy all marked objects to a new model, consisting of exactly one page,
// with the flag PageNotValid set. This means, that only the page's objects
diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx
index 3057ea82b8b8..a3c88de7caa0 100644
--- a/include/vcl/vectorgraphicdata.hxx
+++ b/include/vcl/vectorgraphicdata.hxx
@@ -28,6 +28,7 @@
#include <deque>
#include <memory>
#include <algorithm>
+#include <optional>
namespace com::sun::star::graphic { class XPrimitive2D; }
struct WmfExternal;
@@ -42,7 +43,8 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx(
const std::deque< css::uno::Reference< css::graphic::XPrimitive2D > >& rSequence,
const basegfx::B2DRange& rTargetRange,
const sal_uInt32 nMaximumQuadraticPixels = 500000,
- const o3tl::Length eTargetUnit = o3tl::Length::mm100);
+ const o3tl::Length eTargetUnit = o3tl::Length::mm100,
+ const std::optional<Size>& rTargetDPI = std::nullopt);
enum class VectorGraphicDataType