summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorC├ędric Bosdonnat <cedric.bosdonnat@free.fr>2012-07-10 13:44:33 +0200
committerMichael Stahl <mstahl@redhat.com>2012-07-11 18:58:28 +0200
commit7b139452515f90f536ecb2725c8c86343031bf76 (patch)
tree0d816d0e49119b345392adf729e6d0c0a9fcea10
parent56ef010aef4db3515f713ad9a2b587fb8402cf2b (diff)
fdo#51793: FormatNumber can handle sal_uInt32 values after all...
Change-Id: I9d50bce0278a4aa65873aa816eb991473f556cee (cherry picked from commit 32c7ba61a9ce620c1c9544ac469ccfd143e60bb9) Signed-off-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--sw/inc/fldbas.hxx2
-rw-r--r--sw/source/core/fields/expfld.cxx2
-rw-r--r--sw/source/core/fields/fldbas.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index f865175990cb..243f61197066 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -231,7 +231,7 @@ extern sal_uInt16 aTypeTab[];
// General tools.
String GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM);
void SetErrorStr(const String& rStr);
-String FormatNumber(sal_uInt16 nNum, sal_uInt32 nFormat);
+String FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat);
// Instances of SwFields and those derived from it occur 0 to n times.
// For each class there is one instance of the associated type class.
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index ec54fe50f8db..f38abcf78e55 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -881,7 +881,7 @@ void SwSetExpField::SetValue( const double& rAny )
SwValueField::SetValue(rAny);
if( IsSequenceFld() )
- sExpand = FormatNumber( (sal_uInt16)GetValue(), GetFormat() );
+ sExpand = FormatNumber( (sal_uInt32)GetValue(), GetFormat() );
else
sExpand = ((SwValueFieldType*)GetTyp())->ExpandValue( rAny,
GetFormat(), GetLanguage());
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 04c5b14054bb..c2e65691c7fc 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -430,7 +430,7 @@ SwField * SwField::CopyField() const
Beschreibung: Numerierung expandieren
--------------------------------------------------------------------*/
-String FormatNumber(sal_uInt16 nNum, sal_uInt32 nFormat)
+String FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat)
{
if(SVX_NUM_PAGEDESC == nFormat)
return String::CreateFromInt32( nNum );