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

[Stephan Bergmann (via logerrit)]

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

New commits:
commit 6a195fb60c091e4e42111fb8c23324badacb35b7
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Mon Jun 8 22:44:40 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Jun 9 13:22:35 2020 +0200

    tdf#126025: Non-const GetPropertyValueByName must use non-const Sequence []
    
    ...which internally calls getArray to make sure it references a unique sequence.
    Regression introduced with 85f28ec44a2c169c91dac9346e9c71feda6a6cab "Clean up C-
    style casts from pointers to void".
    
    Change-Id: Id80b75f06322c65fc31040cc0b1892fe3a0aeaab
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95862
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit b505cd8635171e39d055b9a800f672a6313d8cea)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95873
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index 095aa6cec868..b67a8d6eca54 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -90,7 +90,7 @@ css::uno::Any* SdrCustomShapeGeometryItem::GetPropertyValueByName( const OUStrin
             PropertyPairHashMap::iterator aHashIter( aPropPairHashMap.find( PropertyPair( rSequenceName, rPropName ) ) );
             if ( aHashIter != aPropPairHashMap.end() )
             {
-                pRet = const_cast<css::uno::Any *>(&(*rSecSequence)[ (*aHashIter).second ].Value);
+                pRet = &const_cast<css::uno::Sequence<css::beans::PropertyValue> &>(*rSecSequence)[ (*aHashIter).second ].Value;
             }
         }
     }