[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sc/source

[Kohei Yoshida]

 sc/source/core/data/dpcache.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a7223551f8d3c6d08fcfe951ac21ec8dc8ee00af
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Mar 7 11:57:11 2013 -0500

    fdo#54651: Only pick non-default number format for pivot field.
    
    Change-Id: Ia88282803c8df8389ed24efd8b1ca7600a39bf23
    (cherry picked from commit dd1b3ca024a85597b46778a62007bb966174368d)
    Reviewed-on: https://gerrit.libreoffice.org/2585
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index 5f075a3..018d1a2 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -357,7 +357,9 @@ bool ScDPCache::InitFromDoc(ScDocument* pDoc, const ScRange& rRange)
             if (!aData.IsEmpty())
             {
                 maEmptyRows.insert_back(i, i+1, false);
-                rField.mnNumFormat = nNumFormat;
+                if (nNumFormat)
+                    // Only take non-default number format.
+                    rField.mnNumFormat = nNumFormat;
             }
         }