summaryrefslogtreecommitdiff
path: root/chart2/source/view/main
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view/main')
-rw-r--r--chart2/source/view/main/AbstractShapeFactory.cxx8
-rw-r--r--chart2/source/view/main/ChartView.cxx16
-rw-r--r--chart2/source/view/main/DummyXShape.cxx6
-rw-r--r--chart2/source/view/main/LabelPositionHelper.cxx6
-rw-r--r--chart2/source/view/main/OpenglShapeFactory.cxx12
-rw-r--r--chart2/source/view/main/PropertyMapper.cxx32
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx94
-rw-r--r--chart2/source/view/main/VLegend.cxx24
-rw-r--r--chart2/source/view/main/VLegendSymbolFactory.cxx2
-rw-r--r--chart2/source/view/main/VLineProperties.cxx10
-rw-r--r--chart2/source/view/main/VTitle.cxx2
11 files changed, 106 insertions, 106 deletions
diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index 5d79ca406723..e0ddffa0c2d7 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -154,8 +154,8 @@ void AbstractShapeFactory::makeShapeInvisible( const uno::Reference< drawing::XS
{
try
{
- xShapeProp->setPropertyValue( "LineStyle", uno::makeAny( drawing::LineStyle_NONE ));
- xShapeProp->setPropertyValue( "FillStyle", uno::makeAny( drawing::FillStyle_NONE ));
+ xShapeProp->setPropertyValue( "LineStyle", uno::Any( drawing::LineStyle_NONE ));
+ xShapeProp->setPropertyValue( "FillStyle", uno::Any( drawing::FillStyle_NONE ));
}
catch( const uno::Exception& e )
{
@@ -178,7 +178,7 @@ void AbstractShapeFactory::setShapeName( const uno::Reference< drawing::XShape >
try
{
xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME
- , uno::makeAny( rName ) );
+ , uno::Any( rName ) );
}
catch( const uno::Exception& e )
{
@@ -216,7 +216,7 @@ uno::Any AbstractShapeFactory::makeTransformation( const awt::Point& rScreenPosi
// aM.scale( 1, 1 ); Oops? A scale with this parameters is neutral, line commented out
aM.rotate( fRotationAnglePi );
aM.translate( rScreenPosition2D.X, rScreenPosition2D.Y );
- uno::Any aATransformation = uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) );
+ uno::Any aATransformation( B2DHomMatrixToHomogenMatrix3(aM) );
return aATransformation;
}
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index c3ea04246c93..94404507feb2 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -519,7 +519,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
uno::Any aAny = xPropertySet->getPropertyValue( "3DRelativeHeight" );
aAny >>= n3DRelativeHeightOldValue;
if (n3DRelativeHeightOldValue != n3DRelativeHeight)
- xPropertySet->setPropertyValue( "3DRelativeHeight", uno::makeAny(n3DRelativeHeight) );
+ xPropertySet->setPropertyValue( "3DRelativeHeight", uno::Any(n3DRelativeHeight) );
}
catch (const uno::Exception&) { }
}
@@ -1290,13 +1290,13 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre
//#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100%
aFilterData[4].Name = "ScaleXNumerator";
- aFilterData[4].Value = uno::makeAny( m_nScaleXNumerator );
+ aFilterData[4].Value <<= m_nScaleXNumerator;
aFilterData[5].Name = "ScaleXDenominator";
- aFilterData[5].Value = uno::makeAny( m_nScaleXDenominator );
+ aFilterData[5].Value <<= m_nScaleXDenominator;
aFilterData[6].Name = "ScaleYNumerator";
- aFilterData[6].Value = uno::makeAny( m_nScaleYNumerator );
+ aFilterData[6].Value <<= m_nScaleYNumerator;
aFilterData[7].Name = "ScaleYDenominator";
- aFilterData[7].Value = uno::makeAny( m_nScaleYDenominator );
+ aFilterData[7].Value <<= m_nScaleYDenominator;
aProps[2].Name = "FilterData";
@@ -2060,7 +2060,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
}
if (nFormat >= 0 && nOldFormat != nFormat)
- xSeriesOrPointProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::makeAny(nFormat));
+ xSeriesOrPointProp->setPropertyValue(CHART_UNONAME_NUMFMT, uno::Any(nFormat));
}
if(nFormat<0)
@@ -2501,7 +2501,7 @@ void formatPage(
PropertyMapper::getValueMap( aNameValueMap, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xModelPage );
OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );
- aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID OUString
+ aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::Any( aCID ) ) ); //CID OUString
tNameSequence aNames;
tAnySequence aValues;
@@ -2967,7 +2967,7 @@ Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName )
Any aRet;
if( rPropertyName == "Resolution" )
{
- aRet = uno::makeAny( m_aPageResolution );
+ aRet <<= m_aPageResolution;
}
else
throw beans::UnknownPropertyException( "unknown property was tried to get from chart wizard", nullptr );
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 115654d66bd7..4d7291c03646 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -971,16 +971,16 @@ DummyChart* DummyChart::getRootShape()
uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType )
{
if( rType == cppu::UnoType<drawing::XShapes>::get() )
- return uno::makeAny(uno::Reference<drawing::XShapes>(this));
+ return uno::Any(uno::Reference<drawing::XShapes>(this));
if( rType == cppu::UnoType<container::XIndexAccess>::get() )
- return uno::makeAny(uno::Reference<container::XIndexAccess>(this));
+ return uno::Any(uno::Reference<container::XIndexAccess>(this));
return DummyXShape::queryInterface(rType);
}
uno::Any SAL_CALL DummyXShapes::queryAggregation( const uno::Type & rType )
{
if( rType == cppu::UnoType<drawing::XShapes>::get() )
- return uno::makeAny(uno::Reference< drawing::XShapes >(this));
+ return uno::Any(uno::Reference< drawing::XShapes >(this));
else
return DummyXShape::queryAggregation( rType );
}
diff --git a/chart2/source/view/main/LabelPositionHelper.cxx b/chart2/source/view/main/LabelPositionHelper.cxx
index 84c279d2b591..50b18e7d2c3f 100644
--- a/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/chart2/source/view/main/LabelPositionHelper.cxx
@@ -63,7 +63,7 @@ void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const
eHorizontalAdjust = drawing::TextHorizontalAdjust_RIGHT;
uno::Any* pHorizontalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,"TextHorizontalAdjust");
if(pHorizontalAdjustAny)
- *pHorizontalAdjustAny = uno::makeAny(eHorizontalAdjust);
+ *pHorizontalAdjustAny <<= eHorizontalAdjust;
}
//VerticalAdjustment
@@ -75,7 +75,7 @@ void LabelPositionHelper::changeTextAdjustment( tAnySequence& rPropValues, const
eVerticalAdjust = drawing::TextVerticalAdjust_TOP;
uno::Any* pVerticalAdjustAny = PropertyMapper::getValuePointer(rPropValues,rPropNames,"TextVerticalAdjust");
if(pVerticalAdjustAny)
- *pVerticalAdjustAny = uno::makeAny(eVerticalAdjust);
+ *pVerticalAdjustAny <<= eVerticalAdjust;
}
}
@@ -87,7 +87,7 @@ void lcl_doDynamicFontResize( uno::Any* pAOldAndNewFontHeightAny
if( pAOldAndNewFontHeightAny && ( *pAOldAndNewFontHeightAny >>= fOldFontHeight ) )
{
double fNewFontHeight = RelativeSizeHelper::calculate( fOldFontHeight, rOldReferenceSize, rNewReferenceSize );
- *pAOldAndNewFontHeightAny = uno::makeAny(fNewFontHeight);
+ *pAOldAndNewFontHeightAny <<= fNewFontHeight;
}
}
diff --git a/chart2/source/view/main/OpenglShapeFactory.cxx b/chart2/source/view/main/OpenglShapeFactory.cxx
index 39c740cc8c92..b06ae6afd432 100644
--- a/chart2/source/view/main/OpenglShapeFactory.cxx
+++ b/chart2/source/view/main/OpenglShapeFactory.cxx
@@ -351,7 +351,7 @@ uno::Reference< drawing::XShape > OpenglShapeFactory::createInvisibleRectangle(
, const awt::Size& rSize )
{
dummy::DummyRectangle* pRectangle = new dummy::DummyRectangle(rSize);
- pRectangle->setPropertyValue("Invisible", uno::makeAny(true));
+ pRectangle->setPropertyValue("Invisible", uno::Any(true));
xTarget->add(pRectangle);
return pRectangle;
}
@@ -430,10 +430,10 @@ uno::Reference< drawing::XShape >
drawing::TextHorizontalAdjust eHorizontalAdjust = drawing::TextHorizontalAdjust_CENTER;
drawing::TextVerticalAdjust eVerticalAdjust = drawing::TextVerticalAdjust_CENTER;
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(true) ) ); // sal_Bool
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(true) ) ); // sal_Bool
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::Any(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::Any(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::Any(true) ) ); // sal_Bool
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::Any(true) ) ); // sal_Bool
}
@@ -451,7 +451,7 @@ uno::Reference< drawing::XShape >
aM.translate( nXPos, nYPos );
dummy::DummyText* pText = new dummy::DummyText(aString, aPropNames, aPropValues,
- uno::makeAny(B2DHomMatrixToHomogenMatrix3(aM)), xTarget, nRotation);
+ uno::Any(B2DHomMatrixToHomogenMatrix3(aM)), xTarget, nRotation);
pText->setName(rName);
return pText;
}
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 420ac93cafc2..ec00463fe4ea 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -452,20 +452,20 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
PropertyMapper::getValueMap(aValueMap, aNameMap, xSourceProp);
//some more shape properties apart from character properties, position-matrix and label string
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(true) ) ); // sal_Bool
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(true) ) ); // sal_Bool
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::Any(drawing::TextHorizontalAdjust_CENTER) ) ); // drawing::TextHorizontalAdjust - needs to be overwritten
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::Any(drawing::TextVerticalAdjust_CENTER) ) ); //drawing::TextVerticalAdjust - needs to be overwritten
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::Any(true) ) ); // sal_Bool
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::Any(true) ) ); // sal_Bool
if( bName )
- aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( OUString() ) ) ); //CID OUString - needs to be overwritten for each point
+ aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::Any( OUString() ) ) ); //CID OUString - needs to be overwritten for each point
if( nLimitedSpace > 0 )
{
if(bLimitedHeight)
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameHeight", uno::makeAny(nLimitedSpace) ) ); //sal_Int32
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameHeight", uno::Any(nLimitedSpace) ) ); //sal_Int32
else
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameWidth", uno::makeAny(nLimitedSpace) ) ); //sal_Int32
- aValueMap.insert( tPropertyNameValueMap::value_type( "ParaIsHyphenation", uno::makeAny(true) ) );
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextMaximumFrameWidth", uno::Any(nLimitedSpace) ) ); //sal_Int32
+ aValueMap.insert( tPropertyNameValueMap::value_type( "ParaIsHyphenation", uno::Any(true) ) );
}
PropertyMapper::getMultiPropertyListsFromValueMap( rPropNames, rPropValues, aValueMap );
@@ -482,18 +482,18 @@ void PropertyMapper::getPreparedTextShapePropertyLists(
, xSourceProp );
// auto-grow makes sure the shape has the correct size after setting text
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny( drawing::TextHorizontalAdjust_CENTER )));
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny( drawing::TextVerticalAdjust_CENTER )));
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny( true )));
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny( true )));
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::Any( drawing::TextHorizontalAdjust_CENTER )));
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::Any( drawing::TextVerticalAdjust_CENTER )));
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::Any( true )));
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::Any( true )));
// set some distance to the border, in case it is shown
const sal_Int32 nWidthDist = 250;
const sal_Int32 nHeightDist = 125;
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextLeftDistance", uno::makeAny( nWidthDist )));
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextRightDistance", uno::makeAny( nWidthDist )));
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextUpperDistance", uno::makeAny( nHeightDist )));
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextLowerDistance", uno::makeAny( nHeightDist )));
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextLeftDistance", uno::Any( nWidthDist )));
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextRightDistance", uno::Any( nWidthDist )));
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextUpperDistance", uno::Any( nHeightDist )));
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextLowerDistance", uno::Any( nHeightDist )));
// use a line-joint showing the border of thick lines like two rectangles
// filled in between.
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index d9ccc32000d6..2b4e85555dc7 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -401,12 +401,12 @@ uno::Reference<drawing::XShape>
if(fDepth<0)
fDepth*=-1.0;
xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH
- , uno::makeAny((sal_Int32)fDepth) );
+ , uno::Any((sal_Int32)fDepth) );
//PercentDiagonal
sal_Int16 nPercentDiagonal = bRounded ? 3 : 0;
xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL
- , uno::makeAny( nPercentDiagonal ) );
+ , uno::Any( nPercentDiagonal ) );
//Polygon
xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D
@@ -422,7 +422,7 @@ uno::Reference<drawing::XShape>
, rPosition.PositionZ - (fDepth/2.0));
drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM);
xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
- , uno::makeAny(aHM) );
+ , uno::Any(aHM) );
}
}
catch( const uno::Exception& e )
@@ -642,7 +642,7 @@ uno::Reference<drawing::XShape>
//PercentDiagonal
sal_Int16 nPercentDiagonal = 5;
xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL
- , uno::makeAny( nPercentDiagonal ) );
+ , uno::Any( nPercentDiagonal ) );
//Polygon
sal_Int32 nVerticalSegmentCount = 0;
@@ -662,18 +662,18 @@ uno::Reference<drawing::XShape>
aM.translate(rPosition.PositionX, rPosition.PositionY, rPosition.PositionZ);
drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM);
xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
- , uno::makeAny(aHM) );
+ , uno::Any(aHM) );
}
//Segments
xProp->setPropertyValue( UNO_NAME_3D_HORZ_SEGS
- , uno::makeAny(CHART_3DOBJECT_SEGMENTCOUNT) );
+ , uno::Any(CHART_3DOBJECT_SEGMENTCOUNT) );
xProp->setPropertyValue( UNO_NAME_3D_VERT_SEGS
- , uno::makeAny((sal_Int32)nVerticalSegmentCount) );//depends on point count of the used polygon
+ , uno::Any((sal_Int32)nVerticalSegmentCount) );//depends on point count of the used polygon
//Reduced lines
xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY
- , uno::makeAny(true) );
+ , uno::Any(true) );
}
catch( const uno::Exception& e )
{
@@ -882,7 +882,7 @@ uno::Reference< drawing::XShape >
, fUnitCircleStartAngleDegree*F_PI/180.0, fUnitCircleWidthAngleDegree*F_PI/180.0
, aTransformationFromUnitCircle, fAngleSubdivisionRadian );
- xProp->setPropertyValue( "PolyPolygonBezier", uno::makeAny( aCoords ) );
+ xProp->setPropertyValue( "PolyPolygonBezier", uno::Any( aCoords ) );
}
catch( const uno::Exception& e )
{
@@ -935,36 +935,36 @@ uno::Reference< drawing::XShape >
//depth
xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH
- , uno::makeAny((sal_Int32)fDepth) );
+ , uno::Any((sal_Int32)fDepth) );
//PercentDiagonal
sal_Int16 nPercentDiagonal = 0;
xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL
- , uno::makeAny( nPercentDiagonal ) );
+ , uno::Any( nPercentDiagonal ) );
//Polygon
drawing::PolyPolygonShape3D aPoly( BezierToPoly(aCoords) );
ShapeFactory::closePolygon( aPoly );
xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D
- , uno::makeAny( aPoly ) );
+ , uno::Any( aPoly ) );
//DoubleSided
xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED
- , uno::makeAny( true ) );
+ , uno::Any( true ) );
//Reduced lines
xProp->setPropertyValue( UNO_NAME_3D_REDUCED_LINE_GEOMETRY
- , uno::makeAny( true ) );
+ , uno::Any( true ) );
//TextureProjectionMode
xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_Y
- , uno::makeAny( drawing::TextureProjectionMode_OBJECTSPECIFIC ) );
+ , uno::Any( drawing::TextureProjectionMode_OBJECTSPECIFIC ) );
//TextureProjectionMode
xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_X
- , uno::makeAny( drawing::TextureProjectionMode_PARALLEL ) );
+ , uno::Any( drawing::TextureProjectionMode_PARALLEL ) );
xProp->setPropertyValue( UNO_NAME_3D_TEXTURE_PROJ_Y
- , uno::makeAny( drawing::TextureProjectionMode_OBJECTSPECIFIC ) );
+ , uno::Any( drawing::TextureProjectionMode_OBJECTSPECIFIC ) );
}
catch( const uno::Exception& e )
{
@@ -1013,15 +1013,15 @@ uno::Reference< drawing::XShape >
//NormalsKind
if(bFlatNormals)
xProp->setPropertyValue( UNO_NAME_3D_NORMALS_KIND
- , uno::makeAny( drawing::NormalsKind_FLAT ) );
+ , uno::Any( drawing::NormalsKind_FLAT ) );
//LineOnly
xProp->setPropertyValue( UNO_NAME_3D_LINEONLY
- , uno::makeAny( false) );
+ , uno::Any( false) );
//DoubleSided
xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED
- , uno::makeAny(bDoubleSided) );
+ , uno::Any(bDoubleSided) );
if( xSourceProp.is())
PropertyMapper::setMappedProperties( xProp, xSourceProp, rPropertyNameMap );
@@ -1060,20 +1060,20 @@ uno::Reference< drawing::XShape >
{
//depth
xProp->setPropertyValue( UNO_NAME_3D_EXTRUDE_DEPTH
- , uno::makeAny((sal_Int32)fDepth) );
+ , uno::Any((sal_Int32)fDepth) );
//PercentDiagonal
sal_Int16 nPercentDiagonal = 0;
xProp->setPropertyValue( UNO_NAME_3D_PERCENT_DIAGONAL
- , uno::makeAny( nPercentDiagonal ) );
+ , uno::Any( nPercentDiagonal ) );
//Polygon
xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D
- , uno::makeAny( rPolyPolygon ) );
+ , uno::Any( rPolyPolygon ) );
//DoubleSided
xProp->setPropertyValue( UNO_NAME_3D_DOUBLE_SIDED
- , uno::makeAny( true) );
+ , uno::Any( true) );
//the z component of the polygon is now ignored by the drawing layer,
//so we need to translate the object via transformation matrix
@@ -1087,7 +1087,7 @@ uno::Reference< drawing::XShape >
, rPolyPolygon.SequenceZ[0][0] );
drawing::HomogenMatrix aHM = B3DHomMatrixToHomogenMatrix(aM);
xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
- , uno::makeAny(aHM) );
+ , uno::Any(aHM) );
}
}
catch( const uno::Exception& e )
@@ -1123,12 +1123,12 @@ uno::Reference< drawing::XShape >
//Polygon
xProp->setPropertyValue( UNO_NAME_POLYPOLYGON
- , uno::makeAny( aPoints ) );
+ , uno::Any( aPoints ) );
//ZOrder
//an area should always be behind other shapes
xProp->setPropertyValue( UNO_NAME_MISC_OBJ_ZORDER
- , uno::makeAny( sal_Int32(0) ) );
+ , uno::Any( sal_Int32(0) ) );
}
catch( const uno::Exception& e )
{
@@ -1669,15 +1669,15 @@ uno::Reference< drawing::XShape >
//Polygon
xProp->setPropertyValue( UNO_NAME_POLYPOLYGON
- , uno::makeAny( aPoints ) );
+ , uno::Any( aPoints ) );
//LineColor
xProp->setPropertyValue( UNO_NAME_LINECOLOR
- , uno::makeAny( nBorderColor ) );
+ , uno::Any( nBorderColor ) );
//FillColor
xProp->setPropertyValue( UNO_NAME_FILLCOLOR
- , uno::makeAny( nFillColor ) );
+ , uno::Any( nFillColor ) );
}
catch( const uno::Exception& e )
{
@@ -1726,7 +1726,7 @@ uno::Reference< drawing::XShape >
{
try
{
- xProp->setPropertyValue( "Graphic", uno::makeAny( xGraphic ));
+ xProp->setPropertyValue( "Graphic", uno::Any( xGraphic ));
}
catch( const uno::Exception& e )
{
@@ -1799,7 +1799,7 @@ uno::Reference< drawing::XShapes >
{
::basegfx::B3DHomMatrix aM;
xProp->setPropertyValue( UNO_NAME_3D_TRANSFORM_MATRIX
- , uno::makeAny(B3DHomMatrixToHomogenMatrix(aM)) );
+ , uno::Any(B3DHomMatrixToHomogenMatrix(aM)) );
}
catch( const uno::Exception& e )
{
@@ -1861,7 +1861,7 @@ uno::Reference< drawing::XShape >
{
drawing::CircleKind eKind = drawing::CircleKind_FULL;
xProp->setPropertyValue( UNO_NAME_CIRCKIND
- , uno::makeAny( eKind ) );
+ , uno::Any( eKind ) );
}
catch( const uno::Exception& e )
{
@@ -1912,11 +1912,11 @@ uno::Reference< drawing::XShape >
{
//Polygon
xProp->setPropertyValue( UNO_NAME_3D_POLYPOLYGON3D
- , uno::makeAny( rPoints ) );
+ , uno::Any( rPoints ) );
//LineOnly
xProp->setPropertyValue( UNO_NAME_3D_LINEONLY
- , uno::makeAny( true ) );
+ , uno::Any( true ) );
//Transparency
if(rLineProperties.Transparence.hasValue())
@@ -1937,7 +1937,7 @@ uno::Reference< drawing::XShape >
if(rLineProperties.Color.hasValue())
xProp->setPropertyValue( UNO_NAME_LINECOLOR
, rLineProperties.Color );
- //, uno::makeAny( sal_Int32( Color(COL_RED).GetColor()) ) );
+ //, uno::Any( sal_Int32( Color(COL_RED).GetColor()) ) );
}
catch( const uno::Exception& e )
{
@@ -1973,7 +1973,7 @@ uno::Reference< drawing::XShape >
{
//Polygon
xProp->setPropertyValue( UNO_NAME_POLYPOLYGON
- , uno::makeAny( rPoints ) );
+ , uno::Any( rPoints ) );
if(pLineProperties)
{
@@ -2282,14 +2282,14 @@ uno::Reference< drawing::XShape >
drawing::TextHorizontalAdjust eHorizontalAdjust = drawing::TextHorizontalAdjust_CENTER;
drawing::TextVerticalAdjust eVerticalAdjust = drawing::TextVerticalAdjust_CENTER;
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::makeAny(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::makeAny(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(true) ) ); // sal_Bool
- aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(true) ) ); // sal_Bool
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextHorizontalAdjust", uno::Any(eHorizontalAdjust) ) ); // drawing::TextHorizontalAdjust
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextVerticalAdjust", uno::Any(eVerticalAdjust) ) ); //drawing::TextVerticalAdjust
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::Any(true) ) ); // sal_Bool
+ aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::Any(true) ) ); // sal_Bool
//set name/classified ObjectID (CID)
if( !aName.isEmpty() )
- aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aName ) ) ); //CID OUString
+ aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::Any( aName ) ) ); //CID OUString
}
//set global title properties
@@ -2375,10 +2375,10 @@ uno::Reference< drawing::XShape >
sal_Int32 nXDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fXFraction ) );
float fYFraction = 0.30f;
sal_Int32 nYDistance = static_cast< sal_Int32 >( ::rtl::math::round( fFontHeight * fYFraction ) );
- xShapeProp->setPropertyValue( "TextLeftDistance", uno::makeAny( nXDistance ) );
- xShapeProp->setPropertyValue( "TextRightDistance", uno::makeAny( nXDistance ) );
- xShapeProp->setPropertyValue( "TextUpperDistance", uno::makeAny( nYDistance ) );
- xShapeProp->setPropertyValue( "TextLowerDistance", uno::makeAny( nYDistance ) );
+ xShapeProp->setPropertyValue( "TextLeftDistance", uno::Any( nXDistance ) );
+ xShapeProp->setPropertyValue( "TextRightDistance", uno::Any( nXDistance ) );
+ xShapeProp->setPropertyValue( "TextUpperDistance", uno::Any( nYDistance ) );
+ xShapeProp->setPropertyValue( "TextLowerDistance", uno::Any( nYDistance ) );
}
sal_Int32 nXPos = rPos.X;
sal_Int32 nYPos = rPos.Y;
@@ -2388,7 +2388,7 @@ uno::Reference< drawing::XShape >
::basegfx::B2DHomMatrix aM;
aM.rotate( -nRotation*F_PI/180.0 );//#i78696#->#i80521#
aM.translate( nXPos, nYPos );
- xShapeProp->setPropertyValue( "Transformation", uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) );
+ xShapeProp->setPropertyValue( "Transformation", uno::Any( B2DHomMatrixToHomogenMatrix3(aM) ) );
}
catch( const uno::Exception& e )
{
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 766b16d9039c..8007f2931efb 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -98,7 +98,7 @@ void lcl_getProperties(
::chart::tPropertyNameValueMap aLineFillValueMap;
::chart::PropertyMapper::getValueMap( aLineFillValueMap, ::chart::PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xLegendProp );
- aLineFillValueMap[ "LineJoint" ] = uno::makeAny( drawing::LineJoint_ROUND );
+ aLineFillValueMap[ "LineJoint" ] <<= drawing::LineJoint_ROUND;
::chart::PropertyMapper::getMultiPropertyListsFromValueMap(
rOutLineFillProperties.first, rOutLineFillProperties.second, aLineFillValueMap );
@@ -108,10 +108,10 @@ void lcl_getProperties(
::chart::PropertyMapper::getValueMap( aTextValueMap, ::chart::PropertyMapper::getPropertyNameMapForCharacterProperties(), xLegendProp );
drawing::TextHorizontalAdjust eHorizAdjust( drawing::TextHorizontalAdjust_LEFT );
- aTextValueMap[ "TextAutoGrowHeight" ] = uno::makeAny( true );
- aTextValueMap[ "TextAutoGrowWidth" ] = uno::makeAny( true );
- aTextValueMap[ "TextHorizontalAdjust" ] = uno::makeAny( eHorizAdjust );
- aTextValueMap[ "TextMaximumFrameWidth" ] = uno::makeAny( rReferenceSize.Width ); //needs to be overwritten by actual available space in the legend
+ aTextValueMap[ "TextAutoGrowHeight" ] <<= true;
+ aTextValueMap[ "TextAutoGrowWidth" ] <<= true;
+ aTextValueMap[ "TextHorizontalAdjust" ] <<= eHorizAdjust;
+ aTextValueMap[ "TextMaximumFrameWidth" ] <<= rReferenceSize.Width; //needs to be overwritten by actual available space in the legend
// recalculate font size
awt::Size aPropRefSize;
@@ -120,21 +120,21 @@ void lcl_getProperties(
(aPropRefSize.Height > 0) &&
(aTextValueMap[ "CharHeight" ] >>= fFontHeight) )
{
- aTextValueMap[ "CharHeight" ] = uno::makeAny(
+ aTextValueMap[ "CharHeight" ] <<=
static_cast< float >(
- ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize )));
+ ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ));
if( aTextValueMap[ "CharHeightAsian" ] >>= fFontHeight )
{
- aTextValueMap[ "CharHeightAsian" ] = uno::makeAny(
+ aTextValueMap[ "CharHeightAsian" ] <<=
static_cast< float >(
- ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize )));
+ ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ));
}
if( aTextValueMap[ "CharHeightComplex" ] >>= fFontHeight )
{
- aTextValueMap[ "CharHeightComplex" ] = uno::makeAny(
+ aTextValueMap[ "CharHeightComplex" ] <<=
static_cast< float >(
- ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize )));
+ ::chart::RelativeSizeHelper::calculate( fFontHeight, aPropRefSize, rReferenceSize ));
}
}
@@ -288,7 +288,7 @@ awt::Size lcl_placeLegendEntries(
// #i109336# Improve auto positioning in chart
nMaxTextWidth = rAvailableSpace.Width * 3 / 10;
}
- *pFrameWidthAny = uno::makeAny(nMaxTextWidth);
+ *pFrameWidthAny <<= nMaxTextWidth;
}
::std::vector< Reference< drawing::XShape > > aTextShapes;
diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx
index 125d456de506..4579d45a6b7c 100644
--- a/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -72,7 +72,7 @@ void getPropNamesAndValues( const Reference< beans::XPropertySet >& xProp,
// use legend entry height as upper limit for line width
sal_Int32 nMaxLineWidthForLegend = aMaxSymbolExtent.Height;
if( nLineWidth>nMaxLineWidthForLegend )
- *pLineWidthAny = uno::makeAny( nMaxLineWidthForLegend );
+ *pLineWidthAny <<= nMaxLineWidthForLegend;
}
}
diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx
index e3486ce84cf3..2c0330bf2ff9 100644
--- a/chart2/source/view/main/VLineProperties.cxx
+++ b/chart2/source/view/main/VLineProperties.cxx
@@ -29,10 +29,10 @@ using namespace ::com::sun::star;
VLineProperties::VLineProperties()
{
- this->Color = uno::makeAny( sal_Int32(0x000000) ); //type sal_Int32 UNO_NAME_LINECOLOR
- this->LineStyle = uno::makeAny( drawing::LineStyle_SOLID ); //type drawing::LineStyle for property UNO_NAME_LINESTYLE
- this->Transparence = uno::makeAny( sal_Int16(0) );//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE
- this->Width = uno::makeAny( sal_Int32(0) );//type sal_Int32 for property UNO_NAME_LINEWIDTH
+ this->Color <<= sal_Int32(0x000000); //type sal_Int32 UNO_NAME_LINECOLOR
+ this->LineStyle <<= drawing::LineStyle_SOLID; //type drawing::LineStyle for property UNO_NAME_LINESTYLE
+ this->Transparence <<= sal_Int16(0);//type sal_Int16 for property UNO_NAME_LINETRANSPARENCE
+ this->Width <<= sal_Int32(0);//type sal_Int32 for property UNO_NAME_LINEWIDTH
}
void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
@@ -53,7 +53,7 @@ void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropert
}
}
else
- this->LineStyle = uno::makeAny( drawing::LineStyle_NONE );
+ this->LineStyle <<= drawing::LineStyle_NONE;
}
bool VLineProperties::isLineVisible() const
diff --git a/chart2/source/view/main/VTitle.cxx b/chart2/source/view/main/VTitle.cxx
index a2212ca1b602..4fafd1fccb01 100644
--- a/chart2/source/view/main/VTitle.cxx
+++ b/chart2/source/view/main/VTitle.cxx
@@ -96,7 +96,7 @@ void VTitle::changePosition( const awt::Point& rPos )
::basegfx::B2DHomMatrix aM;
aM.rotate( -m_fRotationAngleDegree*F_PI/180.0 );//#i78696#->#i80521#
aM.translate( m_nXPos, m_nYPos);
- xShapeProp->setPropertyValue( "Transformation", uno::makeAny( B2DHomMatrixToHomogenMatrix3(aM) ) );
+ xShapeProp->setPropertyValue( "Transformation", uno::Any( B2DHomMatrixToHomogenMatrix3(aM) ) );
}
catch( const uno::Exception& e )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 17:26:33 +0000