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, 2 insertions, 30 deletions

diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 36afef60a6d4..b3ae733c4067 100644..100755
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -73,7 +73,6 @@ using ::rtl::OUString;
 namespace chart
 {
 
-// static
 DiagramHelper::tTemplateWithServiceName
     DiagramHelper::getTemplateForDiagram(
         const Reference< XDiagram > & xDiagram,
@@ -132,7 +131,6 @@ DiagramHelper::tTemplateWithServiceName
     return aResult;
 }
 
-// static
 void DiagramHelper::setVertical(
     const Reference< XDiagram > & xDiagram,
     bool bVertical /* = true */ )
@@ -210,7 +208,6 @@ void DiagramHelper::setVertical(
     }
 }
 
-//static
 bool DiagramHelper::getVertical( const uno::Reference< chart2::XDiagram > & xDiagram,
                              bool& rbFound, bool& rbAmbiguous )
 {
@@ -248,7 +245,6 @@ bool DiagramHelper::getVertical( const uno::Reference< chart2::XDiagram > & xDia
     return bValue;
 }
 
-//static
 void DiagramHelper::setStackMode(
     const Reference< XDiagram > & xDiagram,
     StackMode eStackMode,
@@ -340,8 +336,6 @@ void DiagramHelper::setStackMode(
     }
 }
 
-//static
-
 StackMode DiagramHelper::getStackMode( const Reference< XDiagram > & xDiagram, bool& rbFound, bool& rbAmbiguous )
 {
     rbFound=false;
@@ -383,7 +377,6 @@ StackMode DiagramHelper::getStackMode( const Reference< XDiagram > & xDiagram, b
     return eGlobalStackMode;
 }
 
-// static
 StackMode DiagramHelper::getStackModeFromChartType(
     const Reference< XChartType > & xChartType,
     bool& rbFound, bool& rbAmbiguous,
@@ -467,7 +460,6 @@ StackMode DiagramHelper::getStackModeFromChartType(
     return eStackMode;
 }
 
-// static
 sal_Int32 DiagramHelper::getDimension( const Reference< XDiagram > & xDiagram )
 {
     // -1: not yet set
@@ -500,7 +492,6 @@ sal_Int32 DiagramHelper::getDimension( const Reference< XDiagram > & xDiagram )
     return nResult;
 }
 
-// static
 void DiagramHelper::setDimension(
     const Reference< XDiagram > & xDiagram,
     sal_Int32 nNewDimensionCount )
@@ -561,7 +552,6 @@ void DiagramHelper::setDimension(
     }
 }
 
-// static
 void DiagramHelper::replaceCoordinateSystem(
     const Reference< XDiagram > & xDiagram,
     const Reference< XCoordinateSystem > & xCooSysToReplace,
@@ -597,7 +587,6 @@ void DiagramHelper::replaceCoordinateSystem(
     }
 }
 
-//static
 bool DiagramHelper::isSeriesAttachedToMainAxis(
                           const uno::Reference< chart2::XDataSeries >& xDataSeries )
 {
@@ -605,7 +594,6 @@ bool DiagramHelper::isSeriesAttachedToMainAxis(
     return (nAxisIndex==0);
 }
 
-//static
 bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
                         , const uno::Reference< chart2::XDataSeries >& xDataSeries
                         , const uno::Reference< chart2::XDiagram >& xDiagram
@@ -651,7 +639,6 @@ bool DiagramHelper::attachSeriesToAxis( bool bAttachToMainAxis
     return bChanged;
 }
 
-//static
 uno::Reference< XAxis > DiagramHelper::getAttachedAxis(
         const uno::Reference< XDataSeries >& xSeries,
         const uno::Reference< XDiagram >& xDiagram )
@@ -659,7 +646,6 @@ uno::Reference< XAxis > DiagramHelper::getAttachedAxis(
     return AxisHelper::getAxis( 1, DiagramHelper::isSeriesAttachedToMainAxis( xSeries ), xDiagram );
 }
 
-//static
 uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
                                 const uno::Reference< chart2::XDiagram >&   xDiagram
                               , const uno::Reference< XDataSeries >&        xGivenDataSeries )
@@ -709,7 +695,6 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
     return 0;
 }
 
-// static
 ::std::vector< Reference< XDataSeries > >
     DiagramHelper::getDataSeriesFromDiagram(
         const Reference< XDiagram > & xDiagram )
@@ -856,7 +841,6 @@ std::vector< Reference< XAxis > > lcl_getAxisHoldingCategoriesFromDiagram(
 
 } // anonymous namespace
 
-//static
 bool DiagramHelper::isCategoryDiagram(
             const Reference< XDiagram >& xDiagram )
 {
@@ -895,7 +879,6 @@ bool DiagramHelper::isCategoryDiagram(
     return false;
 }
 
-// static
 void DiagramHelper::setCategoriesToDiagram(
     const Reference< chart2::data::XLabeledDataSequence >& xCategories,
     const Reference< XDiagram >& xDiagram,
@@ -927,7 +910,6 @@ void DiagramHelper::setCategoriesToDiagram(
     }
 }
 
-// static
 Reference< data::XLabeledDataSequence >
     DiagramHelper::getCategoriesFromDiagram(
         const Reference< XDiagram > & xDiagram )
@@ -1022,7 +1004,6 @@ Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys(
     return aRet;
 }
 
-//static
 Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories(
             const Reference< XChartDocument >& xChartDoc )
 {
@@ -1037,7 +1018,6 @@ Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories(
     return aRet;
 }
 
-// static
 Sequence< Reference< XChartType > >
     DiagramHelper::getChartTypesFromDiagram(
         const Reference< XDiagram > & xDiagram )
@@ -1067,7 +1047,6 @@ Sequence< Reference< XChartType > >
     return ContainerHelper::ContainerToSequence( aResult );
 }
 
-//static
 bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartType >& xFirstType,
                 const Reference< ::chart2::XChartType >& xSecondType )
 {
@@ -1327,7 +1306,6 @@ bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference<
     return false;
 }
 
-// static
 sal_Int32 DiagramHelper::getGeometry3D(
     const uno::Reference< chart2::XDiagram > & xDiagram,
     bool& rbFound, bool& rbAmbiguous )
@@ -1374,7 +1352,6 @@ sal_Int32 DiagramHelper::getGeometry3D(
     return nCommonGeom;
 }
 
-// static
 void DiagramHelper::setGeometry3D(
     const Reference< chart2::XDiagram > & xDiagram,
     sal_Int32 nNewGeometry )
@@ -1390,7 +1367,6 @@ void DiagramHelper::setGeometry3D(
     }
 }
 
