[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sw/source

[Szymon Kłos]

 sw/source/uibase/app/docst.cxx |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 793fe2ead4b494174272afd04fbedfac1899f227
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Thu Sep 21 11:31:53 2017 +0200

    Watermark: apply when new page style is created
    
    Change-Id: I0d0103f8cc351ec87f7c3bf936ef4725a166d315
    Reviewed-on: https://gerrit.libreoffice.org/42581
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    (cherry picked from commit 22e94ab1860b1bdea8d107d4e8824f63c6b1c8c5)
    Reviewed-on: https://gerrit.libreoffice.org/42691
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index faa2ac13d814..d9313fbe941f 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -321,6 +321,14 @@ void SwDocShell::ExecStyleSheet( SfxRequest& rReq )
                 sName = SfxStyleDialog::GenerateUnusedName(*m_xBasePool);
 
             nRet = Edit( sName, sParent, nFamily, nMask, true, OString(), nullptr, rReq.IsAPI() );
+
+            // Update Watermark if new page style was created
+            if( nFamily == SfxStyleFamily::Page )
+            {
+                SwWrtShell* pShell = GetWrtShell();
+                const SfxWatermarkItem aWatermark = pShell->GetWatermark();
+                pShell->SetWatermark( aWatermark );
+            }
         }
         break;