diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-21 11:52:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-11-22 08:33:08 +0100 |
| commit | f1a55c4bfc6afcd9fd316e055e626097e0666ea8 (patch) | |
| tree | 732404505e1ab4f41342322a2be37148dbe453ba /filter | |
| parent | 02393281b6964b6657985a453c6f1a43ac77411c (diff) | |
TypedWhichId for SDRATTR* constants (3)
Change-Id: Iea72cb3a4bbf693096de46269f58259b5952eedb
Reviewed-on: https://gerrit.libreoffice.org/45024
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 8 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 5a27ec408d79..b06a325ded6b 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2428,8 +2428,8 @@ void ConvertEnhancedCustomShapeEquation( SdrObjCustomShape* pCustoShape, if ( pCustoShape ) { uno::Sequence< OUString > sEquationSource; - const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>( - pCustoShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); + const SdrCustomShapeGeometryItem& rGeometryItem = + pCustoShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); const uno::Any* pAny = rGeometryItem.GetPropertyValueByName( "Equations" ); if ( pAny ) *pAny >>= sEquationSource; @@ -4568,8 +4568,8 @@ sal_uInt32 EscherConnectorListEntry::GetConnectorRule( bool bFirst ) SdrObject* pCustoShape( GetSdrObjectFromXShape( aXShape ) ); if ( dynamic_cast<const SdrObjCustomShape* >(pCustoShape) != nullptr ) { - const SdrCustomShapeGeometryItem& rGeometryItem = static_cast<const SdrCustomShapeGeometryItem&>( - pCustoShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )); + const SdrCustomShapeGeometryItem& rGeometryItem = + pCustoShape->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ); const OUString sPath( "Path" ); const OUString sType( "Type" ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 25be4f0f04f6..4b7f8e36b81d 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -2763,7 +2763,7 @@ void DffPropertyReader::CheckAndCorrectExcelTextRotation( SvStream& rIn, SfxItem if ( !bRotateTextWithShape ) { const css::uno::Any* pAny; - SdrCustomShapeGeometryItem aGeometryItem(static_cast<const SdrCustomShapeGeometryItem&>(rSet.Get( SDRATTR_CUSTOMSHAPE_GEOMETRY ))); + SdrCustomShapeGeometryItem aGeometryItem(rSet.Get( SDRATTR_CUSTOMSHAPE_GEOMETRY )); const OUString sTextRotateAngle( "TextRotateAngle" ); pAny = aGeometryItem.GetPropertyValueByName( sTextRotateAngle ); double fExtraTextRotateAngle = 0.0; @@ -4499,7 +4499,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r const OUString sViewBox( "ViewBox" ); const OUString sPath( "Path" ); const OUString sTextFrames( "TextFrames" ); - SdrCustomShapeGeometryItem aGeometryItem( static_cast<const SdrCustomShapeGeometryItem&>(static_cast<SdrObjCustomShape*>(pRet)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) ); + SdrCustomShapeGeometryItem aGeometryItem( static_cast<SdrObjCustomShape*>(pRet)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); css::uno::Sequence< css::drawing::EnhancedCustomShapeParameterPair> seqCoordinates; css::uno::Sequence< css::drawing::EnhancedCustomShapeAdjustmentValue > seqAdjustmentValues; @@ -4673,7 +4673,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r static_cast<SdrObjCustomShape*>(pRet)->MergeDefaultAttributes(); // now setting a new name, so the above correction is only done once when importing from ms - SdrCustomShapeGeometryItem aGeoName( static_cast<const SdrCustomShapeGeometryItem&>(static_cast<SdrObjCustomShape*>(pRet)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ) ); + SdrCustomShapeGeometryItem aGeoName( static_cast<SdrObjCustomShape*>(pRet)->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) ); const OUString sType( "Type" ); const OUString sName( "mso-spt100" ); PropertyValue aPropVal; |