#i112600#: clean up l10ntools, rsc, sot, svl, tools and unotools

1 files changed, 13 insertions, 13 deletions

diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index acaa66839981..1cd7e194d266 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -121,7 +121,7 @@ SvxMacroTableDtor& SvxMacroTableDtor::operator=( const SvxMacroTableDtor& rTbl )
 }
 
 
-SvStream& SvxMacroTableDtor::Read( SvStream& rStrm, USHORT nVersion )
+SvStream& SvxMacroTableDtor::Read( SvStream& rStrm, sal_uInt16 nVersion )
 {
     if( SVX_MACROTBL_VERSION40 <= nVersion )
         rStrm >> nVersion;
@@ -130,7 +130,7 @@ SvStream& SvxMacroTableDtor::Read( SvStream& rStrm, USHORT nVersion )
 
     for( short i = 0; i < nMacro; ++i )
     {
-        USHORT nCurKey, eType = STARBASIC;
+        sal_uInt16 nCurKey, eType = STARBASIC;
         String aLibName, aMacName;
         rStrm >> nCurKey;
         SfxPoolItem::readByteString(rStrm, aLibName);
@@ -156,14 +156,14 @@ SvStream& SvxMacroTableDtor::Read( SvStream& rStrm, USHORT nVersion )
 
 SvStream& SvxMacroTableDtor::Write( SvStream& rStream ) const
 {
-    USHORT nVersion = SOFFICE_FILEFORMAT_31 == rStream.GetVersion()
+    sal_uInt16 nVersion = SOFFICE_FILEFORMAT_31 == rStream.GetVersion()
                                     ? SVX_MACROTBL_VERSION31
                                     : SVX_MACROTBL_AKTVERSION;
 
     if( SVX_MACROTBL_VERSION40 <= nVersion )
         rStream << nVersion;
 
-    rStream << (USHORT)Count();
+    rStream << (sal_uInt16)Count();
 
     SvxMacro* pMac = ((SvxMacroTableDtor*)this)->First();
     while( pMac && rStream.GetError() == SVSTREAM_OK )
@@ -173,7 +173,7 @@ SvStream& SvxMacroTableDtor::Write( SvStream& rStream ) const
         SfxPoolItem::writeByteString(rStream, pMac->GetMacName());
 
         if( SVX_MACROTBL_VERSION40 <= nVersion )
-            rStream << (USHORT)pMac->GetScriptType();
+            rStream << (sal_uInt16)pMac->GetScriptType();
         pMac = ((SvxMacroTableDtor*)this)->Next();
     }
     return rStream;
@@ -203,20 +203,20 @@ int SvxMacroItem::operator==( const SfxPoolItem& rAttr ) const
 
     // Anzahl unterschiedlich => auf jeden Fall ungleich
     if ( rOwn.Count() != rOther.Count() )
-        return FALSE;
+        return sal_False;
 
     // einzeln verleichen; wegen Performance ist die Reihenfolge wichtig
-    for ( USHORT nNo = 0; nNo < rOwn.Count(); ++nNo )
+    for ( sal_uInt16 nNo = 0; nNo < rOwn.Count(); ++nNo )
     {
         const SvxMacro *pOwnMac = rOwn.GetObject(nNo);
         const SvxMacro *pOtherMac = rOther.GetObject(nNo);
         if (    rOwn.GetKey(pOwnMac) != rOther.GetKey(pOtherMac)  ||
                 pOwnMac->GetLibName() != pOtherMac->GetLibName() ||
                 pOwnMac->GetMacName() != pOtherMac->GetMacName() )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 }
 
 // -----------------------------------------------------------------------
@@ -257,14 +257,14 @@ SfxItemPresentation SvxMacroItem::GetPresentation
 
 // -----------------------------------------------------------------------
 
-SvStream& SvxMacroItem::Store( SvStream& rStrm , USHORT ) const
+SvStream& SvxMacroItem::Store( SvStream& rStrm , sal_uInt16 ) const
 {
     return aMacroTable.Write( rStrm );
 }
 
 // -----------------------------------------------------------------------
 
-SfxPoolItem* SvxMacroItem::Create( SvStream& rStrm, USHORT nVersion ) const
+SfxPoolItem* SvxMacroItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
 {
     SvxMacroItem* pAttr = new SvxMacroItem( Which() );
     pAttr->aMacroTable.Read( rStrm, nVersion );
@@ -273,7 +273,7 @@ SfxPoolItem* SvxMacroItem::Create( SvStream& rStrm, USHORT nVersion ) const
 
 // -----------------------------------------------------------------------
 
-void SvxMacroItem::SetMacro( USHORT nEvent, const SvxMacro& rMacro )
+void SvxMacroItem::SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro )
 {
     SvxMacro *pMacro;
     if ( 0 != (pMacro=aMacroTable.Get(nEvent)) )
@@ -287,7 +287,7 @@ void SvxMacroItem::SetMacro( USHORT nEvent, const SvxMacro& rMacro )
 
 // -----------------------------------------------------------------------
 
-USHORT SvxMacroItem::GetVersion( USHORT nFileFormatVersion ) const
+sal_uInt16 SvxMacroItem::GetVersion( sal_uInt16 nFileFormatVersion ) const
 {
     return SOFFICE_FILEFORMAT_31 == nFileFormatVersion
                 ? 0 : aMacroTable.GetVersion();