diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-06-13 10:22:58 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-06-17 13:41:14 +0200 |
| commit | 721efbeb117962e9b0cd547b51ede4a6736042a6 (patch) | |
| tree | 311ec0d3eef3a57e79ea378a3ad3ad31cac0494d | |
| parent | a11f4a757c8e937151e64a202f2e8aaa8d5e4300 (diff) | |
tdf#108494 incorrect Watermark position
Change-Id: Iec1dba66604af008ad8b6b1c20cd508048144463
Reviewed-on: https://gerrit.libreoffice.org/38722
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit f9aa57181be0cd02d07fb463410b5c1dde11ea1e)
Reviewed-on: https://gerrit.libreoffice.org/38891
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
| -rw-r--r-- | sw/source/core/edit/edfcol.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 23f16bb8bbf9..c2cf6252dec0 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -369,6 +369,10 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& rWatermark) if (!bHeaderIsOn) xPageStyle->setPropertyValue(UNO_NAME_HEADER_IS_ON, uno::makeAny(true)); + // backup header height + sal_Int32 nOldValue; + xPageStyle->getPropertyValue(UNO_NAME_HEADER_HEIGHT) >>= nOldValue; + // If the header already contains a document header field, no need to do anything. uno::Reference<text::XText> xHeaderText; xPageStyle->getPropertyValue(UNO_NAME_HEADER_TEXT) >>= xHeaderText; @@ -515,6 +519,11 @@ void SwEditShell::SetWatermark(const SfxWatermarkItem& rWatermark) xNamed->setName(sWatermark); xLockable->removeActionLock(); } + + // tdf#108494 the header height was switched to height of a watermark + // and shape was moved to the lower part of a page + xPageStyle->setPropertyValue(UNO_NAME_HEADER_HEIGHT, uno::makeAny((sal_Int32)11)); + xPageStyle->setPropertyValue(UNO_NAME_HEADER_HEIGHT, uno::makeAny(nOldValue)); } } |