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

[Kohei Yoshida]

 sc/source/core/data/dpoutput.cxx |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 0aff5fa1f53a3172463663c2546793e84ea2492f
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Mon Oct 24 14:35:26 2011 -0400

    fdo#42169: Display caption strings without format detection.
    
    We don't need to auto-detect the formats of caption values; they are
    already formatted by the time they arrive in to ScDPOutput.
    
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx
index a48f0b6..6902252 100644
--- a/sc/source/core/data/dpoutput.cxx
+++ b/sc/source/core/data/dpoutput.cxx
@@ -57,6 +57,8 @@
 #include "unonames.hxx"
 #include "sc.hrc"
 #include "dpglobal.hxx"
+#include "stringutil.hxx"
+
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include <vector>
@@ -795,7 +797,11 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
 
     if ( nFlags & sheet::MemberResultFlags::HASMEMBER )
     {
-        pDoc->SetString( nCol, nRow, nTab, rData.Caption);
+        // Avoid unwanted automatic format detection.
+        ScSetStringParam aParam;
+        aParam.mbDetectNumberFormat = false;
+        aParam.mbSetTextCellFormat = true;
+        pDoc->SetString(nCol, nRow, nTab, rData.Caption, &aParam);
     }
 
     if ( nFlags & sheet::MemberResultFlags::SUBTOTAL )
@@ -827,7 +833,12 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab,
 void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption,
                             bool bInTable, bool bPopup, bool bHasHiddenMember )
 {
-    pDoc->SetString( nCol, nRow, nTab, rCaption );
+    // Avoid unwanted automatic format detection.
+    ScSetStringParam aParam;
+    aParam.mbDetectNumberFormat = false;
+    aParam.mbSetTextCellFormat = true;
+    pDoc->SetString(nCol, nRow, nTab, rCaption, &aParam);
+
     if (bInTable)
         lcl_SetFrame( pDoc,nTab, nCol,nRow, nCol,nRow, 20 );