[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Kohei Yoshida]

 sc/source/ui/unoobj/chart2uno.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36e877cf80eb3b7fc092c08cdc166b75d674bf53
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
    
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 93dcb56..effb9e8 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -3285,7 +3285,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.