1 files changed, 19 insertions, 19 deletions

diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx
index adf42fe26f8f..98ed17982444 100644
--- a/svl/source/numbers/numhead.cxx
+++ b/svl/source/numbers/numhead.cxx
@@ -47,7 +47,7 @@
 SvNumReadHeader::SvNumReadHeader(SvStream& rNewStream) :
     rStream( rNewStream )
 {
-    ULONG nDataSize;
+    sal_uLong nDataSize;
     rStream >> nDataSize;
     nDataEnd = rStream.Tell() + nDataSize;
 }
@@ -56,7 +56,7 @@ SvNumReadHeader::SvNumReadHeader(SvStream& rNewStream) :
 
 SvNumReadHeader::~SvNumReadHeader()
 {
-    ULONG nReadEnd = rStream.Tell();
+    sal_uLong nReadEnd = rStream.Tell();
     DBG_ASSERT( nReadEnd <= nDataEnd, "zuviele Bytes gelesen" );
     if ( nReadEnd != nDataEnd )
         rStream.Seek(nDataEnd);                     // Rest ueberspringen
@@ -64,9 +64,9 @@ SvNumReadHeader::~SvNumReadHeader()
 
 //#pragma SEG_FUNCDEF(numhead_03)
 
-ULONG SvNumReadHeader::BytesLeft() const
+sal_uLong SvNumReadHeader::BytesLeft() const
 {
-    ULONG nReadEnd = rStream.Tell();
+    sal_uLong nReadEnd = rStream.Tell();
     if (nReadEnd <= nDataEnd)
         return nDataEnd-nReadEnd;
 
@@ -78,7 +78,7 @@ ULONG SvNumReadHeader::BytesLeft() const
 
 //#pragma SEG_FUNCDEF(numhead_04)
 
-SvNumWriteHeader::SvNumWriteHeader(SvStream& rNewStream, ULONG nDefault) :
+SvNumWriteHeader::SvNumWriteHeader(SvStream& rNewStream, sal_uLong nDefault) :
     rStream( rNewStream )
 {
     nDataSize = nDefault;
@@ -90,7 +90,7 @@ SvNumWriteHeader::SvNumWriteHeader(SvStream& rNewStream, ULONG nDefault) :
 
 SvNumWriteHeader::~SvNumWriteHeader()
 {
-    ULONG nPos = rStream.Tell();
+    sal_uLong nPos = rStream.Tell();
 
     if ( nPos - nDataPos != nDataSize )             // Default getroffen?
     {
@@ -112,11 +112,11 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) :
 {
     sal_uInt32 nDataSize;
     rStream >> nDataSize;
-    ULONG nDataPos = rStream.Tell();
+    sal_uLong nDataPos = rStream.Tell();
     nEntryEnd = nDataPos;
 
     rStream.SeekRel(nDataSize);
-    USHORT nID;
+    sal_uInt16 nID;
     rStream >> nID;
     if (nID != SV_NUMID_SIZES)
     {
@@ -151,7 +151,7 @@ void ImpSvNumMultipleReadHeader::Skip( SvStream& rStream )
     sal_uInt32 nDataSize;
     rStream >> nDataSize;
     rStream.SeekRel( nDataSize );
-    USHORT nID;
+    sal_uInt16 nID;
     rStream >> nID;
     if ( nID != SV_NUMID_SIZES )
     {
@@ -166,7 +166,7 @@ void ImpSvNumMultipleReadHeader::Skip( SvStream& rStream )
 
 void ImpSvNumMultipleReadHeader::EndEntry()
 {
-    ULONG nPos = rStream.Tell();
+    sal_uLong nPos = rStream.Tell();
     DBG_ASSERT( nPos <= nEntryEnd, "zuviel gelesen" );
     if ( nPos != nEntryEnd )
         rStream.Seek( nEntryEnd );          // Rest ueberspringen
@@ -176,7 +176,7 @@ void ImpSvNumMultipleReadHeader::EndEntry()
 
 void ImpSvNumMultipleReadHeader::StartEntry()
 {
-    ULONG nPos = rStream.Tell();
+    sal_uLong nPos = rStream.Tell();
     sal_uInt32 nEntrySize;
     (*pMemStream) >> nEntrySize;
 
@@ -185,9 +185,9 @@ void ImpSvNumMultipleReadHeader::StartEntry()
 
 //#pragma SEG_FUNCDEF(numhead_09)
 
-ULONG ImpSvNumMultipleReadHeader::BytesLeft() const
+sal_uLong ImpSvNumMultipleReadHeader::BytesLeft() const
 {
-    ULONG nReadEnd = rStream.Tell();
+    sal_uLong nReadEnd = rStream.Tell();
     if (nReadEnd <= nEntryEnd)
         return nEntryEnd-nReadEnd;
 
@@ -200,7 +200,7 @@ ULONG ImpSvNumMultipleReadHeader::BytesLeft() const
 //#pragma SEG_FUNCDEF(numhead_0a)
 
 ImpSvNumMultipleWriteHeader::ImpSvNumMultipleWriteHeader(SvStream& rNewStream,
-                                                   ULONG nDefault) :
+                                                   sal_uLong nDefault) :
     rStream( rNewStream ),
     aMemStream( 4096, 4096 )
 {
@@ -215,16 +215,16 @@ ImpSvNumMultipleWriteHeader::ImpSvNumMultipleWriteHeader(SvStream& rNewStream,
 
 ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader()
 {
-    ULONG nDataEnd = rStream.Tell();
+    sal_uLong nDataEnd = rStream.Tell();
 
-    rStream << (USHORT) SV_NUMID_SIZES;
+    rStream << (sal_uInt16) SV_NUMID_SIZES;
     rStream << static_cast<sal_uInt32>(aMemStream.Tell());
     rStream.Write( aMemStream.GetData(), aMemStream.Tell() );
 
     if ( nDataEnd - nDataPos != nDataSize )                 // Default getroffen?
     {
         nDataSize = nDataEnd - nDataPos;
-        ULONG nPos = rStream.Tell();
+        sal_uLong nPos = rStream.Tell();
         rStream.Seek(nDataPos-sizeof(sal_uInt32));
         rStream << nDataSize;                               // Groesse am Anfang eintragen
         rStream.Seek(nPos);
@@ -235,7 +235,7 @@ ImpSvNumMultipleWriteHeader::~ImpSvNumMultipleWriteHeader()
 
 void ImpSvNumMultipleWriteHeader::EndEntry()
 {
-    ULONG nPos = rStream.Tell();
+    sal_uLong nPos = rStream.Tell();
     aMemStream << static_cast<sal_uInt32>(nPos - nEntryStart);
 }
 
@@ -243,7 +243,7 @@ void ImpSvNumMultipleWriteHeader::EndEntry()
 
 void ImpSvNumMultipleWriteHeader::StartEntry()
 {
-    ULONG nPos = rStream.Tell();
+    sal_uLong nPos = rStream.Tell();
     nEntryStart = nPos;
 }