From 00773382c1a3228fc0e4ecf40d6f11b8a15e34e5 Mon Sep 17 00:00:00 2001
From: Ingrid Halama <iha@openoffice.org>
Date: Fri, 29 Jan 2010 17:23:04 +0100
Subject: [PATCH] chartmultiline: fixed compiler warnings

---
 .../source/controller/dialogs/DataBrowserModel.cxx   |  2 +-
 chart2/source/tools/InternalDataProvider.cxx         | 10 +++++-----
 chart2/source/view/axes/VAxisProperties.cxx          |  2 +-
 chart2/source/view/axes/VCartesianAxis.cxx           | 12 +++++++++---
 chart2/source/view/axes/VCartesianAxis.hxx           |  2 ++
 sc/source/ui/unoobj/chart2uno.cxx                    |  2 +-
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 841aa007ed90..b2fc18f6ea2d 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -740,7 +740,7 @@ OUString DataBrowserModel::getRoleOfColumn( sal_Int32 nColumnIndex ) const
 bool DataBrowserModel::isCategoriesColumn( sal_Int32 nColumnIndex ) const
 {
     bool bIsCategories = false;
-    if( nColumnIndex>=0 && nColumnIndex<m_aColumns.size() )
+    if( nColumnIndex>=0 && nColumnIndex<static_cast< sal_Int32 >(m_aColumns.size()) )
         bIsCategories = !m_aColumns[ nColumnIndex ].m_xDataSeries.is();
     return bIsCategories;
 }
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 369d6a13ab14..f246618baf82 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -200,7 +200,7 @@ public:
     uno::Any operator() ( const vector< OUString >& rVector )
     {
         OUString aString;
-        if( m_nLevel < rVector.size() )
+        if( m_nLevel <  static_cast< sal_Int32 >(rVector.size()) )
             aString = rVector[m_nLevel];
         return uno::makeAny( aString );
     }
@@ -219,7 +219,7 @@ public:
     OUString operator() ( const vector< OUString >& rVector )
     {
         OUString aString;
-        if( m_nLevel < rVector.size() )
+        if( m_nLevel < static_cast< sal_Int32 >(rVector.size()) )
             aString = rVector[m_nLevel];
         return aString;
     }
@@ -239,7 +239,7 @@ public:
     vector< OUString > operator() ( const vector< OUString >& rVector, const OUString& rNewText )
     {
         vector< OUString > aRet( rVector );
-        if( m_nLevel >= aRet.size() )
+        if( m_nLevel >= static_cast< sal_Int32 >(aRet.size()) )
             aRet.resize( m_nLevel+1 );
         aRet[ m_nLevel ]=rNewText;
         return aRet;
@@ -258,7 +258,7 @@ public:
 
     void operator() ( vector< OUString >& rVector )
     {
-        if( m_nLevel > rVector.size() )
+        if( m_nLevel > static_cast< sal_Int32 >(rVector.size()) )
             rVector.resize( m_nLevel );
 
         vector< OUString >::iterator aIt( rVector.begin() );
@@ -359,7 +359,7 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum
                         if( xSeq.is() )
                             aStringSeq = xSeq->getTextualData(); // @todo: be able to deal with XDataSequence, too
                         sal_Int32 nLength = aStringSeq.getLength();
-                        if( aNewCategories.size() < nLength )
+                        if( static_cast< sal_Int32 >(aNewCategories.size()) < nLength )
                             aNewCategories.resize( nLength );
 
                         transform( aNewCategories.begin(), aNewCategories.end(), aStringSeq.getConstArray(),
diff --git a/chart2/source/view/axes/VAxisProperties.cxx b/chart2/source/view/axes/VAxisProperties.cxx
index 35fd0874399f..80374e5a8678 100644
--- a/chart2/source/view/axes/VAxisProperties.cxx
+++ b/chart2/source/view/axes/VAxisProperties.cxx
@@ -148,7 +148,7 @@ TickmarkProperties AxisProperties::makeTickmarkProperties(
 }
 
 TickmarkProperties AxisProperties::makeTickmarkPropertiesForComplexCategories(
-    sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 nTextLevel ) const
+    sal_Int32 nTickLength, sal_Int32 nTickStartDistanceToAxis, sal_Int32 /*nTextLevel*/ ) const
 {
     sal_Int32 nTickmarkStyle = (m_fLabelDirectionSign==m_fInnerDirectionSign) ? 2/*outside*/ : 1/*inside*/;
 
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 98adff6e93ef..dba76685ed97 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -524,7 +524,7 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo
 {
     if( m_aAxisProperties.m_bComplexCategories && m_bUseTextLabels )
     {
-        if( nTextLevel>=0 && nTextLevel < m_aAllTickInfos.size() )
+        if( nTextLevel>=0 && nTextLevel < static_cast< sal_Int32 >(m_aAllTickInfos.size()) )
             return ::std::auto_ptr< TickIter >( new PureTickIter( m_aAllTickInfos[nTextLevel] ) );
     }
     else
@@ -1233,10 +1233,16 @@ void VCartesianAxis::hideIdenticalScreenValues( ::std::vector< ::std::vector< Ti
     {
         sal_Int32 nCount = rTickInfos.size();
         for( sal_Int32 nN=0; nN<nCount; nN++ )
-            lcl_hideIdenticalScreenValues( PureTickIter( rTickInfos[nN] ) );
+        {
+            PureTickIter aTickIter( rTickInfos[nN] );
+            lcl_hideIdenticalScreenValues( aTickIter );
+        }
     }
     else
-        lcl_hideIdenticalScreenValues( EquidistantTickIter( rTickInfos, m_aIncrement, 0, -1 ) );
+    {
+        EquidistantTickIter aTickIter( rTickInfos, m_aIncrement, 0, -1 );
+        lcl_hideIdenticalScreenValues( aTickIter );
+    }
 }
 
 sal_Int32 VCartesianAxis::estimateMaximumAutoMainIncrementCount()
diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx
index 060d841065d7..78c479dab34b 100644
--- a/chart2/source/view/axes/VCartesianAxis.hxx
+++ b/chart2/source/view/axes/VCartesianAxis.hxx
@@ -33,6 +33,8 @@
 #include "VAxisBase.hxx"
 #include <basegfx/vector/b2dvector.hxx>
 
+#include <memory>
+
 //.............................................................................
 namespace chart
 {
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 7f3f353af4f5..6bd2d31ceb60 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -1088,7 +1088,7 @@ ScChart2LabeledDataSequence* lcl_createScChart2DataSequenceFromTokens( auto_ptr<
  * @return true if the corner was added, false otherwise.
  */
 bool lcl_addUpperLeftCornerIfMissing(vector<ScSharedTokenRef>& rRefTokens,
-            sal_uInt32 nCornerRowCount=1, sal_uInt32 nCornerColumnCount=1)
+            SCROW nCornerRowCount=1, SCCOL nCornerColumnCount=1)
 {
     using ::std::max;
     using ::std::min;