From b6d5719d06190f01e43ed11b190c61fa9612de05 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 19 Aug 2016 12:53:25 +0200 Subject: convert DefaultType to scoped enum Change-Id: Ib5c596bf8f2493cbc6f95530f2b3cd9ef7ab4156 --- filter/source/msfilter/escherex.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'filter') 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; } -- cgit