summaryrefslogtreecommitdiffstats
path: root/chart2/source/model/template
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-15 15:17:13 +0200
committerNoel Grandin <noel@peralex.com>2014-04-15 15:23:29 +0200
commit329332ba526983c1d64763f61df2940e6bcb7d8a (patch)
treecab0aa5fb7bdabeb56300b27cd7dbfa740820c46 /chart2/source/model/template
parentadd "include/comphelper" to list of includes to ignore (diff)
downloadcore-329332ba526983c1d64763f61df2940e6bcb7d8a.tar.gz
core-329332ba526983c1d64763f61df2940e6bcb7d8a.zip
chart2: sal_Bool->bool
Change-Id: I85751b4e636596ef88ef02bc958abdc6abf98427
Diffstat (limited to 'chart2/source/model/template')
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx6
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx2
-rw-r--r--chart2/source/model/template/ChartType.cxx2
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx6
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/NetChartType.cxx2
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/PieChartType.cxx4
-rw-r--r--chart2/source/model/template/PieChartType.hxx2
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx10
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx2
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx2
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx8
14 files changed, 26 insertions, 26 deletions
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 8a0334173751..5ccc30855a93 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -166,7 +166,7 @@ sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate(
sal_Bool bAdaptProperties )
throw (uno::RuntimeException, std::exception)
{
- sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+ bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
//check BarDirection
if( bResult )
@@ -175,9 +175,9 @@ sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate(
bool bAmbiguous = false;
bool bVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
if( m_eBarDirection == HORIZONTAL )
- bResult = sal_Bool( bVertical );
+ bResult = bVertical;
else if( m_eBarDirection == VERTICAL )
- bResult = sal_Bool( !bVertical );
+ bResult = !bVertical;
}
// adapt solid-type of template according to values in series
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 999fe504a5b9..42ce1be61ab1 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -131,7 +131,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
{
Reference< chart2::XCoordinateSystem > xResult(
new CartesianCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+ GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 7c5857753596..9fb275f7a61e 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -79,7 +79,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
{
Reference< chart2::XCoordinateSystem > xResult(
new CartesianCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+ GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 1b2a69d037a0..e1296cfc9d3f 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -320,7 +320,7 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate(
sal_Bool /* bAdaptProperties */ )
throw (uno::RuntimeException, std::exception)
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if( ! xDiagram.is())
return bResult;
@@ -449,7 +449,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram
throw (uno::RuntimeException, std::exception)
{
// reset number format if we had percent stacking on
- sal_Bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
+ bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
if( bPercent )
{
Sequence< Reference< chart2::XAxis > > aAxisSeq( AxisHelper::getAllAxesOfDiagram( xDiagram ) );
@@ -754,7 +754,7 @@ void ChartTypeTemplate::adaptAxes(
if( nAxisIndex == MAIN_AXIS_INDEX || nAxisIndex == SECONDARY_AXIS_INDEX )
{
// adapt scales
- sal_Bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
+ bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT);
if( bPercent && nDim == 1 )
{
Reference< beans::XPropertySet > xAxisProp( xAxis, uno::UNO_QUERY );
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 901cd528eb8e..81489ffdcb99 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -280,7 +280,7 @@ sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate(
sal_Bool bAdaptProperties )
throw (uno::RuntimeException, std::exception)
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if( ! xDiagram.is())
return bResult;
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 591f259fc056..5d0f544d11fb 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -204,7 +204,7 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate(
sal_Bool bAdaptProperties )
throw (uno::RuntimeException, std::exception)
{
- sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+ bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
// check symbol-style and line-style
// for a template with symbols (or with lines) it is ok, if there is at least one series
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index deef738a1ec1..ab94fe3b018a 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -66,7 +66,7 @@ Reference< XCoordinateSystem > SAL_CALL
Reference< XCoordinateSystem > xResult(
new PolarCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+ GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
Reference< XAxis > xAxis( xResult->getAxisByDimension( 0, MAIN_AXIS_INDEX ) );
if( xAxis.is() )
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index c0a907961250..ecf7435146ef 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -88,7 +88,7 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate(
sal_Bool bAdaptProperties )
throw (uno::RuntimeException, std::exception)
{
- sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+ bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
uno::Reference< beans::XPropertySet > xChartTypeProp(
DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW );
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 101335923bcb..312f25ca8cfa 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -128,7 +128,7 @@ namespace chart
PieChartType::PieChartType(
const uno::Reference< uno::XComponentContext > & xContext,
- sal_Bool bUseRings /* = sal_False */) :
+ bool bUseRings /* = sal_False */) :
ChartType( xContext )
{
if( bUseRings )
@@ -164,7 +164,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
{
Reference< chart2::XCoordinateSystem > xResult(
new PolarCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+ GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index 575bfff47130..f82fb20e2c70 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -31,7 +31,7 @@ public:
PieChartType(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- sal_Bool bUseRings = sal_False );
+ bool bUseRings = false );
virtual ~PieChartType();
virtual OUString SAL_CALL
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 9da96d65045e..77294b0b5c9a 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -165,7 +165,7 @@ PieChartTypeTemplate::PieChartTypeTemplate(
{
setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_OFFSET_MODE, uno::makeAny( eMode ));
setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_DIMENSION, uno::makeAny( nDim ));
- setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_USE_RINGS, uno::makeAny( sal_Bool( bRings )));
+ setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_USE_RINGS, uno::makeAny( bRings ));
}
PieChartTypeTemplate::~PieChartTypeTemplate()
@@ -311,9 +311,9 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
sal_Bool bAdaptProperties )
throw (uno::RuntimeException, std::exception)
{
- sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+ bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
- sal_Bool bTemplateUsesRings = sal_False;
+ bool bTemplateUsesRings = false;
getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS ) >>= bTemplateUsesRings;
chart2::PieChartOffsetMode ePieOffsetMode;
getFastPropertyValue( PROP_PIE_TEMPLATE_OFFSET_MODE ) >>= ePieOffsetMode;
@@ -382,7 +382,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
{
uno::Reference< beans::XPropertySet > xCTProp(
DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), uno::UNO_QUERY_THROW );
- sal_Bool bUseRings = false;
+ bool bUseRings = false;
if( xCTProp->getPropertyValue( "UseRings") >>= bUseRings )
{
bResult = ( bTemplateUsesRings == bUseRings );
@@ -460,7 +460,7 @@ void SAL_CALL PieChartTypeTemplate::applyStyle(
{
uno::Reference< beans::XPropertySet > xProp( xSeries, uno::UNO_QUERY_THROW );
- sal_Bool bTemplateUsesRings = sal_False;
+ bool bTemplateUsesRings = false;
getFastPropertyValue( PROP_PIE_TEMPLATE_USE_RINGS ) >>= bTemplateUsesRings;
sal_Int32 nOuterSeriesIndex = 0; //@todo in future this will depend on Orientation of the radius axis scale
if( nSeriesIndex == nOuterSeriesIndex )
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 7d83da334ca2..2ae99ea1da32 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -183,7 +183,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
{
Reference< chart2::XCoordinateSystem > xResult(
new CartesianCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ sal_False ));
+ GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 371e2a4eeb6a..87efd97332d1 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -238,7 +238,7 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate(
sal_Bool bAdaptProperties )
throw (uno::RuntimeException, std::exception)
{
- sal_Bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
+ bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties );
// check symbol-style and line-style
// for a template with symbols (or with lines) it is ok, if there is at least one series
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index cf8ca49af8ee..8f9fae68db66 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -408,14 +408,14 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate(
sal_Bool /* bAdaptProperties */ )
throw (uno::RuntimeException, std::exception)
{
- sal_Bool bResult = sal_False;
+ bool bResult = false;
if( ! xDiagram.is())
return bResult;
try
{
- sal_Bool bHasVolume = false, bHasOpenValue = false, bHasJapaneseStyle = false;
+ bool bHasVolume = false, bHasOpenValue = false, bHasJapaneseStyle = false;
getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_VOLUME ) >>= bHasVolume;
getFastPropertyValue( PROP_STOCKCHARTTYPE_TEMPLATE_OPEN ) >>= bHasOpenValue;
@@ -466,12 +466,12 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate(
Reference< beans::XPropertySet > xCTProp( xCandleStickChartType, uno::UNO_QUERY );
if( xCTProp.is())
{
- sal_Bool bJapaneseProp = sal_False;
+ bool bJapaneseProp = false;
xCTProp->getPropertyValue( "Japanese") >>= bJapaneseProp;
bResult = bResult && ( bHasJapaneseStyle == bJapaneseProp );
// in old chart japanese == showFirst
- sal_Bool bShowFirstProp = sal_False;
+ bool bShowFirstProp = false;
xCTProp->getPropertyValue( "ShowFirst") >>= bShowFirstProp;
bResult = bResult && ( bHasOpenValue == bShowFirstProp );
}