diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-29 20:38:18 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-10-03 10:31:30 +0200 |
| commit | 0e9d68707f0e76054375334fc28b6abacad77cb3 (patch) | |
| tree | 5e2999df23932f583c54fbe04c74995aca6c2eb7 | |
| parent | b5ddcd4b3dc7395dd6f8bbf86c85465ccb0013ce (diff) | |
Resolves: fdo#79131 crash in EnhancedCustomShapeTypeNames::Get
Change-Id: Ib21a4a1574119120f09d4ecac73b93a0f2f6739f
(cherry picked from commit 65277f994ae25d930c15aebba0ed19f8de0abba1)
Reviewed-on: https://gerrit.libreoffice.org/11704
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx | 2 | ||||
| -rw-r--r-- | sw/qa/core/data/ooxml/pass/fdo79131.docx | bin | 0 -> 10426 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index 8e7966291913..6eca6e9b6e15 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 Binary files differnew file mode 100644 index 000000000000..5f10d9c86fb0 --- /dev/null +++ b/sw/qa/core/data/ooxml/pass/fdo79131.docx |