diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-12-16 10:16:02 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-12-17 11:57:24 +0100 |
| commit | f21f0f0ff656880149cfdfd34b8984c9541bca24 (patch) | |
| tree | ce3a3171c03a0f71d9b1931cb2ffd20d25f9b8c0 /include | |
| parent | Bump version to 21.06.10.1 (diff) | |
| download | core-f21f0f0ff656880149cfdfd34b8984c9541bca24.tar.gz core-f21f0f0ff656880149cfdfd34b8984c9541bca24.zip | |
VML import: handle <v:imagedata gain="..." blacklevel="...">
co-21.06.10-1
Map it to (the UNO API of) GraphicDrawMode::Watermark, similar to what
the binary import does in SvxMSDffManager::ImportGraphic() and how the
drawingML import does it in
oox::drawingml::GraphicProperties::pushToPropMap().
On export, the drawingML export is used, and that already maps
GraphicDrawMode::Watermark to <a:lum bright="70000" contrast="-70000">.
(cherry picked from commit 90556b6df0f6378fb60d7dee18b2f5d275ece530)
Conflicts:
oox/qa/unit/vml.cxx
Change-Id: I33986a03bf3d3863da5c5b1f0a2e0da0fa595c9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126949
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/oox/vml/vmlshape.hxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 0e50e5b6ee1f..ad001c3e6e41 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -113,6 +113,12 @@ struct ShapeTypeModel OptValue<OUString> moCropTop; ///< Specifies how much to crop the image from the top down as a fraction of picture size. OUString maLayoutFlowAlt; ///< Specifies the alternate layout flow for text in textboxes. + /// An adjustment for the intensity of all colors, i.e. contrast, on a 0..0x10000 scale. + sal_Int32 mnGain = 0x10000; + + /// The image brightness, on a 0..0x10000 scale. + sal_Int16 mnBlacklevel = 0; + explicit ShapeTypeModel(); void assignUsed( const ShapeTypeModel& rSource ); |