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

[Libreoffice Gerrit user]

 sc/source/core/data/document.cxx |    2 +-
 sw/source/uibase/app/apphdl.cxx  |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8a8e4e3fc338994883fbb7db8fb9447e1f99f012
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Thu Aug 30 12:59:06 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Sep 3 10:12:51 2018 +0200

    tdf#112454 Also consider last SCTAB in loop
    
    Since 'rRange.aEnd.Tab()' is valid, it needs to
    be included in the loop to get a valid result.
    
    Reviewed-on: https://gerrit.libreoffice.org/59798
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    (cherry picked from commit 03b361673d04f31e0602d2988e4df26eaeb53a34)
    
     Conflicts:
            sc/source/core/data/document.cxx
    
    Backported.
    
    Change-Id: I7b2447e059dc03444c56e7fc0b113e1b618dd510
    Reviewed-on: https://gerrit.libreoffice.org/59878
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Jenkins
    (cherry picked from commit 9858b7004856a632778dde0dc7edddb14b673194)

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 1c06c813c2f7..f5a3218301f5 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -6730,7 +6730,7 @@ bool ScDocument::ContainsNotesInRange( const ScRangeList& rRange ) const
     for( size_t i = 0; i < rRange.size(); ++i)
     {
         const ScRange* pRange = rRange[i];
-        for( SCTAB nTab = pRange->aStart.Tab(); nTab < pRange->aEnd.Tab(); ++nTab )
+        for( SCTAB nTab = pRange->aStart.Tab(); nTab <= pRange->aEnd.Tab(); ++nTab )
         {
             bool bContainsNote = maTabs[nTab]->ContainsNotesInRange( *pRange );
             if(bContainsNote)
commit d576955f513509a2740ab2e40b4523bf1a6b17ac
Author:     Ilhan Yesil <ilhanyesil at gmx.de>
AuthorDate: Tue Aug 28 18:39:57 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Sep 3 10:12:50 2018 +0200

    tdf#117823 Save mail merge config item in new view
    
    The config object is now saved in a newly created document.
    
    Regression from commit id 00fa85e701d4a8984cfa3a24c9b7a3963b031fa0.
    
    Change-Id: I2265de1dd69038d447e28dfda2e85c7cf89903c6
    Reviewed-on: https://gerrit.libreoffice.org/59728
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>
    (cherry picked from commit 9d847ff825c1c94286e8ab864a88fc5375d9341c)
    Reviewed-on: https://gerrit.libreoffice.org/59803
    (cherry picked from commit 55498d196c31c098b02da5f4638fc0ca155b60b4)

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 27dbf41be1ce..5952313aabd4 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -532,6 +532,7 @@ IMPL_LINK_NOARG( SwMailMergeWizardExecutor, EndDialogHdl, Dialog&, void )
             std::shared_ptr<SwMailMergeConfigItem> xMMConfig = m_pView->GetMailMergeConfigItem();
             if (pNewView)
             {
+                pNewView->SetMailMergeConfigItem(xMMConfig);
                 m_pView = pNewView;
                 xMMConfig->DocumentReloaded();
                 //new source view!