1 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 2ab7b1c9602b..59d3107532a4 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -66,7 +66,7 @@ using namespace com::sun::star;
 SfxEventNamesList& SfxEventNamesList::operator=( const SfxEventNamesList& rTbl )
 {
     DelDtor();
-    for (USHORT n=0; n<rTbl.Count(); n++ )
+    for (sal_uInt16 n=0; n<rTbl.Count(); n++ )
     {
         SfxEventName* pTmp = ((SfxEventNamesList&)rTbl).GetObject(n);
         SfxEventName *pNew = new SfxEventName( *pTmp );
@@ -94,19 +94,19 @@ int SfxEventNamesItem::operator==( const SfxPoolItem& rAttr ) const
     const SfxEventNamesList& rOther = ( (SfxEventNamesItem&) rAttr ).aEventsList;
 
     if ( rOwn.Count() != rOther.Count() )
-        return FALSE;
+        return sal_False;
 
-    for ( USHORT nNo = 0; nNo < rOwn.Count(); ++nNo )
+    for ( sal_uInt16 nNo = 0; nNo < rOwn.Count(); ++nNo )
     {
         const SfxEventName *pOwn = rOwn.GetObject(nNo);
         const SfxEventName *pOther = rOther.GetObject(nNo);
         if (    pOwn->mnId != pOther->mnId ||
                 pOwn->maEventName != pOther->maEventName ||
                 pOwn->maUIName != pOther->maUIName )
-            return FALSE;
+            return sal_False;
     }
 
-    return TRUE;
+    return sal_True;
 
 }
 
@@ -125,25 +125,25 @@ SfxPoolItem* SfxEventNamesItem::Clone( SfxItemPool *) const
     return new SfxEventNamesItem(*this);
 }
 
-SfxPoolItem* SfxEventNamesItem::Create(SvStream &, USHORT) const
+SfxPoolItem* SfxEventNamesItem::Create(SvStream &, sal_uInt16) const
 {
     DBG_ERROR("not streamable!");
     return new SfxEventNamesItem(Which());
 }
 
-SvStream& SfxEventNamesItem::Store(SvStream &rStream, USHORT ) const
+SvStream& SfxEventNamesItem::Store(SvStream &rStream, sal_uInt16 ) const
 {
     DBG_ERROR("not streamable!");
     return rStream;
 }
 
-USHORT SfxEventNamesItem::GetVersion( USHORT ) const
+sal_uInt16 SfxEventNamesItem::GetVersion( sal_uInt16 ) const
 {
     DBG_ERROR("not streamable!");
     return 0;
 }
 
-void SfxEventNamesItem::AddEvent( const String& rName, const String& rUIName, USHORT nID )
+void SfxEventNamesItem::AddEvent( const String& rName, const String& rUIName, sal_uInt16 nID )
 {
     aEventsList.Insert( new SfxEventName( nID, rName, rUIName.Len() ? rUIName : rName ) );
 }
@@ -287,7 +287,7 @@ void SfxEventConfiguration::ConfigureEvent( rtl::OUString aName, const SvxMacro&
 }
 
 // -------------------------------------------------------------------------------------------------------
-SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, BOOL bBlowUp )
+SvxMacro* SfxEventConfiguration::ConvertToMacro( const com::sun::star::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bBlowUp )
 {
     return SfxEvents_Impl::ConvertToMacro( rElement, pDoc, bBlowUp );
 }