fdo#45067: Differentiate numeric and non-numeric field member values.

c4431fda · Kohei Yoshida · d947fb8a · c4431fda
Kaydet (Commit) c4431fda authored Ock 24, 2012 tarafından Kohei Yoshida
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

dpoutput.cxx sc/source/core/data/dpoutput.cxx +11 -4

No files found.
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -795,11 +795,18 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
    if ( nFlags & sheet::MemberResultFlags::HASMEMBER )
    {
-        // We need automatic number format detection here. Date and number
+        bool bNumeric = (nFlags & sheet::MemberResultFlags::NUMERIC) != 0;
-        // grouping functionality depend on it.
        ScSetStringParam aParam;
-        aParam.mbDetectNumberFormat = true;
+        if (bNumeric)
-        aParam.mbSetTextCellFormat = false;
+        {
+            aParam.mbDetectNumberFormat = true;
+            aParam.mbSetTextCellFormat = false;
+        }
+        else
+        {
+            aParam.mbDetectNumberFormat = false;
+            aParam.mbSetTextCellFormat = true;
+        }
        pDoc->SetString(nCol, nRow, nTab, rData.Caption, &aParam);
    }