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/appl | |
parent | a95c164df022d2a0c2308028abf08032cf2cdf99 (diff) |
removetooltypes01: #i112600# remove tooltypes from sfx2
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r-- | sfx2/source/appl/app.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appbas.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/appl/appcfg.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appinit.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/shutdownicon.cxx | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index b214012ddfdb..f97fc6b4b495 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -651,7 +651,7 @@ void SfxApplication::LeaveAsynchronCall_Impl() //-------------------------------------------------------------------- -FASTBOOL SfxApplication::IsInAsynchronCall_Impl() const +bool SfxApplication::IsInAsynchronCall_Impl() const { return pAppData_Impl->nAsynchronCalls > 0; } diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 7e775cbbb502..1054f1793c07 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -293,7 +293,7 @@ StarBASIC* SfxApplication::GetBasic() //-------------------------------------------------------------------- -FASTBOOL SfxApplication::IsInBasicCall() const +bool SfxApplication::IsInBasicCall() const { return 0 != pAppData_Impl->nBasicCallLevel; } @@ -493,7 +493,7 @@ void SfxApplication::PropState_Impl( SfxItemSet &rSet ) break; case SID_ATTR_UNDO_COUNT: - rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, sal::static_int_cast< UINT16 >( SvtUndoOptions().GetUndoCount() ) ) ); + rSet.Put( SfxUInt16Item( SID_ATTR_UNDO_COUNT, sal::static_int_cast< sal_uInt16 >( SvtUndoOptions().GetUndoCount() ) ) ); break; case SID_UPDATE_VERSION: diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 7f6e6c335383..4a7cc13b791d 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -1003,7 +1003,7 @@ SfxEventConfiguration* SfxApplication::GetEventConfig() const //-------------------------------------------------------------------- //-------------------------------------------------------------------- -void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, FASTBOOL bSynchron ) +void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron ) { //DBG_ASSERT(pAppData_Impl->pEventConfig,"Keine Events angemeldet!"); diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 2aa19901d87c..295d1445ea57 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -231,7 +231,7 @@ String GetSpecialCharsForEdit(Window* pParent, const Font& rFont) //==================================================================== -FASTBOOL SfxApplication::Initialize_Impl() +bool SfxApplication::Initialize_Impl() { RTL_LOGFILE_CONTEXT( aLog, "sfx2 (mb93783) ::SfxApplication::Initialize_Impl" ); diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 3c323b05fd72..f7053321ddfa 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -749,14 +749,14 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : void ShutdownIcon::EnterModalMode() { - bModalMode = TRUE; + bModalMode = sal_True; } // ------------------------------- void ShutdownIcon::LeaveModalMode() { - bModalMode = FALSE; + bModalMode = sal_False; } #ifdef WNT |