sc/inc/attrib.hxx | 2 --
sc/source/ui/unoobj/fmtuno.cxx | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
New commits:
commit e225b0925b371bd33d40d97c240bd3165b628464
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Tue Dec 23 21:26:35 2014 +0100
Don't crash when nIndex < 0
Change-Id: I24ba4365d9d5f78e875ea51382c6b1f864b2e5fe
diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx
index 1c61dbf..aa99980 100644
--- a/sc/source/ui/unoobj/fmtuno.cxx
+++ b/sc/source/ui/unoobj/fmtuno.cxx
@@ -349,7 +349,7 @@ void SAL_CALL ScTableConditionalFormat::removeByIndex(
sal_Int32 nIndex )
{
SolarMutexGuard aGuard;
- if (nIndex < static_cast<sal_Int32>(aEntries.size()))
+ if (nIndex < static_cast<sal_Int32>(aEntries.size()) && nIndex >= 0)
{
std::vector<ScTableConditionalEntry*>::iterator iter =
aEntries.begin()+nIndex;
commit 2e9a3ad1c6ce34af70d007cb6eda54888139f250
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Tue Dec 23 19:58:19 2014 +0100
ScCondFormatItem::RemoveCondFormatData() is not implemented
Change-Id: I00b0fcf60725b7c728b1d92734f27b914d57b1a3
diff --git a/sc/inc/attrib.hxx b/sc/inc/attrib.hxx
index ab08306..42535b9 100644
--- a/sc/inc/attrib.hxx
+++ b/sc/inc/attrib.hxx
@@ -380,10 +380,8 @@ public:
const std::vector<sal_uInt32>& GetCondFormatData() const { return maIndex;}
void AddCondFormatData( sal_uInt32 nIndex );
void SetCondFormatData( const std::vector<sal_uInt32>& aIndex );
- void RemoveCondFormatData( sal_uInt32 nIndex );
private:
-
std::vector<sal_uInt32> maIndex;
};
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
