[Libreoffice-commits] core.git: svx/source

Julien Nabet serval2412 at yahoo.fr
Sat Apr 29 05:40:42 UTC 2017


 svx/source/unodraw/unoshap2.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit ffd7e06be3a05a7912dc4fc507e03865a01c894c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Apr 27 07:10:16 2017 +0200

    Avoid warning about FlushCustomShapeUnoApiObjects
    
    See http://nabble.documentfoundation.org/Unknown-FlushCustomShapeUnoApiObjects-property-xmloff-svx-td4212940.html
    
    Change-Id: Ia82beb75015d09c847268c2f696b79fd8c395a29
    Reviewed-on: https://gerrit.libreoffice.org/37012
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 779155c1f51a..48c0158b8fb9 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1691,6 +1691,9 @@ void SAL_CALL SvxCustomShape::setPropertyValue( const OUString& aPropertyName, c
             // will free the involved EditEngine and VirtualDevice.
             pTarget->mxCustomShapeEngine.set(nullptr);
         }
+        // since this case is only for the application cores
+        // we should return from this function now
+        return;
     }
 
     bool bCustomShapeGeometry = pObject && aPropertyName == "CustomShapeGeometry";


More information about the Libreoffice-commits mailing list