summaryrefslogtreecommitdiff
path: root/sfx2/source/control
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/control')
-rw-r--r--sfx2/source/control/bindings.cxx8
-rwxr-xr-xsfx2/source/control/dispatch.cxx18
-rw-r--r--sfx2/source/control/macro.cxx10
-rw-r--r--sfx2/source/control/request.cxx8
-rw-r--r--sfx2/source/control/shell.cxx2
-rw-r--r--sfx2/source/control/statcach.cxx4
6 files changed, 25 insertions, 25 deletions
diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index b2b414707291..8dab74f6c7d8 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -373,7 +373,7 @@ void SfxBindings::HidePopups( bool bHide )
pImp->pWorkWin->HidePopups_Impl( bHide, sal_True );
}
-void SfxBindings::HidePopupCtrls_Impl( int bHide )
+void SfxBindings::HidePopupCtrls_Impl( FASTBOOL bHide )
{
if ( bHide )
{
@@ -1503,10 +1503,10 @@ SfxItemSet* SfxBindings::CreateSet_Impl
}
// Mu\s der Slot "uberhaupt upgedatet werden ?
- int bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
+ bool bInsert = pSiblingCache && pSiblingCache->IsControllerDirty();
// Bugfix #26161#: Es reicht nicht, nach der selben Shell zu fragen !!
- int bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
+ bool bSameMethod = pSiblingCache && pFnc == pSiblingFnc;
// Wenn der Slot ein nicht-dirty MasterSlot ist, dann ist vielleicht
// einer seiner Slaves dirty ? Dann wird der Masterslot doch eingef"ugt.
@@ -1736,7 +1736,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
pImp->aTimer.SetTimeout(TIMEOUT_UPDATING);
// at least 10 loops and further if more jobs are available but no input
- int bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
+ bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule;
sal_uInt16 nLoops = 10;
pImp->bInNextJob = sal_True;
const sal_uInt16 nCount = pImp->pCaches->Count();
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index de8df832ef5b..295b8891fbbb 100755
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -2022,7 +2022,7 @@ void SfxDispatcher::FlushImpl()
{
// tats"aechlich poppen
SfxShell* pPopped = 0;
- int bFound = sal_False;
+ bool bFound = sal_False;
do
{
DBG_ASSERT( pImp->aStack.Count(), "popping from empty stack" );
@@ -2403,12 +2403,12 @@ sal_Bool SfxDispatcher::_FindServer
if ( pSlot )
{
// Slot geh"ort zum Container?
- int bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
- int bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
+ bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
+ bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
// Shell geh"ort zum Server?
// AppDispatcher oder IPFrame-Dispatcher
- int bIsServerShell = !pImp->pFrame || bIsInPlace;
+ bool bIsServerShell = !pImp->pFrame || bIsInPlace;
// Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf
// einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen.
@@ -2420,7 +2420,7 @@ sal_Bool SfxDispatcher::_FindServer
// Shell geh"ort zum Container?
// AppDispatcher oder kein IPFrameDispatcher
- int bIsContainerShell = !pImp->pFrame || !bIsInPlace;
+ bool bIsContainerShell = !pImp->pFrame || !bIsInPlace;
// Shell und Slot passen zusammen
if ( !( ( bIsContainerSlot && bIsContainerShell ) ||
( !bIsContainerSlot && bIsServerShell ) ) )
@@ -2521,12 +2521,12 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
if ( pSlot )
{
// Slot geh"ort zum Container?
- int bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
- int bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
+ bool bIsContainerSlot = pSlot->IsMode(SFX_SLOT_CONTAINER);
+ bool bIsInPlace = pImp->pFrame && pImp->pFrame->GetObjectShell()->IsInPlaceActive();
// Shell geh"ort zum Server?
// AppDispatcher oder IPFrame-Dispatcher
- int bIsServerShell = !pImp->pFrame || bIsInPlace;
+ bool bIsServerShell = !pImp->pFrame || bIsInPlace;
// Nat"urlich sind ServerShell-Slots auch ausf"uhrbar, wenn sie auf
// einem Container-Dispatcher ohne IPClient ausgef"uhrt werden sollen.
@@ -2538,7 +2538,7 @@ sal_Bool SfxDispatcher::HasSlot_Impl( sal_uInt16 nSlot )
// Shell geh"ort zum Container?
// AppDispatcher oder kein IPFrameDispatcher
- int bIsContainerShell = !pImp->pFrame || !bIsInPlace;
+ bool bIsContainerShell = !pImp->pFrame || !bIsInPlace;
// Shell und Slot passen zusammen
if ( !( ( bIsContainerSlot && bIsContainerShell ) ||
diff --git a/sfx2/source/control/macro.cxx b/sfx2/source/control/macro.cxx
index 4bf4eeef8696..87879656021e 100644
--- a/sfx2/source/control/macro.cxx
+++ b/sfx2/source/control/macro.cxx
@@ -126,11 +126,11 @@ SfxMacroStatement::SfxMacroStatement
return;
/*
// Objekt-Typ bestimmen
- int bIsApp = rShell.ISA(SfxApplication);
- int bIsDoc = rShell.ISA(SfxObjectShell);
- int bIsWin = !bIsApp && !bIsDoc &&
+ bool bIsApp = rShell.ISA(SfxApplication);
+ bool bIsDoc = rShell.ISA(SfxObjectShell);
+ bool bIsWin = !bIsApp && !bIsDoc &&
( rShell.ISA(SfxViewShell) || rShell.ISA(SfxViewFrame) );
- int bIsSel = !bIsApp && !bIsDoc && !bIsWin;
+ bool bIsSel = !bIsApp && !bIsDoc && !bIsWin;
// Objekt nicht schon im Slot-Namen enthalten?
if ( bIsSel || rSlot.pName[0] == '.' )
@@ -387,7 +387,7 @@ void SfxMacroStatement::GenerateNameAndArgs_Impl
}
// nicht druckbare Zeichen werden als chr$(...) geschrieben
- int bPrevReplaced = sal_False;
+ bool bPrevReplaced = sal_False;
for ( sal_uInt16 n = 0; n < aRecordable.Len(); ++n )
{
sal_Unicode cChar = aRecordable.GetChar(n);
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 05c9a8da0eb0..718e51922e7d 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -471,7 +471,7 @@ void SfxRequest::RemoveItem( sal_uInt16 nID )
const SfxPoolItem* SfxRequest::GetArg
(
sal_uInt16 nSlotId, // Slot-Id oder Which-Id des Parameters
- int bDeep, // sal_False: nicht in Parent-ItemSets suchen
+ bool bDeep, // false: nicht in Parent-ItemSets suchen
TypeId aType // != 0: RTTI Pruefung mit Assertion
) const
{
@@ -574,11 +574,11 @@ void SfxRequest::Done
erfragt wurden, ggf. 0 falls keine
Parameter gesetzt wurden */
- int bKeep /* sal_True (default)
+ bool bKeep /* true (default)
'rSet' wird gepeichert und ist "uber
GetArgs() abfragbar
- FALSE
+ false
'rSet' wird nicht kopiert (schneller) */
)
@@ -904,7 +904,7 @@ sal_Bool SfxRequest::IsAPI() const
//--------------------------------------------------------------------
-int SfxRequest::IsRecording() const
+bool SfxRequest::IsRecording() const
/* [Beschreibung]
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx
index eabf666078f6..5722d228ed07 100644
--- a/sfx2/source/control/shell.cxx
+++ b/sfx2/source/control/shell.cxx
@@ -853,7 +853,7 @@ ResMgr* SfxShell::GetResMgr() const
//--------------------------------------------------------------------
-int SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
+bool SfxShell::CanExecuteSlot_Impl( const SfxSlot &rSlot )
/* [Beschreibung]
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index cb2498c290f7..889cf97b1b6c 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -457,10 +457,10 @@ void SfxStateCache::SetState_Impl
DBG_PROFSTART(SfxStateCacheSetState);
// m"ussen die Controller "uberhaupt benachrichtigt werden?
- int bNotify = bItemDirty;
+ bool bNotify = bItemDirty;
if ( !bItemDirty )
{
- int bBothAvailable = pLastItem && pState &&
+ bool bBothAvailable = pLastItem && pState &&
!IsInvalidItem(pState) && !IsInvalidItem(pLastItem);
DBG_ASSERT( !bBothAvailable || pState != pLastItem, "setting state with own item" );
if ( bBothAvailable )
generated by cgit (git 2.34.1) at 2024-06-28 17:51:19 +0000