summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorGülşah Köse <gulsah.kose@collabora.com>2019-10-17 18:23:07 +0300
committerAndras Timar <andras.timar@collabora.com>2019-10-18 08:53:25 +0200
commit49e0127419dbad8a75f1899db02115a2fe54aacd (patch)
treef1be6b6ae6b406e91372e43244ce14de34bc32d4 /oox
parent2fca4bcfda927c6e63f67f70a3331d2d748e65ca (diff)
tdf#128209 Add check for crash handling 3D rotation.
Handling text 3D z rotation works only for custom shapes. Prevent to use it for other services. Change-Id: I99971bccc2f7a4b08e212e467343cb661869804a Reviewed-on: https://gerrit.libreoffice.org/80974 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/textbodypropertiescontext.cxx7
1 files changed, 5 insertions, 2 deletions
diff --git a/oox/source/drawingml/textbodypropertiescontext.cxx b/oox/source/drawingml/textbodypropertiescontext.cxx
index cac8bc10f89e..d696b4c3ac70 100644
--- a/oox/source/drawingml/textbodypropertiescontext.cxx
+++ b/oox/source/drawingml/textbodypropertiescontext.cxx
@@ -172,9 +172,12 @@ ContextHandlerRef TextBodyPropertiesContext::onCreateContext( sal_Int32 aElement
break;
case A_TOKEN( scene3d ): // CT_Scene3D
- return new Scene3DPropertiesContext( *this, mpShapePtr->get3DProperties() );
- break;
+ {
+ if(mpShapePtr && mpShapePtr->getServiceName() == "com.sun.star.drawing.CustomShape")
+ return new Scene3DPropertiesContext( *this, mpShapePtr->get3DProperties() );
+ break;
+ }
// EG_Text3D
case A_TOKEN( sp3d ): // CT_Shape3D