[Libreoffice-commits] core.git: sc/qa sc/source

[Caolán McNamara (via logerrit)]

 sc/qa/unit/data/slk/pass/ofz14093-1.slk |    1 +
 sc/source/core/data/table2.cxx          |   10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 6db38ca2cc9cafb353dd2ca2f4a617d5fa3eb51d
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Apr 6 14:03:11 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Apr 6 16:44:07 2019 +0200

    ofz#14093 bunch of new ofz detected crashes related to tdf#50916
    
    since...
    
    commit 7282014e362a1529a36c88eb308df8ed359c2cfa
    Date:   Fri Feb 1 15:15:16 2019 +0100
    
        tdf#50916 Makes numbers of columns dynamic.
    
    Change-Id: I7588e34a9a52cde0d38dd9c1f15e6bbdb3601241
    Reviewed-on: https://gerrit.libreoffice.org/70345
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/qa/unit/data/slk/pass/ofz14093-1.slk b/sc/qa/unit/data/slk/pass/ofz14093-1.slk
new file mode 100644
index 000000000000..7667ddb0a00a
--- /dev/null
+++ b/sc/qa/unit/data/slk/pass/ofz14093-1.slk
@@ -0,0 +1 @@
+C;X152;K" 
\ No newline at end of file
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index a74fc3a9a289..b049ff193b66 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -1405,11 +1405,13 @@ bool ScTable::TestCopyScenarioTo( const ScTable* pDestTab ) const
 bool ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const OUString& rString,
                          const ScSetStringParam * pParam )
 {
-    if (ValidColRow(nCol,nRow))
-        return aCol[nCol].SetString(
-            nRow, nTabP, rString, pDocument->GetAddressConvention(), pParam );
-    else
+    if (!ValidColRow(nCol,nRow))
+    {
         return false;
+    }
+
+    return CreateColumnIfNotExists(nCol).SetString(
+        nRow, nTabP, rString, pDocument->GetAddressConvention(), pParam);
 }
 
 bool ScTable::SetEditText( SCCOL nCol, SCROW nRow, std::unique_ptr<EditTextObject> pEditText )