svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 2 +-
sw/qa/core/data/ooxml/pass/fdo79131.docx |binary
2 files changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3c8eb2fe90622afce3ee935000f8f549b5d0efa7
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Sep 29 20:38:18 2014 +0100
Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::Get
Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f
(cherry picked from commit 65277f994ae25d930c15aebba0ed19f8de0abba1)
Reviewed-on: https://gerrit.libreoffice.org/11703
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
index 8e79662..6eca6e9 100644
--- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx
@@ -300,7 +300,7 @@ MSO_SPT EnhancedCustomShapeTypeNames::Get( const OUString&
rShapeType )
OUString EnhancedCustomShapeTypeNames::Get( const MSO_SPT eShapeType )
{
- return eShapeType <= mso_sptTextBox
+ return (eShapeType <= mso_sptTextBox && eShapeType >= mso_sptMin)
? OUString::createFromAscii( pNameTypeTableArray[ eShapeType ].pS )
: OUString();
}
diff --git a/sw/qa/core/data/ooxml/pass/fdo79131.docx
b/sw/qa/core/data/ooxml/pass/fdo79131.docx
new file mode 100644
index 0000000..5f10d9c
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/fdo79131.docx differ
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
