sal_uLong to sal_uInt32/sal_uInt64

Change-Id: I8f563ae1de4ae9e032ffbcfae194372b5501a0ee
(cherry picked from commit 4088208d731ac281c88a8854978b683aee477385)

3 files changed, 8 insertions, 9 deletions

diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 7f74550281bd..b236bad1d0c5 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -535,8 +535,7 @@ public:
                                                 SfxObjectShell* pShell );
     SC_DLLPUBLIC static OUString            GetDocTabName( const OUString& rFileName,
                                                 const OUString& rTabName );
-    SC_DLLPUBLIC static sal_uLong               GetStandardFormat( SvNumberFormatter&,
-                                    sal_uLong nFormat, short nType );
+    SC_DLLPUBLIC static sal_uInt32 GetStandardFormat( SvNumberFormatter&, sal_uInt32 nFormat, short nType );
 
     SC_DLLPUBLIC static sal_uInt16 GetStandardRowHeight();
     SC_DLLPUBLIC static double              nScreenPPTX;
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index daf8f65de44f..26a1de92bf6d 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1916,7 +1916,7 @@ void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam )
             bool bSetFormat = true;
             const short nOldFormatType = nFormatType;
             nFormatType = p->GetRetFormatType();
-            sal_Int32 nFormatIndex = p->GetRetFormatIndex();
+            sal_uInt32 nFormatIndex = p->GetRetFormatIndex();
 
             if (nFormatType == css::util::NumberFormat::TEXT)
             {
@@ -2452,10 +2452,10 @@ void ScFormulaCell::GetURLResult( OUString& rURL, OUString& rCellText )
 
     // Cell Text uses the Cell format while the URL uses
     // the default format for the type.
-    sal_uLong nCellFormat = pDocument->GetNumberFormat( aPos );
+    const sal_uInt32 nCellFormat = pDocument->GetNumberFormat( aPos );
     SvNumberFormatter* pFormatter = pDocument->GetFormatTable();
 
-    sal_uLong nURLFormat = ScGlobal::GetStandardFormat( *pFormatter, nCellFormat, css::util::NumberFormat::NUMBER);
+    const sal_uInt32 nURLFormat = ScGlobal::GetStandardFormat( *pFormatter, nCellFormat, css::util::NumberFormat::NUMBER);
 
     if ( IsValue() )
     {
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 02c418a6ac25..7036bac3d245 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -171,8 +171,8 @@ bool ScGlobal::HasAttrChanged( const SfxItemSet&  rNewAttrs,
     return bInvalidate;
 }
 
-sal_uLong ScGlobal::GetStandardFormat( SvNumberFormatter& rFormatter,
-        sal_uLong nFormat, short nType )
+sal_uInt32 ScGlobal::GetStandardFormat( SvNumberFormatter& rFormatter,
+        sal_uInt32 nFormat, short nType )
 {
     const SvNumberformat* pFormat = rFormatter.GetEntry( nFormat );
     if ( pFormat )
@@ -861,7 +861,7 @@ bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1,
         SvMemoryStream  aStream2;
         pObj1->Store( aStream1 );
         pObj2->Store( aStream2 );
-        sal_uLong nSize = aStream1.Tell();
+        const sal_uInt64 nSize = aStream1.Tell();
         if ( aStream2.Tell() == nSize )
             if ( !memcmp( aStream1.GetData(), aStream2.GetData(), (sal_uInt16) nSize ) )
                 return true;
@@ -1056,7 +1056,7 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter )
         const SvNumberformat* pHardFormat = rFormatter.GetEntry(
             static_cast<const SfxUInt32Item*>(pHardItem)->GetValue() );
 
-        sal_uLong nParentFmt = 0; // Pool default
+        sal_uInt32 nParentFmt = 0; // Pool default
         const SfxItemSet* pParent = rSet.GetParent();
         if ( pParent )
             nParentFmt = static_cast<const SfxUInt32Item&>(pParent->Get( ATTR_VALUE_FORMAT )).GetValue();