mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS numberformat (1.7.70); FILE MERGED

Browse Source 
2005/10/26 17:50:36 kendy 1.7.70.1: #i55546#
The ULONG -> sal_uInt32 patches related to NumberFormat extracted from ooo64bit02 CWS.
This commit is contained in:
Rüdiger Timm
2005-12-14 13:48:32 +00:00
parent 0e3f7688f4
commit 97ea4537b5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sw/source/core/fields/cellfml.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: cellfml.cxx,v $ * $RCSfile: cellfml.cxx,v $
* *
* $Revision: 1.7 $ * $Revision: 1.8 $
* *
* last change: $Author: rt $ $Date: 2005-09-09 03:32:05 $ * last change: $Author: rt $ $Date: 2005-12-14 14:48:32 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -261,7 +261,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
double aNum; double aNum;
String sTxt( rTxt.Copy( nSttPos ) ); String sTxt( rTxt.Copy( nSttPos ) );
ULONG nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue(); sal_uInt32 nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue();
SvNumberFormatter* pNumFmtr = pDoc->GetNumberFormatter(); SvNumberFormatter* pNumFmtr = pDoc->GetNumberFormatter();
@@ -271,7 +271,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
else if( sTxt.Len() && else if( sTxt.Len() &&
NUMBERFORMAT_PERCENT == pNumFmtr->GetType( nFmtIndex )) NUMBERFORMAT_PERCENT == pNumFmtr->GetType( nFmtIndex ))
{ {
ULONG nTmpFmt = 0; sal_uInt32 nTmpFmt = 0;
if( pNumFmtr->IsNumberFormat( sTxt, nTmpFmt, aNum ) && if( pNumFmtr->IsNumberFormat( sTxt, nTmpFmt, aNum ) &&
NUMBERFORMAT_NUMBER == pNumFmtr->GetType( nTmpFmt )) NUMBERFORMAT_NUMBER == pNumFmtr->GetType( nTmpFmt ))
sTxt += '%'; sTxt += '%';