[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

[Szymon Kłos]

 sw/source/core/edit/edfcol.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 62d34ffaef1ec248d8c67138064155b23f8c7645
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Tue Oct 31 10:08:28 2017 +0100

    Watermark: set Auto size
    
    Change-Id: I8800094387ec5fdc49e21c7c02bfc419f13998ed
    Reviewed-on: https://gerrit.libreoffice.org/44105
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index 6d8ac2eb87e6..2201ada112c3 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -61,6 +61,7 @@
 #include <sfx2/watermarkitem.hxx>
 
 #define WATERMARK_NAME "PowerPlusWaterMarkObject"
+#define WATERMARK_AUTO_SIZE sal_uInt32(1)
 
 namespace
 {
@@ -466,6 +467,7 @@ void lcl_placeWatermarkInHeader(const SfxWatermarkItem& rWatermark,
         xPropertySet->setPropertyValue(UNO_NAME_TEXT_WRAP, uno::makeAny(text::WrapTextMode_THROUGHT));
         xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT_RELATION, uno::makeAny(static_cast<sal_Int16>(text::RelOrientation::PAGE_PRINT_AREA)));
         xPropertySet->setPropertyValue(UNO_NAME_CHAR_FONT_NAME, uno::makeAny(sFont));
+        xPropertySet->setPropertyValue(UNO_NAME_CHAR_HEIGHT, uno::makeAny(WATERMARK_AUTO_SIZE));
         xPropertySet->setPropertyValue("Transformation", uno::makeAny(aMatrix));
         xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT, uno::makeAny(static_cast<sal_Int16>(text::HoriOrientation::CENTER)));
         xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT, uno::makeAny(static_cast<sal_Int16>(text::VertOrientation::CENTER)));