diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-08-18 15:13:52 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-08-25 16:21:39 +0200 |
| commit | 7deade09127367cc0345033062f689db92b08d19 (patch) | |
| tree | 38729a194059c6e2c7abe09dbfffde80969c453c /writerfilter | |
| parent | 6273f015108ffb10c40f97604a11ce2e3ec0a06d (diff) | |
Watermark: not visible if page background was set
Watermark was drawn under the page background.
It has to be placed on the upper layer to be visible.
Change-Id: I132a313eed6fb712aafdca14a38fe559aa4231c8
Reviewed-on: https://gerrit.libreoffice.org/41289
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/41557
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 25751c12be4e..34b9f6b1601f 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,6 +2138,14 @@ 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; |