filter/source/msfilter/escherex.cxx | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
New commits:
commit 1b3692c6a4dbd0c16da97c0966d242d31dcf4c5f
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jun 21 12:02:56 2013 +0100
take a copy of the prop rather than pointer to ref
follow up to af2053c318564ef56235482f058d30ae26ecf77d
Change-Id: I3493077076554b714600c4bb4e93ce44bc690190
diff --git a/filter/source/msfilter/escherex.cxx
b/filter/source/msfilter/escherex.cxx
index 51ab62a..3696251 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -2641,7 +2641,8 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
const OUString sHandles ( "Handles" );
const OUString sAdjustmentValues ( "AdjustmentValues" );
- const beans::PropertyValue* pAdjustmentValuesProp = NULL;
+ bool bAdjustmentValuesProp = false;
+ uno::Any aAdjustmentValuesProp;
bool bPathCoordinatesProp = false;
uno::Any aPathCoordinatesProp;
@@ -3705,13 +3706,14 @@ void
EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
{
// it is required, that the information which handle is
polar has already be read,
// so we are able to change the polar value to a fixed
float
- pAdjustmentValuesProp = &rProp;
+ aAdjustmentValuesProp = rProp.Value;
+ bAdjustmentValuesProp = true;
}
}
- if ( pAdjustmentValuesProp )
+ if ( bAdjustmentValuesProp )
{
uno::Sequence<
com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue > aAdjustmentSeq;
- if ( pAdjustmentValuesProp->Value >>= aAdjustmentSeq )
+ if ( aAdjustmentValuesProp >>= aAdjustmentSeq )
{
if ( bPredefinedHandlesUsed )
LookForPolarHandles( eShapeType,
nAdjustmentsWhichNeedsToBeConverted );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
