[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - sc/source

[Eike Rathke]

 sc/source/core/data/document.cxx |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 8a4737360ea28296f7ac1d3cddf2e27b3ac25915
Author: Eike Rathke <erack at redhat.com>
Date:   Tue May 27 12:31:30 2014 +0200

    resolved rhbz#1101224 do not attempt to obtain names for NULL tabs
    
    This happened when the HTML export via clipboard tried to resolve
    conditional formats, where we have a temporary instance of a document
    containing only the sheet to be exported.
    
    Change-Id: Ic7498a1cab3eabede74773868287a2cc3edef052
    (cherry picked from commit 17979abf4fde202cae231be19a218be3fe27d04c)
    Reviewed-on: https://gerrit.libreoffice.org/9510
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index 47164be..2ec7d68 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -259,9 +259,14 @@ std::vector<OUString> ScDocument::GetAllTableNames() const
     TableContainer::const_iterator it = maTabs.begin(), itEnd = maTabs.end();
     for (; it != itEnd; ++it)
     {
+        // Positions need to be preserved for ScCompiler and address convention
+        // context, so still push an empty string for NULL tabs.
         OUString aName;
-        const ScTable& rTab = **it;
-        rTab.GetName(aName);
+        if (*it)
+        {
+            const ScTable& rTab = **it;
+            rTab.GetName(aName);
+        }
         aNames.push_back(aName);
     }