[Libreoffice-commits] .: 2 commits - chart2/source sc/source

[Markus Mohrhard]

 chart2/source/view/axes/VCartesianAxis.cxx |    4 ++--
 sc/source/ui/unoobj/chart2uno.cxx          |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1ed8aae1050a0900998726e0484a032c097b6a60
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Mar 10 16:23:34 2012 +0100

    take explicit number format before implicit number format, fdo#47084
    
    Follow-up to fdo#43467

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 034d261..5ff808b 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3280,7 +3280,7 @@ sal_uLong getDisplayNumberFormat(ScDocument* pDoc, const ScAddress& rPos)
         return nFormat;
 
     ScBaseCell* pCell = pDoc->GetCell(rPos);
-    if (!pCell || pCell->GetCellType() != CELLTYPE_FORMULA)
+    if (!pCell || pCell->GetCellType() != CELLTYPE_FORMULA || nFormat)
         return nFormat;
 
     // With formula cell, the format may be inferred from the formula result.
commit 2ddf3a73030c04f5060654894dc5a6543cbe2ed0
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Sat Mar 10 00:49:50 2012 +0100

    add two accidently removed return statements

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 264450d..f56cae0 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -556,7 +556,7 @@ void VCartesianAxis::createAllTickInfos( ::std::vector< ::std::vector< TickInfo
 TickIter* VCartesianAxis::createLabelTickIterator( sal_Int32 nTextLevel )
 {
     if( nTextLevel>=0 && nTextLevel < static_cast< sal_Int32 >(m_aAllTickInfos.size()) )
-        new PureTickIter( m_aAllTickInfos[nTextLevel] );
+        return new PureTickIter( m_aAllTickInfos[nTextLevel] );
     return NULL;
 }
 
@@ -573,7 +573,7 @@ TickIter* VCartesianAxis::createMaximumLabelTickIterator( sal_Int32 nTextLevel )
             if( !m_aAllTickInfos.empty() )
             {
                 sal_Int32 nLongestLabelIndex = m_bUseTextLabels ? this->getIndexOfLongestLabel( m_aTextLabels ) : 0;
-                new MaxLabelTickIter( m_aAllTickInfos[0], nLongestLabelIndex );
+                return new MaxLabelTickIter( m_aAllTickInfos[0], nLongestLabelIndex );
             }
         }
     }