undoapi: merged after pulling DEV300_m96. Most probably still not buildable:A number of changes which happened in the CWS need to be redone due to the new build system

1 files changed, 0 insertions, 36 deletions

diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 8cdd24e4dc05..b5f7abfb8206 100644..100755
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -64,19 +64,16 @@ using namespace ::com::sun::star::chart2;
 using ::com::sun::star::uno::Reference;
 using ::com::sun::star::uno::Sequence;
 
-//static
 Reference< chart2::XScaling > AxisHelper::createLinearScaling()
 {
     return new LinearScaling( 1.0, 0.0 );
 }
 
-//static
 Reference< chart2::XScaling > AxisHelper::createLogarithmicScaling( double fBase )
 {
     return new LogarithmicScaling( fBase );
 }
 
-//static
 ScaleData AxisHelper::createDefaultScale()
 {
     ScaleData aScaleData;
@@ -87,7 +84,6 @@ ScaleData AxisHelper::createDefaultScale()
     return aScaleData;
 }
 
-//static
 void AxisHelper::removeExplicitScaling( ScaleData& rScaleData )
 {
     uno::Any aEmpty;
@@ -95,7 +91,6 @@ void AxisHelper::removeExplicitScaling( ScaleData& rScaleData )
     rScaleData.Scaling = 0;
 }
 
-//static
 bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
 {
     bool bReturn = false;
@@ -105,7 +100,6 @@ bool AxisHelper::isLogarithmic( const Reference< XScaling >& xScaling )
     return bReturn;
 }
 
-//static
 Reference< XAxis > AxisHelper::createAxis(
           sal_Int32 nDimensionIndex
         , sal_Int32 nAxisIndex // 0==main or 1==secondary axis
@@ -173,7 +167,6 @@ Reference< XAxis > AxisHelper::createAxis(
     return xAxis;
 }
 
-//static
 Reference< XAxis > AxisHelper::createAxis( sal_Int32 nDimensionIndex, bool bMainAxis
                 , const Reference< chart2::XDiagram >& xDiagram
                 , const Reference< uno::XComponentContext >& xContext
@@ -192,7 +185,6 @@ Reference< XAxis > AxisHelper::createAxis( sal_Int32 nDimensionIndex, bool bMain
         nDimensionIndex, nAxisIndex, xCooSys, xContext, pRefSizeProvider );
 }
 
-//static
 void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis
                 , const Reference< chart2::XDiagram >& xDiagram
                 , const Reference< uno::XComponentContext >& xContext
@@ -215,7 +207,6 @@ void AxisHelper::showAxis( sal_Int32 nDimensionIndex, bool bMainAxis
         AxisHelper::makeAxisVisible( xAxis );
 }
 
-//static
 void AxisHelper::showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bool bMainGrid
                 , const Reference< XDiagram >& xDiagram
                 , const Reference< uno::XComponentContext >& /*xContext*/ )
@@ -245,7 +236,6 @@ void AxisHelper::showGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bo
     }
 }
 
-//static
 void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
 {
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
@@ -257,7 +247,6 @@ void AxisHelper::makeAxisVisible( const Reference< XAxis >& xAxis )
     }
 }
 
-//static
 void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridProperties )
 {
     if( xGridProperties.is() )
@@ -267,14 +256,12 @@ void AxisHelper::makeGridVisible( const Reference< beans::XPropertySet >& xGridP
     }
 }
 
-//static
 void AxisHelper::hideAxis( sal_Int32 nDimensionIndex, bool bMainAxis
                 , const Reference< XDiagram >& xDiagram )
 {
     AxisHelper::makeAxisInvisible( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram ) );
 }
 
-//static
 void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis )
 {
     Reference< beans::XPropertySet > xProps( xAxis, uno::UNO_QUERY );
@@ -284,7 +271,6 @@ void AxisHelper::makeAxisInvisible( const Reference< XAxis >& xAxis )
     }
 }
 
