diff options
Diffstat (limited to 'chart2/source')
38 files changed, 98 insertions, 110 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 0ed15d33058c..4548d3b6f4df 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -654,7 +654,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const { sal_Int32 nColIndex = static_cast< sal_Int32 >( nColumnId ) - 1; - if( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::NUMBER ) + if( m_apDataBrowserModel->getCellType( nColIndex ) == DataBrowserModel::NUMBER ) { double fData( m_apDataBrowserModel->getCellNumber( nColIndex, nRow )); sal_Int32 nLabelColor; @@ -664,11 +664,11 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const { bool bColorChanged = false; aResult = m_spNumberFormatterWrapper->getFormattedString( - GetNumberFormatKey( nRow, nColumnId ), + GetNumberFormatKey( nColumnId ), fData, nLabelColor, bColorChanged ); } } - else if( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::TEXTORDATE ) + else if( m_apDataBrowserModel->getCellType( nColIndex ) == DataBrowserModel::TEXTORDATE ) { uno::Any aAny = m_apDataBrowserModel->getCellAny( nColIndex, nRow ); OUString aText; @@ -694,7 +694,7 @@ OUString DataBrowser::GetCellText( long nRow, sal_uInt16 nColumnId ) const } else { - OSL_ASSERT( m_apDataBrowserModel->getCellType( nColIndex, nRow ) == DataBrowserModel::TEXT ); + OSL_ASSERT( m_apDataBrowserModel->getCellType( nColIndex ) == DataBrowserModel::TEXT ); aResult = m_apDataBrowserModel->getCellText( nColIndex, nRow ); } } @@ -780,10 +780,9 @@ bool DataBrowser::ShowQueryBox() bool DataBrowser::IsDataValid() { bool bValid = true; - const sal_Int32 nRow = lcl_getRowInData( GetCurRow()); const sal_Int32 nCol = lcl_getColumnInData( GetCurColumnId()); - if( m_apDataBrowserModel->getCellType( nCol, nRow ) == DataBrowserModel::NUMBER ) + if( m_apDataBrowserModel->getCellType( nCol ) == DataBrowserModel::NUMBER ) { sal_uInt32 nDummy = 0; double fDummy = 0.0; @@ -1087,15 +1086,15 @@ bool DataBrowser::IsTabAllowed( bool bForward ) const nCol != nBadCol ); } -::svt::CellController* DataBrowser::GetController( long nRow, sal_uInt16 nCol ) +::svt::CellController* DataBrowser::GetController( long /*nRow*/, sal_uInt16 nCol ) { if( m_bIsReadOnly ) return nullptr; - if( CellContainsNumbers( nRow, nCol )) + if( CellContainsNumbers( nCol )) { m_aNumberEditField->UseInputStringForFormatting(); - m_aNumberEditField->SetFormatKey( GetNumberFormatKey( nRow, nCol )); + m_aNumberEditField->SetFormatKey( GetNumberFormatKey( nCol )); return m_rNumberEditController.get(); } @@ -1128,19 +1127,18 @@ void DataBrowser::InitController( } } -bool DataBrowser::CellContainsNumbers( sal_Int32 nRow, sal_uInt16 nCol ) const +bool DataBrowser::CellContainsNumbers( sal_uInt16 nCol ) const { if( ! m_apDataBrowserModel.get()) return false; - return (m_apDataBrowserModel->getCellType( lcl_getColumnInData( nCol ), lcl_getRowInData( nRow )) == - DataBrowserModel::NUMBER); + return m_apDataBrowserModel->getCellType( lcl_getColumnInData( nCol )) == DataBrowserModel::NUMBER; } -sal_uInt32 DataBrowser::GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) const +sal_uInt32 DataBrowser::GetNumberFormatKey( sal_uInt16 nCol ) const { if( ! m_apDataBrowserModel.get()) return 0; - return m_apDataBrowserModel->getNumberFormatKey( lcl_getColumnInData( nCol ), lcl_getRowInData( nRow )); + return m_apDataBrowserModel->getNumberFormatKey( lcl_getColumnInData( nCol ) ); } bool DataBrowser::isDateTimeString( const OUString& aInputString, double& fOutDateTimeValue ) @@ -1168,7 +1166,7 @@ bool DataBrowser::SaveModified() OSL_ENSURE( nRow >= 0 || nCol >= 0, "This cell should not be modified!" ); SvNumberFormatter* pSvNumberFormatter = m_spNumberFormatterWrapper.get() ? m_spNumberFormatterWrapper->getSvNumberFormatter() : nullptr; - switch( m_apDataBrowserModel->getCellType( nCol, nRow )) + switch( m_apDataBrowserModel->getCellType( nCol )) { case DataBrowserModel::NUMBER: { diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 0be7b531cafe..a3edc8cde4b2 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -132,9 +132,9 @@ public: /// confirms all pending changes to be ready to be closed bool EndEditing(); - bool CellContainsNumbers( sal_Int32 nRow, sal_uInt16 nCol ) const; + bool CellContainsNumbers( sal_uInt16 nCol ) const; - sal_uInt32 GetNumberFormatKey( sal_Int32 nRow, sal_uInt16 nCol ) const; + sal_uInt32 GetNumberFormatKey( sal_uInt16 nCol ) const; bool IsEnableItem() { return m_bDataValid;} bool IsDataValid(); diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx index 91a332394cf0..875137f1f576 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.cxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx @@ -576,7 +576,7 @@ Reference< chart2::XDataSeries > return nullptr; } -DataBrowserModel::eCellType DataBrowserModel::getCellType( sal_Int32 nAtColumn, sal_Int32 /* nAtRow */ ) const +DataBrowserModel::eCellType DataBrowserModel::getCellType( sal_Int32 nAtColumn ) const { eCellType eResult = TEXT; tDataColumnVector::size_type nIndex( nAtColumn ); @@ -646,7 +646,7 @@ OUString DataBrowserModel::getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow ) return aResult; } -sal_uInt32 DataBrowserModel::getNumberFormatKey( sal_Int32 nAtColumn, sal_Int32 /* nAtRow */ ) +sal_uInt32 DataBrowserModel::getNumberFormatKey( sal_Int32 nAtColumn ) { tDataColumnVector::size_type nIndex( nAtColumn ); if( nIndex < m_aColumns.size()) @@ -697,13 +697,13 @@ bool DataBrowserModel::setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const bool DataBrowserModel::setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue ) { - return (getCellType( nAtColumn, nAtRow ) == NUMBER) && + return (getCellType( nAtColumn ) == NUMBER) && setCellAny( nAtColumn, nAtRow, uno::Any( fValue )); } bool DataBrowserModel::setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText ) { - return (getCellType( nAtColumn, nAtRow ) == TEXT) && + return (getCellType( nAtColumn ) == TEXT) && setCellAny( nAtColumn, nAtRow, uno::Any( rText )); } diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx index 589fe79086b9..7d9f90843dbf 100644 --- a/chart2/source/controller/dialogs/DataBrowserModel.hxx +++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx @@ -73,12 +73,12 @@ public: TEXTORDATE }; - eCellType getCellType( sal_Int32 nAtColumn, sal_Int32 nAtRow ) const; + eCellType getCellType( sal_Int32 nAtColumn ) const; /// If getCellType( nAtColumn, nAtRow ) returns TEXT, the result will be Nan double getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow ); OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow ); css::uno::Any getCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow ); - sal_uInt32 getNumberFormatKey( sal_Int32 nAtColumn, sal_Int32 nAtRow ); + sal_uInt32 getNumberFormatKey( sal_Int32 nAtColumn ); /// returns </sal_True> if the number could successfully be set at the given position bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue ); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index e23c021b50f5..6f8cc675d86f 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -130,7 +130,7 @@ void ObjectPropertiesDialogParameter::init( const uno::Reference< frame::XModel if( bHasSeriesProperties ) { m_bHasStatisticProperties = ChartTypeHelper::isSupportingStatisticProperties( xChartType, nDimensionCount ); - m_bProvidesSecondaryYAxis = ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount, 1 ); + m_bProvidesSecondaryYAxis = ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount ); m_bProvidesOverlapAndGapWidth = ChartTypeHelper::isSupportingOverlapAndGapWidthProperties( xChartType, nDimensionCount ); m_bProvidesBarConnectors = ChartTypeHelper::isSupportingBarConnectors( xChartType, nDimensionCount ); m_bProvidesStartingAngle = ChartTypeHelper::isSupportingStartingAngle( xChartType ); diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index d69a7a268fd2..b32b4b7e725d 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -280,7 +280,7 @@ public: const css::uno::Any& aInfo ) override; // WindowController stuff - void PrePaint(vcl::RenderContext& rRenderContext); + void PrePaint(); void execute_Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect); void execute_MouseButtonDown( const MouseEvent& rMEvt ); void execute_MouseMove( const MouseEvent& rMEvt ); diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 15af577c6f72..4ba0b751ed3d 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -435,7 +435,7 @@ void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutI AxisHelper::getCoordinateSystemOfAxis( m_xAxis, ChartModelHelper::findDiagram( m_xChartDoc ) ) ); sal_Int32 nDimensionIndex=0; sal_Int32 nAxisIndex=0; AxisHelper::getIndicesForAxis(m_xAxis, xCooSys, nDimensionIndex, nAxisIndex ); - bool bChartTypeAllowsDateAxis = ChartTypeHelper::isSupportingDateAxis( AxisHelper::getChartTypeByIndex( xCooSys, 0 ), 2, nDimensionIndex ); + bool bChartTypeAllowsDateAxis = ChartTypeHelper::isSupportingDateAxis( AxisHelper::getChartTypeByIndex( xCooSys, 0 ), nDimensionIndex ); rOutItemSet.Put( SfxBoolItem( nWhichId, bChartTypeAllowsDateAxis )); } break; diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 7aa642c3cdba..2ad50b7cc088 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -434,7 +434,7 @@ void SAL_CALL ChartController::removePaintListener( } // impl vcl window controller methods -void ChartController::PrePaint(vcl::RenderContext& /*rRenderContext*/) +void ChartController::PrePaint() { // forward VCLs PrePaint window event to DrawingLayer DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper; diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 4ffb92fde111..dae7c1b6b8d8 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -97,12 +97,12 @@ void ChartWindow::dispose() vcl::Window::dispose(); } -void ChartWindow::PrePaint(vcl::RenderContext& rRenderContext) +void ChartWindow::PrePaint(vcl::RenderContext& ) { // forward VCLs PrePaint window event to DrawingLayer if (m_pWindowController) { - m_pWindowController->PrePaint(rRenderContext); + m_pWindowController->PrePaint(); } } diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 23db1d2d403e..3e9fd051127e 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -326,7 +326,7 @@ void ImplObjectHierarchy::createAxesTree( sal_Int32 nDimensionIndex = 0; sal_Int32 nAxisIndex = 0; AxisHelper::getIndicesForAxis( xAxis, xDiagram, nCooSysIndex, nDimensionIndex, nAxisIndex ); - if( nAxisIndex>0 && !ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount, nDimensionIndex ) ) + if( nAxisIndex>0 && !ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount ) ) continue; if( m_bOrderingForElementSelector ) diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx index 9e66c59e6684..67b57bf3dd62 100644 --- a/chart2/source/inc/ChartTypeHelper.hxx +++ b/chart2/source/inc/ChartTypeHelper.hxx @@ -30,9 +30,6 @@ namespace chart { -/** -*/ - class OOO_DLLPUBLIC_CHARTTOOLS ChartTypeHelper { public: @@ -40,19 +37,19 @@ public: static bool isSupportingStatisticProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); static bool isSupportingRegressionProperties(const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); static bool isSupportingMainAxis( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); - static bool isSupportingSecondaryAxis( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); + static bool isSupportingSecondaryAxis( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); static bool isSupportingAreaProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); static bool isSupportingSymbolProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); static bool isSupportingOverlapAndGapWidthProperties( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); static bool isSupportingBarConnectors( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); static bool isSupportingRightAngledAxes( const css::uno::Reference< css::chart2::XChartType >& xChartType ); - static bool isSupportingAxisSideBySide( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); - static bool isSupportingStartingAngle( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + static bool isSupportingAxisSideBySide( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount ); + static bool isSupportingStartingAngle( const css::uno::Reference< css::chart2::XChartType >& xChartType ); //starting value for bars or baseline for areas for example - static bool isSupportingBaseValue( const css::uno::Reference< css::chart2::XChartType >& xChartType ); - static bool shiftCategoryPosAtXAxisPerDefault( const css::uno::Reference< css::chart2::XChartType >& xChartType ); - static bool isSupportingAxisPositioning( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); - static bool isSupportingDateAxis( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); + static bool isSupportingBaseValue( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + static bool shiftCategoryPosAtXAxisPerDefault( const css::uno::Reference< css::chart2::XChartType >& xChartType ); + static bool isSupportingAxisPositioning( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 nDimensionIndex ); + static bool isSupportingDateAxis( const css::uno::Reference< css::chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex ); //returns sequence of css::chart::DataLabelPlacement static css::uno::Sequence < sal_Int32 > getSupportedLabelPlacements( diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index c45fa77e5792..5a10d6b73e90 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -90,13 +90,13 @@ OOO_DLLPUBLIC_CHARTTOOLS CloseableLifeTimeManager( css::util::XCloseable* pCl , css::lang::XComponent* pComponent ); OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager() override; -OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); +OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); /// @throws css::uno::Exception OOO_DLLPUBLIC_CHARTTOOLS bool g_close_startTryClose(bool bDeliverOwnership); /// @throws css::util::CloseVetoException OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex ); -OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(bool bDeliverOwnership, bool bMyVeto ); -OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); +OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(bool bDeliverOwnership ); +OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); /// @throws css::uno::RuntimeException OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ); diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 35b5c6df84f1..69ac5871f21e 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -385,7 +385,7 @@ Axis::Axis( const Axis & rOther ) : } // late initialization to call after copy-constructing -void Axis::Init( const Axis & /* rOther */ ) +void Axis::Init() { if( m_aScaleData.Categories.is()) EventListenerHelper::addListener( m_aScaleData.Categories, this ); @@ -543,7 +543,7 @@ Reference< util::XCloneable > SAL_CALL Axis::createClone() // hold a reference to the clone Reference< util::XCloneable > xResult( pNewAxis ); // do initialization that uses uno references to the clone - pNewAxis->Init( *this ); + pNewAxis->Init(); return xResult; } diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 5ec250fc36b2..8292a7c5019b 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -71,7 +71,7 @@ protected: explicit Axis( const Axis & rOther ); // late initialization to call after copy-constructing - void Init( const Axis & rOther ); + void Init(); // ____ OPropertySet ____ virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 579a9c341eb8..1b3e233b5218 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -650,7 +650,7 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) //if not successful canceled if(!bLongLastingCallsAreCanceled) { - m_aLifeTimeManager.g_close_endTryClose( bDeliverOwnership, true ); + m_aLifeTimeManager.g_close_endTryClose( bDeliverOwnership ); throw aVetoException; } } diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index d876ae0c4c56..cc7b5b833145 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -166,7 +166,7 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource } Sequence< Reference< XChartType > > aOldChartTypesSeq; - FillDiagram( xDia, aData.Series, aData.Categories, aOldChartTypesSeq, true ); + FillDiagram( xDia, aData.Series, aData.Categories, aOldChartTypesSeq ); } catch( const uno::Exception & ex ) { @@ -247,7 +247,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram > } } - FillDiagram( xDiagram, aSeriesSeq, aData.Categories, aOldChartTypesSeq, false ); + FillDiagram( xDiagram, aSeriesSeq, aData.Categories, aOldChartTypesSeq ); } catch( const uno::Exception & ex ) { @@ -628,7 +628,7 @@ void ChartTypeTemplate::adaptScales( { Reference< XChartType > xChartType( getChartTypeForNewSeries(Sequence< Reference< XChartType > >() )); - bool bSupportsDates = ::chart::ChartTypeHelper::isSupportingDateAxis( xChartType, 2, nDimensionX ); + bool bSupportsDates = ::chart::ChartTypeHelper::isSupportingDateAxis( xChartType, nDimensionX ); if( aData.AxisType != AxisType::CATEGORY && ( aData.AxisType != AxisType::DATE || !bSupportsDates) ) { aData.AxisType = AxisType::CATEGORY; @@ -765,8 +765,7 @@ void ChartTypeTemplate::FillDiagram( const Reference< XDiagram >& xDiagram, const Sequence< Sequence< Reference< XDataSeries > > >& aSeriesSeq, const Reference< data::XLabeledDataSequence >& xCategories, - const Sequence< Reference< XChartType > >& aOldChartTypesSeq, - bool /* bCreate */ ) + const Sequence< Reference< XChartType > >& aOldChartTypesSeq ) { adaptDiagram( xDiagram ); diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 4cf11ca6cdae..94122c69295c 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -248,8 +248,7 @@ private: css::chart2::data::XLabeledDataSequence >& xCategories, const css::uno::Sequence< css::uno::Reference< - css::chart2::XChartType > > & aOldChartTypesSeq, - bool bCreate ); + css::chart2::XChartType > > & aOldChartTypesSeq); }; } // namespace chart diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx index d3da454af5e2..473d1eed8015 100644 --- a/chart2/source/tools/AxisHelper.cxx +++ b/chart2/source/tools/AxisHelper.cxx @@ -102,7 +102,7 @@ chart2::ScaleData AxisHelper::getDateCheckedScale( const Reference< chart2::XAxi { sal_Int32 nDimensionIndex=0; sal_Int32 nAxisIndex=0; AxisHelper::getIndicesForAxis(xAxis, xCooSys, nDimensionIndex, nAxisIndex ); - bool bChartTypeAllowsDateAxis = ChartTypeHelper::isSupportingDateAxis( AxisHelper::getChartTypeByIndex( xCooSys, 0 ), 2, nDimensionIndex ); + bool bChartTypeAllowsDateAxis = ChartTypeHelper::isSupportingDateAxis( AxisHelper::getChartTypeByIndex( xCooSys, 0 ), nDimensionIndex ); if( bChartTypeAllowsDateAxis ) aScale.AxisType = AxisType::DATE; } @@ -915,7 +915,7 @@ void AxisHelper::getAxisOrGridPossibilities( Sequence< sal_Bool >& rPossibilityL rPossibilityList[nIndex]=ChartTypeHelper::isSupportingMainAxis(xChartType,nDimensionCount,nIndex); for(nIndex=3;nIndex<6;nIndex++) if( bAxis ) - rPossibilityList[nIndex]=ChartTypeHelper::isSupportingSecondaryAxis(xChartType,nDimensionCount,nIndex-3); + rPossibilityList[nIndex]=ChartTypeHelper::isSupportingSecondaryAxis(xChartType,nDimensionCount); else rPossibilityList[nIndex] = rPossibilityList[nIndex-3]; } @@ -966,7 +966,7 @@ bool AxisHelper::shouldAxisBeDisplayed( const Reference< XAxis >& xAxis if( bMainAxis ) bRet = ChartTypeHelper::isSupportingMainAxis(xChartType,nDimensionCount,nDimensionIndex); else - bRet = ChartTypeHelper::isSupportingSecondaryAxis(xChartType,nDimensionCount,nDimensionIndex); + bRet = ChartTypeHelper::isSupportingSecondaryAxis(xChartType,nDimensionCount); } } diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index f822e29ba0e7..91dd9792e641 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -168,7 +168,7 @@ bool ChartTypeHelper::isSupportingMainAxis( const uno::Reference< XChartType >& return true; } -bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount, sal_Int32 /*nDimensionIndex*/ ) +bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChartType >& xChartType, sal_Int32 nDimensionCount ) { //3D, pie and net charts do not support a secondary axis at all @@ -402,7 +402,7 @@ bool ChartTypeHelper::isSupportingAxisPositioning( const uno::Reference< chart2: return true; } -bool ChartTypeHelper::isSupportingDateAxis( const uno::Reference< chart2::XChartType >& xChartType, sal_Int32 /*nDimensionCount*/, sal_Int32 nDimensionIndex ) +bool ChartTypeHelper::isSupportingDateAxis( const uno::Reference< chart2::XChartType >& xChartType, sal_Int32 nDimensionIndex ) { if( nDimensionIndex!=0 ) return false; diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index 1866bf1788ee..3bc8e462a839 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -1119,7 +1119,7 @@ void DiagramHelper::switchToTextCategories( const Reference< XChartDocument >& x bool DiagramHelper::isSupportingDateAxis( const Reference< chart2::XDiagram >& xDiagram ) { return ::chart::ChartTypeHelper::isSupportingDateAxis( - DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), DiagramHelper::getDimension( xDiagram ), 0 ); + DiagramHelper::getChartTypeByIndex( xDiagram, 0 ), 0 ); } bool DiagramHelper::isDateNumberFormat( sal_Int32 nNumberFormat, const Reference< util::XNumberFormats >& xNumberFormats ) diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index 6b2c4edb00ca..925c5e56f72a 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -485,7 +485,7 @@ void ExplicitCategoriesProvider::init() { if(m_bIsDateAxis) { - if( ChartTypeHelper::isSupportingDateAxis( AxisHelper::getChartTypeByIndex( m_xCooSysModel, 0 ), 2, 0 ) ) + if( ChartTypeHelper::isSupportingDateAxis( AxisHelper::getChartTypeByIndex( m_xCooSysModel, 0 ), 0 ) ) m_bIsDateAxis = lcl_fillDateCategories( m_xOriginalCategories->getValues(), m_aDateCategories, m_bIsAutoDate, mrModel ); else m_bIsDateAxis = false; diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index b04f0a82a548..f24facbab19c 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -240,13 +240,13 @@ bool CloseableLifeTimeManager::g_close_startTryClose(bool bDeliverOwnership) catch( const uno::Exception& ) { //no mutex is acquired - g_close_endTryClose(bDeliverOwnership, false); + g_close_endTryClose(bDeliverOwnership); throw; } return true; } -void CloseableLifeTimeManager::g_close_endTryClose(bool bDeliverOwnership, bool /* bMyVeto */ ) +void CloseableLifeTimeManager::g_close_endTryClose(bool bDeliverOwnership ) { //this method is called, if the try to close was not successful osl::Guard< osl::Mutex > aGuard( m_aAccessMutex ); diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index e09ce607416f..ebbeb4cb304b 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -137,7 +137,7 @@ sal_Int32 EquidistantTickFactory::getTickDepth() const void EquidistantTickFactory::addSubTicks( sal_Int32 nDepth, uno::Sequence< uno::Sequence< double > >& rParentTicks ) const { - EquidistantTickIter aIter( rParentTicks, m_rIncrement, 0, nDepth-1 ); + EquidistantTickIter aIter( rParentTicks, m_rIncrement, nDepth-1 ); double* pfNextParentTick = aIter.firstValue(); if(!pfNextParentTick) return; @@ -411,7 +411,7 @@ void EquidistantTickFactory::getAllTicksShifted( TickInfoArraysType& rAllTickInf EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< double > >& rTicks , const ExplicitIncrementData& rIncrement - , sal_Int32 nMinDepth, sal_Int32 nMaxDepth ) + , sal_Int32 nMaxDepth ) : m_pSimpleTicks(&rTicks) , m_pInfoTicks(nullptr) , m_rIncrement(rIncrement) @@ -420,12 +420,12 @@ EquidistantTickIter::EquidistantTickIter( const uno::Sequence< uno::Sequence< do , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr) , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 ) { - initIter( nMinDepth, nMaxDepth ); + initIter( nMaxDepth ); } EquidistantTickIter::EquidistantTickIter( TickInfoArraysType& rTicks , const ExplicitIncrementData& rIncrement - , sal_Int32 nMinDepth, sal_Int32 nMaxDepth ) + , sal_Int32 nMaxDepth ) : m_pSimpleTicks(nullptr) , m_pInfoTicks(&rTicks) , m_rIncrement(rIncrement) @@ -434,10 +434,10 @@ EquidistantTickIter::EquidistantTickIter( TickInfoArraysType& rTicks , m_pnPreParentCount(nullptr), m_pbIntervalFinished(nullptr) , m_nCurrentDepth(-1), m_nCurrentPos(-1), m_fCurrentValue( 0.0 ) { - initIter( nMinDepth, nMaxDepth ); + initIter( nMaxDepth ); } -void EquidistantTickIter::initIter( sal_Int32 /*nMinDepth*/, sal_Int32 nMaxDepth ) +void EquidistantTickIter::initIter( sal_Int32 nMaxDepth ) { m_nMaxDepth = nMaxDepth; if(nMaxDepth<0 || m_nMaxDepth>getMaxDepth()) diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index b99958bbc96b..2f60c694622c 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -30,10 +30,10 @@ class EquidistantTickIter : public TickIter public: EquidistantTickIter( const css::uno::Sequence< css::uno::Sequence< double > >& rTicks , const ExplicitIncrementData& rIncrement - , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); + , sal_Int32 nMaxDepth ); EquidistantTickIter( TickInfoArraysType& rTickInfos , const ExplicitIncrementData& rIncrement - , sal_Int32 nMinDepth=0, sal_Int32 nMaxDepth=-1 ); + , sal_Int32 nMaxDepth ); virtual ~EquidistantTickIter() override; double* firstValue(); @@ -46,7 +46,7 @@ private: //methods sal_Int32 getIntervalCount( sal_Int32 nDepth ); bool isAtLastPartTick(); - void initIter( sal_Int32 nMinDepth, sal_Int32 nMaxDepth ); + void initIter( sal_Int32 nMaxDepth ); sal_Int32 getStartDepth() const; bool gotoFirst(); diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index 0c425a4cda4f..786e8a3d73aa 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -126,19 +126,19 @@ TickmarkProperties AxisProperties::makeTickmarkProperties( TickmarkProperties aTickmarkProperties; aTickmarkProperties.Length = lcl_calcTickLengthForDepth(nDepth,nTickmarkStyle); aTickmarkProperties.RelativePos = static_cast<sal_Int32>(lcl_getTickOffset(aTickmarkProperties.Length,nTickmarkStyle)); - aTickmarkProperties.aLineProperties = this->makeLinePropertiesForDepth( nDepth ); + aTickmarkProperties.aLineProperties = makeLinePropertiesForDepth(); return aTickmarkProperties; } TickmarkProperties AxisProperties::makeTickmarkPropertiesForComplexCategories( - sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 /*nTextLevel*/ ) const + sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis ) const { sal_Int32 nTickmarkStyle = (maLabelAlignment.mfLabelDirection == maLabelAlignment.mfInnerTickDirection) ? 2/*outside*/ : 1/*inside*/; TickmarkProperties aTickmarkProperties; aTickmarkProperties.Length = nTickLength;// + nTextLevel*( lcl_calcTickLengthForDepth(0,nTickmarkStyle) ); aTickmarkProperties.RelativePos = static_cast<sal_Int32>(lcl_getTickOffset(aTickmarkProperties.Length+nTickStartDistanceToAxis,nTickmarkStyle)); - aTickmarkProperties.aLineProperties = this->makeLinePropertiesForDepth( 0 ); + aTickmarkProperties.aLineProperties = makeLinePropertiesForDepth(); return aTickmarkProperties; } diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx index 8178ab8c6edf..8908d72e1cc2 100644 --- a/chart2/source/view/axes/VAxisProperties.hxx +++ b/chart2/source/view/axes/VAxisProperties.hxx @@ -151,7 +151,7 @@ struct AxisProperties final void initAxisPositioning( const css::uno::Reference< css::beans::XPropertySet >& xAxisProp ); static TickmarkProperties getBiggestTickmarkProperties(); - TickmarkProperties makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 nTextLevel ) const; + TickmarkProperties makeTickmarkPropertiesForComplexCategories( sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis ) const; private: AxisProperties() = delete; @@ -159,7 +159,7 @@ private: TickmarkProperties makeTickmarkProperties( sal_Int32 nDepth ) const; //@todo get this from somewhere; maybe for each subincrement //so far the model does not offer different settings for each tick depth - const VLineProperties& makeLinePropertiesForDepth( sal_Int32 /*nDepth*/ ) const { return m_aLineProperties; } + const VLineProperties& makeLinePropertiesForDepth() const { return m_aLineProperties; } }; } //namespace chart diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 75c7bff6db55..90348c90fcb9 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -1474,7 +1474,7 @@ void VCartesianAxis::hideIdenticalScreenValues( TickInfoArraysType& rTickInfos ) } else { - EquidistantTickIter aTickIter( rTickInfos, m_aIncrement, 0, -1 ); + EquidistantTickIter aTickIter( rTickInfos, m_aIncrement, -1 ); lcl_hideIdenticalScreenValues( aTickIter ); } } @@ -1780,7 +1780,7 @@ void VCartesianAxis::createShapes() double fRotationAngleDegree = m_aAxisLabelProperties.fRotationAngleDegree; B2DVector aLabelsDistance( lcl_getLabelsDistance( *apTickIter.get(), pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties ), fRotationAngleDegree ) ); sal_Int32 nCurrentLength = static_cast<sal_Int32>(aLabelsDistance.getLength()); - aTickmarkPropertiesList.push_back( m_aAxisProperties.makeTickmarkPropertiesForComplexCategories( nOffset + nCurrentLength, 0, nTextLevel ) ); + aTickmarkPropertiesList.push_back( m_aAxisProperties.makeTickmarkPropertiesForComplexCategories( nOffset + nCurrentLength, 0 ) ); nOffset += nCurrentLength; } } diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx index 21ee8e2543c0..c5d6b62ded37 100644 --- a/chart2/source/view/axes/VPolarAngleAxis.cxx +++ b/chart2/source/view/axes/VPolarAngleAxis.cxx @@ -172,7 +172,7 @@ void VPolarAngleAxis::createLabels() //create tick mark text shapes //@todo: iterate through all tick depth which should be labeled - EquidistantTickIter aTickIter( m_aAllTickInfos, m_aIncrement, 0, 0 ); + EquidistantTickIter aTickIter( m_aAllTickInfos, m_aIncrement, 0 ); this->updateUnscaledValuesAtTicks( aTickIter ); removeTextShapesFromTicks(); diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx index c20f1a68730e..6347900a167e 100644 --- a/chart2/source/view/axes/VPolarGrid.cxx +++ b/chart2/source/view/axes/VPolarGrid.cxx @@ -77,7 +77,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis( xInverseScaling = rScale.Scaling->getInverseScaling(); sal_Int32 nTick = 0; - EquidistantTickIter aIter( rAllTickInfos, rIncrement, 0, 0 ); + EquidistantTickIter aIter( rAllTickInfos, rIncrement, 0 ); for( TickInfo* pTickInfo = aIter.firstInfo() ; pTickInfo ; pTickInfo = aIter.nextInfo(), nTick++ ) diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index 5ebb65809dab..d05c2f4b7e72 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -139,7 +139,7 @@ void VPolarRadiusAxis::createShapes() AxisProperties aAxisProperties(m_aAxisProperties); sal_Int32 nTick = 0; - EquidistantTickIter aIter( aAngleTickInfos, rAngleIncrement, 0, 0 ); + EquidistantTickIter aIter( aAngleTickInfos, rAngleIncrement, 0 ); for( TickInfo* pTickInfo = aIter.firstInfo() ; pTickInfo; pTickInfo = aIter.nextInfo(), nTick++ ) { diff --git a/chart2/source/view/charttypes/BarPositionHelper.cxx b/chart2/source/view/charttypes/BarPositionHelper.cxx index f9769125cacf..0036acaef3aa 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.cxx +++ b/chart2/source/view/charttypes/BarPositionHelper.cxx @@ -29,7 +29,7 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -BarPositionHelper::BarPositionHelper( bool /* bSwapXAndY */ ) +BarPositionHelper::BarPositionHelper() : CategoryPositionHelper( 1 ) { AllowShiftXAxisPos(true); diff --git a/chart2/source/view/charttypes/BarPositionHelper.hxx b/chart2/source/view/charttypes/BarPositionHelper.hxx index 444edc7c8bf5..0024e990979c 100644 --- a/chart2/source/view/charttypes/BarPositionHelper.hxx +++ b/chart2/source/view/charttypes/BarPositionHelper.hxx @@ -26,19 +26,16 @@ namespace chart { -/** -*/ - class BarPositionHelper : public CategoryPositionHelper, public PlottingPositionHelper { public: - explicit BarPositionHelper( bool bSwapXAndY=true ); + explicit BarPositionHelper(); BarPositionHelper( const BarPositionHelper& rSource ); virtual ~BarPositionHelper() override; virtual PlottingPositionHelper* clone() const override; - void updateSeriesCount( double fSeriesCount ); /*only enter the size of x stacked series*/ + void updateSeriesCount( double fSeriesCount ); /*only enter the size of x stacked series*/ virtual double getScaledSlotPos( double fCategoryX, double fSeriesNumber ) const override; virtual void setScaledCategoryWidth( double fScaledCategoryWidth ) override; diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 39a3757e5596..6cf3fafe878a 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -184,7 +184,7 @@ public: * (For a pie chart the origin of the coordinate system is the pie center). */ css::drawing::Position3D - transformUnitCircleToScene( double fUnitAngleDegree, double fUnitRadius, double fLogicZ, bool bDoScaling=true ) const; + transformUnitCircleToScene( double fUnitAngleDegree, double fUnitRadius, double fLogicZ ) const; using PlottingPositionHelper::transformScaledLogicToScene; diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 8e85b0063e13..b0f99831c090 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -588,7 +588,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter( //ignore secondary axis for charttypes that do not support them if( pSeries->getAttachedAxisIndex() != MAIN_AXIS_INDEX && - !ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount, 1 ) ) + !ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimensionCount ) ) { pSeries->setAttachedAxisIndex(MAIN_AXIS_INDEX); } @@ -674,7 +674,7 @@ void SeriesPlotterContainer::initAxisUsageList(const Date& rNullDate) for (sal_Int32 nDimIndex = 0; nDimIndex < nDimCount; ++nDimIndex) { bool bDateAxisAllowed = ChartTypeHelper::isSupportingDateAxis( - AxisHelper::getChartTypeByIndex(xCooSys, 0), nDimCount, nDimIndex); + AxisHelper::getChartTypeByIndex(xCooSys, 0), nDimIndex); // Each dimension may have primary and secondary axes. const sal_Int32 nMaxAxisIndex = xCooSys->getMaximumAxisIndexByDimension(nDimIndex); @@ -3363,13 +3363,13 @@ bool ChartView::createAxisTitleShapes2D( CreateShapeParam2D& rParam, const css:: bool bDummy = false; bool bIsVertical = DiagramHelper::getVertical( xDiagram, bDummy, bDummy ); - if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 0 ) ) + if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension ) ) rParam.mpVTitleSecondX = lcl_createTitle( TitleHelper::SECONDARY_X_AXIS_TITLE, mxRootShape, m_xShapeFactory, mrChartModel , rParam.maRemainingSpace, rPageSize, bIsVertical? ALIGN_RIGHT : ALIGN_TOP, rParam.mbAutoPosSecondTitleX ); if (rParam.maRemainingSpace.Width <= 0 || rParam.maRemainingSpace.Height <= 0) return false; - if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension, 1 ) ) + if( ChartTypeHelper::isSupportingSecondaryAxis( xChartType, nDimension ) ) rParam.mpVTitleSecondY = lcl_createTitle( TitleHelper::SECONDARY_Y_AXIS_TITLE, mxRootShape, m_xShapeFactory, mrChartModel , rParam.maRemainingSpace, rPageSize, bIsVertical? ALIGN_TOP : ALIGN_RIGHT, rParam.mbAutoPosSecondTitleY ); if (rParam.maRemainingSpace.Width <= 0 || rParam.maRemainingSpace.Height <= 0) diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 322a21ec000e..541af7fcd5b4 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -469,7 +469,7 @@ void DummySymbol2D::render() pChart->m_GLRender.SetColor(mnFillColor, 255); - pChart->m_GLRender.RenderSymbol2DShape(maPosition.X, maPosition.Y, maSize.Width, maSize.Height, mnStandardSymbol); + pChart->m_GLRender.RenderSymbol2DShape(maPosition.X, maPosition.Y, mnStandardSymbol); } DummyCircle::DummyCircle(const awt::Point& rPos, const awt::Size& rSize) @@ -506,7 +506,7 @@ void DummyCircle::render() pChart->m_GLRender.Bubble2DShapePoint(maPosition.X, maPosition.Y, maSize.Width, maSize.Height); - pChart->m_GLRender.RenderBubble2FBO(GL_TRUE); + pChart->m_GLRender.RenderBubble2FBO(); } namespace { @@ -628,7 +628,7 @@ void DummyLine2D::render() } } - pChart->m_GLRender.RenderLine2FBO(GL_TRUE); + pChart->m_GLRender.RenderLine2FBO(); } @@ -850,7 +850,7 @@ void DummyText::render() { aTransformation = maTrans.get<drawing::HomogenMatrix3>(); } - pChart->m_GLRender.CreateTextTexture(maBitmap, maPosition, maSize, + pChart->m_GLRender.CreateTextTexture(maBitmap, maSize, mnRotation, aTransformation); pChart->m_GLRender.RenderTextShape(); } diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx index ac22c3e26707..27085513680f 100644 --- a/chart2/source/view/main/OpenGLRender.cxx +++ b/chart2/source/view/main/OpenGLRender.cxx @@ -186,7 +186,7 @@ int OpenGLRender::SetLine2DShapePoint(float x, float y, int listLength) return 0; } -int OpenGLRender::RenderLine2FBO(int) +int OpenGLRender::RenderLine2FBO() { CHECK_GL_ERROR(); glLineWidth(m_fLineWidth); @@ -411,7 +411,7 @@ int OpenGLRender::Bubble2DShapePoint(float x, float y, float directionX, float d return 0; } -int OpenGLRender::RenderBubble2FBO(int) +int OpenGLRender::RenderBubble2FBO() { CHECK_GL_ERROR(); glm::vec4 edgeColor = glm::vec4(0.0, 0.0, 0.0, 1.0); @@ -622,7 +622,7 @@ int OpenGLRender::RenderRectangleShape(bool bBorder, bool bFill) } -int OpenGLRender::CreateTextTexture(const BitmapEx& rBitmapEx, const awt::Point&, const awt::Size& aSize, long rotation, +int OpenGLRender::CreateTextTexture(const BitmapEx& rBitmapEx, const awt::Size& aSize, long rotation, const drawing::HomogenMatrix3& rTrans) { #if DEBUG_PNG // debug PNG writing @@ -643,12 +643,11 @@ int OpenGLRender::CreateTextTexture(const BitmapEx& rBitmapEx, const awt::Point& OpenGLHelper::ConvertBitmapExToRGBATextureBuffer(rBitmapEx, bitmapBuf.get()); return CreateTextTexture(bitmapBuf, rBitmapEx.GetSizePixel(), - awt::Point(), aSize, rotation, rTrans); + aSize, rotation, rTrans); } int OpenGLRender::CreateTextTexture(const boost::shared_array<sal_uInt8> &rPixels, const ::Size &aPixelSize, - const awt::Point&, const awt::Size& aSize, long rotation, const drawing::HomogenMatrix3& rTrans) @@ -988,7 +987,7 @@ int OpenGLRender::RenderPieSegment2DShape(float fSize, float fPosX, float fPosY) return 0; } -int OpenGLRender::RenderSymbol2DShape(float x, float y, float , float , sal_Int32 nSymbol) +int OpenGLRender::RenderSymbol2DShape(float x, float y, sal_Int32 nSymbol) { CHECK_GL_ERROR(); diff --git a/chart2/source/view/main/OpenGLRender.hxx b/chart2/source/view/main/OpenGLRender.hxx index 86f830bea933..f400675e15ec 100644 --- a/chart2/source/view/main/OpenGLRender.hxx +++ b/chart2/source/view/main/OpenGLRender.hxx @@ -71,13 +71,13 @@ public: void SetSize(int width, int height); void SetSizePixel(int width, int height); void Release(); - int RenderLine2FBO(int wholeFlag); + int RenderLine2FBO(); int SetLine2DShapePoint(float x, float y, int listLength); void SetLine2DColor(sal_uInt8 r, sal_uInt8 g, sal_uInt8 b, sal_uInt8 nAlpha); void SetLine2DWidth(int width); void SetColor(sal_uInt32 color, sal_uInt8 nAlpha); int Bubble2DShapePoint(float x, float y, float directionX, float directionY); - int RenderBubble2FBO(int wholeFlag); + int RenderBubble2FBO(); void prepareToRender(); @@ -86,12 +86,11 @@ public: int CreateTextTexture(const boost::shared_array<sal_uInt8> &rPixels, const ::Size &aPixelSize, - const css::awt::Point&, const css::awt::Size& aSize, long rotation, const css::drawing::HomogenMatrix3& rTrans); int CreateTextTexture(const BitmapEx& rBitmapEx, - const css::awt::Point& aPos, const css::awt::Size& aSize, + const css::awt::Size& aSize, long rotation, const css::drawing::HomogenMatrix3& rTrans); int RenderTextShape(); @@ -102,7 +101,7 @@ public: void GeneratePieSegment2D(double, double, double, double); int RenderPieSegment2DShape(float, float, float); - int RenderSymbol2DShape(float, float, float, float, sal_Int32); + int RenderSymbol2DShape(float, float, sal_Int32); #if DEBUG_POSITIONING void renderDebug(); #endif diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index a813117d03f8..6035cf06a85d 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -613,7 +613,7 @@ drawing::Position3D PolarPlottingPositionHelper::transformScaledLogicToScene( do return this->transformAngleRadiusToScene( fLogicValueOnAngleAxis, fLogicValueOnRadiusAxis, fZ, false ); } drawing::Position3D PolarPlottingPositionHelper::transformUnitCircleToScene( double fUnitAngleDegree, double fUnitRadius - , double fLogicZ, bool /* bDoScaling */ ) const + , double fLogicZ ) const { double fAnglePi = fUnitAngleDegree*F_PI/180.0; @@ -632,7 +632,7 @@ drawing::Position3D PolarPlottingPositionHelper::transformAngleRadiusToScene( do double fUnitAngleDegree = this->transformToAngleDegree(fLogicValueOnAngleAxis,bDoScaling); double fUnitRadius = this->transformToRadius(fLogicValueOnRadiusAxis,bDoScaling); - return transformUnitCircleToScene( fUnitAngleDegree, fUnitRadius, fLogicZ, bDoScaling ); + return transformUnitCircleToScene( fUnitAngleDegree, fUnitRadius, fLogicZ ); } double PolarPlottingPositionHelper::getOuterLogicRadius() const |