diff options
Diffstat (limited to 'chart2/source/controller/main/PositionAndSizeHelper.cxx')
| -rw-r--r-- | chart2/source/controller/main/PositionAndSizeHelper.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx index 258dd0706cfe..047d55dd5709 100644 --- a/chart2/source/controller/main/PositionAndSizeHelper.cxx +++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx @@ -59,7 +59,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType Point aPos = aObjectRect.TopLeft(); aRelativePosition.Primary = (double(aPos.X())+double(aObjectRect.getWidth())/2.0)/double(aPageRect.getWidth()); aRelativePosition.Secondary = (double(aPos.Y())+double(aObjectRect.getHeight())/2.0)/double(aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); + xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) ); } else if( OBJECTTYPE_DATA_CURVE_EQUATION==eObjectType ) { @@ -70,12 +70,12 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType Point aPos = aObjectRect.TopLeft(); aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getWidth()); aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); + xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) ); } else if(OBJECTTYPE_LEGEND==eObjectType) { - xObjectProp->setPropertyValue( C2U( "AnchorPosition" ), uno::makeAny(LegendPosition(LegendPosition_CUSTOM))); - xObjectProp->setPropertyValue( C2U( "Expansion" ), uno::makeAny(::com::sun::star::chart::ChartLegendExpansion_CUSTOM)); + xObjectProp->setPropertyValue( "AnchorPosition", uno::makeAny(LegendPosition(LegendPosition_CUSTOM))); + xObjectProp->setPropertyValue( "Expansion", uno::makeAny(::com::sun::star::chart::ChartLegendExpansion_CUSTOM)); chart2::RelativePosition aRelativePosition; chart2::RelativeSize aRelativeSize; Point aAnchor = aObjectRect.TopLeft(); @@ -87,7 +87,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType static_cast< double >( aAnchor.Y()) / static_cast< double >( aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); + xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) ); aRelativeSize.Primary = static_cast< double >( aObjectRect.getWidth()) / @@ -100,7 +100,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType if (aRelativeSize.Secondary > 1.0) aRelativeSize.Secondary = 1.0; - xObjectProp->setPropertyValue( C2U( "RelativeSize" ), uno::makeAny(aRelativeSize) ); + xObjectProp->setPropertyValue( "RelativeSize", uno::makeAny(aRelativeSize) ); } else if(OBJECTTYPE_DIAGRAM==eObjectType || OBJECTTYPE_DIAGRAM_WALL==eObjectType || OBJECTTYPE_DIAGRAM_FLOOR==eObjectType) { @@ -113,7 +113,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType Point aPos = aObjectRect.Center(); aRelativePosition.Primary = double(aPos.X())/double(aPageRect.getWidth()); aRelativePosition.Secondary = double(aPos.Y())/double(aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativePosition" ), uno::makeAny(aRelativePosition) ); + xObjectProp->setPropertyValue( "RelativePosition", uno::makeAny(aRelativePosition) ); //set size: RelativeSize aRelativeSize; @@ -121,7 +121,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType //and in the middle of the page aRelativeSize.Primary = double(aObjectRect.getWidth())/double(aPageRect.getWidth()); aRelativeSize.Secondary = double(aObjectRect.getHeight())/double(aPageRect.getHeight()); - xObjectProp->setPropertyValue( C2U( "RelativeSize" ), uno::makeAny(aRelativeSize) ); + xObjectProp->setPropertyValue( "RelativeSize", uno::makeAny(aRelativeSize) ); } else return false; |