[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - svx/source

[Miklos Vajna]

 svx/source/customshapes/EnhancedCustomShapeEngine.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9d816d79cae3526c2da5f038b4b285f7cf00b762
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu May 21 15:12:10 2015 +0100

    tdf#91095 svx: avoid unconditional SdrObject -> SdrObjCustomShape static_cast
    
    Change-Id: I5ed86633e909c13f14ee382b4d9ec8f9c264df1d
    (cherry picked from commit 23cba1f55f1937c27c2a1bc27f9d3fd7b1ef1b47)
    Reviewed-on: https://gerrit.libreoffice.org/16178
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 2d26c30..f10eb61 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -273,7 +273,7 @@ Reference< drawing::XShape > SAL_CALL EnhancedCustomShapeEngine::render()
     throw ( RuntimeException, std::exception )
 {
     Reference< drawing::XShape > xShape;
-    SdrObject* pSdrObjCustomShape( GetSdrObjectFromXShape( mxShape ) );
+    SdrObject* pSdrObjCustomShape( PTR_CAST( SdrObjCustomShape, GetSdrObjectFromXShape( mxShape ) ) );
     if ( pSdrObjCustomShape )
     {
         // retrieving the TextPath property to check if feature is enabled