sw/inc/fldbas.hxx | 2 +-
sw/source/core/fields/expfld.cxx | 2 +-
sw/source/core/fields/fldbas.cxx | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 32c7ba61a9ce620c1c9544ac469ccfd143e60bb9
Author: Cédric Bosdonnat <cedric.bosdon...@free.fr>
Date: Tue Jul 10 13:44:33 2012 +0200
fdo#51793: FormatNumber can handle sal_uInt32 values after all...
Change-Id: I9d50bce0278a4aa65873aa816eb991473f556cee
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 404dcfc..93c7495 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -230,7 +230,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 ba2754c..fee0e9c 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -880,7 +880,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 3ca892e..2a693ea 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -434,7 +434,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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