-//static
 void AxisHelper::hideAxisIfNoDataIsAttached( const Reference< XAxis >& xAxis, const Reference< XDiagram >& xDiagram )
 {
     //axis is hidden if no data is attached anymore but data is available
@@ -328,7 +314,6 @@ void AxisHelper::hideGrid( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIndex, bo
     }
 }
 
-//static
 void AxisHelper::makeGridInvisible( const Reference< beans::XPropertySet >& xGridProperties )
 {
     if( xGridProperties.is() )
@@ -362,7 +347,6 @@ sal_Bool AxisHelper::isGridShown( sal_Int32 nDimensionIndex, sal_Int32 nCooSysIn
     return bRet;
 }
 
-//static
 Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemByIndex(
     const Reference< XDiagram >& xDiagram, sal_Int32 nIndex )
 {
@@ -375,7 +359,6 @@ Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemByIndex(
     return NULL;
 }
 
-//static
 Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, bool bMainAxis
             , const Reference< XDiagram >& xDiagram )
 {
@@ -391,7 +374,6 @@ Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, bool bMainAxi
     return xRet;
 }
 
-//static
 Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
             , const Reference< XCoordinateSystem >& xCooSys )
 {
@@ -407,7 +389,6 @@ Reference< XAxis > AxisHelper::getAxis( sal_Int32 nDimensionIndex, sal_Int32 nAx
     return xRet;
 }
 
-//static
 Reference< XAxis > AxisHelper::getCrossingMainAxis( const Reference< XAxis >& xAxis
             , const Reference< XCoordinateSystem >& xCooSys )
 {
@@ -429,7 +410,6 @@ Reference< XAxis > AxisHelper::getCrossingMainAxis( const Reference< XAxis >& xA
     return AxisHelper::getAxis( nDimensionIndex, 0, xCooSys );
 }
 
-//static
 Reference< XAxis > AxisHelper::getParallelAxis( const Reference< XAxis >& xAxis
             , const Reference< XDiagram >& xDiagram )
 {
@@ -456,7 +436,6 @@ sal_Bool AxisHelper::isAxisShown( sal_Int32 nDimensionIndex, bool bMainAxis
     return AxisHelper::isAxisVisible( AxisHelper::getAxis( nDimensionIndex, bMainAxis, xDiagram ) );
 }
 
-//static
 sal_Bool AxisHelper::isAxisVisible( const Reference< XAxis >& xAxis )
 {
     sal_Bool bRet = false;
@@ -482,7 +461,6 @@ sal_Bool AxisHelper::areAxisLabelsVisible( const Reference< beans::XPropertySet
     return bRet;
 }
 
-//static
 sal_Bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGridProperies )
 {
     sal_Bool bRet = false;
@@ -496,7 +474,6 @@ sal_Bool AxisHelper::isGridVisible( const Reference< beans::XPropertySet >& xGri
     return bRet;
 }
 
-//static
 Reference< beans::XPropertySet > AxisHelper::getGridProperties(
             const Reference< XCoordinateSystem >& xCooSys
         , sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex, sal_Int32 nSubGridIndex )
@@ -519,7 +496,6 @@ Reference< beans::XPropertySet > AxisHelper::getGridProperties(
     return xRet;
 }
 
-//static
 sal_Int32 AxisHelper::getDimensionIndexOfAxis(
               const Reference< XAxis >& xAxis
             , const Reference< XDiagram >& xDiagram )
@@ -531,7 +507,6 @@ sal_Int32 AxisHelper::getDimensionIndexOfAxis(
     return nDimensionIndex;
 }
 
-//static
 bool AxisHelper::getIndicesForAxis(
               const Reference< XAxis >& xAxis
             , const Reference< XCoordinateSystem >& xCooSys
@@ -564,7 +539,6 @@ bool AxisHelper::getIndicesForAxis(
     return false;
 }
 
-//static
 bool AxisHelper::getIndicesForAxis( const Reference< XAxis >& xAxis, const Reference< XDiagram >& xDiagram
             , sal_Int32& rOutCooSysIndex, sal_Int32& rOutDimensionIndex, sal_Int32& rOutAxisIndex )
 {
@@ -591,7 +565,6 @@ bool AxisHelper::getIndicesForAxis( const Reference< XAxis >& xAxis, const Refer
     return false;
 }
 
-//static
 std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
       const Reference< XCoordinateSystem >& xCooSys
     , bool bOnlyVisible /* = false */ )
@@ -638,7 +611,6 @@ std::vector< Reference< XAxis > > AxisHelper::getAllAxesOfCoordinateSystem(
     return aAxisVector;
 }
 
-//static
 Sequence< Reference< XAxis > > AxisHelper::getAllAxesOfDiagram(
       const Reference< XDiagram >& xDiagram
     , bool bOnlyVisible )
@@ -660,7 +632,6 @@ Sequence< Reference< XAxis > > AxisHelper::getAllAxesOfDiagram(
     return ContainerHelper::ContainerToSequence( aAxisVector );
 }
 
-//static
 Sequence< Reference< beans::XPropertySet > > AxisHelper::getAllGrids( const Reference< XDiagram >& xDiagram )
 {
     Sequence< Reference< XAxis > > aAllAxes( AxisHelper::getAllAxesOfDiagram( xDiagram ) );
@@ -689,7 +660,6 @@ Sequence< Reference< beans::XPropertySet > > AxisHelper::getAllGrids( const Refe
     return ContainerHelper::ContainerToSequence( aGridVector );
 }
 
-//static
 void AxisHelper::getAxisOrGridPossibilities( Sequence< sal_Bool >& rPossibilityList
         , const Reference< XDiagram>& xDiagram, sal_Bool bAxis )
 {
@@ -709,7 +679,6 @@ void AxisHelper::getAxisOrGridPossibilities( Sequence< sal_Bool >& rPossibilityL
             rPossibilityList[nIndex] = rPossibilityList[nIndex-3];
 }
 
-//static
 bool AxisHelper::isSecondaryYAxisNeeded( const Reference< XCoordinateSystem >& xCooSys )
 {
     Reference< chart2::XChartTypeContainer > xCTCnt( xCooSys, uno::UNO_QUERY );
@@ -738,7 +707,6 @@ bool AxisHelper::isSecondaryYAxisNeeded( const Reference< XCoordinateSystem >& x
     return false;
 }
 
-//static
 bool AxisHelper::shouldAxisBeDisplayed( const Reference< XAxis >& xAxis
                                        , const Reference< XCoordinateSystem >& xCooSys )
 {
@@ -764,7 +732,6 @@ bool AxisHelper::shouldAxisBeDisplayed( const Reference< XAxis >& xAxis
     return bRet;
 }
 
-//static
 void AxisHelper::getAxisOrGridExcistence( Sequence< sal_Bool >& rExistenceList
         , const Reference< XDiagram>& xDiagram, sal_Bool bAxis )
 {
@@ -790,7 +757,6 @@ void AxisHelper::getAxisOrGridExcistence( Sequence< sal_Bool >& rExistenceList
     }
 }
 
-//static
 bool AxisHelper::changeVisibilityOfAxes( const Reference< XDiagram >& xDiagram
                         , const Sequence< sal_Bool >& rOldExistenceList
                         , const Sequence< sal_Bool >& rNewExistenceList
@@ -814,7 +780,6 @@ bool AxisHelper::changeVisibilityOfAxes( const Reference< XDiagram >& xDiagram
     return bChanged;
 }
 
-//static
 bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram
                         , const Sequence< sal_Bool >& rOldExistenceList
                         , const Sequence< sal_Bool >& rNewExistenceList
@@ -835,7 +800,6 @@ bool AxisHelper::changeVisibilityOfGrids( const Reference< XDiagram >& xDiagram
     return bChanged;
 }
 
-//static
 Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemOfAxis(
               const Reference< XAxis >& xAxis
             , const Reference< XDiagram >& xDiagram )