mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:constantparam in chart2

Browse Source 
Change-Id: I9adcf4516107aaa960463be13090c2ac15685e09
Reviewed-on: https://gerrit.libreoffice.org/23833
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Noel Grandin
2016-04-05 08:24:32 +02:00
committed by Noel Grandin
parent 9866efe3e5
commit a7ec6c29aa
20 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chart2/source/controller/accessibility/AccessibleBase.cxx
View File

@@ -283,7 +283,7 @@ bool AccessibleBase::ImplUpdateChildren()
} }
else if ( aIt->isAdditionalShape() ) else if ( aIt->isAdditionalShape() )
{ {
AddChild( new AccessibleChartShape( aAccInfo, true, false ) ); AddChild( new AccessibleChartShape( aAccInfo ) );
} }
} }
bResult = true; bResult = true;

5
chart2/source/controller/accessibility/AccessibleChartElement.cxx
View File

@@ -50,9 +50,8 @@ namespace chart
AccessibleChartElement::AccessibleChartElement( AccessibleChartElement::AccessibleChartElement(
const AccessibleElementInfo & rAccInfo, const AccessibleElementInfo & rAccInfo,
bool bMayHaveChildren, bool bMayHaveChildren ) :
bool bAlwaysTransparent /* default: false */ ) : impl::AccessibleChartElement_Base( rAccInfo, bMayHaveChildren, false/*bAlwaysTransparent*/ ),
impl::AccessibleChartElement_Base( rAccInfo, bMayHaveChildren, bAlwaysTransparent ),
m_bHasText( false ) m_bHasText( false )
{ {
AddState( AccessibleStateType::TRANSIENT ); AddState( AccessibleStateType::TRANSIENT );

3
chart2/source/controller/accessibility/AccessibleChartElement.hxx
View File

@@ -69,8 +69,7 @@ class AccessibleChartElement :
{ {
public: public:
AccessibleChartElement( const AccessibleElementInfo & rAccInfo, AccessibleChartElement( const AccessibleElementInfo & rAccInfo,
bool bMayHaveChildren, bool bMayHaveChildren );
bool bAlwaysTransparent = false );
virtual ~AccessibleChartElement(); virtual ~AccessibleChartElement();
// ________ AccessibleBase ________ // ________ AccessibleBase ________

5
chart2/source/controller/accessibility/AccessibleChartShape.cxx
View File

@@ -36,9 +36,8 @@ namespace chart
{ {
AccessibleChartShape::AccessibleChartShape( AccessibleChartShape::AccessibleChartShape(
const AccessibleElementInfo& rAccInfo, const AccessibleElementInfo& rAccInfo )
bool bMayHaveChildren, bool bAlwaysTransparent ) :impl::AccessibleChartShape_Base( rAccInfo, true/*bMayHaveChildren*/, false/*bAlwaysTransparent*/ )
:impl::AccessibleChartShape_Base( rAccInfo, bMayHaveChildren, bAlwaysTransparent )
{ {
if ( rAccInfo.m_aOID.isAdditionalShape() ) if ( rAccInfo.m_aOID.isAdditionalShape() )
{ {

3
chart2/source/controller/accessibility/AccessibleChartShape.hxx
View File

@@ -44,8 +44,7 @@ class AccessibleChartShape :
public impl::AccessibleChartShape_Base public impl::AccessibleChartShape_Base
{ {
public: public:
AccessibleChartShape( const AccessibleElementInfo& rAccInfo, AccessibleChartShape( const AccessibleElementInfo& rAccInfo );
bool bMayHaveChildren, bool bAlwaysTransparent = false );
virtual ~AccessibleChartShape(); virtual ~AccessibleChartShape();
// ________ XServiceInfo ________ // ________ XServiceInfo ________

4
chart2/source/controller/accessibility/ChartElementFactory.cxx
View File

@@ -33,7 +33,7 @@ AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElement
{ {
case OBJECTTYPE_DATA_POINT: case OBJECTTYPE_DATA_POINT:
case OBJECTTYPE_LEGEND_ENTRY: case OBJECTTYPE_LEGEND_ENTRY:
return new AccessibleChartElement( rAccInfo, false, false ); return new AccessibleChartElement( rAccInfo, false );
case OBJECTTYPE_PAGE: case OBJECTTYPE_PAGE:
case OBJECTTYPE_TITLE: case OBJECTTYPE_TITLE:
case OBJECTTYPE_LEGEND: case OBJECTTYPE_LEGEND:
@@ -56,7 +56,7 @@ AccessibleBase* ChartElementFactory::CreateChartElement( const AccessibleElement
case OBJECTTYPE_DATA_STOCK_LOSS: case OBJECTTYPE_DATA_STOCK_LOSS:
case OBJECTTYPE_DATA_STOCK_GAIN: case OBJECTTYPE_DATA_STOCK_GAIN:
case OBJECTTYPE_DATA_CURVE_EQUATION: case OBJECTTYPE_DATA_CURVE_EQUATION:
return new AccessibleChartElement( rAccInfo, true, false ); return new AccessibleChartElement( rAccInfo, true );
case OBJECTTYPE_UNKNOWN: case OBJECTTYPE_UNKNOWN:
break; break;
default: default:

5
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
View File

@@ -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) : E3dView(pSdrModel, pOut)
, m_pMarkHandleProvider(nullptr) , m_pMarkHandleProvider(nullptr)
, m_apOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel)) , m_apOutliner(SdrMakeOutliner(OUTLINERMODE_TEXTOBJECT, *pSdrModel))
@@ -104,8 +104,7 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool
{ {
SetBufferedOutputAllowed(true); SetBufferedOutputAllowed(true);
SetBufferedOverlayAllowed(true); SetBufferedOverlayAllowed(true);
SetPagePaintingAllowed(true);
SetPagePaintingAllowed(bPaintPageForEditMode);
// #i12587# support for shapes in chart // #i12587# support for shapes in chart
SdrOutliner* pOutliner = getOutliner(); SdrOutliner* pOutliner = getOutliner();

2
chart2/source/controller/inc/DrawViewWrapper.hxx
View File

@@ -45,7 +45,7 @@ protected:
class DrawViewWrapper : public E3dView class DrawViewWrapper : public E3dView
{ {
public: public:
DrawViewWrapper(SdrModel* pModel, OutputDevice* pOut, bool bPaintPageForEditMode); DrawViewWrapper(SdrModel* pModel, OutputDevice* pOut);
virtual ~DrawViewWrapper(); virtual ~DrawViewWrapper();
//triggers the use of an updated first page //triggers the use of an updated first page

2
chart2/source/controller/main/ChartController.cxx
View File

@@ -785,7 +785,7 @@ void ChartController::impl_createDrawViewController()
{ {
if( m_pDrawModelWrapper ) 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() ); m_pDrawViewWrapper->attachParentReferenceDevice( getModel() );
} }
} }

3
chart2/source/inc/LifeTime.hxx
View File

@@ -86,8 +86,7 @@ protected:
public: public:
OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( css::util::XCloseable* pCloseable OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( css::util::XCloseable* pCloseable
, css::lang::XComponent* pComponent , css::lang::XComponent* pComponent );
, bool bLongLastingCallsCancelable = false );
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true );

3
chart2/source/model/inc/CartesianCoordinateSystem.hxx
View File

@@ -29,8 +29,7 @@ class CartesianCoordinateSystem : public BaseCoordinateSystem
public: public:
explicit CartesianCoordinateSystem( explicit CartesianCoordinateSystem(
const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::uno::XComponentContext > & xContext,
sal_Int32 nDimensionCount = 2, sal_Int32 nDimensionCount = 2 );
bool bSwapXAndYAxis = false );
explicit CartesianCoordinateSystem( const CartesianCoordinateSystem & rSource ); explicit CartesianCoordinateSystem( const CartesianCoordinateSystem & rSource );
virtual ~CartesianCoordinateSystem(); virtual ~CartesianCoordinateSystem();

3
chart2/source/model/inc/PolarCoordinateSystem.hxx
View File

@@ -29,8 +29,7 @@ class PolarCoordinateSystem : public BaseCoordinateSystem
public: public:
explicit PolarCoordinateSystem( explicit PolarCoordinateSystem(
const css::uno::Reference< css::uno::XComponentContext > & xContext, const css::uno::Reference< css::uno::XComponentContext > & xContext,
sal_Int32 nDimensionCount = 2, sal_Int32 nDimensionCount = 2 );
bool bSwapXAndYAxis = false );
explicit PolarCoordinateSystem( const PolarCoordinateSystem & rSource ); explicit PolarCoordinateSystem( const PolarCoordinateSystem & rSource );
virtual ~PolarCoordinateSystem(); virtual ~PolarCoordinateSystem();

9
chart2/source/model/main/CartesianCoordinateSystem.cxx
View File

@@ -47,9 +47,8 @@ namespace chart
// explicit // explicit
CartesianCoordinateSystem::CartesianCoordinateSystem( CartesianCoordinateSystem::CartesianCoordinateSystem(
const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< uno::XComponentContext > & xContext,
sal_Int32 nDimensionCount /* = 2 */, sal_Int32 nDimensionCount /* = 2 */ ) :
bool bSwapXAndYAxis /* = sal_False */ ) : BaseCoordinateSystem( xContext, nDimensionCount, false/*bSwapXAndYAxis*/ )
BaseCoordinateSystem( xContext, nDimensionCount, bSwapXAndYAxis )
{} {}
CartesianCoordinateSystem::CartesianCoordinateSystem( CartesianCoordinateSystem::CartesianCoordinateSystem(
@@ -115,7 +114,7 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedS
CartesianCoordinateSystem2d::CartesianCoordinateSystem2d( CartesianCoordinateSystem2d::CartesianCoordinateSystem2d(
const uno::Reference< uno::XComponentContext > & xContext ) : const uno::Reference< uno::XComponentContext > & xContext ) :
CartesianCoordinateSystem( xContext, 2, false ) CartesianCoordinateSystem( xContext, 2 )
{} {}
CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d() CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d()
@@ -158,7 +157,7 @@ css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupporte
CartesianCoordinateSystem3d::CartesianCoordinateSystem3d( CartesianCoordinateSystem3d::CartesianCoordinateSystem3d(
const uno::Reference< uno::XComponentContext > & xContext ) : const uno::Reference< uno::XComponentContext > & xContext ) :
CartesianCoordinateSystem( xContext, 3, false ) CartesianCoordinateSystem( xContext, 3 )
{} {}
CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d() CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d()

9
chart2/source/model/main/PolarCoordinateSystem.cxx
View File

@@ -47,9 +47,8 @@ namespace chart
// explicit // explicit
PolarCoordinateSystem::PolarCoordinateSystem( PolarCoordinateSystem::PolarCoordinateSystem(
const uno::Reference< uno::XComponentContext > & xContext, const uno::Reference< uno::XComponentContext > & xContext,
sal_Int32 nDimensionCount /* = 2 */, sal_Int32 nDimensionCount /* = 2 */ ) :
bool bSwapXAndYAxis /* = sal_False */ ) : BaseCoordinateSystem( xContext, nDimensionCount, false/*bSwapXAndYAxis*/ )
BaseCoordinateSystem( xContext, nDimensionCount, bSwapXAndYAxis )
{} {}
PolarCoordinateSystem::PolarCoordinateSystem( PolarCoordinateSystem::PolarCoordinateSystem(
@@ -115,7 +114,7 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServi
PolarCoordinateSystem2d::PolarCoordinateSystem2d( PolarCoordinateSystem2d::PolarCoordinateSystem2d(
const uno::Reference< uno::XComponentContext > & xContext ) : const uno::Reference< uno::XComponentContext > & xContext ) :
PolarCoordinateSystem( xContext, 2, false ) PolarCoordinateSystem( xContext, 2 )
{} {}
PolarCoordinateSystem2d::~PolarCoordinateSystem2d() PolarCoordinateSystem2d::~PolarCoordinateSystem2d()
@@ -158,7 +157,7 @@ css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedSer
PolarCoordinateSystem3d::PolarCoordinateSystem3d( PolarCoordinateSystem3d::PolarCoordinateSystem3d(
const uno::Reference< uno::XComponentContext > & xContext ) : const uno::Reference< uno::XComponentContext > & xContext ) :
PolarCoordinateSystem( xContext, 3, false ) PolarCoordinateSystem( xContext, 3 )
{} {}
PolarCoordinateSystem3d::~PolarCoordinateSystem3d() PolarCoordinateSystem3d::~PolarCoordinateSystem3d()

3
chart2/source/model/template/BubbleChartType.cxx
View File

@@ -125,8 +125,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
uno::RuntimeException, std::exception) uno::RuntimeException, std::exception)
{ {
Reference< chart2::XCoordinateSystem > xResult( Reference< chart2::XCoordinateSystem > xResult(
new CartesianCoordinateSystem( new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
for( sal_Int32 i=0; i<DimensionCount; ++i ) for( sal_Int32 i=0; i<DimensionCount; ++i )
{ {

3
chart2/source/model/template/ChartType.cxx
View File

@@ -78,8 +78,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
uno::RuntimeException, std::exception) uno::RuntimeException, std::exception)
{ {
Reference< chart2::XCoordinateSystem > xResult( Reference< chart2::XCoordinateSystem > xResult(
new CartesianCoordinateSystem( new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
for( sal_Int32 i=0; i<DimensionCount; ++i ) for( sal_Int32 i=0; i<DimensionCount; ++i )
{ {

3
chart2/source/model/template/NetChartType.cxx
View File

@@ -66,8 +66,7 @@ Reference< XCoordinateSystem > SAL_CALL
static_cast< ::cppu::OWeakObject* >( this ), 0 ); static_cast< ::cppu::OWeakObject* >( this ), 0 );
Reference< XCoordinateSystem > xResult( Reference< XCoordinateSystem > xResult(
new PolarCoordinateSystem( new PolarCoordinateSystem( GetComponentContext(), DimensionCount ));
GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
Reference< XAxis > xAxis( xResult->getAxisByDimension( 0, MAIN_AXIS_INDEX ) ); Reference< XAxis > xAxis( xResult->getAxisByDimension( 0, MAIN_AXIS_INDEX ) );
if( xAxis.is() ) if( xAxis.is() )

3
chart2/source/model/template/PieChartType.cxx
View File

@@ -164,8 +164,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
uno::RuntimeException, std::exception) uno::RuntimeException, std::exception)
{ {
Reference< chart2::XCoordinateSystem > xResult( Reference< chart2::XCoordinateSystem > xResult(
new PolarCoordinateSystem( new PolarCoordinateSystem( GetComponentContext(), DimensionCount ));
GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
for( sal_Int32 i=0; i<DimensionCount; ++i ) for( sal_Int32 i=0; i<DimensionCount; ++i )
{ {

3
chart2/source/model/template/ScatterChartType.cxx
View File

@@ -183,8 +183,7 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
uno::RuntimeException, std::exception) uno::RuntimeException, std::exception)
{ {
Reference< chart2::XCoordinateSystem > xResult( Reference< chart2::XCoordinateSystem > xResult(
new CartesianCoordinateSystem( new CartesianCoordinateSystem( GetComponentContext(), DimensionCount ));
GetComponentContext(), DimensionCount, /* bSwapXAndYAxis */ false ));
for( sal_Int32 i=0; i<DimensionCount; ++i ) for( sal_Int32 i=0; i<DimensionCount; ++i )
{ {

5
chart2/source/tools/LifeTime.cxx
View File

@@ -162,9 +162,8 @@ bool LifeTimeManager::dispose()
} }
CloseableLifeTimeManager::CloseableLifeTimeManager( css::util::XCloseable* pCloseable CloseableLifeTimeManager::CloseableLifeTimeManager( css::util::XCloseable* pCloseable
, css::lang::XComponent* pComponent , css::lang::XComponent* pComponent )
, bool bLongLastingCallsCancelable ) : LifeTimeManager( pComponent, false/*bLongLastingCallsCancelable*/ )
: LifeTimeManager( pComponent, bLongLastingCallsCancelable )
, m_pCloseable(pCloseable) , m_pCloseable(pCloseable)
{ {
impl_init(); impl_init();