[Libreoffice-commits] core.git: 3 commits - basctl/source chart2/inc chart2/source compilerplugins/clang
Noel Grandin
noel at peralex.com
Tue Apr 15 06:24:34 PDT 2014
basctl/source/basicide/moduldlg.cxx | 2
basctl/source/basicide/moduldlg.hxx | 2
basctl/source/dlged/dlgedclip.cxx | 2
basctl/source/inc/dlgedclip.hxx | 2
chart2/inc/ChartModel.hxx | 8
chart2/inc/ChartView.hxx | 4
chart2/source/controller/accessibility/AccessibleChartShape.cxx | 2
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 16 -
chart2/source/controller/chartapiwrapper/AxisWrapper.hxx | 2
chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx | 4
chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx | 2
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 6
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 28 +-
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 8
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx | 2
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 26 +-
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 8
chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx | 26 +-
chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx | 16 -
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 22 +-
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 14 -
chart2/source/controller/dialogs/DataBrowser.cxx | 10
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 2
chart2/source/controller/dialogs/res_LegendPosition.cxx | 4
chart2/source/controller/dialogs/res_Titles.cxx | 14 -
chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx | 2
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 10
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 4
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 14 -
chart2/source/controller/dialogs/tp_DataSource.cxx | 2
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 2
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 6
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 4
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 6
chart2/source/controller/inc/ChartDocumentWrapper.hxx | 6
chart2/source/controller/inc/SeriesOptionsItemConverter.hxx | 2
chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx | 2
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 12 -
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 6
chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 2
chart2/source/controller/main/ChartController.cxx | 34 +--
chart2/source/controller/main/ChartController.hxx | 16 -
chart2/source/controller/main/ChartController_Insert.cxx | 8
chart2/source/controller/main/ChartController_TextEdit.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 2
chart2/source/controller/main/ChartFrameloader.cxx | 12 -
chart2/source/controller/main/ChartFrameloader.hxx | 4
chart2/source/controller/main/DragMethod_RotateDiagram.cxx | 2
chart2/source/controller/main/DragMethod_RotateDiagram.hxx | 2
chart2/source/controller/main/DrawCommandDispatch.cxx | 8
chart2/source/controller/main/ShapeController.cxx | 6
chart2/source/controller/main/ShapeToolbarController.cxx | 2
chart2/source/inc/AxisHelper.hxx | 14 -
chart2/source/inc/ChartTypeHelper.hxx | 22 +-
chart2/source/inc/CommonConverters.hxx | 4
chart2/source/inc/LifeTime.hxx | 58 ++---
chart2/source/inc/MediaDescriptorHelper.hxx | 100 ++++-----
chart2/source/inc/ObjectIdentifier.hxx | 2
chart2/source/inc/RegressionCurveCalculator.hxx | 2
chart2/source/inc/ThreeDHelper.hxx | 2
chart2/source/inc/chartview/ExplicitValueProvider.hxx | 2
chart2/source/model/filter/XMLFilter.cxx | 2
chart2/source/model/inc/BaseCoordinateSystem.hxx | 2
chart2/source/model/inc/CartesianCoordinateSystem.hxx | 2
chart2/source/model/inc/PolarCoordinateSystem.hxx | 2
chart2/source/model/main/BaseCoordinateSystem.cxx | 4
chart2/source/model/main/CartesianCoordinateSystem.cxx | 6
chart2/source/model/main/ChartModel.cxx | 16 -
chart2/source/model/main/ChartModel_Persistence.cxx | 10
chart2/source/model/main/PolarCoordinateSystem.cxx | 6
chart2/source/model/template/BarChartTypeTemplate.cxx | 6
chart2/source/model/template/BubbleChartType.cxx | 2
chart2/source/model/template/ChartType.cxx | 2
chart2/source/model/template/ChartTypeTemplate.cxx | 6
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 2
chart2/source/model/template/LineChartTypeTemplate.cxx | 2
chart2/source/model/template/NetChartType.cxx | 2
chart2/source/model/template/NetChartTypeTemplate.cxx | 2
chart2/source/model/template/PieChartType.cxx | 4
chart2/source/model/template/PieChartType.hxx | 2
chart2/source/model/template/PieChartTypeTemplate.cxx | 10
chart2/source/model/template/ScatterChartType.cxx | 2
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 2
chart2/source/model/template/StockChartTypeTemplate.cxx | 8
chart2/source/tools/AxisHelper.cxx | 22 +-
chart2/source/tools/ChartTypeHelper.cxx | 98 ++++-----
chart2/source/tools/CommonConverters.cxx | 14 -
chart2/source/tools/DiagramHelper.cxx | 6
chart2/source/tools/InternalDataProvider.cxx | 2
chart2/source/tools/LifeTime.cxx | 106 +++++-----
chart2/source/tools/MediaDescriptorHelper.cxx | 100 ++++-----
chart2/source/tools/ObjectIdentifier.cxx | 2
chart2/source/tools/ThreeDHelper.cxx | 16 -
chart2/source/tools/WrappedIgnoreProperty.cxx | 4
chart2/source/view/axes/VAxisBase.cxx | 4
chart2/source/view/axes/VAxisBase.hxx | 2
chart2/source/view/axes/VCoordinateSystem.cxx | 2
chart2/source/view/axes/VPolarAxis.cxx | 2
chart2/source/view/axes/VPolarAxis.hxx | 2
chart2/source/view/charttypes/VSeriesPlotter.cxx | 6
chart2/source/view/inc/VDataSeries.hxx | 14 -
chart2/source/view/main/ChartView.cxx | 22 +-
chart2/source/view/main/ShapeFactory.cxx | 20 -
chart2/source/view/main/VDataSeries.cxx | 14 -
chart2/source/view/main/VLegend.cxx | 2
compilerplugins/clang/store/salbool.cxx | 1
108 files changed, 592 insertions(+), 591 deletions(-)
New commits:
commit 329332ba526983c1d64763f61df2940e6bcb7d8a
Author: Noel Grandin <noel at peralex.com>
Date: Tue Apr 15 15:17:13 2014 +0200
chart2: sal_Bool->bool
Change-Id: I85751b4e636596ef88ef02bc958abdc6abf98427
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 301003e..d62628f 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -115,10 +115,10 @@ private:
mutable ::apphelper::CloseableLifeTimeManager m_aLifeTimeManager;
mutable ::osl::Mutex m_aModelMutex;
- sal_Bool volatile m_bReadOnly;
- sal_Bool volatile m_bModified;
+ bool volatile m_bReadOnly;
+ bool volatile m_bModified;
sal_Int32 m_nInLoad;
- sal_Bool volatile m_bUpdateNotificationsPending;
+ bool volatile m_bUpdateNotificationsPending;
bool mbTimeBased;
@@ -178,7 +178,7 @@ private:
OUString impl_g_getLocation();
- sal_Bool
+ bool
impl_isControllerConnected( const com::sun::star::uno::Reference<
com::sun::star::frame::XController >& xController );
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index f6252bc..4217ca9 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -121,7 +121,7 @@ public:
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// ___ExplicitValueProvider___
- virtual sal_Bool getExplicitValuesForAxis(
+ virtual bool getExplicitValuesForAxis(
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > xAxis
, ExplicitScaleData& rExplicitScale
, ExplicitIncrementData& rExplicitIncrement ) SAL_OVERRIDE;
@@ -268,7 +268,7 @@ private: //member
sal_Int32 m_nScaleYNumerator;
sal_Int32 m_nScaleYDenominator;
- sal_Bool m_bSdrViewIsInEditMode;
+ bool m_bSdrViewIsInEditMode;
::com::sun::star::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes;
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index 94e9120..aa90d3d 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -149,7 +149,7 @@ OUString AccessibleChartShape::getAccessibleName()
sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint )
throw (uno::RuntimeException, std::exception)
{
- sal_Bool bReturn = sal_False;
+ bool bReturn = false;
if ( m_pAccShape )
{
bReturn = m_pAccShape->containsPoint( aPoint );
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 3c07f88..ddad87b 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -537,20 +537,20 @@ uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats()
return uno::Reference< util::XNumberFormats >();
}
-void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, sal_Bool& rbMainAxis )
+void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis )
{
switch( eType )
{
case X_AXIS:
- rnDimensionIndex = 0; rbMainAxis = sal_True; break;
+ rnDimensionIndex = 0; rbMainAxis = true; break;
case Y_AXIS:
- rnDimensionIndex = 1; rbMainAxis = sal_True; break;
+ rnDimensionIndex = 1; rbMainAxis = true; break;
case Z_AXIS:
- rnDimensionIndex = 2; rbMainAxis = sal_True; break;
+ rnDimensionIndex = 2; rbMainAxis = true; break;
case SECOND_X_AXIS:
- rnDimensionIndex = 0; rbMainAxis = sal_False; break;
+ rnDimensionIndex = 0; rbMainAxis = false; break;
case SECOND_Y_AXIS:
- rnDimensionIndex = 1; rbMainAxis = sal_False; break;
+ rnDimensionIndex = 1; rbMainAxis = false; break;
}
}
@@ -612,7 +612,7 @@ Reference< chart2::XAxis > AxisWrapper::getAxis()
try
{
sal_Int32 nDimensionIndex = 0;
- sal_Bool bMainAxis = sal_True;
+ bool bMainAxis = true;
AxisWrapper::getDimensionAndMainAxisBool( m_eType, nDimensionIndex, bMainAxis );
Reference< XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
@@ -664,7 +664,7 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
WrappedGapwidthProperty* pWrappedGapwidthProperty( new WrappedGapwidthProperty( m_spChart2ModelContact ) );
WrappedBarOverlapProperty* pWrappedBarOverlapProperty( new WrappedBarOverlapProperty( m_spChart2ModelContact ) );
sal_Int32 nDimensionIndex = 0;
- sal_Bool bMainAxis = sal_True;
+ bool bMainAxis = true;
sal_Int32 nAxisIndex = 0;
AxisWrapper::getDimensionAndMainAxisBool( m_eType, nDimensionIndex, bMainAxis );
if( !bMainAxis )
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 61ea830..e6bebca 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -65,7 +65,7 @@ public:
AxisWrapper( tAxisType eType, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~AxisWrapper();
- static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, sal_Bool& rbMainAxis );
+ static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis );
/// XServiceInfo declarations
APPHELPER_XSERVICEINFO_DECL()
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 969f830..7c71bb1 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -141,7 +141,7 @@ uno::Reference< drawing::XDrawPage > Chart2ModelContact::getDrawPage()
return xResult;
}
-sal_Bool Chart2ModelContact::getExplicitValuesForAxis(
+bool Chart2ModelContact::getExplicitValuesForAxis(
const Reference< XAxis > & xAxis,
ExplicitScaleData & rOutExplicitScale,
ExplicitIncrementData & rOutExplicitIncrement )
@@ -152,7 +152,7 @@ sal_Bool Chart2ModelContact::getExplicitValuesForAxis(
return pProvider->getExplicitValuesForAxis(
xAxis, rOutExplicitScale, rOutExplicitIncrement );
}
- return sal_False;
+ return false;
}
sal_Int32 Chart2ModelContact::getExplicitNumberFormatKeyForAxis(
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index c73da31..67514736 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -70,7 +70,7 @@ public:
/** get the current values calculated for an axis in the current view in
case properties are 'auto'.
*/
- sal_Bool getExplicitValuesForAxis(
+ bool getExplicitValuesForAxis(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAxis > & xAxis,
ExplicitScaleData & rOutExplicitScale,
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 406c2ff..0689070 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -650,9 +650,9 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
return;
// remember some diagram properties to reset later
- sal_Bool bStacked = sal_False;
- sal_Bool bPercent = sal_False;
- sal_Bool bDeep = sal_False;
+ bool bStacked = false;
+ bool bPercent = false;
+ bool bDeep = false;
uno::Reference< ::com::sun::star::chart::XChartDocument > xOldDoc( xChartDoc, uno::UNO_QUERY );
OSL_ASSERT( xOldDoc.is());
uno::Reference< beans::XPropertySet > xDiaProp( xOldDoc->getDiagram(), uno::UNO_QUERY );
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 053ac1c..169c5d9 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -307,7 +307,7 @@ WrappedDataSourceLabelsInFirstRowProperty::~WrappedDataSourceLabelsInFirstRowPro
void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bLabelsInFirstRow = sal_True;
+ bool bLabelsInFirstRow = true;
if( ! (rOuterValue >>= bLabelsInFirstRow) )
throw lang::IllegalArgumentException("Property DataSourceLabelsInFirstRow requires value of type boolean", 0, 0 );
@@ -350,7 +350,7 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference
m_spChart2ModelContact->getChartModel(), aRangeString, aSequenceMapping, bUseColumns
, bFirstCellAsLabel, bHasCategories ) )
{
- sal_Bool bLabelsInFirstRow = sal_True;
+ bool bLabelsInFirstRow = true;
if( bUseColumns )
bLabelsInFirstRow = bFirstCellAsLabel;
else
@@ -405,7 +405,7 @@ WrappedDataSourceLabelsInFirstColumnProperty::~WrappedDataSourceLabelsInFirstCol
void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bLabelsInFirstRow = sal_True;
+ bool bLabelsInFirstRow = true;
if( ! (rOuterValue >>= bLabelsInFirstRow) )
throw lang::IllegalArgumentException("Property DataSourceLabelsInFirstRow requires value of type boolean", 0, 0 );
@@ -448,7 +448,7 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Refere
m_spChart2ModelContact->getChartModel(), aRangeString, aSequenceMapping, bUseColumns
, bFirstCellAsLabel, bHasCategories ) )
{
- sal_Bool bLabelsInFirstColumn = sal_True;
+ bool bLabelsInFirstColumn = true;
if( bUseColumns )
bLabelsInFirstColumn = bHasCategories;
else
@@ -500,7 +500,7 @@ WrappedHasLegendProperty::~WrappedHasLegendProperty()
void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNewValue = sal_True;
+ bool bNewValue = true;
if( ! (rOuterValue >>= bNewValue) )
throw lang::IllegalArgumentException("Property HasLegend requires value of type boolean", 0, 0 );
@@ -510,7 +510,7 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
if(xLegend.is())
{
Reference< beans::XPropertySet > xLegendProp( xLegend, uno::UNO_QUERY_THROW );
- sal_Bool bOldValue = sal_True;
+ bool bOldValue = true;
Any aAOld = xLegendProp->getPropertyValue("Show");
aAOld >>= bOldValue;
if( bOldValue != bNewValue )
@@ -584,7 +584,7 @@ WrappedHasMainTitleProperty::~WrappedHasMainTitleProperty()
void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNewValue = sal_True;
+ bool bNewValue = true;
if( ! (rOuterValue >>= bNewValue) )
throw lang::IllegalArgumentException("Property HasMainTitle requires value of type boolean", 0, 0 );
@@ -607,7 +607,7 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp
Any aRet;
try
{
- aRet <<= sal_Bool( TitleHelper::getTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getChartModel() ).is() );
+ aRet <<= TitleHelper::getTitle( TitleHelper::MAIN_TITLE, m_spChart2ModelContact->getChartModel() ).is();
}
catch (const uno::Exception& ex)
{
@@ -657,7 +657,7 @@ WrappedHasSubTitleProperty::~WrappedHasSubTitleProperty()
void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNewValue = sal_True;
+ bool bNewValue = true;
if( ! (rOuterValue >>= bNewValue) )
throw lang::IllegalArgumentException("Property HasSubTitle requires value of type boolean", 0, 0 );
@@ -680,7 +680,7 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope
Any aRet;
try
{
- aRet <<= sal_Bool( TitleHelper::getTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getChartModel() ).is() );
+ aRet <<= TitleHelper::getTitle( TitleHelper::SUB_TITLE, m_spChart2ModelContact->getChartModel() ).is();
}
catch (const uno::Exception& ex)
{
@@ -700,7 +700,7 @@ Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPro
ChartDocumentWrapper::ChartDocumentWrapper(
const Reference< uno::XComponentContext > & xContext ) :
m_spChart2ModelContact( new Chart2ModelContact( xContext ) ),
- m_bUpdateAddIn( sal_True ),
+ m_bUpdateAddIn( true ),
m_bIsDisposed( false )
{
}
@@ -1065,11 +1065,11 @@ void ChartDocumentWrapper::setAddIn( const Reference< util::XRefreshable >& xAdd
}
}
-void ChartDocumentWrapper::setUpdateAddIn( sal_Bool bUpdateAddIn )
+void ChartDocumentWrapper::setUpdateAddIn( bool bUpdateAddIn )
{
m_bUpdateAddIn = bUpdateAddIn;
}
-sal_Bool ChartDocumentWrapper::getUpdateAddIn() const
+bool ChartDocumentWrapper::getUpdateAddIn() const
{
return m_bUpdateAddIn;
}
@@ -1364,7 +1364,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
Sequence< Any > aArguments(2);
Reference<frame::XModel> xModel(this);
aArguments[0]=uno::makeAny(xModel);
- sal_Bool bRefreshAddIn = sal_True;
+ bool bRefreshAddIn = true;
aArguments[1]=uno::makeAny(bRefreshAddIn);
xViewInit->initialize(aArguments);
}
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 047f803..d33e617 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -452,7 +452,7 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(
, m_eType( DATA_SERIES )
, m_nSeriesIndexInNewAPI( -1 )
, m_nPointIndex( -1 )
- , m_bLinesAllowed(sal_True)
+ , m_bLinesAllowed(true)
, m_xDataSeries(0)
{
//need initialize call afterwards
@@ -493,7 +493,7 @@ DataSeriesPointWrapper::DataSeriesPointWrapper( eType _eType,
, m_eType( _eType )
, m_nSeriesIndexInNewAPI( nSeriesIndexInNewAPI )
, m_nPointIndex( (_eType == DATA_POINT) ? nPointIndex : -1 )
- , m_bLinesAllowed( sal_False )
+ , m_bLinesAllowed( false )
, m_xDataSeries(0)
{
}
@@ -616,7 +616,7 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU
if( rPropertyName == "FillColor")
{
Reference< beans::XPropertySet > xSeriesProp( getDataSeries(), uno::UNO_QUERY );
- sal_Bool bVaryColorsByPoint = sal_False;
+ bool bVaryColorsByPoint = false;
if( xSeriesProp.is() && (xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint)
&& bVaryColorsByPoint )
return beans::PropertyState_DIRECT_VALUE;
@@ -816,7 +816,7 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty
if( rPropertyName == "FillColor" )
{
Reference< beans::XPropertySet > xSeriesProp( getDataSeries(), uno::UNO_QUERY );
- sal_Bool bVaryColorsByPoint = sal_False;
+ bool bVaryColorsByPoint = false;
if( xSeriesProp.is() && (xSeriesProp->getPropertyValue("VaryColorsByPoint") >>= bVaryColorsByPoint)
&& bVaryColorsByPoint )
{
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index 743a5c1..f0cff4c 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -134,7 +134,7 @@ private:
sal_Int32 m_nSeriesIndexInNewAPI;
sal_Int32 m_nPointIndex;
- sal_Bool m_bLinesAllowed;
+ bool m_bLinesAllowed;
//this should only be used, if the DataSeriesPointWrapper is initialized via the XInitialize interface
//because a big change in the chartmodel may lead to an dataseriespointer that is not connected to the model anymore
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index bd240f2..a62c6e2 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -846,7 +846,7 @@ sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::Ru
Any aRelativePosition( xDiaProps->getPropertyValue( "RelativePosition" ) );
if( aRelativeSize.hasValue() && aRelativePosition.hasValue() )
{
- sal_Bool bPosSizeExcludeAxes = false;
+ bool bPosSizeExcludeAxes = false;
xDiaProps->getPropertyValue( "PosSizeExcludeAxes" ) >>= bPosSizeExcludeAxes;
return bPosSizeExcludeAxes;
}
@@ -1364,7 +1364,7 @@ bool WrappedStackingProperty::detectInnerValue( StackMode& eStackMode ) const
void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNewValue = false;
+ bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
throw lang::IllegalArgumentException( "Stacking Properties require boolean values", 0, 0 );
@@ -1396,7 +1396,7 @@ Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XProperty
StackMode eInnerStackMode;
if( detectInnerValue( eInnerStackMode ) )
{
- sal_Bool bValue = (eInnerStackMode == m_eStackMode);
+ bool bValue = (eInnerStackMode == m_eStackMode);
Any aAny;
aAny <<= bValue;
return aAny;
@@ -1408,7 +1408,7 @@ Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XProper
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
- aRet <<= sal_Bool( sal_False );
+ aRet <<= false;
return aRet;
}
@@ -1448,7 +1448,7 @@ WrappedDim3DProperty::~WrappedDim3DProperty()
void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNew3D = false;
+ bool bNew3D = false;
if( ! (rOuterValue >>= bNew3D) )
throw lang::IllegalArgumentException( "Property Dim3D requires boolean value", 0, 0 );
@@ -1458,7 +1458,7 @@ void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Refer
if( !xDiagram.is() )
return;
- sal_Bool bOld3D = DiagramHelper::getDimension( xDiagram ) == 3;
+ bool bOld3D = DiagramHelper::getDimension( xDiagram ) == 3;
if( bOld3D != bNew3D )
DiagramHelper::setDimension( xDiagram, bNew3D ? 3 : 2 );
}
@@ -1469,7 +1469,7 @@ Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
if( xDiagram.is() )
{
- sal_Bool b3D = DiagramHelper::getDimension( xDiagram ) == 3;
+ bool b3D = DiagramHelper::getDimension( xDiagram ) == 3;
m_aOuterValue <<= b3D;
}
return m_aOuterValue;
@@ -1479,7 +1479,7 @@ Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyS
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
- aRet <<= sal_Bool( sal_False );
+ aRet <<= false;
return aRet;
}
@@ -1519,7 +1519,7 @@ WrappedVerticalProperty::~WrappedVerticalProperty()
void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNewVertical = false;
+ bool bNewVertical = false;
if( ! (rOuterValue >>= bNewVertical) )
throw lang::IllegalArgumentException( "Property Vertical requires boolean value", 0, 0 );
@@ -1531,7 +1531,7 @@ void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Re
bool bFound = false;
bool bAmbiguous = false;
- sal_Bool bOldVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
+ bool bOldVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
if( bFound && ( bOldVertical != bNewVertical || bAmbiguous ) )
DiagramHelper::setVertical( xDiagram, bNewVertical );
}
@@ -1544,7 +1544,7 @@ Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XProperty
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
if( xDiagram.is() )
{
- sal_Bool bVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
+ bool bVertical = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
if( bFound )
m_aOuterValue <<= bVertical;
}
@@ -1555,7 +1555,7 @@ Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XProper
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
- aRet <<= sal_Bool( sal_False );
+ aRet <<= false;
return aRet;
}
@@ -1999,7 +1999,7 @@ WrappedIncludeHiddenCellsProperty::~WrappedIncludeHiddenCellsProperty()
void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNewValue = false;
+ bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
throw lang::IllegalArgumentException( "Property Dim3D requires boolean value", 0, 0 );
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 5aa6c35..380bc7b 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -83,7 +83,7 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP
Any aRet;
if( xInnerPropertySet.is() )
{
- sal_Bool bShowLegend = sal_True;
+ bool bShowLegend = true;
xInnerPropertySet->getPropertyValue( "Show" ) >>= bShowLegend;
if(!bShowLegend)
{
@@ -103,12 +103,12 @@ void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, c
{
if(xInnerPropertySet.is())
{
- sal_Bool bNewShowLegend = sal_True;
- sal_Bool bOldShowLegend = sal_True;
+ bool bNewShowLegend = true;
+ bool bOldShowLegend = true;
{
::com::sun::star::chart::ChartLegendPosition eOuterPos(::com::sun::star::chart::ChartLegendPosition_NONE);
if( (rOuterValue >>= eOuterPos) && eOuterPos == ::com::sun::star::chart::ChartLegendPosition_NONE )
- bNewShowLegend = sal_False;
+ bNewShowLegend = false;
xInnerPropertySet->getPropertyValue( "Show" ) >>= bOldShowLegend;
}
if(bNewShowLegend!=bOldShowLegend)
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index 1afed57..ad3c3dd 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -112,7 +112,7 @@ WrappedRefreshAddInAllowedProperty::~WrappedRefreshAddInAllowedProperty()
void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bUpdateAddIn = sal_True;
+ bool bUpdateAddIn = true;
if( ! (rOuterValue >>= bUpdateAddIn) )
throw lang::IllegalArgumentException( "The property RefreshAddInAllowed requires type boolean", 0, 0 );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 616a7b6..1070945 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -147,11 +147,11 @@ WrappedAxisAndGridExistenceProperty::~WrappedAxisAndGridExistenceProperty()
void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNewValue = false;
+ bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
throw lang::IllegalArgumentException( "Has axis or grid properties require boolean values", 0, 0 );
- sal_Bool bOldValue = sal_False;
+ bool bOldValue = false;
getPropertyValue( xInnerPropertySet ) >>= bOldValue;
if( bOldValue == bNewValue )
@@ -181,12 +181,12 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< bean
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
if(m_bAxis)
{
- sal_Bool bShown = AxisHelper::isAxisShown( m_nDimensionIndex, m_bMain, xDiagram );
+ bool bShown = AxisHelper::isAxisShown( m_nDimensionIndex, m_bMain, xDiagram );
aRet <<= bShown;
}
else
{
- sal_Bool bShown = AxisHelper::isGridShown( m_nDimensionIndex, 0, m_bMain, xDiagram );
+ bool bShown = AxisHelper::isGridShown( m_nDimensionIndex, 0, m_bMain, xDiagram );
aRet <<= bShown;
}
return aRet;
@@ -269,11 +269,11 @@ WrappedAxisTitleExistenceProperty::~WrappedAxisTitleExistenceProperty()
void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNewValue = false;
+ bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
throw lang::IllegalArgumentException( "Has axis or grid properties require boolean values", 0, 0 );
- sal_Bool bOldValue = sal_False;
+ bool bOldValue = false;
getPropertyValue( xInnerPropertySet ) >>= bOldValue;
if( bOldValue == bNewValue )
@@ -294,11 +294,11 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue
Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bHasTitle = sal_False;
+ bool bHasTitle = false;
Reference< chart2::XTitle > xTitle( TitleHelper::getTitle( m_eTitleType, m_spChart2ModelContact->getChartModel() ) );
if( xTitle.is() && !TitleHelper::getCompleteString( xTitle ).isEmpty() )
- bHasTitle = sal_True;
+ bHasTitle = true;
Any aRet;
aRet <<= bHasTitle;
@@ -310,7 +310,7 @@ Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< bean
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
- aRet <<= sal_Bool( sal_False );
+ aRet <<= false;
return aRet;
}
@@ -375,11 +375,11 @@ WrappedAxisLabelExistenceProperty::~WrappedAxisLabelExistenceProperty()
void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
- sal_Bool bNewValue = false;
+ bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
throw lang::IllegalArgumentException( "Has axis or grid properties require boolean values", 0, 0 );
- sal_Bool bOldValue = sal_False;
+ bool bOldValue = false;
getPropertyValue( xInnerPropertySet ) >>= bOldValue;
if( bOldValue == bNewValue )
@@ -407,7 +407,7 @@ Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans:
if( xProp.is() )
aRet = xProp->getPropertyValue( "DisplayLabels" );
else
- aRet <<= sal_False;
+ aRet <<= false;
return aRet;
}
@@ -415,7 +415,7 @@ Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< bean
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
- aRet <<= sal_Bool( sal_True );
+ aRet <<= true;
return aRet;
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 38f830f..9a1966d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -150,7 +150,7 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
chart2::ScaleData aScaleData( xAxis->getScaleData() );
- sal_Bool bBool = false;
+ bool bBool = false;
switch( eScaleProperty )
{
case SCALE_PROP_MAX:
@@ -485,26 +485,26 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
}
case SCALE_PROP_AUTO_MAX:
{
- aRet <<= (sal_Bool)( !aScaleData.Maximum.hasValue() );
+ aRet <<= !aScaleData.Maximum.hasValue();
break;
}
case SCALE_PROP_AUTO_MIN:
{
- aRet <<= (sal_Bool)( !aScaleData.Minimum.hasValue() );
+ aRet <<= !aScaleData.Minimum.hasValue();
break;
}
case SCALE_PROP_AUTO_STEPMAIN:
{
- aRet <<= (sal_Bool)( !aScaleData.IncrementData.Distance.hasValue() );
+ aRet <<= !aScaleData.IncrementData.Distance.hasValue();
break;
}
case SCALE_PROP_AUTO_STEPHELP:
{
Sequence< chart2::SubIncrement >& rSubIncrements( aScaleData.IncrementData.SubIncrements );
if( rSubIncrements.getLength() > 0 )
- aRet <<= (sal_Bool)( !rSubIncrements[ 0 ].IntervalCount.hasValue() );
+ aRet <<= !rSubIncrements[ 0 ].IntervalCount.hasValue();
else
- aRet <<= sal_True;
+ aRet <<= true;
break;
}
case SCALE_PROP_ORIGIN:
@@ -565,12 +565,12 @@ Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const
}
case SCALE_PROP_LOGARITHMIC:
{
- aRet <<= static_cast< sal_Bool >( AxisHelper::isLogarithmic(aScaleData.Scaling) );
+ aRet <<= AxisHelper::isLogarithmic(aScaleData.Scaling);
break;
}
case SCALE_PROP_REVERSEDIRECTION:
{
- aRet <<= static_cast< sal_Bool >( AxisOrientation_REVERSE == aScaleData.Orientation );
+ aRet <<= AxisOrientation_REVERSE == aScaleData.Orientation;
break;
}
default:
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 6189fee..f0e5080b 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -190,8 +190,8 @@ protected:
// todo: use a valid context
xErrorBarProperties = ::chart::createErrorBar( uno::Reference< uno::XComponentContext >() );
//default in new and old api are different
- xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(sal_Bool(sal_False)) );
- xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(sal_Bool(sal_False)) );
+ xErrorBarProperties->setPropertyValue( "ShowPositiveError" , uno::makeAny(false) );
+ xErrorBarProperties->setPropertyValue( "ShowNegativeError" , uno::makeAny(false) );
xErrorBarProperties->setPropertyValue( "ErrorBarStyle" , uno::makeAny(::com::sun::star::chart::ErrorBarStyle::NONE) );
xSeriesPropertySet->setPropertyValue( "ErrorBarY" , uno::makeAny( xErrorBarProperties ) );
}
@@ -332,7 +332,7 @@ WrappedMeanValueProperty::~WrappedMeanValueProperty()
sal_Bool WrappedMeanValueProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
uno::Reference< chart2::XRegressionCurveContainer > xRegCnt( xSeriesPropertySet, uno::UNO_QUERY );
if( xRegCnt.is() )
bRet = RegressionCurveHelper::hasMeanValueLine( xRegCnt );
@@ -588,8 +588,8 @@ WrappedErrorIndicatorProperty::~WrappedErrorIndicatorProperty()
uno::Reference< beans::XPropertySet > xErrorBarProperties;
if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue( "ErrorBarY" ) >>= xErrorBarProperties ) && xErrorBarProperties.is())
{
- sal_Bool bPositive = sal_False;
- sal_Bool bNegative = sal_False;
+ bool bPositive = false;
+ bool bNegative = false;
xErrorBarProperties->getPropertyValue( "ShowPositiveError" ) >>= bPositive;
xErrorBarProperties->getPropertyValue( "ShowNegativeError" ) >>= bNegative;
@@ -607,19 +607,19 @@ void WrappedErrorIndicatorProperty::setValueToSeries( const Reference< beans::XP
uno::Reference< beans::XPropertySet > xErrorBarProperties( getOrCreateErrorBarProperties(xSeriesPropertySet) );
if( xErrorBarProperties.is() )
{
- sal_Bool bPositive = sal_False;
- sal_Bool bNegative = sal_False;
+ bool bPositive = false;
+ bool bNegative = false;
switch( aNewValue )
{
case ::com::sun::star::chart::ChartErrorIndicatorType_TOP_AND_BOTTOM:
- bPositive = sal_True;
- bNegative = sal_True;
+ bPositive = true;
+ bNegative = true;
break;
case ::com::sun::star::chart::ChartErrorIndicatorType_UPPER:
- bPositive = sal_True;
+ bPositive = true;
break;
case ::com::sun::star::chart::ChartErrorIndicatorType_LOWER:
- bNegative = sal_True;
+ bNegative = true;
break;
default:
break;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index d1b3205..9fef7da 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -75,7 +75,7 @@ WrappedStockProperty::~WrappedStockProperty()
void WrappedStockProperty::setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
{
- sal_Bool bNewValue = false;
+ bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
throw lang::IllegalArgumentException( "stock properties require type sal_Bool", 0, 0 );
@@ -152,12 +152,12 @@ WrappedVolumeProperty::~WrappedVolumeProperty()
if( aTemplateAndService.second == "com.sun.star.chart2.template.StockVolumeLowHighClose"
|| aTemplateAndService.second == "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" )
- m_aOuterValue <<= sal_Bool(sal_True);
+ m_aOuterValue <<= true;
else if( !aTemplateAndService.second.isEmpty() || !m_aOuterValue.hasValue() )
- m_aOuterValue <<= sal_Bool(sal_False);
+ m_aOuterValue <<= false;
}
else if(!m_aOuterValue.hasValue())
- m_aOuterValue <<= sal_Bool(sal_False);
+ m_aOuterValue <<= false;
}
return m_aOuterValue;
}
@@ -221,12 +221,12 @@ WrappedUpDownProperty::~WrappedUpDownProperty()
if( aTemplateAndService.second == "com.sun.star.chart2.template.StockOpenLowHighClose"
|| aTemplateAndService.second == "com.sun.star.chart2.template.StockVolumeOpenLowHighClose" )
- m_aOuterValue <<= sal_Bool(sal_True);
+ m_aOuterValue <<= true;
else if( !aTemplateAndService.second.isEmpty() || !m_aOuterValue.hasValue() )
- m_aOuterValue <<= sal_Bool(sal_False);
+ m_aOuterValue <<= false;
}
else if(!m_aOuterValue.hasValue())
- m_aOuterValue <<= sal_Bool(sal_False);
+ m_aOuterValue <<= false;
}
return m_aOuterValue;
}
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index e478479..94174dd 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -564,7 +564,7 @@ void DataBrowser::RenewTable()
long nOldRow = GetCurRow();
sal_uInt16 nOldColId = GetCurColumnId();
- sal_Bool bLastUpdateMode = GetUpdateMode();
+ bool bLastUpdateMode = GetUpdateMode();
SetUpdateMode( false );
if( IsModified() )
@@ -718,7 +718,7 @@ double DataBrowser::GetCellNumber( long nRow, sal_uInt16 nColumnId ) const
void DataBrowser::Resize()
{
- sal_Bool bLastUpdateMode = GetUpdateMode();
+ bool bLastUpdateMode = GetUpdateMode();
SetUpdateMode( false );
::svt::EditBrowseBox::Resize();
@@ -1010,7 +1010,7 @@ void DataBrowser::PaintCell(
rDev.SetClipRegion(Region(rRect));
// allow for a disabled control ...
- sal_Bool bEnabled = IsEnabled();
+ bool bEnabled = IsEnabled();
Color aOriginalColor = rDev.GetTextColor();
if( ! bEnabled )
rDev.SetTextColor( GetSettings().GetStyleSettings().GetDisableColor() );
@@ -1221,7 +1221,7 @@ sal_Int16 DataBrowser::GetFirstVisibleColumNumber() const
void DataBrowser::ColumnResized( sal_uInt16 nColId )
{
- sal_Bool bLastUpdateMode = GetUpdateMode();
+ bool bLastUpdateMode = GetUpdateMode();
SetUpdateMode( false );
EditBrowseBox::ColumnResized( nColId );
@@ -1231,7 +1231,7 @@ void DataBrowser::ColumnResized( sal_uInt16 nColId )
void DataBrowser::EndScroll()
{
- sal_Bool bLastUpdateMode = GetUpdateMode();
+ bool bLastUpdateMode = GetUpdateMode();
SetUpdateMode( false );
EditBrowseBox::EndScroll();
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 1ceba06..8dab243 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -564,7 +564,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
Reference< chart2::XRegressionCurveCalculator > xCalculator( xCurve->getCalculator(), uno::UNO_QUERY_THROW );
sal_Int32 aDegree = 2;
sal_Int32 aPeriod = 2;
- sal_Bool aForceIntercept = false;
+ bool aForceIntercept = false;
double aInterceptValue = 0.0;
uno::Reference< beans::XPropertySet > xProperties( xCurve, uno::UNO_QUERY );
if ( xProperties.is())
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 3302233..87734a5 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -84,7 +84,7 @@ void LegendPositionResources::writeToResources( const uno::Reference< frame::XMo
if( xProp.is() )
{
//show
- sal_Bool bShowLegend = sal_False;
+ bool bShowLegend = false;
xProp->getPropertyValue( "Show" ) >>= bShowLegend;
if (m_pCbxShow)
m_pCbxShow->Check( bShowLegend );
@@ -125,7 +125,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen
{
try
{
- sal_Bool bShowLegend = m_pCbxShow ? m_pCbxShow->IsChecked() : false;
+ bool bShowLegend = m_pCbxShow ? m_pCbxShow->IsChecked() : false;
ChartModel* pModel = dynamic_cast<ChartModel*>(xChartModel.get());
uno::Reference< beans::XPropertySet > xProp( LegendHelper::getLegend( *pModel,m_xCC,bShowLegend ), uno::UNO_QUERY );
if( xProp.is() )
diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx
index 3f13b9b..a00cae5 100644
--- a/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/chart2/source/controller/dialogs/res_Titles.cxx
@@ -131,13 +131,13 @@ void TitleResources::writeToResources( const TitleDialogData& rInput )
void TitleResources::readFromResources( TitleDialogData& rOutput )
{
- rOutput.aExistenceList[0] = static_cast<sal_Bool>(!m_pEd_Main->GetText().isEmpty());
- rOutput.aExistenceList[1] = static_cast<sal_Bool>(!m_pEd_Sub->GetText().isEmpty());
- rOutput.aExistenceList[2] = static_cast<sal_Bool>(!m_pEd_XAxis->GetText().isEmpty());
- rOutput.aExistenceList[3] = static_cast<sal_Bool>(!m_pEd_YAxis->GetText().isEmpty());
- rOutput.aExistenceList[4] = static_cast<sal_Bool>(!m_pEd_ZAxis->GetText().isEmpty());
- rOutput.aExistenceList[5] = static_cast<sal_Bool>(!m_pEd_SecondaryXAxis->GetText().isEmpty());
- rOutput.aExistenceList[6] = static_cast<sal_Bool>(!m_pEd_SecondaryYAxis->GetText().isEmpty());
+ rOutput.aExistenceList[0] = !m_pEd_Main->GetText().isEmpty();
+ rOutput.aExistenceList[1] = !m_pEd_Sub->GetText().isEmpty();
+ rOutput.aExistenceList[2] = !m_pEd_XAxis->GetText().isEmpty();
+ rOutput.aExistenceList[3] = !m_pEd_YAxis->GetText().isEmpty();
+ rOutput.aExistenceList[4] = !m_pEd_ZAxis->GetText().isEmpty();
+ rOutput.aExistenceList[5] = !m_pEd_SecondaryXAxis->GetText().isEmpty();
+ rOutput.aExistenceList[6] = !m_pEd_SecondaryYAxis->GetText().isEmpty();
rOutput.aTextList[0] = m_pEd_Main->GetText();
rOutput.aTextList[1] = m_pEd_Sub->GetText();
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index d76636d..164f930 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -130,7 +130,7 @@ ThreeD_SceneGeometry_TabPage::ThreeD_SceneGeometry_TabPage( Window* pWindow
m_pMFPerspective->Enable( m_pCbxPerspective->IsChecked() );
//RightAngledAxes
- sal_Bool bRightAngledAxes = false;
+ bool bRightAngledAxes = false;
uno::Reference< chart2::XDiagram > xDiagram( m_xSceneProperties, uno::UNO_QUERY );
if( ChartTypeHelper::isSupportingRightAngledAxes(
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index b4f0d85..eaa6ed5 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -152,7 +152,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
else
{
m_pCbShowDescription->EnableTriState( false );
- sal_Bool bCheck = sal_False;
+ bool bCheck = false;
if( aState == SFX_ITEM_SET )
bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
m_pCbShowDescription->Check( bCheck );
@@ -200,7 +200,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
else
{
m_pCbTextOverlap->EnableTriState( false );
- sal_Bool bCheck = sal_False;
+ bool bCheck = false;
if( aState == SFX_ITEM_SET )
bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
m_pCbTextOverlap->Check( bCheck );
@@ -219,7 +219,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
else
{
m_pCbTextBreak->EnableTriState( false );
- sal_Bool bCheck = sal_False;
+ bool bCheck = false;
if( aState == SFX_ITEM_SET )
bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
m_pCbTextBreak->Check( bCheck );
@@ -261,7 +261,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet& rInAttrs )
ToggleShowLabel( (void*)0 );
}
-void SchAxisLabelTabPage::ShowStaggeringControls( sal_Bool bShowStaggeringControls )
+void SchAxisLabelTabPage::ShowStaggeringControls( bool bShowStaggeringControls )
{
m_bShowStaggeringControls = bShowStaggeringControls;
@@ -284,7 +284,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories )
IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel)
{
- sal_Bool bEnable = ( m_pCbShowDescription->GetState() != TRISTATE_FALSE );
+ bool bEnable = ( m_pCbShowDescription->GetState() != TRISTATE_FALSE );
m_pOrientHlp->Enable( bEnable );
m_pFlOrder->Enable( bEnable );
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 6d9aa3b..0013a0b 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -58,7 +58,7 @@ private:
FixedText* m_pFtTextDirection;
TextDirectionListBox* m_pLbTextDirection;
- sal_Bool m_bShowStaggeringControls;
+ bool m_bShowStaggeringControls;
sal_Int32 m_nInitialDegrees;
bool m_bHasInitialDegrees; /// false = DialControl in tristate
@@ -78,7 +78,7 @@ public:
virtual bool FillItemSet( SfxItemSet& rOutAttrs ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet& rInAttrs ) SAL_OVERRIDE;
- void ShowStaggeringControls( sal_Bool bShowStaggeringControls );
+ void ShowStaggeringControls( bool bShowStaggeringControls );
void SetComplexCategories( bool bComplexCategories );
};
} //namespace chart
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 2f07138..0108a45 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -219,16 +219,16 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
PlaceLabelsSelectHdl( (void*)0 );
// Tick marks
- long nTicks=0,nMinorTicks=0;
+ long nTicks = 0, nMinorTicks = 0;
if(rInAttrs.GetItemState(SCHATTR_AXIS_TICKS,true, &pPoolItem)== SFX_ITEM_SET)
- nTicks=((const SfxInt32Item*)pPoolItem)->GetValue();
+ nTicks = ((const SfxInt32Item*)pPoolItem)->GetValue();
if(rInAttrs.GetItemState(SCHATTR_AXIS_HELPTICKS,true, &pPoolItem)== SFX_ITEM_SET)
- nMinorTicks=((const SfxInt32Item*)pPoolItem)->GetValue();
+ nMinorTicks = ((const SfxInt32Item*)pPoolItem)->GetValue();
- m_pCB_TicksInner->Check(sal_Bool(nTicks&CHAXIS_MARK_INNER));
- m_pCB_TicksOuter->Check(sal_Bool(nTicks&CHAXIS_MARK_OUTER));
- m_pCB_MinorInner->Check(sal_Bool(nMinorTicks&CHAXIS_MARK_INNER));
- m_pCB_MinorOuter->Check(sal_Bool(nMinorTicks&CHAXIS_MARK_OUTER));
+ m_pCB_TicksInner->Check(bool(nTicks&CHAXIS_MARK_INNER));
+ m_pCB_TicksOuter->Check(bool(nTicks&CHAXIS_MARK_OUTER));
+ m_pCB_MinorInner->Check(bool(nMinorTicks&CHAXIS_MARK_INNER));
+ m_pCB_MinorOuter->Check(bool(nMinorTicks&CHAXIS_MARK_OUTER));
// Tick position
if( rInAttrs.GetItemState( SCHATTR_AXIS_MARK_POSITION, false, &pPoolItem ) == SFX_ITEM_SET )
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index b73f7b6..02e386f 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -502,7 +502,7 @@ void DataSourceTabPage::updateControlState()
m_pFT_DATALABELS->Show(!bHasCategories);
m_pFT_CATEGORIES->Show( bHasCategories);
- sal_Bool bShowIB = bHasRangeChooser;
+ bool bShowIB = bHasRangeChooser;
m_pIMB_RANGE_CAT->Show(bShowIB);
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index c5eda1f..1c30d3b 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -85,7 +85,7 @@ void PolarOptionsTabPage::Reset(const SfxItemSet& rInAttrs)
}
if (rInAttrs.GetItemState(SCHATTR_CLOCKWISE, true, &pPoolItem) == SFX_ITEM_SET)
{
- sal_Bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+ bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
m_pCB_Clockwise->Check(bCheck);
}
else
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 63052fb..a9e854f 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -203,11 +203,11 @@ void RangeChooserTabPage::changeDialogModelAccordingToControls()
if( m_bIsDirty )
{
- sal_Bool bFirstCellAsLabel = ( m_pCB_FirstColumnAsLabel->IsChecked() && !m_pRB_Columns->IsChecked() )
+ bool bFirstCellAsLabel = ( m_pCB_FirstColumnAsLabel->IsChecked() && !m_pRB_Columns->IsChecked() )
|| ( m_pCB_FirstRowAsLabel->IsChecked() && !m_pRB_Rows->IsChecked() );
- sal_Bool bHasCategories = ( m_pCB_FirstColumnAsLabel->IsChecked() && m_pRB_Columns->IsChecked() )
+ bool bHasCategories = ( m_pCB_FirstColumnAsLabel->IsChecked() && m_pRB_Columns->IsChecked() )
|| ( m_pCB_FirstRowAsLabel->IsChecked() && m_pRB_Rows->IsChecked() );
- sal_Bool bTimeBased = m_pCB_TimeBased->IsChecked();
+ bool bTimeBased = m_pCB_TimeBased->IsChecked();
Sequence< beans::PropertyValue > aArguments(
DataSourceHelper::createArguments(
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index e0a7c42..4b2fed5 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -147,7 +147,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
if (rInAttrs.GetItemState(SCHATTR_BAR_CONNECT, true, &pPoolItem) == SFX_ITEM_SET)
{
- sal_Bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+ bool bCheck = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
m_pCBConnect->Check(bCheck);
}
@@ -160,7 +160,7 @@ void SchOptionTabPage::Reset(const SfxItemSet& rInAttrs)
{
// model property is "group bars per axis", UI feature is the other way
// round: "show bars side by side"
- sal_Bool bCheck = ! static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+ bool bCheck = ! static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
m_pCBAxisSideBySide->Check( bCheck );
}
else
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index e551c54..f7e1898 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -79,8 +79,8 @@ void TitlesAndObjectsTabPage::initializePage()
uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( m_xChartModel );
uno::Sequence< sal_Bool > aPossibilityList;
uno::Sequence< sal_Bool > aExistenceList;
- AxisHelper::getAxisOrGridPossibilities( aPossibilityList, xDiagram, sal_False );
- AxisHelper::getAxisOrGridExcistence( aExistenceList, xDiagram, sal_False );
+ AxisHelper::getAxisOrGridPossibilities( aPossibilityList, xDiagram, false );
+ AxisHelper::getAxisOrGridExcistence( aExistenceList, xDiagram, false );
m_pCB_Grid_X->Enable( aPossibilityList[0] );
m_pCB_Grid_Y->Enable( aPossibilityList[1] );
m_pCB_Grid_Z->Enable( aPossibilityList[2] );
@@ -123,7 +123,7 @@ void TitlesAndObjectsTabPage::commitToModel()
{
uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xModel );
uno::Sequence< sal_Bool > aOldExistenceList;
- AxisHelper::getAxisOrGridExcistence( aOldExistenceList, xDiagram, sal_False );
+ AxisHelper::getAxisOrGridExcistence( aOldExistenceList, xDiagram, false );
uno::Sequence< sal_Bool > aNewExistenceList(aOldExistenceList);
aNewExistenceList[0] = m_pCB_Grid_X->IsChecked();
aNewExistenceList[1] = m_pCB_Grid_Y->IsChecked();
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index c87cd2c..1cf5a8e 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -71,8 +71,8 @@ public:
void setAddIn( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable >& xAddIn );
::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const;
- void setUpdateAddIn( sal_Bool bUpdateAddIn );
- sal_Bool getUpdateAddIn() const;
+ void setUpdateAddIn( bool bUpdateAddIn );
+ bool getUpdateAddIn() const;
void setBaseDiagram( const OUString& rBaseDiagram );
OUString getBaseDiagram() const;
@@ -210,7 +210,7 @@ private: //member
::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > m_xAddIn;
OUString m_aBaseDiagram;
- sal_Bool m_bUpdateAddIn;
+ bool m_bUpdateAddIn;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xChartView;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index 2ee4ca1..4173005 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -65,7 +65,7 @@ private:
sal_Int32 m_nBarOverlap;
sal_Int32 m_nGapWidth;
- sal_Bool m_bConnectBars;
+ bool m_bConnectBars;
bool m_bSupportingAxisSideBySide;
bool m_bGroupBarsPerAxis;
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 5113b99..5bb42e9 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -110,7 +110,7 @@ private:
com::sun::star::awt::XWindow > m_xParentWindow;
CreationWizard* m_pDialog;
- sal_Bool m_bUnlockControllersOnExecute;
+ bool m_bUnlockControllersOnExecute;
};
} //namespace chart
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 328dd8c..6a15e71 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -217,7 +217,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI
case SCHATTR_AXIS_LOGARITHM:
{
- sal_Bool bValue = AxisHelper::isLogarithmic( rScale.Scaling );
+ bool bValue = AxisHelper::isLogarithmic( rScale.Scaling );
rOutItemSet.Put( SfxBoolItem( nWhichId, bValue ));
}
break;
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 782b0f9..57643b7 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -238,7 +238,7 @@ DataPointItemConverter::DataPointItemConverter(
uno::Reference< XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram , xSeries ) );
bool bFound = false;
bool bAmbiguous = false;
- sal_Bool bSwapXAndY = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
+ bool bSwapXAndY = DiagramHelper::getVertical( xDiagram, bFound, bAmbiguous );
m_aAvailableLabelPlacements = ChartTypeHelper::getSupportedLabelPlacements( xChartType, DiagramHelper::getDimension( xDiagram ), bSwapXAndY, xSeries );
m_bForbidPercentValue = AxisType::CATEGORY != ChartTypeHelper::getAxisType( xChartType, 0 );
@@ -319,19 +319,19 @@ bool DataPointItemConverter::ApplySpecialItem(
sal_Bool& rValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : (
(SCHATTR_DATADESCR_SHOW_PERCENTAGE==nWhichId) ? aLabel.ShowNumberInPercent : (
(SCHATTR_DATADESCR_SHOW_CATEGORY==nWhichId) ? aLabel.ShowCategoryName : aLabel.ShowLegendSymbol ));
- sal_Bool bOldValue = rValue;
- rValue = static_cast< sal_Bool >( rItem.GetValue() );
+ bool bOldValue = rValue;
+ rValue = rItem.GetValue();
if( m_bOverwriteLabelsForAttributedDataPointsAlso )
{
Reference< chart2::XDataSeries > xSeries( GetPropertySet(), uno::UNO_QUERY);
- if( bOldValue != rValue ||
+ if( (bOldValue ? 1 : 0) != rValue ||
DataSeriesHelper::hasAttributedDataPointDifferentValue( xSeries, "Label" , aOldValue ) )
{
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "Label" , uno::makeAny( aLabel ) );
bChanged = true;
}
}
- else if( bOldValue != rValue )
+ else if( (bOldValue ? 1 : 0) != rValue )
{
GetPropertySet()->setPropertyValue( "Label" , uno::makeAny( aLabel ));
bChanged = true;
@@ -541,7 +541,7 @@ void DataPointItemConverter::FillSpecialItem(
chart2::DataPointLabel aLabel;
if( GetPropertySet()->getPropertyValue( "Label" ) >>= aLabel )
{
- sal_Bool bValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : (
+ bool bValue = (SCHATTR_DATADESCR_SHOW_NUMBER==nWhichId) ? aLabel.ShowNumber : (
(SCHATTR_DATADESCR_SHOW_PERCENTAGE==nWhichId) ? aLabel.ShowNumberInPercent : (
(SCHATTR_DATADESCR_SHOW_CATEGORY==nWhichId) ? aLabel.ShowCategoryName : aLabel.ShowLegendSymbol ));
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index d57e698..31e1e3c 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -109,8 +109,8 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
const SfxPoolItem* pPoolItem = NULL;
if( rInItemSet.GetItemState( SCHATTR_LEGEND_SHOW, true, &pPoolItem ) == SFX_ITEM_SET )
{
- sal_Bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
- sal_Bool bWasShown = sal_True;
+ bool bShow = static_cast< const SfxBoolItem * >( pPoolItem )->GetValue();
+ bool bWasShown = true;
if( ! (GetPropertySet()->getPropertyValue( "Show" ) >>= bWasShown) ||
( bWasShown != bShow ))
{
@@ -175,7 +175,7 @@ void LegendItemConverter::FillSpecialItem(
{
case SCHATTR_LEGEND_SHOW:
{
- sal_Bool bShow = sal_True;
+ bool bShow = true;
GetPropertySet()->getPropertyValue( "Show" ) >>= bShow;
rOutItemSet.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, bShow) );
}
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index e0efdc3..34042ca 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -249,7 +249,7 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
case SCHATTR_BAR_CONNECT:
{
- sal_Bool bOldConnectBars = sal_False;
+ bool bOldConnectBars = false;
m_bConnectBars = static_cast< const SfxBoolItem & >(
rItemSet.Get( nWhichId )).GetValue();
if( m_bSupportingBarConnectors )
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 446a816..b711d6b 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -93,8 +93,8 @@ using ::com::sun::star::uno::Sequence;
ChartController::ChartController(uno::Reference<uno::XComponentContext> const & xContext) :
m_aLifeTimeManager( NULL ),
- m_bSuspended( sal_False ),
- m_bCanClose( sal_True ),
+ m_bSuspended( false ),
+ m_bCanClose( true ),
m_xCC(xContext), //@todo is it allowed to hold this context??
m_xFrame( NULL ),
m_aModelMutex(),
@@ -142,8 +142,8 @@ void ChartController::RefCountable::release()
ChartController::TheModel::TheModel( const uno::Reference< frame::XModel > & xModel ) :
m_xModel( xModel ),
m_xCloseable( NULL ),
- m_bOwnership( sal_True ),
- m_bOwnershipIsWellKnown( sal_False )
+ m_bOwnership( true ),
+ m_bOwnershipIsWellKnown( false )
{
m_xCloseable =
uno::Reference< util::XCloseable >( xModel, uno::UNO_QUERY );
@@ -153,10 +153,10 @@ ChartController::TheModel::~TheModel()
{
}
-void ChartController::TheModel::SetOwnership( sal_Bool bGetsOwnership )
+void ChartController::TheModel::SetOwnership( bool bGetsOwnership )
{
m_bOwnership = bGetsOwnership;
- m_bOwnershipIsWellKnown = sal_True;
+ m_bOwnershipIsWellKnown = true;
}
void ChartController::TheModel::addListener( ChartController* pController )
@@ -209,7 +209,7 @@ void ChartController::TheModel::tryTermination()
m_xCloseable->close(sal_True);
m_bOwnership = false;
- m_bOwnershipIsWellKnown = sal_True;
+ m_bOwnershipIsWellKnown = true;
}
catch( const util::CloseVetoException& )
{
@@ -222,7 +222,7 @@ void ChartController::TheModel::tryTermination()
#endif
m_bOwnership = false;
- m_bOwnershipIsWellKnown = sal_True;
+ m_bOwnershipIsWellKnown = true;
return;
}
@@ -289,24 +289,24 @@ ChartController::TheModelRef::~TheModelRef()
if(m_pTheModel)
m_pTheModel->release();
}
-sal_Bool ChartController::TheModelRef::is() const
+bool ChartController::TheModelRef::is() const
{
return (m_pTheModel != 0);
}
// private methods
-sal_Bool ChartController::impl_isDisposedOrSuspended() const
+bool ChartController::impl_isDisposedOrSuspended() const
{
if( m_aLifeTimeManager.impl_isDisposed() )
- return sal_True;
+ return true;
if( m_bSuspended )
{
OSL_FAIL( "This Controller is suspended" );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// lang::XServiceInfo
@@ -655,7 +655,7 @@ sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend )
if( m_aLifeTimeManager.impl_isDisposed() )
return sal_False; //behave passive if already disposed, return false because request was not accepted //@todo? correct
- if(bSuspend==m_bSuspended)
+ if(bSuspend == (m_bSuspended ? 1 : 0))
{
OSL_FAIL( "new suspend mode equals old suspend mode" );
return sal_True;
@@ -1160,7 +1160,7 @@ void SAL_CALL ChartController::dispatch(
}
else
{
- this->executeDispatch_MoveSeries( sal_True );
+ this->executeDispatch_MoveSeries( true );
}
}
else if ( aCommand == "Backward" )
@@ -1171,7 +1171,7 @@ void SAL_CALL ChartController::dispatch(
}
else
{
- this->executeDispatch_MoveSeries( sal_False );
+ this->executeDispatch_MoveSeries( false );
}
}
else if( aCommand == "NewArrangement")
@@ -1283,7 +1283,7 @@ void SAL_CALL ChartController::executeDispatch_SourceData()
}
}
-void SAL_CALL ChartController::executeDispatch_MoveSeries( sal_Bool bForward )
+void SAL_CALL ChartController::executeDispatch_MoveSeries( bool bForward )
{
ControllerLockGuardUNO aCLGuard( getModel() );
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index 0698d56..a207f51 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -462,7 +462,7 @@ private:
virtual ~TheModel();
- void SetOwnership( sal_Bool bGetsOwnership );
+ void SetOwnership( bool bGetsOwnership );
void addListener( ChartController* pController );
void removeListener( ChartController* pController );
void tryTermination();
@@ -475,11 +475,11 @@ private:
//the ownership between model and controller is not clear at first
//each controller might consider himself as owner of the model first
- sal_Bool volatile m_bOwnership;
+ bool volatile m_bOwnership;
//with a XCloseable::close call and during XCloseListener::queryClosing
//the ownership can be regulated more explicit,
//if so the ownership is considered to be well known
- sal_Bool volatile m_bOwnershipIsWellKnown;
+ bool volatile m_bOwnershipIsWellKnown;
};
class TheModelRef
{
@@ -489,7 +489,7 @@ private:
TheModelRef& operator=(ChartController::TheModel* pTheModel);
TheModelRef& operator=(const TheModelRef& rTheModel);
virtual ~TheModelRef();
- sal_Bool is() const;
+ bool is() const;
TheModel* operator->() const { return m_pTheModel; }
private:
TheModel* m_pTheModel;
@@ -500,8 +500,8 @@ private:
mutable ::apphelper::LifeTimeManager m_aLifeTimeManager;
mutable ::osl::Mutex m_aControllerMutex;
- sal_Bool volatile m_bSuspended;
- sal_Bool volatile m_bCanClose;
+ bool volatile m_bSuspended;
+ bool volatile m_bCanClose;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC;
@@ -548,7 +548,7 @@ private:
private:
//private methods
- sal_Bool impl_isDisposedOrSuspended() const;
+ bool impl_isDisposedOrSuspended() const;
::std::auto_ptr< ReferenceSizeProvider > impl_createReferenceSizeProvider();
void impl_adaptDataSeriesAutoResize();
@@ -606,7 +606,7 @@ private:
void SAL_CALL executeDispatch_InsertSpecialCharacter();
void SAL_CALL executeDispatch_EditText( const Point* pMousePixel = NULL );
void SAL_CALL executeDispatch_SourceData();
- void SAL_CALL executeDispatch_MoveSeries( sal_Bool bForward );
+ void SAL_CALL executeDispatch_MoveSeries( bool bForward );
void StartTextEdit( const Point* pMousePixel = NULL );
bool EndTextEdit();
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 034b326..ea435b6 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -109,8 +109,8 @@ void ChartController::executeDispatch_InsertAxes()
{
InsertAxisOrGridDialogData aDialogInput;
uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram(getModel());
- AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, sal_True );
- AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, sal_True );
+ AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, true );
+ AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, true );
SolarMutexGuard aGuard;
SchAxisDlg aDlg( m_pChartWindow, aDialogInput );
@@ -147,8 +147,8 @@ void ChartController::executeDispatch_InsertGrid()
{
InsertAxisOrGridDialogData aDialogInput;
uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram(getModel());
- AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, sal_False );
- AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, sal_False );
+ AxisHelper::getAxisOrGridExcistence( aDialogInput.aExistenceList, xDiagram, false );
+ AxisHelper::getAxisOrGridPossibilities( aDialogInput.aPossibilityList, xDiagram, false );
SolarMutexGuard aGuard;
SchGridDlg aDlg( m_pChartWindow, aDialogInput );//aItemSet, b3D, bNet, bSecondaryX, bSecondaryY );
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index ace308d..729c816 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -73,7 +73,7 @@ void ChartController::StartTextEdit( const Point* pMousePixel )
if( xChartViewProps.is() )
xChartViewProps->setPropertyValue( "SdrViewIsInEditMode", uno::makeAny(sal_True) );
- sal_Bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj
+ bool bEdit = m_pDrawViewWrapper->SdrBeginTextEdit( pTextObj
, m_pDrawViewWrapper->GetPageView()
, m_pChartWindow
, false //bIsNewObj
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 66ea74f..aded435 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -1886,7 +1886,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
Point aMousePos( m_pChartWindow->PixelToLogic( rEvent.GetPosPixel()));
sal_uInt16 nModifier = rEvent.GetModifier();
- sal_Bool bLeftDown = rEvent.IsLeft();
+ bool bLeftDown = rEvent.IsLeft();
if ( m_pDrawViewWrapper->IsTextEdit() )
{
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index f0b5fed..dd424a5 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -33,7 +33,7 @@ using namespace ::com::sun::star;
ChartFrameLoader::ChartFrameLoader(
uno::Reference<uno::XComponentContext> const & xContext)
- : m_bCancelRequired( sal_False )
+ : m_bCancelRequired( false )
{
m_xCC = xContext;
m_oCancelFinished.reset();
@@ -43,15 +43,15 @@ ChartFrameLoader::~ChartFrameLoader()
{
}
- sal_Bool ChartFrameLoader
+ bool ChartFrameLoader
::impl_checkCancel()
{
if(m_bCancelRequired)
{
m_oCancelFinished.set();
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// lang::XServiceInfo
@@ -180,9 +180,9 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
::cancel() throw (uno::RuntimeException, std::exception)
{
m_oCancelFinished.reset();
- m_bCancelRequired = sal_True;
+ m_bCancelRequired = true;
m_oCancelFinished.wait();
- m_bCancelRequired = sal_False;
+ m_bCancelRequired = false;
}
} //namespace chart
diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx
index 769a385..024ed2c 100644
--- a/chart2/source/controller/main/ChartFrameloader.hxx
+++ b/chart2/source/controller/main/ChartFrameloader.hxx
@@ -40,11 +40,11 @@ class ChartFrameLoader : public ::cppu::WeakImplHelper2<
{
private:
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext> m_xCC;
- sal_Bool m_bCancelRequired;
+ bool m_bCancelRequired;
::osl::Condition m_oCancelFinished;
private:
- sal_Bool impl_checkCancel();
+ bool impl_checkCancel();
//no default constructor
ChartFrameLoader(){}
public:
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index f9e8e98..9daa3db 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -64,7 +64,7 @@ DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWr
, m_nAdditionalHorizontalAngleDegree(0)
, m_nAdditionalVerticalAngleDegree(0)
, m_eRotationDirection(eRotationDirection)
- , m_bRightAngledAxes(sal_False)
+ , m_bRightAngledAxes(false)
{
m_pScene = SelectionHelper::getSceneToRotate( rDrawViewWrapper.getNamedSdrObject( rObjectCID ) );
SdrObject* pObj = rDrawViewWrapper.getSelectedObject();
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
index c9d1fb1..98825df 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
@@ -75,7 +75,7 @@ private:
sal_Int32 m_nAdditionalVerticalAngleDegree;
RotationDirection m_eRotationDirection;
- sal_Bool m_bRightAngledAxes;
+ bool m_bRightAngledAxes;
};
} // namespace chart
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 5398e2e..c20e0af 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -121,7 +121,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
DrawViewWrapper* pDrawViewWrapper = m_pChartController->GetDrawViewWrapper();
if ( pDrawModelWrapper && pDrawViewWrapper && pDrawViewWrapper->GetCurrentObjIdentifier() == OBJ_CUSTOMSHAPE )
{
- sal_Bool bAttributesAppliedFromGallery = sal_False;
+ bool bAttributesAppliedFromGallery = false;
if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
{
::std::vector< OUString > aObjList;
@@ -162,7 +162,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
double a = nAngle * F_PI18000;
pObj->NbcRotate( pObj->GetSnapRect().Center(), nAngle, sin( a ), cos( a ) );
}
- bAttributesAppliedFromGallery = sal_True;
+ bAttributesAppliedFromGallery = true;
}
}
break;
@@ -510,7 +510,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
if ( pTextObj )
{
pTextObj->SetLogicRect( aRect );
- sal_Bool bVertical = ( nID == COMMAND_ID_DRAW_TEXT_VERTICAL );
+ bool bVertical = ( nID == COMMAND_ID_DRAW_TEXT_VERTICAL );
pTextObj->SetVerticalWriting( bVertical );
if ( bVertical )
{
@@ -530,7 +530,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
{
if ( pObj->ISA( SdrCaptionObj ) )
{
- sal_Bool bIsVertical( COMMAND_ID_DRAW_CAPTION_VERTICAL == nID );
+ bool bIsVertical( COMMAND_ID_DRAW_CAPTION_VERTICAL == nID );
SdrTextObj* pTextObj = dynamic_cast< SdrTextObj* >( pObj );
if ( pTextObj )
{
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 2f808e0..dea2771 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -259,7 +259,7 @@ void ShapeController::executeDispatch_FormatLine()
{
SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject();
SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
- sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
+ bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
if ( bHasMarked )
{
pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
@@ -298,7 +298,7 @@ void ShapeController::executeDispatch_FormatArea()
if ( pParent && pDrawModelWrapper && pDrawViewWrapper )
{
SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
- sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
+ bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
if ( bHasMarked )
{
pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
@@ -340,7 +340,7 @@ void ShapeController::executeDispatch_TextAttributes()
if ( pParent && pDrawViewWrapper )
{
SfxItemSet aAttr( pDrawViewWrapper->GetDefaultAttr() );
- sal_Bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
+ bool bHasMarked = pDrawViewWrapper->AreObjectsMarked();
if ( bHasMarked )
{
pDrawViewWrapper->MergeAttrFromMarked( aAttr, false );
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index 253091f..946dcba 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -184,7 +184,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even
aFind->second = Event.IsEnabled;
if ( m_pToolbarController.is() )
{
- sal_Bool bCheckmark = sal_False;
+ bool bCheckmark = false;
ToolBox& rTb = m_pToolbarController->GetToolBox();
for ( sal_uInt16 i = 0; i < rTb.GetItemCount(); ++i )
diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx
index b6e4a61..3aff9dd 100644
--- a/chart2/source/inc/AxisHelper.hxx
+++ b/chart2/source/inc/AxisHelper.hxx
@@ -92,9 +92,9 @@ public:
static void hideGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
- static sal_Bool isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
+ static bool isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
- static sal_Bool isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
+ static bool isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram );
static void makeAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
@@ -106,9 +106,9 @@ public:
static void hideAxisIfNoDataIsAttached( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis
, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram);
- SAL_DLLPRIVATE static sal_Bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties );
- static sal_Bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
- static sal_Bool isGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties );
+ SAL_DLLPRIVATE static bool areAxisLabelsVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xAxisProperties );
+ static bool isAxisVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis );
+ static bool isGridVisible( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xGridProperties );
static ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XCoordinateSystem >
@@ -206,10 +206,10 @@ public:
::com::sun::star::chart2::XDiagram >& xDiagram );
static void getAxisOrGridPossibilities( ::com::sun::star::uno::Sequence< sal_Bool >& rPossibilityList
- , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, sal_Bool bAxis=sal_True );
+ , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, bool bAxis=true );
static void getAxisOrGridExcistence( ::com::sun::star::uno::Sequence< sal_Bool >& rExcistenceList
- , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, sal_Bool bAxis=sal_True );
+ , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram, bool bAxis=true );
static bool changeVisibilityOfGrids( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram>& xDiagram
, const ::com::sun::star::uno::Sequence< sal_Bool >& rOldExistenceList
diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx
index 2a3c7c5..1751a83 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -36,16 +36,16 @@ namespace chart
class OOO_DLLPUBLIC_CHARTTOOLS ChartTypeHelper
{
public:
- static sal_Bool isSupportingGeometryProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
- static sal_Bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
- static sal_Bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
- static sal_Bool isSupportingMainAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
- static sal_Bool isSupportingSecondaryAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
- static sal_Bool isSupportingAreaProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
- static sal_Bool isSupportingSymbolProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
- static sal_Bool isSupportingOverlapAndGapWidthProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
- static sal_Bool isSupportingBarConnectors( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
- static sal_Bool isSupportingRightAngledAxes( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
+ static bool isSupportingGeometryProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+ static bool isSupportingStatisticProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+ static bool isSupportingRegressionProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+ static bool isSupportingMainAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
+ static bool isSupportingSecondaryAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex );
+ static bool isSupportingAreaProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+ static bool isSupportingSymbolProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+ static bool isSupportingOverlapAndGapWidthProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+ static bool isSupportingBarConnectors( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
+ static bool isSupportingRightAngledAxes( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
static bool isSupportingAxisSideBySide( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount );
static bool isSupportingStartingAngle( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType );
//starting value for bars or baseline for areas for example
@@ -56,7 +56,7 @@ public:
//returns sequence of ::com::sun::star::chart::DataLabelPlacement
static ::com::sun::star::uno::Sequence < sal_Int32 > getSupportedLabelPlacements(
- const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Bool bSwapXAndY
+ const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, bool bSwapXAndY
, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >& xSeries );
//returns sequence of ::com::sun::star::chart::MissingValueTreatment
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index 485579c..7c779c9 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -223,10 +223,10 @@ template< typename T >
}
OOO_DLLPUBLIC_CHARTTOOLS
-sal_Bool hasDoubleValue( const ::com::sun::star::uno::Any& rAny );
+bool hasDoubleValue( const ::com::sun::star::uno::Any& rAny );
OOO_DLLPUBLIC_CHARTTOOLS
-sal_Bool hasLongOrShortValue( const ::com::sun::star::uno::Any& rAny );
+bool hasLongOrShortValue( const ::com::sun::star::uno::Any& rAny );
OOO_DLLPUBLIC_CHARTTOOLS
sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny );
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index ce7626d..4b20858 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -39,21 +39,21 @@ friend class LifeTimeGuard;
protected:
mutable ::osl::Mutex m_aAccessMutex;
public:
-OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, sal_Bool bLongLastingCallsCancelable = sal_False );
+OOO_DLLPUBLIC_CHARTTOOLS LifeTimeManager( ::com::sun::star::lang::XComponent* pComponent, bool bLongLastingCallsCancelable = false );
OOO_DLLPUBLIC_CHARTTOOLS virtual ~LifeTimeManager();
OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposed( bool bAssert=true );
-OOO_DLLPUBLIC_CHARTTOOLS sal_Bool dispose() throw(::com::sun::star::uno::RuntimeException);
+OOO_DLLPUBLIC_CHARTTOOLS bool dispose() throw(::com::sun::star::uno::RuntimeException);
public:
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer;
protected:
- virtual sal_Bool impl_canStartApiCall();
+ virtual bool impl_canStartApiCall();
virtual void impl_apiCallCountReachedNull(){}
- void impl_registerApiCall(sal_Bool bLongLastingCall);
- void impl_unregisterApiCall(sal_Bool bLongLastingCall);
+ void impl_registerApiCall(bool bLongLastingCall);
+ void impl_unregisterApiCall(bool bLongLastingCall);
void impl_init();
@@ -63,10 +63,10 @@ protected:
::osl::Condition m_aNoAccessCountCondition;
sal_Int32 volatile m_nAccessCount;
- sal_Bool volatile m_bDisposed;
- sal_Bool volatile m_bInDispose;
+ bool volatile m_bDisposed;
+ bool volatile m_bInDispose;
- sal_Bool m_bLongLastingCallsCancelable;
+ bool m_bLongLastingCallsCancelable;
::osl::Condition m_aNoLongLastingCallCountCondition;
sal_Int32 volatile m_nLongLastingCallCount;
};
@@ -77,48 +77,48 @@ protected:
::com::sun::star::util::XCloseable* m_pCloseable;
::osl::Condition m_aEndTryClosingCondition;
- sal_Bool volatile m_bClosed;
- sal_Bool volatile m_bInTryClose;
+ bool volatile m_bClosed;
+ bool volatile m_bInTryClose;
//the ownership between model and controller is not clear at first
//each controller might consider him as owner of the model first
//at start the model is not considered as owner of itself
- sal_Bool volatile m_bOwnership;
+ bool volatile m_bOwnership;
//with a XCloseable::close call and during XCloseListener::queryClosing
//the ownership can be regulated more explicit,
//if so the ownership is considered to be well known
- sal_Bool volatile m_bOwnershipIsWellKnown;
+ bool volatile m_bOwnershipIsWellKnown;
public:
OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( ::com::sun::star::util::XCloseable* pCloseable
, ::com::sun::star::lang::XComponent* pComponent
- , sal_Bool bLongLastingCallsCancelable = sal_False );
+ , bool bLongLastingCallsCancelable = false );
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true );
-OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_startTryClose(sal_Bool bDeliverOwnership)
+OOO_DLLPUBLIC_CHARTTOOLS bool g_close_startTryClose(bool bDeliverOwnership)
throw ( ::com::sun::star::uno::Exception );
-OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_close_isNeedToCancelLongLastingCalls( sal_Bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex )
+OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, ::com::sun::star::util::CloseVetoException& ex )
throw ( ::com::sun::star::util::CloseVetoException );
-OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(sal_Bool bDeliverOwnership, sal_Bool bMyVeto );
+OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(bool bDeliverOwnership, bool bMyVeto );
OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose();
-OOO_DLLPUBLIC_CHARTTOOLS sal_Bool g_addCloseListener( const ::com::sun::star::uno::Reference<
+OOO_DLLPUBLIC_CHARTTOOLS bool g_addCloseListener( const ::com::sun::star::uno::Reference<
::com::sun::star::util::XCloseListener > & xListener )
throw(::com::sun::star::uno::RuntimeException);
protected:
- virtual sal_Bool impl_canStartApiCall() SAL_OVERRIDE;
+ virtual bool impl_canStartApiCall() SAL_OVERRIDE;
virtual void impl_apiCallCountReachedNull() SAL_OVERRIDE;
- void impl_setOwnership( sal_Bool bDeliverOwnership, sal_Bool bMyVeto );
- sal_Bool impl_shouldCloseAtNextChance();
+ void impl_setOwnership( bool bDeliverOwnership, bool bMyVeto );
+ bool impl_shouldCloseAtNextChance();
void impl_doClose();
void impl_init()
{
- m_bClosed = sal_False;
- m_bInTryClose = sal_False;
- m_bOwnership = sal_False;
- m_bOwnershipIsWellKnown = sal_False;
+ m_bClosed = false;
+ m_bInTryClose = false;
+ m_bOwnership = false;
+ m_bOwnershipIsWellKnown = false;
m_aEndTryClosingCondition.set();
}
};
@@ -192,20 +192,20 @@ public:
LifeTimeGuard( LifeTimeManager& rManager )
: m_guard( rManager.m_aAccessMutex )
, m_rManager(rManager)
- , m_bCallRegistered(sal_False)
- , m_bLongLastingCallRegistered(sal_False)
+ , m_bCallRegistered(false)
+ , m_bLongLastingCallRegistered(false)
{
}
- sal_Bool startApiCall(sal_Bool bLongLastingCall=sal_False);
+ bool startApiCall(bool bLongLastingCall=false);
~LifeTimeGuard();
void clear() { m_guard.clear(); }
private:
osl::ClearableMutexGuard m_guard;
LifeTimeManager& m_rManager;
- sal_Bool m_bCallRegistered;
- sal_Bool m_bLongLastingCallRegistered;
+ bool m_bCallRegistered;
+ bool m_bLongLastingCallRegistered;
private:
// these make no sense
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index 35e89b5..6b05612 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -75,115 +75,115 @@ public:
m_aModelProperties; //these are properties which are not described in service com.sun.star.document.MediaDescriptor
//@todo define this for debug only, except URL
- sal_Bool AsTemplate; //document is a template.
- sal_Bool ISSET_AsTemplate;
+ bool AsTemplate; //document is a template.
+ bool ISSET_AsTemplate;
OUString Author;
- sal_Bool ISSET_Author;
+ bool ISSET_Author;
OUString CharacterSet; //identifier of used character set.
- sal_Bool ISSET_CharacterSet;
+ bool ISSET_CharacterSet;
OUString Comment;
- sal_Bool ISSET_Comment;
+ bool ISSET_Comment;
::com::sun::star::uno::Any
ComponentData;
- sal_Bool ISSET_ComponentData;
+ bool ISSET_ComponentData;
OUString FileName; //deprecated, same as url
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list