summaryrefslogtreecommitdiff
path: root/writerfilter/source
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2017-06-16 14:54:35 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2017-06-23 15:27:09 +0200
commit2f812014ae9f8203de967ed4ec40834d7f56388a (patch)
tree7a87510c443e2d3feb28c923546b859021bc8df6 /writerfilter/source
parentd86170942e322aabd928bf56854cb7cf08bd13a1 (diff)
Watermark: auto size in the RTF
When Watermark size is set to Auto in the MSO, the saved value is equal 1pt. Before this patch in this case Watermark was invisible due to small size. Change-Id: Ia2028a6547cf98dd31031305bcc5375625b83fe0 Reviewed-on: https://gerrit.libreoffice.org/38883 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit bd72163f21375cd216dcd25568b05527063ea726) Reviewed-on: https://gerrit.libreoffice.org/39131 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'writerfilter/source')
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 9f0ba006785c..59ab0633db75 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -919,6 +919,8 @@ void RTFSdrImport::resolve(RTFShape& rShape, bool bClose, ShapeOrPict const shap
it->Value <<= aPropertyValues;
xPropertySet->setPropertyValue("CustomShapeGeometry", uno::makeAny(comphelper::containerToSequence(aGeomPropVec)));
+ xPropertySet->setPropertyValue("TextAutoGrowHeight", uno::makeAny(false));
+ xPropertySet->setPropertyValue("TextAutoGrowWidth", uno::makeAny(false));
}
if (!boost::logic::indeterminate(obRelFlipV) && xPropertySet.is())