From 653e49371444e5ae48b1570e85822577fb8fd147 Mon Sep 17 00:00:00 2001
From: Szymon Kłos <szymon.klos@collabora.com>
Date: Mon, 11 Sep 2017 10:53:47 +0200
Subject: tdf#112304 Revert "Watermark: not visible if page background was set"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 39c08074a286855dd014ce1c30b8f7ef95b10242.
Fixed by: I69517efb7d82acd719d6a27a09ba61554dbf1ec9

Change-Id: Icd45b3f55292670ff7338a367eba212453a0687e
Reviewed-on: https://gerrit.libreoffice.org/42155
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'writerfilter')

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 229bfa71be2d..2cd7f7fff6c2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -88,7 +88,7 @@
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <unotools/mediadescriptor.hxx>
-#include <editeng/unoprnms.hxx>
+
 
 
 
@@ -2185,14 +2185,6 @@ void DomainMapper_Impl::PopShapeContext()
             {
             }
         }
-        // Move Watermark upper to be visible if page background is set
-        uno::Reference<drawing::XShape> xShape( xObj, uno::UNO_QUERY_THROW );
-        uno::Reference<container::XNamed> xNamed( xShape, uno::UNO_QUERY );
-        if ( xNamed.is() && xNamed->getName().match( "PowerPlusWaterMarkObject" ) )
-        {
-            uno::Reference<beans::XPropertySet> xShapePropertySet( xShape, uno::UNO_QUERY );
-            xShapePropertySet->setPropertyValue( UNO_NAME_MISC_OBJ_LAYERID, uno::makeAny( sal_Int16(1) ) );
-        }
         m_aAnchoredStack.pop();
     }
     m_bFrameBtLr = false;
-- 
cgit