[Libreoffice-commits] core.git: chart2/source
Noel Grandin
noel at peralex.com
Tue Apr 5 11:30:37 UTC 2016
chart2/source/controller/accessibility/AccessibleBase.cxx | 2 +-
chart2/source/controller/accessibility/AccessibleChartElement.cxx | 5 ++---
chart2/source/controller/accessibility/AccessibleChartElement.hxx | 3 +--
chart2/source/controller/accessibility/AccessibleChartShape.cxx | 5 ++---
chart2/source/controller/accessibility/AccessibleChartShape.hxx | 3 +--
chart2/source/controller/accessibility/ChartElementFactory.cxx | 4 ++--
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 5 ++---
chart2/source/controller/inc/DrawViewWrapper.hxx | 2 +-
chart2/source/controller/main/ChartController.cxx | 2 +-
chart2/source/inc/LifeTime.hxx | 3 +--
chart2/source/model/inc/CartesianCoordinateSystem.hxx | 3 +--
chart2/source/model/inc/PolarCoordinateSystem.hxx | 3 +--
chart2/source/model/main/CartesianCoordinateSystem.cxx | 9 ++++-----
chart2/source/model/main/PolarCoordinateSystem.cxx | 9 ++++-----
chart2/source/model/template/BubbleChartType.cxx | 3 +--
chart2/source/model/template/ChartType.cxx | 3 +--
chart2/source/model/template/NetChartType.cxx | 3 +--
chart2/source/model/template/PieChartType.cxx | 3 +--
chart2/source/model/template/ScatterChartType.cxx | 3 +--
chart2/source/tools/LifeTime.cxx | 5 ++---
20 files changed, 31 insertions(+), 47 deletions(-)
New commits:
commit a7ec6c29aaed1ed7dd8713a9b8698d12181c40a3
Author: Noel Grandin <noel at peralex.com>
Date: Tue Apr 5 08:24:32 2016 +0200
loplugin:constantparam in chart2
Change-Id: I9adcf4516107aaa960463be13090c2ac15685e09
Reviewed-on: https://gerrit.libreoffice.org/23833
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 6888666..587a827 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -283,7 +283,7 @@ bool AccessibleBase::ImplUpdateChildren()
}
else if ( aIt->isAdditionalShape() )
{
- AddChild( new AccessibleChartShape( aAccInfo, true, false ) );
+ AddChild( new AccessibleChartShape( aAccInfo ) );
}
}
bResult = true;
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 375f63c..cb6faa5 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -50,9 +50,8 @@ namespace chart
AccessibleChartElement::AccessibleChartElement(
const AccessibleElementInfo & rAccInfo,
- bool bMayHaveChildren,
- bool bAlwaysTransparent /* default: false */ ) :
- impl::AccessibleChartElement_Base( rAccInfo, bMayHaveChildren, bAlwaysTransparent ),
+ bool bMayHaveChildren ) :
+ impl::AccessibleChartElement_Base( rAccInfo, bMayHaveChildren, false/*bAlwaysTransparent*/ ),
m_bHasText( false )
{
AddState( AccessibleStateType::TRANSIENT );
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index b6aef8b..e68d8df 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -69,8 +69,7 @@ class AccessibleChartElement :
{
public:
AccessibleChartElement( const AccessibleElementInfo & rAccInfo,
- bool bMayHaveChildren,
- bool bAlwaysTransparent = false );
+ bool bMayHaveChildren );
virtual ~AccessibleChartElement();
// ________ AccessibleBase ________
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index e7b4eed..3139f9d 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -36,9 +36,8 @@ namespace chart
{
AccessibleChartShape::AccessibleChartShape(
- const AccessibleElementInfo& rAccInfo,
- bool bMayHaveChildren, bool bAlwaysTransparent )
- :impl::AccessibleChartShape_Base( rAccInfo, bMayHaveChildren, bAlwaysTransparent )
+ const AccessibleElementInfo& rAccInfo )
+ :impl::AccessibleChartShape_Base( rAccInfo, true/*bMayHaveChildren*/, false/*bAlwaysTransparent*/ )
{
if ( rAccInfo.m_aOID.isAdditionalShape() )
{
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index 97bbb8d..e853c50 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -44,8 +44,7 @@ class AccessibleChartShape :
public impl::AccessibleChartShape_Base
{
public:
- AccessibleChartShape( const AccessibleElementInfo& rAccInfo,
- bool bMayHaveChildren, bool bAlwaysTransparent = false );
+ AccessibleChartShape( const AccessibleElementInfo& rAccInfo );
virtual ~AccessibleChartShape();
// ________ XServiceInfo ________
diff --git a/chart2/source/controller/accessibility/ChartElementFactory.cxx b/chart2/source/controller/accessibility/ChartElementFactory.cxx
index ab26c02..0276ac8 100644
--- a/chart2/source/controller/accessibility/ChartElementFactory.cxx
+++ b/chart2/source/controller/accessibility/ChartElementFactory.cxx
@@ -33,7 +33,7 @@ AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElement
{
case OBJECTTYPE_DATA_POINT:
case OBJECTTYPE_LEGEND_ENTRY:
- return new AccessibleChartElement( rAccInfo, false, false );
+ return new AccessibleChartElement( rAccInfo, false );
case OBJECTTYPE_PAGE:
case OBJECTTYPE_TITLE:
case OBJECTTYPE_LEGEND:
@@ -56,7 +56,7 @@ AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElement
case OBJECTTYPE_DATA_STOCK_LOSS:
case OBJECTTYPE_DATA_STOCK_GAIN:
case OBJECTTYPE_DATA_CURVE_EQUATION:
- return new AccessibleChartElement( rAccInfo, true, false );
+ return new AccessibleChartElement( rAccInfo, true );
case OBJECTTYPE_UNKNOWN:
break;
default:
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 1cac581..75a1b07 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -96,7 +96,7 @@ OutputDevice * lcl_GetParentRefDevice( const uno::Reference< frame::XModel > & x
}
-DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool bPaintPageForEditMode)
+DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut)
: E3dView(pSdrModel, pOut)
, m_pMarkHandleProvider(nullptr)
, m_apOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel))
@@ -104,8 +104,7 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool
{
SetBufferedOutputAllowed(true);
SetBufferedOverlayAllowed(true);
-
- SetPagePaintingAllowed(bPaintPageForEditMode);
+ SetPagePaintingAllowed(true);
// #i12587# support for shapes in chart
SdrOutliner* pOutliner = getOutliner();
diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx
index 53a4c05..f6d9c88 100644
--- a/chart2/source/controller/inc/DrawViewWrapper.hxx
+++ b/chart2/source/controller/inc/DrawViewWrapper.hxx
@@ -45,7 +45,7 @@ protected:
class DrawViewWrapper : public E3dView
{
public:
- DrawViewWrapper(SdrModel* pModel, OutputDevice* pOut, bool bPaintPageForEditMode);
+ DrawViewWrapper(SdrModel* pModel, OutputDevice* pOut);
virtual ~DrawViewWrapper();
//triggers the use of an updated first page
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index b1eee73..7806011 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -785,7 +785,7 @@ void ChartController::impl_createDrawViewController()
{
if( m_pDrawModelWrapper )
{
- m_pDrawViewWrapper = new DrawViewWrapper(&m_pDrawModelWrapper->getSdrModel(),m_pChartWindow,true);
+ m_pDrawViewWrapper = new DrawViewWrapper(&m_pDrawModelWrapper->getSdrModel(),m_pChartWindow);
m_pDrawViewWrapper->attachParentReferenceDevice( getModel() );
}
}
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index ef65f00..3bb12a8 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -86,8 +86,7 @@ protected:
public:
OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( css::util::XCloseable* pCloseable
- , css::lang::XComponent* pComponent
- , bool bLongLastingCallsCancelable = false );
+ , css::lang::XComponent* pComponent );
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true );
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index 9466a9a..d17126c 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -29,8 +29,7 @@ class CartesianCoordinateSystem : public BaseCoordinateSystem
public:
explicit CartesianCoordinateSystem(
const css::uno::Reference< css::uno::XComponentContext > & xContext,
- sal_Int32 nDimensionCount = 2,
- bool bSwapXAndYAxis = false );
+ sal_Int32 nDimensionCount = 2 );
explicit CartesianCoordinateSystem( const CartesianCoordinateSystem & rSource );
virtual ~CartesianCoordinateSystem();
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index abd8a6b..ba4def8 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -29,8 +29,7 @@ class PolarCoordinateSystem : public BaseCoordinateSystem
public:
explicit PolarCoordinateSystem(
const css::uno::Reference< css::uno::XComponentContext > & xContext,
- sal_Int32 nDimensionCount = 2,
- bool bSwapXAndYAxis = false );
+ sal_Int32 nDimensionCount = 2 );
explicit PolarCoordinateSystem( const PolarCoordinateSystem & rSource );
virtual ~PolarCoordinateSystem();
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index 4e1409f..3e49456 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -47,9 +47,8 @@ namespace chart
// explicit
CartesianCoordinateSystem::CartesianCoordinateSystem(
const uno::Reference< uno::XComponentContext > & xContext,
- sal_Int32 nDimensionCount /* = 2 */,
- bool bSwapXAndYAxis /* = sal_False */ ) :
- BaseCoordinateSystem( xContext, nDimensionCount, bSwapXAndYAxis )
+ sal_Int32 nDimensionCount /* = 2 */ ) :
+ BaseCoordinateSystem( xContext, nDimensionCount, false/*bSwapXAndYAxis*/ )
{}
CartesianCoordinateSystem::CartesianCoordinateSystem(
@@ -115,7 +114,7 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedS
CartesianCoordinateSystem2d::CartesianCoordinateSystem2d(
const uno::Reference< uno::XComponentContext > & xContext ) :
- CartesianCoordinateSystem( xContext, 2, false )
+ CartesianCoordinateSystem( xContext, 2 )
{}
CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d()
@@ -158,7 +157,7 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupporte
CartesianCoordinateSystem3d::CartesianCoordinateSystem3d(
const uno::Reference< uno::XComponentContext > & xContext ) :
- CartesianCoordinateSystem( xContext, 3, false )
+ CartesianCoordinateSystem( xContext, 3 )
{}
CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d()
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index 96c9bf2..525f3fe 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -47,9 +47,8 @@ namespace chart
// explicit
PolarCoordinateSystem::PolarCoordinateSystem(
const uno::Reference< uno::XComponentContext > & xContext,
- sal_Int32 nDimensionCount /* = 2 */,
- bool bSwapXAndYAxis /* = sal_False */ ) :
- BaseCoordinateSystem( xContext, nDimensionCount, bSwapXAndYAxis )
+ sal_Int32 nDimensionCount /* = 2 */ ) :
+ BaseCoordinateSystem( xContext, nDimensionCount, false/*bSwapXAndYAxis*/ )
{}
PolarCoordinateSystem::PolarCoordinateSystem(
@@ -115,7 +114,7 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServi
PolarCoordinateSystem2d::PolarCoordinateSystem2d(
const uno::Reference< uno::XComponentContext > & xContext ) :
- PolarCoordinateSystem( xContext, 2, false )
+ PolarCoordinateSystem( xContext, 2 )
{}
PolarCoordinateSystem2d::~PolarCoordinateSystem2d()
@@ -158,7 +157,7 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedSer
PolarCoordinateSystem3d::PolarCoordinateSystem3d(
const uno::Reference< uno::XComponentContext > & xContext ) :
- PolarCoordinateSystem( xContext, 3, false )
+ PolarCoordinateSystem( xContext, 3 )
{}
PolarCoordinateSystem3d::~PolarCoordinateSystem3d()
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 09ce013..12ece46 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -125,8 +125,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
uno::RuntimeException, std::exception)
{
Reference< chart2::XCoordinateSystem > xResult(
- new CartesianCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
+ new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index bd61628..7c402f2 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -78,8 +78,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
uno::RuntimeException, std::exception)
{
Reference< chart2::XCoordinateSystem > xResult(
- new CartesianCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
+ new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index fc745a60..7b2ee98 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -66,8 +66,7 @@ Reference< XCoordinateSystem > SAL_CALL
static_cast< ::cppu::OWeakObject* >( this ), 0 );
Reference< XCoordinateSystem > xResult(
- new PolarCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
+ new PolarCoordinateSystem( GetComponentContext(), DimensionCount ));
Reference< XAxis > xAxis( xResult->getAxisByDimension( 0, MAIN_AXIS_INDEX ) );
if( xAxis.is() )
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index 568966f..f6c2975 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -164,8 +164,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
uno::RuntimeException, std::exception)
{
Reference< chart2::XCoordinateSystem > xResult(
- new PolarCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
+ new PolarCoordinateSystem( GetComponentContext(), DimensionCount ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 0849a40..f4466f9 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -183,8 +183,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
uno::RuntimeException, std::exception)
{
Reference< chart2::XCoordinateSystem > xResult(
- new CartesianCoordinateSystem(
- GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
+ new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
for( sal_Int32 i=0; i<DimensionCount; ++i )
{
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 2378ad0..a802287 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -162,9 +162,8 @@ bool LifeTimeManager::dispose()
}
CloseableLifeTimeManager::CloseableLifeTimeManager( css::util::XCloseable* pCloseable
- , css::lang::XComponent* pComponent
- , bool bLongLastingCallsCancelable )
- : LifeTimeManager( pComponent, bLongLastingCallsCancelable )
+ , css::lang::XComponent* pComponent )
+ : LifeTimeManager( pComponent, false/*bLongLastingCallsCancelable*/ )
, m_pCloseable(pCloseable)
{
impl_init();
More information about the Libreoffice-commits
mailing list