[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/source

[Szymon Kłos]

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

New commits:
commit a61d03c2fffc882a8619e293034f1432b4099de4
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Wed May 24 12:59:26 2017 +0200

    tdf#108040 Don't turn on header to check if Watermark exist
    
    Change-Id: Ieaf42384248deb283f71743f68c059b384abaa1a
    Reviewed-on: https://gerrit.libreoffice.org/37985
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index c39ccadf3f81..4ffbd1263864 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -277,7 +277,7 @@ SfxWatermarkItem SwEditShell::GetWatermark()
         bool bHeaderIsOn = false;
         xPageStyle->getPropertyValue(UNO_NAME_HEADER_IS_ON) >>= bHeaderIsOn;
         if (!bHeaderIsOn)
-            xPageStyle->setPropertyValue(UNO_NAME_HEADER_IS_ON, uno::makeAny(true));
+            return SfxWatermarkItem();
 
         uno::Reference<text::XText> xHeaderText;
         xPageStyle->getPropertyValue(UNO_NAME_HEADER_TEXT) >>= xHeaderText;