diff options
Diffstat (limited to 'sfx2/source/config/evntconf.cxx')
| -rw-r--r-- | sfx2/source/config/evntconf.cxx | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx index 185ec0626c51..59d3107532a4 100644 --- a/sfx2/source/config/evntconf.cxx +++ b/sfx2/source/config/evntconf.cxx @@ -34,7 +34,7 @@ #include <basic/sbmod.hxx> #include <tools/urlobj.hxx> #include <basic/sbx.hxx> - #include <sot/storage.hxx> +#include <sot/storage.hxx> #include <unotools/securityoptions.hxx> #include <rtl/ustring.h> @@ -42,12 +42,11 @@ #include <framework/eventsconfiguration.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/evntconf.hxx> -#include <sfx2/macrconf.hxx> + #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/dispatch.hxx> -#include "config.hrc" #include "sfx2/sfxresid.hxx" #include "eventsupplier.hxx" @@ -67,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 ); @@ -95,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; } @@ -126,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 ) ); } @@ -288,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 ); } |