diff options
Diffstat (limited to 'chart2/source/view/axes')
-rw-r--r-- | chart2/source/view/axes/ScaleAutomatism.cxx | 2 | ||||
-rw-r--r-- | chart2/source/view/axes/VAxisProperties.cxx | 10 | ||||
-rw-r--r-- | chart2/source/view/axes/VCartesianAxis.cxx | 24 | ||||
-rw-r--r-- | chart2/source/view/axes/VCartesianGrid.cxx | 4 |
4 files changed, 20 insertions, 20 deletions
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx index e6f2d4d0192f..5a72a875168b 100644 --- a/chart2/source/view/axes/ScaleAutomatism.cxx +++ b/chart2/source/view/axes/ScaleAutomatism.cxx @@ -40,7 +40,7 @@ using ::com::sun::star::chart::TimeUnit::YEAR; const sal_Int32 MAXIMUM_MANUAL_INCREMENT_COUNT = 500; const sal_Int32 MAXIMUM_SUB_INCREMENT_COUNT = 100; -sal_Int32 lcl_getMaximumAutoIncrementCount( sal_Int32 nAxisType ) +static sal_Int32 lcl_getMaximumAutoIncrementCount( sal_Int32 nAxisType ) { sal_Int32 nMaximumAutoIncrementCount = 10; if( nAxisType==AxisType::DATE ) diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx index c2385db62631..fd16b851412b 100644 --- a/chart2/source/view/axes/VAxisProperties.cxx +++ b/chart2/source/view/axes/VAxisProperties.cxx @@ -43,7 +43,7 @@ AxisLabelAlignment::AxisLabelAlignment() : mfInnerTickDirection(1.0), meAlignment(LABEL_ALIGN_RIGHT_TOP) {} -sal_Int32 lcl_calcTickLengthForDepth(sal_Int32 nDepth,sal_Int32 nTickmarkStyle) +static sal_Int32 lcl_calcTickLengthForDepth(sal_Int32 nDepth,sal_Int32 nTickmarkStyle) { sal_Int32 const nWidth = AXIS2D_TICKLENGTH; //@maybefuturetodo this length could be offered by the model double fPercent = 1.0; @@ -67,7 +67,7 @@ sal_Int32 lcl_calcTickLengthForDepth(sal_Int32 nDepth,sal_Int32 nTickmarkStyle) return static_cast<sal_Int32>(nWidth*fPercent); } -double lcl_getTickOffset(sal_Int32 nLength,sal_Int32 nTickmarkStyle) +static double lcl_getTickOffset(sal_Int32 nLength,sal_Int32 nTickmarkStyle) { double fPercent = 0.0; //0<=fPercent<=1 //0.0: completely inner @@ -180,7 +180,7 @@ AxisProperties::AxisProperties( const uno::Reference< XAxis >& xAxisModel { } -LabelAlignment lcl_getLabelAlignmentForZAxis( const AxisProperties& rAxisProperties ) +static LabelAlignment lcl_getLabelAlignmentForZAxis( const AxisProperties& rAxisProperties ) { LabelAlignment aRet( LABEL_ALIGN_RIGHT ); if (rAxisProperties.maLabelAlignment.mfLabelDirection < 0) @@ -188,7 +188,7 @@ LabelAlignment lcl_getLabelAlignmentForZAxis( const AxisProperties& rAxisPropert return aRet; } -LabelAlignment lcl_getLabelAlignmentForYAxis( const AxisProperties& rAxisProperties ) +static LabelAlignment lcl_getLabelAlignmentForYAxis( const AxisProperties& rAxisProperties ) { LabelAlignment aRet( LABEL_ALIGN_RIGHT ); if (rAxisProperties.maLabelAlignment.mfLabelDirection < 0) @@ -196,7 +196,7 @@ LabelAlignment lcl_getLabelAlignmentForYAxis( const AxisProperties& rAxisPropert return aRet; } -LabelAlignment lcl_getLabelAlignmentForXAxis( const AxisProperties& rAxisProperties ) +static LabelAlignment lcl_getLabelAlignmentForXAxis( const AxisProperties& rAxisProperties ) { LabelAlignment aRet( LABEL_ALIGN_BOTTOM ); if (rAxisProperties.maLabelAlignment.mfLabelDirection < 0) diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index a047f7239b59..c6f59216593e 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -76,7 +76,7 @@ VCartesianAxis::~VCartesianAxis() m_pPosHelper = nullptr; } -void lcl_ResizeTextShapeToFitAvailableSpace( Reference< drawing::XShape > const & xShape2DText, +static void lcl_ResizeTextShapeToFitAvailableSpace( Reference< drawing::XShape > const & xShape2DText, const AxisLabelProperties& rAxisLabelProperties, const OUString& rLabel, const tNameSequence& rPropNames, @@ -123,7 +123,7 @@ void lcl_ResizeTextShapeToFitAvailableSpace( Reference< drawing::XShape > const } } -Reference< drawing::XShape > createSingleLabel( +static Reference< drawing::XShape > createSingleLabel( const Reference< lang::XMultiServiceFactory>& xShapeFactory , const Reference< drawing::XShapes >& xTarget , const awt::Point& rAnchorScreenPosition2D @@ -154,7 +154,7 @@ Reference< drawing::XShape > createSingleLabel( return xShape2DText; } -bool lcl_doesShapeOverlapWithTickmark( const Reference< drawing::XShape >& xShape +static bool lcl_doesShapeOverlapWithTickmark( const Reference< drawing::XShape >& xShape , double fRotationAngleDegree , const basegfx::B2DVector& rTickScreenPosition ) { @@ -169,7 +169,7 @@ bool lcl_doesShapeOverlapWithTickmark( const Reference< drawing::XShape >& xShap return aShapeRect.isInside(aPosition); } -void lcl_getRotatedPolygon( B2DPolygon &aPoly, const ::basegfx::B2DRectangle &aRect, const awt::Point &aPos, const double fRotationAngleDegree ) +static void lcl_getRotatedPolygon( B2DPolygon &aPoly, const ::basegfx::B2DRectangle &aRect, const awt::Point &aPos, const double fRotationAngleDegree ) { aPoly = basegfx::utils::createPolygonFromRect( aRect ); @@ -189,7 +189,7 @@ void lcl_getRotatedPolygon( B2DPolygon &aPoly, const ::basegfx::B2DRectangle &aR aPoly.transform( aMatrix ); } -bool doesOverlap( const Reference< drawing::XShape >& xShape1 +static bool doesOverlap( const Reference< drawing::XShape >& xShape1 , const Reference< drawing::XShape >& xShape2 , double fRotationAngleDegree ) { @@ -212,7 +212,7 @@ bool doesOverlap( const Reference< drawing::XShape >& xShape1 return (overlapPoly.count() > 0); } -void removeShapesAtWrongRhythm( TickIter& rIter +static void removeShapesAtWrongRhythm( TickIter& rIter , sal_Int32 nCorrectRhythm , sal_Int32 nMaxTickToCheck , const Reference< drawing::XShapes >& xTarget ) @@ -309,7 +309,7 @@ TickInfo* LabelIterator::nextInfo() return pTickInfo; } -B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTickToText, double fRotationAngleDegree ) +static B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTickToText, double fRotationAngleDegree ) { //calculates the height or width of a line of labels //thus a following line of labels can be shifted for that distance @@ -349,7 +349,7 @@ B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTick return aRet; } -void lcl_shiftLabels( TickIter& rIter, const B2DVector& rStaggerDistance ) +static void lcl_shiftLabels( TickIter& rIter, const B2DVector& rStaggerDistance ) { if(rStaggerDistance.getLength()==0.0) return; @@ -369,7 +369,7 @@ void lcl_shiftLabels( TickIter& rIter, const B2DVector& rStaggerDistance ) } } -bool lcl_hasWordBreak( const Reference<drawing::XShape>& xShape ) +static bool lcl_hasWordBreak( const Reference<drawing::XShape>& xShape ) { if (!xShape.is()) return false; @@ -411,7 +411,7 @@ bool lcl_hasWordBreak( const Reference<drawing::XShape>& xShape ) return false; } -OUString getTextLabelString( +static OUString getTextLabelString( const FixedNumberFormatter& rFixedNumberFormatter, const uno::Sequence<OUString>* pCategories, const TickInfo* pTickInfo, bool bComplexCat, Color& rExtraColor, bool& rHasExtraColor ) { @@ -435,7 +435,7 @@ OUString getTextLabelString( return rFixedNumberFormatter.getFormattedString(pTickInfo->getUnscaledTickValue(), rExtraColor, rHasExtraColor); } -void getAxisLabelProperties( +static void getAxisLabelProperties( tNameSequence& rPropNames, tAnySequence& rPropValues, const AxisProperties& rAxisProp, const AxisLabelProperties& rAxisLabelProp, sal_Int32 nLimitedSpaceForText, bool bLimitedHeight ) @@ -1475,7 +1475,7 @@ TickFactory2D* VCartesianAxis::createTickFactory2D() return new TickFactory2D( m_aScale, m_aIncrement, aStart, aEnd, aLabelLineStart-aStart ); } -void lcl_hideIdenticalScreenValues( TickIter& rTickIter ) +static void lcl_hideIdenticalScreenValues( TickIter& rTickIter ) { TickInfo* pPrevTickInfo = rTickIter.firstInfo(); if (!pPrevTickInfo) diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx index a9df579ac353..df74eeeaf05d 100644 --- a/chart2/source/view/axes/VCartesianGrid.cxx +++ b/chart2/source/view/axes/VCartesianGrid.cxx @@ -135,7 +135,7 @@ void GridLinePoints::update( double fScaledTickValue ) P0[m_nDimensionIndex] = P1[m_nDimensionIndex] = P2[m_nDimensionIndex] = fScaledTickValue; } -void addLine2D( drawing::PointSequenceSequence& rPoints, sal_Int32 nIndex +static void addLine2D( drawing::PointSequenceSequence& rPoints, sal_Int32 nIndex , const GridLinePoints& rScaledLogicPoints , const Reference< XTransformation > & xTransformation ) @@ -150,7 +150,7 @@ void addLine2D( drawing::PointSequenceSequence& rPoints, sal_Int32 nIndex rPoints[nIndex][1].Y = static_cast<sal_Int32>(aPB.PositionY); } -void addLine3D( drawing::PolyPolygonShape3D& rPoints, sal_Int32 nIndex +static void addLine3D( drawing::PolyPolygonShape3D& rPoints, sal_Int32 nIndex , const GridLinePoints& rBasePoints , const Reference< XTransformation > & xTransformation ) { |