sc/source/core/data/documen4.cxx | 3 +--
sc/source/filter/excel/xihelper.cxx | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit f78fa7e9c72ab1bd3e6a19d5234651f379c44a08
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 12 15:14:53 2015 +0000
apparently calling match on a string with an index past the end is now fatal
assert on loading ooo55345-1.ppt etc
Change-Id: Ie76720e511674ddd883f7e397442a84838c1a1f4
diff --git a/sc/source/filter/excel/xihelper.cxx
b/sc/source/filter/excel/xihelper.cxx
index 3940b63..01ba6c1 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -623,7 +623,7 @@ void XclImpUrlHelper::DecodeUrl(
sal_Unicode cCurrDrive = 0;
OUString aDosBase( INetURLObject( rRoot.GetBasePath() ).getFSysPath(
INetURLObject::FSYS_DOS ) );
- if( aDosBase.match(":\\", 1) )
+ if (!aDosBase.isEmpty() && aDosBase.match(":\\", 1))
cCurrDrive = aDosBase[0];
const sal_Unicode* pChar = rEncodedUrl.getStr();
commit 20bea5c86f793b8e48d12ba487c9dee50792b0bd
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Feb 12 13:12:10 2015 +0000
coverity#1267653 Logically dead code
Change-Id: I371e719cc7e1ba2faa53535f25eca1d9074342bb
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index ba09b3b..01667c3 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -291,8 +291,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW
nRow1,
if (*itr == nTab1)
{
pCell = maTabs[*itr]->SetFormulaCell(nCol1, nRow1, pCell);
- assert(pCell); //NULL if nCol1/nRow1 is invalid, which it can't
be here
- if (!pCell)
+ if (!pCell) //NULL if nCol1/nRow1 is invalid, which it can't be
here
break;
}
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
