diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-29 20:38:18 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-09-30 20:25:15 +0000 |
| commit | a2dda857b3d163a42c243566eaef9bc97e933779 (patch) | |
| tree | 72ca4f9b73231800c9e242b2d000168277e5747b | |
| parent | 4fca0fcd7801091d0469525821231dc319a23811 (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 88115ee89434..de2db7fdf836 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 |