From 6b7239855d8babdc1bcc7742f79ce2df64d1e476 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 24 Oct 2014 16:21:51 +0200 Subject: fdo#82859 RTF import: don't try to set CustomShapeGeometry on a TextFrame Change-Id: I687fa609559f0484fe6bb804265243de154c3760 --- writerfilter/source/rtftok/rtfsdrimport.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'writerfilter') diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index fcb5b9c37b82..df1c1850f5af 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -824,7 +824,7 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap aPropertyValue.Value <<= aPath.getAsConstList(); aGeometry.push_back(aPropertyValue); } - if (!aGeometry.empty() && xPropertySet.is()) + if (!aGeometry.empty() && xPropertySet.is() && !m_bTextFrame) xPropertySet->setPropertyValue("CustomShapeGeometry", uno::Any(aGeometry.getAsConstList())); // Set position and size -- cgit -4.1'>distro/capgemini/cg-4.1 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/swext/Configuration_mediawiki.mk
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2021-12-16 10:16:02 +0100
committerMike Kaganski <mike.kaganski@collabora.com>2021-12-17 11:57:24 +0100
commitf21f0f0ff656880149cfdfd34b8984c9541bca24 (patch)
treece3a3171c03a0f71d9b1931cb2ffd20d25f9b8c0 /swext/Configuration_mediawiki.mk
parentd382e7c1decd39c4f3d8a25ce4e808e79b516e68 (diff)
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>