diff options
author | Noel Grandin <noel@peralex.com> | 2016-08-04 11:35:36 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-08-05 06:26:59 +0000 |
commit | f22fa994603311a36f467a6afea19bc4fad03814 (patch) | |
tree | f261b4bad8ef402d5d06b1619e35e6b5f5fd04f8 | |
parent | ce97110f37825f9666bff8ff2df0d2092620ae17 (diff) |
loplugin:countusersofdefaultparams in canvas,chart2
Change-Id: Id66a706171b73affeb508812744028d9f30133af
Reviewed-on: https://gerrit.libreoffice.org/27868
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
44 files changed, 69 insertions, 70 deletions
diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index fe712e3adb1b..920b37a2ebad 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -133,7 +133,7 @@ namespace cairocanvas // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; - virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override; + virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ) override; virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override; virtual ::cairo::SurfaceSharedPtr changeSurface() override; virtual OutputDevice* getOutputDevice() override; diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index e6c9f0c8f591..d7954183e75d 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -93,7 +93,7 @@ namespace cairocanvas // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; - virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override; + virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ) override; virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override; virtual ::cairo::SurfaceSharedPtr changeSurface() override; virtual OutputDevice* getOutputDevice() override; diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index 9b5b9e84a65a..107b0fe393c5 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -47,7 +47,7 @@ namespace cairocanvas SAL_INFO( "canvas.cairo", "sprite size: " << ::canvas::tools::roundUp( rSpriteSize.Width ) << ", " << ::canvas::tools::roundUp( rSpriteSize.Height )); - mpBufferSurface = mpSpriteCanvas->createSurface( maSize ); + mpBufferSurface = mpSpriteCanvas->createSurface( maSize, CAIRO_CONTENT_COLOR_ALPHA ); maCanvasHelper.init( maSize, *rRefDevice, diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index d42b68cc057f..6ce6102fbbc3 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.hxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx @@ -131,7 +131,7 @@ namespace cairocanvas // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; - virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override; + virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ) override; virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override; virtual ::cairo::SurfaceSharedPtr changeSurface() override; virtual OutputDevice* getOutputDevice() override; diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 46f71a17820e..def6cd6cfa29 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -659,7 +659,7 @@ namespace cairocanvas return pSurface; } - static void addColorStops( cairo_pattern_t* pPattern, const uno::Sequence< uno::Sequence< double > >& rColors, const uno::Sequence< double >& rStops, bool bReverseStops = false ) + static void addColorStops( cairo_pattern_t* pPattern, const uno::Sequence< uno::Sequence< double > >& rColors, const uno::Sequence< double >& rStops, bool bReverseStops ) { int i; @@ -717,7 +717,7 @@ namespace cairocanvas x1 = 1; y1 = 0; pPattern = cairo_pattern_create_linear( x0, y0, x1, y1 ); - addColorStops( pPattern, aValues.maColors, aValues.maStops ); + addColorStops( pPattern, aValues.maColors, aValues.maStops, false ); break; case ::canvas::ParametricPolyPolygon::GradientType::Elliptical: diff --git a/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx index 430f91ae071c..c0e7449416c3 100644 --- a/canvas/source/cairo/cairo_devicehelper.hxx +++ b/canvas/source/cairo/cairo_devicehelper.hxx @@ -92,7 +92,7 @@ namespace cairocanvas OutputDevice* getOutputDevice() const { return mpRefDevice; } const ::cairo::SurfaceSharedPtr& getSurface() { return mpSurface; } - ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ); + ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ); ::cairo::SurfaceSharedPtr createSurface( BitmapSystemData& rData, const Size& rSize ); protected: diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 8e41026bd361..9a3b61aaeb75 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -132,7 +132,7 @@ namespace cairocanvas // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; - virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ) override; + virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ) override; virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) override; virtual ::cairo::SurfaceSharedPtr changeSurface() override; virtual OutputDevice* getOutputDevice() override; diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx index 750b97f5bf6a..2cd748f27550 100644 --- a/canvas/source/cairo/cairo_spritedevicehelper.hxx +++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx @@ -62,7 +62,7 @@ namespace cairocanvas const ::cairo::SurfaceSharedPtr& getBufferSurface() { return mpBufferSurface; } ::cairo::SurfaceSharedPtr getWindowSurface(); - ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent = CAIRO_CONTENT_COLOR_ALPHA ); + ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, int aContent ); ::cairo::SurfaceSharedPtr createSurface( BitmapSystemData& rData, const Size& rSize ); const ::basegfx::B2ISize& getSizePixel() { return maSize; } void flush(); diff --git a/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx index c2156cc44403..6a123c275fc2 100644 --- a/canvas/source/cairo/cairo_surfaceprovider.hxx +++ b/canvas/source/cairo/cairo_surfaceprovider.hxx @@ -53,7 +53,7 @@ namespace cairocanvas /// create new surface in given size virtual ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, - int aContent = CAIRO_CONTENT_COLOR_ALPHA ) = 0; + int aContent ) = 0; /// create new surface from given bitmap virtual ::cairo::SurfaceSharedPtr createSurface( ::Bitmap& rBitmap ) = 0; diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 50a44999b28c..f602777233ed 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -53,7 +53,7 @@ static void initContext() glShadeModel(GL_FLAT); } -static void initTransformation(const ::Size& rSize, bool bMirror=false) +static void initTransformation(const ::Size& rSize, bool bMirror) { // use whole window glViewport( 0,0, @@ -282,7 +282,7 @@ namespace oglcanvas SystemChildWindow* pChildWindow = mxContext->getChildWindow(); const ::Size& rOutputSize = pChildWindow->GetSizePixel(); - initTransformation(rOutputSize); + initTransformation(rOutputSize, false); // render the actual spritecanvas content mpSpriteCanvas->renderRecordedActions(); diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 5a7ffafe3c4b..b74694078153 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -111,7 +111,7 @@ public: virtual void hideExtraControls() const; virtual void fillExtraControls( const ChartTypeParameter& rParameter , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel - , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps=css::uno::Reference< css::beans::XPropertySet >() ) const; + , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const; virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException); bool isSubType( const OUString& rServiceName ); @@ -276,7 +276,7 @@ public: virtual void hideExtraControls() const override; virtual void fillExtraControls( const ChartTypeParameter& rParameter , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel - , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps=css::uno::Reference< css::beans::XPropertySet >() ) const override; + , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const override; virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException) override; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index d71dfa7c739a..bee501889089 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -101,7 +101,7 @@ public: void setStartColumn( sal_Int32 nStartColumn ); sal_Int32 getStartColumn() const { return m_nStartColumn;} - void SetShowWarningBox( bool bShowWarning = true ); + void SetShowWarningBox( bool bShowWarning ); private: sal_Int32 m_nStartColumn; diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 414794d929b6..e905e021ccdb 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -116,7 +116,7 @@ private: @return false, if nResIdMessage was 0, true otherwise */ - bool ShowWarning( sal_uInt16 nResIdMessage, Control* pControl = nullptr ); + bool ShowWarning( sal_uInt16 nResIdMessage, Control* pControl ); void HideAllControls(); }; diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 157e31e04482..e5f078dc42f6 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -554,7 +554,7 @@ private: const css::uno::Sequence< css::beans::PropertyValue >& rArgs ); DECL_LINK_TYPED( DoubleClickWaitingHdl, Timer*, void ); - void execute_DoubleClick( const Point* pMousePixel = nullptr ); + void execute_DoubleClick( const Point* pMousePixel ); void startDoubleClickWaiting(); void stopDoubleClickWaiting(); diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 7dcc1a7dc08b..96daf4b1c50d 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -92,8 +92,7 @@ protected: const OUString & rURL, const css::uno::Any & rState, bool bEnabled, - const css::uno::Reference< css::frame::XStatusListener > & xSingleListener = - css::uno::Reference< css::frame::XStatusListener >(), + const css::uno::Reference< css::frame::XStatusListener > & xSingleListener, const OUString & rFeatureDescriptor = OUString() ); // ____ XDispatch ____ diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 60686e8f58c5..8912572b6c07 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -90,7 +90,7 @@ protected: by the user, see also <type scope="css::frame">CommandGroup</type>. */ void implDescribeSupportedFeature( const sal_Char* pAsciiCommandURL, sal_uInt16 nId, - sal_Int16 nGroup = css::frame::CommandGroup::INTERNAL ); + sal_Int16 nGroup ); mutable SupportedFeatures m_aSupportedFeatures; diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index 5a8625b996c5..b18171313702 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -588,7 +588,7 @@ void ChartElementsPanel::setTitleVisible(TitleHelper::eTitleType eTitle, bool bV if (bVisible) { OUString aText = eTitle == TitleHelper::SUB_TITLE ? maTextSubTitle : maTextTitle; - TitleHelper::createOrShowTitle(eTitle, aText, mxModel, comphelper::getProcessComponentContext()); + TitleHelper::createOrShowTitle(eTitle, aText, mxModel, comphelper::getProcessComponentContext(), nullptr); } else { diff --git a/chart2/source/inc/AxisHelper.hxx b/chart2/source/inc/AxisHelper.hxx index 357e0c12701a..a0edd492b693 100644 --- a/chart2/source/inc/AxisHelper.hxx +++ b/chart2/source/inc/AxisHelper.hxx @@ -135,7 +135,7 @@ public: getGridProperties( const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys , sal_Int32 nDimensionIndex , sal_Int32 nAxisIndex //0: Primary axis, 1: secondary axis - , sal_Int32 nSubGridIndex = -1 //-1: Main Grid; 0: First SubGrid etc + , sal_Int32 nSubGridIndex //-1: Main Grid; 0: First SubGrid etc ); static sal_Int32 getDimensionIndexOfAxis( @@ -184,7 +184,7 @@ public: , const css::uno::Sequence< sal_Bool >& rOldExistenceList , const css::uno::Sequence< sal_Bool >& rNewExistenceList , const css::uno::Reference< css::uno::XComponentContext >& xContext - , ReferenceSizeProvider * pRefSizeProvider = nullptr ); + , ReferenceSizeProvider * pRefSizeProvider ); static bool shouldAxisBeDisplayed( const css::uno::Reference< css::chart2::XAxis >& xAxis , const css::uno::Reference< css::chart2::XCoordinateSystem >& xCooSys ); diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx index c218bf761f49..789906e25f36 100644 --- a/chart2/source/inc/CommonConverters.hxx +++ b/chart2/source/inc/CommonConverters.hxx @@ -94,7 +94,7 @@ void AddPointToPoly( css::drawing::PolyPolygonShape3D& rPoly */ OOO_DLLPUBLIC_CHARTTOOLS css::drawing::Position3D getPointFromPoly( const css::drawing::PolyPolygonShape3D& rPolygon - , sal_Int32 nPointIndex, sal_Int32 nPolyIndex=0 ); + , sal_Int32 nPointIndex, sal_Int32 nPolyIndex ); OOO_DLLPUBLIC_CHARTTOOLS void addPolygon( css::drawing::PolyPolygonShape3D& rRet diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx index 748721cd2214..0566db7cec49 100644 --- a/chart2/source/inc/DataSeriesHelper.hxx +++ b/chart2/source/inc/DataSeriesHelper.hxx @@ -69,7 +69,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > getAllDataSequencesByRole( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & aDataSequences, const OUString& aRole, - bool bMatchPrefix = false ); + bool bMatchPrefix ); OOO_DLLPUBLIC_CHARTTOOLS std::vector<css::uno::Reference<css::chart2::data::XLabeledDataSequence> > diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx index f4d3945a46f0..29cc79d4af91 100644 --- a/chart2/source/inc/DiagramHelper.hxx +++ b/chart2/source/inc/DiagramHelper.hxx @@ -75,7 +75,7 @@ public: "vertical==true" for bar charts, "vertical==false" for column charts */ static void setVertical( const css::uno::Reference< css::chart2::XDiagram > & xDiagram, - bool bVertical = true ); + bool bVertical ); /** Gets the "SwapXAndYAxis" property at all coordinate systems found in the given diagram. @@ -113,8 +113,7 @@ public: static StackMode getStackModeFromChartType( const css::uno::Reference< css::chart2::XChartType > & xChartType, bool& rbFound, bool& rbAmbiguous, - const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem = - css::uno::Reference< css::chart2::XCoordinateSystem >() + const css::uno::Reference< css::chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem ); /** Returns the dimension found for all chart types in the tree. If the diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index f40587fdca82..4f8e2604f87f 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -50,7 +50,7 @@ protected: const css::uno::Reference< css::util::XNumberFormatter >& xNumFormatter, sal_Int32 nNumberFormatKey, double fNumber, - sal_Int32* pStringLength = nullptr ); + sal_Int32* pStringLength ); static void addStringToEquation( OUStringBuffer& aStrEquation, sal_Int32& nLineLength, OUStringBuffer& aAddString, sal_Int32* pMaxLength ); diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx index a00738ad30a9..4c89c234a24a 100644 --- a/chart2/source/inc/RegressionCurveHelper.hxx +++ b/chart2/source/inc/RegressionCurveHelper.hxx @@ -143,7 +143,7 @@ namespace RegressionCurveHelper void initializeCurveCalculator( const css::uno::Reference<css::chart2::XRegressionCurveCalculator>& xOutCurveCalculator, const css::uno::Reference<css::chart2::data::XDataSource>& xSource, - bool bUseXValuesIfAvailable = true ); + bool bUseXValuesIfAvailable ); /** Same method as above, but uses the given XModel to determine the parameter bUseXValuesIfAvailable in the above function. It is also diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx index 89e1a7bbaee1..3f08684550fe 100644 --- a/chart2/source/inc/TitleHelper.hxx +++ b/chart2/source/inc/TitleHelper.hxx @@ -72,7 +72,7 @@ public: , const OUString& rTitleText , const css::uno::Reference< css::frame::XModel >& xModel , const css::uno::Reference< css::uno::XComponentContext > & xContext - , ReferenceSizeProvider * pRefSizeProvider = nullptr ); + , ReferenceSizeProvider * pRefSizeProvider ); static void removeTitle( eTitleType nTitleIndex , const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index be12ffdebe53..6bc788ec8b9e 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -43,7 +43,7 @@ const auto defaultPreferredColor = COL_LIGHTBLUE; void lcl_fillRanges( Sequence< chart2::data::HighlightedRange > & rOutRanges, const Sequence< OUString >& aRangeStrings, - sal_Int32 nPreferredColor = defaultPreferredColor, + sal_Int32 nPreferredColor, sal_Int32 nIndex = -1 ) { rOutRanges.realloc( aRangeStrings.getLength()); @@ -257,7 +257,8 @@ void RangeHighlighter::fillRangesForCategories( const Reference< chart2::XAxis > return; chart2::ScaleData aData( xAxis->getScaleData()); lcl_fillRanges( m_aSelectedRanges, - DataSourceHelper::getRangesFromLabeledDataSequence( aData.Categories )); + DataSourceHelper::getRangesFromLabeledDataSequence( aData.Categories ), + defaultPreferredColor ); } void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface > & xDataSeries, sal_Int32 nIndex ) diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/chart2/source/view/axes/Tickmarks_Equidistant.cxx index a3f2cb5ad082..e4fe9e4741ec 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.cxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.cxx @@ -313,7 +313,7 @@ void EquidistantTickFactory::getAllTicks( TickInfoArraysType& rAllTickInfos ) co { //create point sequences for each tick depth sal_Int32 nDepthCount = this->getTickDepth(); - sal_Int32 nMaxMajorTickCount = this->getMaxTickCount(); + sal_Int32 nMaxMajorTickCount = this->getMaxTickCount(0); if (nDepthCount <= 0 || nMaxMajorTickCount <= 0) return; diff --git a/chart2/source/view/axes/Tickmarks_Equidistant.hxx b/chart2/source/view/axes/Tickmarks_Equidistant.hxx index 4a12bec1a056..69ec5e44158c 100644 --- a/chart2/source/view/axes/Tickmarks_Equidistant.hxx +++ b/chart2/source/view/axes/Tickmarks_Equidistant.hxx @@ -108,7 +108,7 @@ private: //methods double* getMajorTick( sal_Int32 nTick ) const; double* getMinorTick( sal_Int32 nTick, sal_Int32 nDepth , double fStartParentTick, double fNextParentTick ) const; - sal_Int32 getMaxTickCount( sal_Int32 nDepth = 0 ) const; + sal_Int32 getMaxTickCount( sal_Int32 nDepth ) const; sal_Int32 getTickDepth() const; bool isVisible( double fValue ) const; diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 440d46971222..8933429d04f0 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -922,7 +922,7 @@ void AreaChart::createShapes() createErrorBar_X( aUnscaledLogicPosition, **aSeriesIter, nIndex, m_xErrorBarTarget ); if (bCreateYErrorBar) - createErrorBar_Y( aUnscaledLogicPosition, **aSeriesIter, nIndex, m_xErrorBarTarget ); + createErrorBar_Y( aUnscaledLogicPosition, **aSeriesIter, nIndex, m_xErrorBarTarget, nullptr ); //create data point label if( (**aSeriesIter).getDataPointLabelIfLabel(nIndex) ) diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index b1fd51023365..d355287de4d8 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -48,7 +48,7 @@ public: virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; virtual LegendSymbolStyle getLegendSymbolStyle() override; - virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; + virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex/*-1 for series symbol*/ ) override; private: //methods void impl_createSeriesShapes(); diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 521054adf8de..a10a06e8654e 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -1311,7 +1311,7 @@ void GL3DBarChart::updateClickEvent() aTitle = " "; maScreenTextShapes.push_back(o3tl::make_unique<opengl3D::ScreenText>(mpRenderer.get(), *mpTextCache, aTitle, glm::vec4(0.0f, 0.0f, 0.0f, 0.5f), 0)); opengl3D::ScreenText* pScreenText = static_cast<opengl3D::ScreenText*>(maScreenTextShapes.back().get()); - pScreenText->setPosition(glm::vec2(nMinXCoord, 0.99f), glm::vec2(nMaxXCoord, 0.99f - nMaxHight)); + pScreenText->setPosition(glm::vec2(nMinXCoord, 0.99f), glm::vec2(nMaxXCoord, 0.99f - nMaxHight), glm::vec3(0.0, 0.0, 0.0)); } } diff --git a/chart2/source/view/charttypes/NetChart.hxx b/chart2/source/view/charttypes/NetChart.hxx index 8ec0f2793d53..381678de3be7 100644 --- a/chart2/source/view/charttypes/NetChart.hxx +++ b/chart2/source/view/charttypes/NetChart.hxx @@ -49,7 +49,7 @@ public: virtual bool isSeparateStackingForDifferentSigns( sal_Int32 nDimensionIndex ) override; virtual LegendSymbolStyle getLegendSymbolStyle() override; - virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ) override; + virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex/*-1 for series symbol*/ ) override; private: //methods void impl_createSeriesShapes(); diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 3da33c908255..9407995715f6 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -319,7 +319,7 @@ void PieChart::createTextLabelShape( awt::Point aScreenPosition2D( aPolarPosHelper.getLabelScreenPositionAndAlignmentForUnitCircleValues(eAlignment, nLabelPlacement , rParam.mfUnitCircleStartAngleDegree, rParam.mfUnitCircleWidthAngleDegree - , rParam.mfUnitCircleInnerRadius, rParam.mfUnitCircleOuterRadius, rParam.mfLogicZ+0.5 )); + , rParam.mfUnitCircleInnerRadius, rParam.mfUnitCircleOuterRadius, rParam.mfLogicZ+0.5, 0 )); ///the screen position of the pie/donut center is calculated. PieLabelInfo aPieLabelInfo; diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index ea6d34112846..eebc5969e2f2 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -2346,7 +2346,7 @@ Reference< drawing::XShape > VSeriesPlotter::createLegendSymbolForSeries( { LegendSymbolStyle eLegendSymbolStyle = this->getLegendSymbolStyle(); - uno::Any aExplicitSymbol( this->getExplicitSymbol( rSeries ) ); + uno::Any aExplicitSymbol( this->getExplicitSymbol( rSeries, -1 ) ); VLegendSymbolFactory::tPropertyType ePropType = VLegendSymbolFactory::PROP_TYPE_FILLED_SERIES; diff --git a/chart2/source/view/inc/3DChartObjects.hxx b/chart2/source/view/inc/3DChartObjects.hxx index fd2c8b23c277..a8e30d1c1b1c 100644 --- a/chart2/source/view/inc/3DChartObjects.hxx +++ b/chart2/source/view/inc/3DChartObjects.hxx @@ -109,7 +109,7 @@ public: virtual void render() override; void setPosition(const glm::vec2& rTopLeft, const glm::vec2& rBottomRight, - const glm::vec3& r3DPos = glm::vec3(0.0, 0.0, 0.0)); + const glm::vec3& r3DPos); private: TextCacheItem maText; diff --git a/chart2/source/view/inc/AbstractShapeFactory.hxx b/chart2/source/view/inc/AbstractShapeFactory.hxx index 8d988bee27c0..ff2ac600694c 100644 --- a/chart2/source/view/inc/AbstractShapeFactory.hxx +++ b/chart2/source/view/inc/AbstractShapeFactory.hxx @@ -132,7 +132,7 @@ public: , const Stripe& rStripe , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap - , bool bDoubleSided = true + , bool bDoubleSided , short nRotatedTexture = 0 //0 to 7 are the different possibilities , bool bFlatNormals=true ) = 0; @@ -152,8 +152,8 @@ public: , const css::drawing::Position3D& rPos , const css::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol - , sal_Int32 nBorderColor=0 - , sal_Int32 nFillColor=0 ) = 0; + , sal_Int32 nBorderColor + , sal_Int32 nFillColor ) = 0; virtual css::uno::Reference< css::drawing::XShape > createGraphic2D( const css::uno::Reference< css::drawing::XShapes >& xTarget @@ -236,7 +236,7 @@ public: /** * Only necessary for stateless implementations */ - virtual void render(css::uno::Reference< css::drawing::XShapes > xRootShape, bool bInitOpenGL = true) = 0; + virtual void render(css::uno::Reference< css::drawing::XShapes > xRootShape, bool bInitOpenGL) = 0; virtual bool preRender(css::uno::Reference< css::drawing::XShapes > xRootShape, OpenGLWindow* pWindow) = 0; virtual void postRender(OpenGLWindow* pWindow) = 0; @@ -255,7 +255,7 @@ public: static css::uno::Any makeTransformation( const css::awt::Point& rScreenPosition2D, double fRotationAnglePi=0.0 ); - static OUString getStackedString( const OUString& rString, bool bStacked=true ); + static OUString getStackedString( const OUString& rString, bool bStacked ); static bool hasPolygonAnyLines( css::drawing::PolyPolygonShape3D& rPoly ); static bool isPolygonEmptyOrSinglePoint( css::drawing::PolyPolygonShape3D& rPoly ); diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index e7ae9ac4c1d5..4fe03a5f1729 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -103,7 +103,7 @@ private: void updateDataUpdateFPS(); DECL_LINK_TYPED(UpdateTimerHdl, Idle*, void); static int calcTimeInterval(TimeValue &startTime, TimeValue &endTime); - float addScreenTextShape(OUString &nStr, const glm::vec2& rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag = true, + float addScreenTextShape(OUString &nStr, const glm::vec2& rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag, const glm::vec4& rColor = glm::vec4(0.0f, 1.0f, 1.0f, 0.0f), const glm::vec3& rPos = glm::vec3(0.0f, 0.0f, 0.0f), sal_uInt32 nEvent = 0); diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index ee3403b7cc67..49feca78e73e 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -176,7 +176,7 @@ public: ~OpenGL3DRenderer(); void init(); - void Set3DSenceInfo(sal_uInt32 color = 255, bool twoSidesLighting = true); + void Set3DSenceInfo(sal_uInt32 color, bool twoSidesLighting = true); void SetLightInfo(bool lightOn, sal_uInt32 color, const glm::vec4& direction); void AddShapePolygon3DObject(sal_uInt32 color, bool lineOnly, sal_uInt32 lineColor, long fillStyle, sal_uInt32 specular, sal_uInt32 nUniqueId); diff --git a/chart2/source/view/inc/OpenglShapeFactory.hxx b/chart2/source/view/inc/OpenglShapeFactory.hxx index aa74308f951b..01b2223cf59c 100644 --- a/chart2/source/view/inc/OpenglShapeFactory.hxx +++ b/chart2/source/view/inc/OpenglShapeFactory.hxx @@ -82,7 +82,7 @@ public: , const Stripe& rStripe , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap - , bool bDoubleSided = true + , bool bDoubleSided , short nRotatedTexture = 0 //0 to 7 are the different possibilities , bool bFlatNormals=true ) override; @@ -100,8 +100,8 @@ public: , const css::drawing::Position3D& rPos , const css::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol - , sal_Int32 nBorderColor=0 - , sal_Int32 nFillColor=0 ) override; + , sal_Int32 nBorderColor + , sal_Int32 nFillColor ) override; virtual css::uno::Reference< css::drawing::XShape > createGraphic2D( const css::uno::Reference< css::drawing::XShapes >& xTarget @@ -182,7 +182,7 @@ public: virtual void setPageSize( css::uno::Reference < css::drawing::XShapes > xChartShapes, const css::awt::Size& rSize ) override; - virtual void render(css::uno::Reference< css::drawing::XShapes > xDrawPage, bool bInitOpenGL = true) override; + virtual void render(css::uno::Reference< css::drawing::XShapes > xDrawPage, bool bInitOpenGL) override; virtual bool preRender(css::uno::Reference< css::drawing::XShapes > xRootShape, OpenGLWindow* pWindow) override; virtual void postRender(OpenGLWindow* pWindow) override; diff --git a/chart2/source/view/inc/PolarLabelPositionHelper.hxx b/chart2/source/view/inc/PolarLabelPositionHelper.hxx index a5bb57251574..95d25d33909f 100644 --- a/chart2/source/view/inc/PolarLabelPositionHelper.hxx +++ b/chart2/source/view/inc/PolarLabelPositionHelper.hxx @@ -46,7 +46,7 @@ public: , double fLogicValueOnAngleAxis , double fLogicValueOnRadiusAxis , double fLogicZ - , sal_Int32 nScreenValueOffsetInRadiusDirection=0 ) const; + , sal_Int32 nScreenValueOffsetInRadiusDirection ) const; /** Calculate the anchor point position for a text label. * When the requested label placement is of `INSIDE` or `OUTSIDE` type the @@ -64,7 +64,7 @@ public: , double fUnitCircleStartAngleDegree, double fUnitCircleWidthAngleDegree , double fUnitCircleInnerRadius, double fUnitCircleOuterRadius , double fLogicZ - , sal_Int32 nScreenValueOffsetInRadiusDirection=0 ) const; + , sal_Int32 nScreenValueOffsetInRadiusDirection ) const; private: PolarPlottingPositionHelper* m_pPosHelper; diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx index 8083411de00d..02a75d3a0764 100644 --- a/chart2/source/view/inc/ShapeFactory.hxx +++ b/chart2/source/view/inc/ShapeFactory.hxx @@ -93,7 +93,7 @@ public: , const Stripe& rStripe , const css::uno::Reference< css::beans::XPropertySet >& xSourceProp , const tPropertyNameMap& rPropertyNameMap - , bool bDoubleSided = true + , bool bDoubleSided , short nRotatedTexture = 0 //0 to 7 are the different possibilities , bool bFlatNormals=true ) override; @@ -111,8 +111,8 @@ public: , const css::drawing::Position3D& rPos , const css::drawing::Direction3D& rSize , sal_Int32 nStandardSymbol - , sal_Int32 nBorderColor=0 - , sal_Int32 nFillColor=0 ) override; + , sal_Int32 nBorderColor + , sal_Int32 nFillColor ) override; virtual css::uno::Reference< css::drawing::XShape > createGraphic2D( const css::uno::Reference< css::drawing::XShapes >& xTarget @@ -242,7 +242,7 @@ private: , const css::drawing::Position3D& rPosition , const css::drawing::Direction3D& rSize , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree - , bool bCylinder = false); + , bool bCylinder); }; } //namespace chart diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index fb4ffbb8c6af..d5817b211a0e 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -195,7 +195,7 @@ public: virtual LegendSymbolStyle getLegendSymbolStyle(); virtual css::awt::Size getPreferredLegendKeyAspectRatio() override; - virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex=-1/*-1 for series symbol*/ ); + virtual css::uno::Any getExplicitSymbol( const VDataSeries& rSeries, sal_Int32 nPointIndex/*-1 for series symbol*/ ); css::uno::Reference< css::drawing::XShape > createLegendSymbolForSeries( const css::awt::Size& rEntryKeyAspectRatio @@ -224,7 +224,7 @@ public: // This method creates a series plotter of the requested type; e.g. : return new PieChart .... static VSeriesPlotter* createSeriesPlotter( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel , sal_Int32 nDimensionCount - , bool bExcludingPositioning = false /*for pie and donut charts labels and exploded segments are excluded from the given size*/); + , bool bExcludingPositioning /*for pie and donut charts labels and exploded segments are excluded from the given size*/); sal_Int32 getPointCount() const; @@ -319,7 +319,7 @@ protected: , double fValue , double fSumValue , const css::awt::Point& rScreenPosition2D - , LabelAlignment eAlignment=LABEL_ALIGN_CENTER + , LabelAlignment eAlignment , sal_Int32 nOffset=0 , sal_Int32 nTextWidth = 0 ); @@ -364,7 +364,7 @@ protected: void createErrorBar_Y( const css::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex , const css::uno::Reference< css::drawing::XShapes >& xTarget - , double* pfScaledLogicX=nullptr ); + , double* pfScaledLogicX ); void createRegressionCurvesShapes( VDataSeries& rVDataSeries , const css::uno::Reference< css::drawing::XShapes >& xTarget diff --git a/chart2/source/view/main/DataPointSymbolSupplier.cxx b/chart2/source/view/main/DataPointSymbolSupplier.cxx index 986f8d7f2fd2..2597cd9d5510 100644 --- a/chart2/source/view/main/DataPointSymbolSupplier.cxx +++ b/chart2/source/view/main/DataPointSymbolSupplier.cxx @@ -37,7 +37,7 @@ uno::Reference< drawing::XShapes > DataPointSymbolSupplier::create2DSymbolList( drawing::Position3D aPos(0,0,0); for(sal_Int32 nS=0;nS<AbstractShapeFactory::getSymbolCount();nS++) { - pShapeFactory->createSymbol2D( xGroupShapes, aPos, rSize, nS ); + pShapeFactory->createSymbol2D( xGroupShapes, aPos, rSize, nS, 0, 0 ); } return xGroupShapes; } diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index be3064fbc286..bf8de1628401 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -89,7 +89,7 @@ void ShapeFactory::setPageSize(uno::Reference< drawing::XShapes >, const awt::Si // diverse tools::PolyPolygon create methods uno::Any createPolyPolygon_Cube( - const drawing::Direction3D& rSize, double fRoundedEdge, bool bRounded = true ) + const drawing::Direction3D& rSize, double fRoundedEdge, bool bRounded ) { OSL_PRECOND(fRoundedEdge>=0, "fRoundedEdge needs to be >= 0"); @@ -609,7 +609,7 @@ uno::Reference<drawing::XShape> , const drawing::Position3D& rPosition, const drawing::Direction3D& rSize , double fTopHeight, sal_Int32 nRotateZAngleHundredthDegree ) { - return impl_createConeOrCylinder( xTarget, rPosition, rSize, fTopHeight, nRotateZAngleHundredthDegree ); + return impl_createConeOrCylinder( xTarget, rPosition, rSize, fTopHeight, nRotateZAngleHundredthDegree, false ); } uno::Reference<drawing::XShape> diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index b7abf086cd5f..125d456de506 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -35,7 +35,7 @@ void getPropNamesAndValues( const Reference< beans::XPropertySet >& xProp, ::chart::tNameSequence& rNames, ::chart::tAnySequence& rValues, ::chart::VLegendSymbolFactory::tPropertyType ePropertyType, - const awt::Size& aMaxSymbolExtent = awt::Size(0,0)) + const awt::Size& aMaxSymbolExtent) { const ::chart::tPropertyNameMap & aFilledSeriesNameMap( ::chart::PropertyMapper::getPropertyNameMapForFilledSeriesProperties()); const ::chart::tPropertyNameMap & aLineSeriesNameMap( ::chart::PropertyMapper::getPropertyNameMapForLineSeriesProperties()); @@ -80,7 +80,7 @@ void lcl_setPropetiesToShape( const Reference< beans::XPropertySet > & xProp, const Reference< drawing::XShape > & xShape, ::chart::VLegendSymbolFactory::tPropertyType ePropertyType, - const awt::Size& aMaxSymbolExtent = awt::Size(0,0)) + const awt::Size& aMaxSymbolExtent) { ::chart::tNameSequence aPropNames; ::chart::tAnySequence aPropValues; @@ -178,7 +178,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( awt::Point( rEntryKeyAspectRatio.Width/2-nSize/2, rEntryKeyAspectRatio.Height/2-nSize/2 )); if( xShape.is() ) { - lcl_setPropetiesToShape( xLegendEntryProperties, xShape, ePropertyType ); // PROP_TYPE_FILLED_SERIES ); + lcl_setPropetiesToShape( xLegendEntryProperties, xShape, ePropertyType, awt::Size(0,0) ); // PROP_TYPE_FILLED_SERIES ); } } else // eStyle == LegendSymbolStyle_BOX @@ -187,7 +187,7 @@ Reference< drawing::XShape > VLegendSymbolFactory::createSymbol( tAnySequence aPropValues; getPropNamesAndValues( xLegendEntryProperties, aPropNames, aPropValues, - ePropertyType );// PROP_TYPE_FILLED_SERIES + ePropertyType, awt::Size(0,0) );// PROP_TYPE_FILLED_SERIES Reference< drawing::XShape > xShape = pShapeFactory->createRectangle( xResultGroup, |