-//static
 sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment(
             const Reference< chart2::XDiagram > & xDiagram,
             const Reference< chart2::XChartType >& xChartType )
@@ -1418,7 +1394,6 @@ sal_Int32 DiagramHelper::getCorrectedMissingValueTreatment(
     return nResult;
 }
 
-//static
 DiagramPositioningMode DiagramHelper::getDiagramPositioningMode( const uno::Reference<
                 chart2::XDiagram > & xDiagram )
 {
@@ -1450,7 +1425,6 @@ void lcl_ensureRange0to1( double& rValue )
         rValue=1.0;
 }
 
-//static
 bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel >& xChartModel,
         const awt::Rectangle& rPosRect /*100th mm*/ )
 {
@@ -1496,7 +1470,6 @@ bool DiagramHelper::setDiagramPositioning( const uno::Reference< frame::XModel >
     return bChanged;
 }
 
-//static
 awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference< frame::XModel >& xChartModel )
 {
     awt::Rectangle aRet(-1,-1,-1,-1);
@@ -1513,8 +1486,8 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference
     xDiaProps->getPropertyValue(C2U("RelativeSize") ) >>= aRelSize;
 
     awt::Size aAbsSize(
-        aRelSize.Primary * aPageSize.Width,
-        aRelSize.Secondary * aPageSize.Height );
+        static_cast< sal_Int32 >( aRelSize.Primary * aPageSize.Width ),
+        static_cast< sal_Int32 >( aRelSize.Secondary * aPageSize.Height ));
 
     awt::Point aAbsPos(
         static_cast< sal_Int32 >( aRelPos.Primary * aPageSize.Width ),
@@ -1527,7 +1500,6 @@ awt::Rectangle DiagramHelper::getDiagramRectangleFromModel( const uno::Reference
     return aRet;
 }
 
-//static
 bool DiagramHelper::switchDiagramPositioningToExcludingPositioning(
     const uno::Reference< frame::XModel >& xChartModel
     , bool bResetModifiedState, bool bConvertAlsoFromAutoPositioning )