diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-12 10:36:54 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-12 10:36:54 +0100 |
| commit | 7afd69a40182db58aef59502f78705ffaffd19c6 (patch) | |
| tree | 6ed4f5c62983dfe1a617294ae64b7019143f0395 /sfx2/source/control | |
| parent | a95c164df022d2a0c2308028abf08032cf2cdf99 (diff) | |
removetooltypes01: #i112600# remove tooltypes from sfx2
Diffstat (limited to 'sfx2/source/control')
| -rw-r--r-- | sfx2/source/control/ctrlitem.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/macrconf.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/control/msg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/request.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/control/shell.cxx | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index cef5d7043cc5..e90b680ffa13 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -312,7 +312,7 @@ SfxControllerItem::~SfxControllerItem() void SfxControllerItem::StateChanged ( - USHORT , // <SID> des ausl"osenden Slot + sal_uInt16 , // <SID> des ausl"osenden Slot SfxItemState , // <SfxItemState> von 'pState' const SfxPoolItem* // Slot-Status, ggf. 0 oder IsInvalidItem() ) @@ -352,7 +352,7 @@ void SfxControllerItem::DeleteFloatingWindow() void SfxStatusForwarder::StateChanged ( - USHORT nSID, // <SID> des ausl"osenden Slot + sal_uInt16 nSID, // <SID> des ausl"osenden Slot SfxItemState eState, // <SfxItemState> von 'pState' const SfxPoolItem* pState // Slot-Status, ggf. 0 oder IsInvalidItem() ) diff --git a/sfx2/source/control/macrconf.cxx b/sfx2/source/control/macrconf.cxx index 079c7180ac1a..80a55593c2f6 100644 --- a/sfx2/source/control/macrconf.cxx +++ b/sfx2/source/control/macrconf.cxx @@ -177,7 +177,7 @@ ErrCode SfxCallMacro( BasicManager* pMgr, const String& rCode, SfxMacroInfo::SfxMacroInfo( const String& rURL ) : pHelpText(0), nRefCnt(0), - bAppBasic(TRUE), + bAppBasic(sal_True), nSlotId(0), pSlot(0) { @@ -189,7 +189,7 @@ SfxMacroInfo::SfxMacroInfo( const String& rURL ) : // 'macro:///lib.mod.proc(args)' => Macro via App-BASIC-Mgr // 'macro://[docname|.]/lib.mod.proc(args)' => Macro via zugehoerigen Doc-BASIC-Mgr if ( aTmp.CompareToAscii("///", 3 ) != COMPARE_EQUAL ) - bAppBasic = FALSE; + bAppBasic = sal_False; aTmp = rURL.GetToken( 3, '/' ); if ( aTmp.GetTokenCount('.') == 3 ) { diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 6b05c03160ff..ffedd2632770 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -53,7 +53,7 @@ SfxSlotKind SfxSlot::GetKind() const //-------------------------------------------------------------------- -USHORT SfxSlot::GetWhich( const SfxItemPool &rPool ) const +sal_uInt16 SfxSlot::GetWhich( const SfxItemPool &rPool ) const { if ( !nMasterSlotId || nMasterSlotId == USHRT_MAX ) ((SfxSlot*) this) -> nMasterSlotId = rPool.GetWhich(nSlotId); diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 718e51922e7d..ec6f9a7428e9 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -235,7 +235,7 @@ SfxRequest::SfxRequest SfxRequest::SfxRequest ( - USHORT nSlotId, // auszuf"uhrende <Slot-Id> + sal_uInt16 nSlotId, // auszuf"uhrende <Slot-Id> SfxCallMode nMode, // Synch/API/... SfxItemPool& rPool // ggf. f"ur das SfxItemSet f"ur Parameter ) diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 5722d228ed07..a9d16aa3d5e1 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -343,7 +343,7 @@ const SfxPoolItem* SfxShell::GetItem void SfxShell::RemoveItem ( - USHORT nSlotId // Slot-Id des zu l"oschenden <SfxPoolItem>s + sal_uInt16 nSlotId // Slot-Id des zu l"oschenden <SfxPoolItem>s ) /* [Beschreibung] |