[Libreoffice-commits] core.git: Branch 'feature/cib_contract6721b' - 3 commits - cui/source sw/source

[Samuel Mehrbrodt (via logerrit)]

 cui/source/dialogs/SignSignatureLineDialog.cxx |    1 +
 sw/source/uibase/shells/basesh.cxx             |    2 +-
 sw/source/uibase/uno/unotxdoc.cxx              |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2c8d33cd1d03ba48103ccda245cd57b0d86f5733
Author:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Mon Jan 18 15:51:47 2021 +0100
Commit:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
CommitDate: Thu Jul 15 16:09:32 2021 +0200

    "Update all" should do a full reformatting
    
    Change-Id: I05b06e4b345c2125f4fd5272fc6a3354396a29ed
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109554
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
    (cherry picked from commit 4ecabed3ac5aff26bee6d195136ca819cbeb995c)

diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 44d78d6e5821..5fe0078a2b6c 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -733,7 +733,7 @@ void SwBaseShell::Execute(SfxRequest &rReq)
                 rDis.Execute( FN_UPDATE_FIELDS );
                 rDis.Execute( FN_UPDATE_TOX );
                 rDis.Execute( FN_UPDATE_CHARTS );
-                rSh.CalcLayout();
+                rSh.Reformat();
             }
             break;
 
commit 0d466f118444aa3361b634eb3b6fa3143c220565
Author:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Mon Jan 18 12:07:16 2021 +0100
Commit:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
CommitDate: Thu Jul 15 16:05:52 2021 +0200

    XTextDocument::refresh should do a full reformatting
    
    Change-Id: Ia92e10e43cb8254b6dd35db03462b87d0fe93f45
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109538
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
    (cherry picked from commit cbbfed893616f804cb6557185ddda26c0cef2ed6)

diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index b65386a7c392..482b7b90d100 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2216,7 +2216,7 @@ void SwXTextDocument::refresh()
     SwViewShell *pViewShell = pDocShell->GetWrtShell();
     NotifyRefreshListeners();
     if(pViewShell)
-        pViewShell->CalcLayout();
+        pViewShell->Reformat();
 }
 
 void SAL_CALL SwXTextDocument::addRefreshListener(
commit 920fba6c66831929d2f964dce58e04c95978205e
Author:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
AuthorDate: Thu Jul 15 16:04:16 2021 +0200
Commit:     Samuel Mehrbrodt <samuel.mehrbrodt at allotropia.de>
CommitDate: Thu Jul 15 16:04:16 2021 +0200

    Add missing include
    
    Change-Id: Ibd040ea1d6fa750a040b9f3eb87fd34877e56851

diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index da31418a7161..e11dad749676 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -21,6 +21,7 @@
 #include <comphelper/storagehelper.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
+#include <sfx2/filedlghelper.hxx>
 #include <sfx2/objsh.hxx>
 #include <svx/xoutbmp.hxx>
 #include <tools/date.hxx>