diff options
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 16 | ||||
| -rw-r--r-- | include/svx/svdoashp.hxx | 20 | ||||
| -rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 18 |
3 files changed, 27 insertions, 27 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 5480a584352e..a3eda373d8fb 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -2553,14 +2553,14 @@ bool EscherPropertyContainer::IsDefaultObject( SdrObjCustomShape* pCustoShape , if ( pCustoShape ) { - if ( pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_EQUATIONS ) - && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_VIEWBOX ) - && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_PATH ) - && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_GLUEPOINTS ) - && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_SEGMENTS ) - && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_STRETCHX ) - && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_STRETCHY ) - && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DEFAULT_TEXTFRAMES ) ) + if ( pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DefaultType::Equations ) + && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DefaultType::Viewbox ) + && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DefaultType::Path ) + && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DefaultType::Gluepoints ) + && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DefaultType::Segments ) + && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DefaultType::StretchX ) + && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DefaultType::StretchY ) + && pCustoShape->IsDefaultGeometry( SdrObjCustomShape::DefaultType::TextFrames ) ) bIsDefaultObject = true; } diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 8bf0037c3e87..2d5ba46993bb 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -169,17 +169,17 @@ public: void MergeDefaultAttributes( const OUString* pType = nullptr ); /* the method is checking if the geometry data is unchanged/default, in this case the data might not be stored */ - enum DefaultType + enum class DefaultType { - DEFAULT_PATH, - DEFAULT_VIEWBOX, - DEFAULT_SEGMENTS, - DEFAULT_GLUEPOINTS, - DEFAULT_STRETCHX, - DEFAULT_STRETCHY, - DEFAULT_EQUATIONS, - DEFAULT_HANDLES, - DEFAULT_TEXTFRAMES + Path, + Viewbox, + Segments, + Gluepoints, + StretchX, + StretchY, + Equations, + Handles, + TextFrames }; bool IsDefaultGeometry( const DefaultType eDefaultType ) const; diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index ef16b4b1ac74..3da4aa33b061 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -1108,7 +1108,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons const OUString sPath( "Path" ); switch( eDefaultType ) { - case DEFAULT_VIEWBOX : + case DefaultType::Viewbox : { const OUString sViewBox( "ViewBox" ); const Any* pViewBox = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sViewBox ); @@ -1122,7 +1122,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons } break; - case DEFAULT_PATH : + case DefaultType::Path : { const OUString sCoordinates( "Coordinates" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sCoordinates ); @@ -1147,7 +1147,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons } break; - case DEFAULT_GLUEPOINTS : + case DefaultType::Gluepoints : { const OUString sGluePoints( "GluePoints" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sGluePoints ); @@ -1172,7 +1172,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons } break; - case DEFAULT_SEGMENTS : + case DefaultType::Segments : { // Path/Segments const OUString sSegments( "Segments" ); @@ -1217,7 +1217,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons } break; - case DEFAULT_STRETCHX : + case DefaultType::StretchX : { const OUString sStretchX( "StretchX" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchX ); @@ -1235,7 +1235,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons } break; - case DEFAULT_STRETCHY : + case DefaultType::StretchY : { const OUString sStretchY( "StretchY" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sStretchY ); @@ -1253,7 +1253,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons } break; - case DEFAULT_EQUATIONS : + case DefaultType::Equations : { const OUString sEquations( "Equations" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sEquations ); @@ -1278,7 +1278,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons } break; - case DEFAULT_TEXTFRAMES : + case DefaultType::TextFrames : { const OUString sTextFrames( "TextFrames" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sPath, sTextFrames ); @@ -1306,7 +1306,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons } break; - case DEFAULT_HANDLES : + case DefaultType::Handles : { const OUString sHandles( "Handles" ); pAny = ((SdrCustomShapeGeometryItem&)aGeometryItem).GetPropertyValueByName( sHandles ); |