strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fdo#42169: Display caption strings without format detection.

Browse source 
We don't need to auto-detect the formats of caption values; they are
already formatted by the time they arrive in to ScDPOutput.
This commit is contained in:
Kohei Yoshida 2011-10-24 14:35:26 -04:00
parent d781ae9ae1
commit 18bff2c2e9
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sc/source/core/data/dpoutput.cxx
View file

@ -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 );