chart2/source/model/main/Diagram.cxx | 2 +-
chart2/source/model/template/PieChartType.cxx | 2 +-
chart2/source/view/charttypes/PieChart.cxx | 3 +--
chart2/source/view/main/ChartView.cxx | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit bab961dd0a5abe985e2787aa789eae7a4d6cbbd9
Author: Fridrich Å trba <fridrich.st...@bluewin.ch>
Date: Mon Mar 11 18:14:50 2013 +0100
Fix chart2 build
Change-Id: Ia3eb1c1576034c1cbc93e9fb4e60d205a325b132
diff --git a/chart2/source/model/main/Diagram.cxx
b/chart2/source/model/main/Diagram.cxx
index 810da642..1d0295a 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -168,7 +168,7 @@ void lcl_AddPropertiesToVector(
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
- Property( C2U("3DRelativeHeight"),
+ Property( "3DRelativeHeight",
PROP_DIAGRAM_3DRELATIVEHEIGHT,
::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/model/template/PieChartType.cxx
b/chart2/source/model/template/PieChartType.cxx
index 5bef973..b54d976 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -56,7 +56,7 @@ static void lcl_AddPropertiesToVector(
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
rOutProperties.push_back(
- Property( C2U("3DRelativeHeight"),
+ Property( "3DRelativeHeight",
PROP_PIECHARTTYPE_3DRELATIVEHEIGHT,
::getCppuType( reinterpret_cast< const sal_Int32 * >(0)),
beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/view/charttypes/PieChart.cxx
b/chart2/source/view/charttypes/PieChart.cxx
index b532c20..64b2f2b 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -346,7 +346,7 @@ void PieChart::createShapes()
{
try
{
- uno::Any aAny = xPropertySet->getPropertyValue(
C2U("3DRelativeHeight") );
+ uno::Any aAny = xPropertySet->getPropertyValue( "3DRelativeHeight"
);
aAny >>= n3DRelativeHeight;
}
catch(const uno::Exception& e) {}
@@ -391,7 +391,6 @@ void PieChart::createShapes()
if( !bIsVisible )
continue;
- double fLogicZ = -1.0;//as defined
double fDepth = this->getTransformedDepth() * (n3DRelativeHeight
/ 100.0);
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes =
getSeriesGroupShape(pSeries, xSeriesTarget);
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index 70612e0..d6efb50 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -678,10 +678,10 @@ void
SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
try
{
sal_Int32 n3DRelativeHeightOldValue(100);
- uno::Any aAny = xPropertySet->getPropertyValue(
C2U("3DRelativeHeight") );
+ uno::Any aAny = xPropertySet->getPropertyValue(
"3DRelativeHeight" );
aAny >>= n3DRelativeHeightOldValue;
if (n3DRelativeHeightOldValue != n3DRelativeHeight)
- xPropertySet->setPropertyValue(
C2U("3DRelativeHeight"), uno::makeAny(n3DRelativeHeight) );
+ xPropertySet->setPropertyValue(
"3DRelativeHeight", uno::makeAny(n3DRelativeHeight) );
}
catch(const uno::Exception& e){}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
