From 97ea4537b51cbbde929e8f1e4c4f505a2d8ba384 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=BCdiger=20Timm?= <rt@openoffice.org>
Date: Wed, 14 Dec 2005 13:48:32 +0000
Subject: [PATCH] INTEGRATION: CWS numberformat (1.7.70); FILE MERGED
 2005/10/26 17:50:36 kendy 1.7.70.1: #i55546# The ULONG -> sal_uInt32 patches
 related to NumberFormat extracted from ooo64bit02 CWS.

---
 sw/source/core/fields/cellfml.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index ab52e55afb7a..4b33fe39d03f 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -4,9 +4,9 @@
  *
  *  $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 terms of GNU Lesser General Public License Version 2.1.
@@ -261,7 +261,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
 
             double aNum;
             String sTxt( rTxt.Copy( nSttPos ) );
-            ULONG nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue();
+            sal_uInt32 nFmtIndex = GetFrmFmt()->GetTblBoxNumFmt().GetValue();
 
             SvNumberFormatter* pNumFmtr = pDoc->GetNumberFormatter();
 
@@ -271,7 +271,7 @@ double SwTableBox::GetValue( SwTblCalcPara& rCalcPara ) const
             else if( sTxt.Len() &&
                     NUMBERFORMAT_PERCENT == pNumFmtr->GetType( nFmtIndex ))
             {
-                ULONG nTmpFmt = 0;
+                sal_uInt32 nTmpFmt = 0;
                 if( pNumFmtr->IsNumberFormat( sTxt, nTmpFmt, aNum ) &&
                     NUMBERFORMAT_NUMBER == pNumFmtr->GetType( nTmpFmt ))
                     sTxt += '%';