diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-09-11 10:53:47 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-09-12 21:16:23 +0200 |
| commit | 348bc3c6a8142ed605e260ae930d76e6cec7f656 (patch) | |
| tree | 9bfa7b23b1d97cce51ba6d36f5dead5554dcf0ff /writerfilter/source | |
| parent | 35f65ee050ee206e76f20e1a811177bc73972fa6 (diff) | |
tdf#112304 Revert "Watermark: not visible if page background was set"
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>
Reviewed-on: https://gerrit.libreoffice.org/42165
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'writerfilter/source')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 34b9f6b1601f..25751c12be4e 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -85,7 +85,7 @@ #include <comphelper/sequence.hxx> #include <comphelper/propertyvalue.hxx> #include <unotools/mediadescriptor.hxx> -#include <editeng/unoprnms.hxx> + @@ -2138,14 +2138,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; |