Kaydet (Commit) bab961dd authored tarafından Fridrich Štrba's avatar Fridrich Štrba

Fix chart2 build

Change-Id: Ia3eb1c1576034c1cbc93e9fb4e60d205a325b132
üst 065415b4
...@@ -168,7 +168,7 @@ void lcl_AddPropertiesToVector( ...@@ -168,7 +168,7 @@ void lcl_AddPropertiesToVector(
beans::PropertyAttribute::BOUND beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID )); | beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back( rOutProperties.push_back(
Property( C2U("3DRelativeHeight"), Property( "3DRelativeHeight",
PROP_DIAGRAM_3DRELATIVEHEIGHT, PROP_DIAGRAM_3DRELATIVEHEIGHT,
::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
beans::PropertyAttribute::MAYBEVOID )); beans::PropertyAttribute::MAYBEVOID ));
......
...@@ -56,7 +56,7 @@ static void lcl_AddPropertiesToVector( ...@@ -56,7 +56,7 @@ static void lcl_AddPropertiesToVector(
beans::PropertyAttribute::BOUND beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT )); | beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back( rOutProperties.push_back(
Property( C2U("3DRelativeHeight"), Property( "3DRelativeHeight",
PROP_PIECHARTTYPE_3DRELATIVEHEIGHT, PROP_PIECHARTTYPE_3DRELATIVEHEIGHT,
::getCppuType( reinterpret_cast< const sal_Int32 * >(0)), ::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
beans::PropertyAttribute::MAYBEVOID )); beans::PropertyAttribute::MAYBEVOID ));
......
...@@ -346,7 +346,7 @@ void PieChart::createShapes() ...@@ -346,7 +346,7 @@ void PieChart::createShapes()
{ {
try try
{ {
uno::Any aAny = xPropertySet->getPropertyValue( C2U("3DRelativeHeight") ); uno::Any aAny = xPropertySet->getPropertyValue( "3DRelativeHeight" );
aAny >>= n3DRelativeHeight; aAny >>= n3DRelativeHeight;
} }
catch(const uno::Exception& e) {} catch(const uno::Exception& e) {}
...@@ -391,7 +391,6 @@ void PieChart::createShapes() ...@@ -391,7 +391,6 @@ void PieChart::createShapes()
if( !bIsVisible ) if( !bIsVisible )
continue; continue;
double fLogicZ = -1.0;//as defined
double fDepth = this->getTransformedDepth() * (n3DRelativeHeight / 100.0); double fDepth = this->getTransformedDepth() * (n3DRelativeHeight / 100.0);
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(pSeries, xSeriesTarget); uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes = getSeriesGroupShape(pSeries, xSeriesTarget);
......
...@@ -678,10 +678,10 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( ...@@ -678,10 +678,10 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
try try
{ {
sal_Int32 n3DRelativeHeightOldValue(100); sal_Int32 n3DRelativeHeightOldValue(100);
uno::Any aAny = xPropertySet->getPropertyValue( C2U("3DRelativeHeight") ); uno::Any aAny = xPropertySet->getPropertyValue( "3DRelativeHeight" );
aAny >>= n3DRelativeHeightOldValue; aAny >>= n3DRelativeHeightOldValue;
if (n3DRelativeHeightOldValue != n3DRelativeHeight) if (n3DRelativeHeightOldValue != n3DRelativeHeight)
xPropertySet->setPropertyValue( C2U("3DRelativeHeight"), uno::makeAny(n3DRelativeHeight) ); xPropertySet->setPropertyValue( "3DRelativeHeight", uno::makeAny(n3DRelativeHeight) );
} }
catch(const uno::Exception& e){} catch(const uno::Exception& e){}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment