Skip to content

C
core
Kaydet (Commit) fb77ab1d authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

sfx2: sal_Bool->bool 

Change-Id: Ib2a02c7e05e48657b9745bcccc8f8f626daaef2d
üst ac01de88
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 109 deletions
include/sfx2/printer.hxx
Dosyayı görüntüle @ fb77ab1d
......@@ -37,7 +37,7 @@ private:
JobSetup aOrigJobSetup;
SfxItemSet* pOptions;
SfxPrinter_Impl* pImpl;
sal_Bool bKnown;
bool bKnown;
SAL_DLLPRIVATE void operator =(SfxPrinter &); // not defined
......@@ -66,8 +66,8 @@ public:
const SfxItemSet& GetOptions() const { return *pOptions; }
void SetOptions( const SfxItemSet &rNewOptions );
sal_Bool IsKnown() const { return bKnown; }
sal_Bool IsOriginal() const { return bKnown; }
bool IsKnown() const { return bKnown; }
bool IsOriginal() const { return bKnown; }
};
#endif
......
include/sfx2/prnmon.hxx
Dosyayı görüntüle @ fb77ab1d
......@@ -46,7 +46,7 @@ public:
const SfxItemSet *rOptions );
virtual ~SfxPrintOptionsDialog();
sal_Bool Construct();
bool Construct();
virtual short Execute();
virtual bool Notify( NotifyEvent& rNEvt );
......
include/sfx2/progress.hxx
Dosyayı görüntüle @ fb77ab1d
......@@ -36,24 +36,24 @@ struct SvProgressArg;
class SFX2_DLLPUBLIC SfxProgress
{
SfxProgress_Impl* pImp;
sal_uIntPtr nVal;
sal_Bool bSuspended;
sal_uIntPtr nVal;
bool bSuspended;
public:
SfxProgress( SfxObjectShell* pObjSh,
const rtl::OUString& rText,
sal_uIntPtr nRange, sal_Bool bAllDocs = sal_False,
sal_Bool bWait = sal_True );
sal_uIntPtr nRange, bool bAllDocs = false,
bool bWait = true );
virtual ~SfxProgress();
virtual void SetText( const OUString& rText );
sal_Bool SetStateText( sal_uIntPtr nVal, const rtl::OUString &rVal, sal_uIntPtr nNewRange = 0 );
virtual sal_Bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
sal_uIntPtr GetState() const { return nVal; }
bool SetStateText( sal_uIntPtr nVal, const rtl::OUString &rVal, sal_uIntPtr nNewRange = 0 );
virtual bool SetState( sal_uIntPtr nVal, sal_uIntPtr nNewRange = 0 );
sal_uIntPtr GetState() const { return nVal; }
void Resume();
void Suspend();
sal_Bool IsSuspended() const { return bSuspended; }
bool IsSuspended() const { return bSuspended; }
void UnLock();
void Reschedule();
......
include/sfx2/request.hxx
Dosyayı görüntüle @ fb77ab1d
......@@ -88,20 +88,20 @@ public:
const SfxPoolItem* GetReturnValue() const;
static com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > GetMacroRecorder( SfxViewFrame* pFrame=NULL );
static sal_Bool HasMacroRecorder( SfxViewFrame* pFrame=NULL );
sal_uInt16 GetCallMode() const;
void AllowRecording( sal_Bool );
sal_Bool AllowsRecording() const;
sal_Bool IsAPI() const;
sal_Bool IsSynchronCall() const;
void SetSynchronCall( sal_Bool bSynchron );
static bool HasMacroRecorder( SfxViewFrame* pFrame=NULL );
sal_uInt16 GetCallMode() const;
void AllowRecording( bool );
bool AllowsRecording() const;
bool IsAPI() const;
bool IsSynchronCall() const;
void SetSynchronCall( bool bSynchron );
sal_Bool IsDone() const;
void Done( sal_Bool bRemove = sal_False );
bool IsDone() const;
void Done( bool bRemove = false );
void Ignore();
void Cancel();
sal_Bool IsCancelled() const;
bool IsCancelled() const;
void Done(const SfxItemSet &, bool bKeep = true );
void ForgetAllArgs();
......
sfx2/source/bastyp/progress.cxx
Dosyayı görüntüle @ fb77ab1d
......@@ -55,10 +55,10 @@ struct SfxProgress_Impl
sal_uIntPtr nMax;
clock_t nCreate;
clock_t nNextReschedule;
sal_Bool bLocked, bAllDocs;
sal_Bool bWaitMode;
sal_Bool bAllowRescheduling;
sal_Bool bRunning;
bool bLocked, bAllDocs;
bool bWaitMode;
bool bAllowRescheduling;
bool bRunning;
SfxProgress* pActiveProgress;
SfxObjectShellRef xObjSh;
......@@ -66,7 +66,7 @@ struct SfxProgress_Impl
SfxViewFrame* pView;
SfxProgress_Impl( const OUString& );
void Enable_Impl( sal_Bool );
void Enable_Impl( bool );
};
......@@ -79,7 +79,7 @@ extern sal_uInt32 Get10ThSec();
void SfxProgress_Impl::Enable_Impl( sal_Bool bEnable )
void SfxProgress_Impl::Enable_Impl( bool bEnable )
{
SfxObjectShell* pDoc = bAllDocs ? NULL : (SfxObjectShell*) xObjSh;
SfxViewFrame *pFrame= SfxViewFrame::GetFirst(pDoc);
......@@ -131,8 +131,8 @@ SfxProgress::SfxProgress
sal_uIntPtr nRange, /* Max value for range */
sal_Bool bAll, /* Disable all documents or only the document of the ViewFram */
sal_Bool bWait /* Activate the wait-Pointer initially (TRUE) */
bool bAll, /* Disable all documents or only the document of the ViewFram */
bool bWait /* Activate the wait-Pointer initially (TRUE) */
)
/* [Description]
......@@ -146,15 +146,15 @@ SfxProgress::SfxProgress
: pImp( new SfxProgress_Impl( rText ) ),
nVal(0),
bSuspended(sal_True)
bSuspended(true)
{
pImp->bRunning = sal_True;
pImp->bRunning = true;
pImp->bAllowRescheduling = Application::IsInExecute();
pImp->xObjSh = pObjSh;
pImp->aText = rText;
pImp->nMax = nRange;
pImp->bLocked = sal_False;
pImp->bLocked = false;
pImp->bWaitMode = bWait;
pImp->nCreate = Get10ThSec();
pImp->nNextReschedule = pImp->nCreate;
......@@ -208,7 +208,7 @@ void SfxProgress::Stop()
if ( !pImp->bRunning )
return;
pImp->bRunning = sal_False;
pImp->bRunning = false;
DBG( DbgOutf( "SfxProgress: destroyed at %luds", Get10ThSec() ) );
Suspend();
......@@ -217,7 +217,7 @@ void SfxProgress::Stop()
else
SFX_APP()->SetProgress_Impl(0);
if ( pImp->bLocked )
pImp->Enable_Impl(sal_True);
pImp->Enable_Impl(true);
}
......@@ -257,7 +257,7 @@ long TimeOut_Impl( void*, void* pArgV )
sal_Bool SfxProgress::SetStateText
bool SfxProgress::SetStateText
(
sal_uLong nNewVal, /* New value for the progress-bar */
const OUString& rNewVal, /* Status as Text */
......@@ -271,7 +271,7 @@ sal_Bool SfxProgress::SetStateText
sal_Bool SfxProgress::SetState
bool SfxProgress::SetState
(
sal_uLong nNewVal, /* new value for the progress bar */
......@@ -283,7 +283,7 @@ sal_Bool SfxProgress::SetState
[Return value]
sal_Bool TRUE
bool TRUE
Proceed with the action
FALSE
......@@ -291,7 +291,7 @@ sal_Bool SfxProgress::SetState
*/
{
if( pImp->pActiveProgress ) return sal_True;
if( pImp->pActiveProgress ) return true;
nVal = nNewVal;
......@@ -351,7 +351,7 @@ sal_Bool SfxProgress::SetState
pImp->xStatusInd->setValue( nNewVal );
}
return sal_True;
return true;
}
......@@ -396,7 +396,7 @@ void SfxProgress::Resume()
pFrame->GetBindings().ENTERREGISTRATIONS();
}
bSuspended = sal_False;
bSuspended = false;
}
}
......@@ -418,7 +418,7 @@ void SfxProgress::Suspend()
if ( !bSuspended )
{
DBG( DbgOutf( "SfxProgress: suspended" ) );
bSuspended = sal_True;
bSuspended = true;
if ( pImp->xStatusInd.is() )
{
......@@ -451,8 +451,8 @@ void SfxProgress::UnLock()
return;
DBG( DbgOutf( "SfxProgress: unlocked" ) );
pImp->bLocked = sal_False;
pImp->Enable_Impl(sal_True);
pImp->bLocked = false;
pImp->Enable_Impl(true);
}
......
sfx2/source/control/dispatch.cxx
Dosyayı görüntüle @ fb77ab1d
......@@ -307,7 +307,7 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest
}
// do nothing after this object is dead
return rReq.IsDone();
return rReq.IsDone() ? 1 : 0;
}
}
......@@ -960,7 +960,7 @@ void SfxDispatcher::_Execute
if ( &rShell == *(pDispat->pImp->aStack.rbegin() + n) )
{
if ( eCallMode & SFX_CALLMODE_RECORD )
rReq.AllowRecording( sal_True );
rReq.AllowRecording( true );
pDispat->pImp->xPoster->Post(new SfxRequest(rReq));
return;
}
......@@ -1267,7 +1267,7 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
// When the pSlot is a "Pseudoslot" for macros or Verbs, it can
// be destroyed in the Call_Impl, thus do not use it anymore!
pReq->SetSynchronCall( sal_False );
pReq->SetSynchronCall( false );
Call_Impl( *pSh, *pSlot, *pReq, pReq->AllowsRecording() ); //! why bRecord?
DBG( pSfxApp->LeaveAsynchronCall_Impl() );
}
......
sfx2/source/control/request.cxx
Dosyayı görüntüle @ fb77ab1d
......@@ -59,15 +59,15 @@ struct SfxRequest_Impl: public SfxListener
SfxPoolItem* pRetVal; // Return value belongs to itself
SfxShell* pShell; // run from this shell
const SfxSlot* pSlot; // executed Slot
sal_uInt16 nModifier; // which Modifier was pressed?
sal_Bool bDone; // at all executed
sal_Bool bIgnored; // Cancelled by the User
sal_Bool bCancelled; // no longer notify
sal_Bool bUseTarget; // aTarget was set by Application
sal_uInt16 nCallMode; // Synch/Asynch/API/Record
sal_Bool bAllowRecording;
SfxAllItemSet* pInternalArgs;
SfxViewFrame* pViewFrame;
sal_uInt16 nModifier; // which Modifier was pressed?
bool bDone; // at all executed
bool bIgnored; // Cancelled by the User
bool bCancelled; // no longer notify
bool bUseTarget; // aTarget was set by Application
sal_uInt16 nCallMode; // Synch/Asynch/API/Record
bool bAllowRecording;
SfxAllItemSet* pInternalArgs;
SfxViewFrame* pViewFrame;
com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > xRecorder;
......@@ -78,9 +78,9 @@ struct SfxRequest_Impl: public SfxListener
, pShell(0)
, pSlot(0)
, nModifier(0)
, bCancelled(sal_False)
, bCancelled(false)
, nCallMode( SFX_CALLMODE_SYNCHRON )
, bAllowRecording( sal_False )
, bAllowRecording( false )
, pInternalArgs( 0 )
, pViewFrame(0)
{}
......@@ -144,8 +144,8 @@ SfxRequest::SfxRequest
pImp( new SfxRequest_Impl(this) )
{
pImp->bAllowRecording = rOrig.pImp->bAllowRecording;
pImp->bDone = sal_False;
pImp->bIgnored = sal_False;
pImp->bDone = false;
pImp->bIgnored = false;
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
......@@ -185,14 +185,14 @@ SfxRequest::SfxRequest
pArgs(0),
pImp( new SfxRequest_Impl(this) )
{
pImp->bDone = sal_False;
pImp->bIgnored = sal_False;
pImp->bDone = false;
pImp->bIgnored = false;
pImp->SetPool( &pViewFrame->GetPool() );
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
pImp->nCallMode = SFX_CALLMODE_SYNCHRON;
pImp->bUseTarget = sal_False;
pImp->bUseTarget = false;
pImp->pViewFrame = pViewFrame;
if( pImp->pViewFrame->GetDispatcher()->GetShellAndSlot_Impl( nSlotId, &pImp->pShell, &pImp->pSlot, true, true ) )
{
......@@ -226,14 +226,14 @@ SfxRequest::SfxRequest
pArgs(0),
pImp( new SfxRequest_Impl(this) )
{
pImp->bDone = sal_False;
pImp->bIgnored = sal_False;
pImp->bDone = false;
pImp->bIgnored = false;
pImp->SetPool( &rPool );
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
pImp->nCallMode = nMode;
pImp->bUseTarget = sal_False;
pImp->bUseTarget = false;
}
SfxRequest::SfxRequest
......@@ -247,14 +247,14 @@ SfxRequest::SfxRequest
pArgs(new SfxAllItemSet(rPool)),
pImp( new SfxRequest_Impl(this) )
{
pImp->bDone = sal_False;
pImp->bIgnored = sal_False;
pImp->bDone = false;
pImp->bIgnored = false;
pImp->SetPool( &rPool );
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
pImp->nCallMode = nMode;
pImp->bUseTarget = sal_False;
pImp->bUseTarget = false;
TransformParameters( nSlot, rArgs, *pArgs, pSlot );
}
......@@ -273,14 +273,14 @@ SfxRequest::SfxRequest
pArgs(new SfxAllItemSet(rSfxArgs)),
pImp( new SfxRequest_Impl(this) )
{
pImp->bDone = sal_False;
pImp->bIgnored = sal_False;
pImp->bDone = false;
pImp->bIgnored = false;
pImp->SetPool( rSfxArgs.GetPool() );
pImp->pRetVal = 0;
pImp->pShell = 0;
pImp->pSlot = 0;
pImp->nCallMode = nMode;
pImp->bUseTarget = sal_False;
pImp->bUseTarget = false;
}
......@@ -291,14 +291,14 @@ sal_uInt16 SfxRequest::GetCallMode() const
sal_Bool SfxRequest::IsSynchronCall() const
bool SfxRequest::IsSynchronCall() const
{
return SFX_CALLMODE_SYNCHRON == ( SFX_CALLMODE_SYNCHRON & pImp->nCallMode );
}
void SfxRequest::SetSynchronCall( sal_Bool bSynchron )
void SfxRequest::SetSynchronCall( bool bSynchron )
{
if ( bSynchron )
pImp->nCallMode |= SFX_CALLMODE_SYNCHRON;
......@@ -590,7 +590,7 @@ void SfxRequest::Done
void SfxRequest::Done( sal_Bool bRelease )
void SfxRequest::Done( bool bRelease )
// [<SfxRequest::Done(SfxItemSet&)>]
{
Done_Impl( pArgs );
......@@ -608,7 +608,7 @@ void SfxRequest::ForgetAllArgs()
sal_Bool SfxRequest::IsCancelled() const
bool SfxRequest::IsCancelled() const
{
return pImp->bCancelled;
}
......@@ -624,7 +624,7 @@ void SfxRequest::Cancel()
*/
{
pImp->bCancelled = sal_True;
pImp->bCancelled = true;
pImp->SetPool( 0 );
DELETEZ( pArgs );
}
......@@ -648,7 +648,7 @@ void SfxRequest::Ignore()
{
// Mark as actually executed
pImp->bIgnored = sal_True;
pImp->bIgnored = true;
}
......@@ -670,7 +670,7 @@ void SfxRequest::Done_Impl
{
// Mark as actually executed
pImp->bDone = sal_True;
pImp->bDone = true;
// not Recording
if ( !pImp->xRecorder.is() )
......@@ -768,7 +768,7 @@ void SfxRequest::Done_Impl
sal_Bool SfxRequest::IsDone() const
bool SfxRequest::IsDone() const
/* [Description]
......@@ -777,7 +777,7 @@ sal_Bool SfxRequest::IsDone() const
because it was canceled by the user or the context for this request was
wrong, this was not implemented on a separate <SfxShell>.
SfxRequest instances that return sal_False will not be recorded.
SfxRequest instances that return false will not be recorded.
[Cross-reference]
......@@ -821,7 +821,7 @@ com::sun::star::uno::Reference< com::sun::star::frame::XDispatchRecorder > SfxRe
return xRecorder;
}
sal_Bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
{
return GetMacroRecorder( pView ).is();
}
......@@ -829,12 +829,12 @@ sal_Bool SfxRequest::HasMacroRecorder( SfxViewFrame* pView )
sal_Bool SfxRequest::IsAPI() const
bool SfxRequest::IsAPI() const
/* [Description]
Returns sal_True if this SfxRequest was generated by an API (for example BASIC),
otherwise sal_False.
Returns true if this SfxRequest was generated by an API (for example BASIC),
otherwise false.
*/
{
......@@ -855,14 +855,14 @@ sal_uInt16 SfxRequest::GetModifier() const
void SfxRequest::AllowRecording( sal_Bool bSet )
void SfxRequest::AllowRecording( bool bSet )
{
pImp->bAllowRecording = bSet;
}
sal_Bool SfxRequest::AllowsRecording() const
bool SfxRequest::AllowsRecording() const
{
sal_Bool bAllow = pImp->bAllowRecording;
bool bAllow = pImp->bAllowRecording;
if( !bAllow )
bAllow = ( SFX_CALLMODE_API != ( SFX_CALLMODE_API & pImp->nCallMode ) ) &&
( SFX_CALLMODE_RECORD == ( SFX_CALLMODE_RECORD & pImp->nCallMode ) );
......
sfx2/source/view/printer.cxx
Dosyayı görüntüle @ fb77ab1d
......@@ -37,25 +37,25 @@
struct SfxPrinter_Impl
{
sal_Bool mbAll;
sal_Bool mbSelection;
sal_Bool mbFromTo;
sal_Bool mbRange;
bool mbAll;
bool mbSelection;
bool mbFromTo;
bool mbRange;
SfxPrinter_Impl() :
mbAll ( sal_True ),
mbSelection ( sal_True ),
mbFromTo ( sal_True ),
mbRange ( sal_True ) {}
mbAll ( true ),
mbSelection ( true ),
mbFromTo ( true ),
mbRange ( true ) {}
~SfxPrinter_Impl() {}
};
struct SfxPrintOptDlg_Impl
{
sal_Bool mbHelpDisabled;
bool mbHelpDisabled;
SfxPrintOptDlg_Impl() :
mbHelpDisabled ( sal_False ) {}
mbHelpDisabled ( false ) {}
};
// class SfxPrinter ------------------------------------------------------
......@@ -106,7 +106,7 @@ SfxPrinter::SfxPrinter( SfxItemSet* pTheOptions ) :
*/
pOptions( pTheOptions ),
bKnown(sal_True)
bKnown(true)
{
pImpl = new SfxPrinter_Impl;
......@@ -262,7 +262,7 @@ bool SfxPrintOptionsDialog::Notify( NotifyEvent& rNEvt )
void SfxPrintOptionsDialog::DisableHelp()
{
pDlgImpl->mbHelpDisabled = sal_True;
pDlgImpl->mbHelpDisabled = true;
get<HelpButton>("help")->Disable();
}
......
sfx2/source/view/viewfrm.cxx
Dosyayı görüntüle @ fb77ab1d
......@@ -504,7 +504,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
}
// Readonly document can not be switched to edit mode?
rReq.Done( sal_False );
rReq.Done( false );
if ( nOpenMode == SFX_STREAM_READWRITE && !rReq.IsAPI() )
{
......@@ -548,7 +548,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
pSh->DoSaveCompleted( pMed );
pSh->Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) );
rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), true ) );
rReq.Done( sal_True );
rReq.Done( true );
return;
}
}
......@@ -840,7 +840,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
}
// Record as done
rReq.Done( sal_True );
rReq.Done( true );
rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), true));
return;
}
......
sfx2/source/view/viewsh.cxx
Dosyayı görüntüle @ fb77ab1d
......@@ -657,7 +657,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
// No type and no location => error
if ( aFilterName.isEmpty() || aTypeName.isEmpty())
{
rReq.Done(sal_False);
rReq.Done(false);
return;
}
......@@ -698,7 +698,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
}
catch (const io::IOException&)
{
rReq.Done(sal_False);
rReq.Done(false);
return;
}
......@@ -707,7 +707,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
}
else
{
rReq.Done(sal_False);
rReq.Done(false);
return;
}
}
......@@ -725,7 +725,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
// Jetzt schon DONE aufrufen, da die Argumente evtl. einen Pool
// benutzen, der demn"achst weg ist
rReq.Done(sal_True);
rReq.Done(true);
// ausfuehren
if (!pShowItem || (bActive != pImp->m_bPlugInsActive))
......
sw/source/core/uibase/app/mainwn.cxx
Dosyayı görüntüle @ fb77ab1d
......@@ -68,8 +68,8 @@ void StartProgress( sal_uInt16 nMessResId, long nStartValue, long nEndValue,
pProgress->pProgress = new SfxProgress( pDocShell,
SW_RESSTR(nMessResId),
nEndValue - nStartValue,
sal_False,
sal_True );
false,
true );
pProgress->nStartCount = 1;
pProgress->pDocShell = pDocShell;
pProgressContainer->insert( pProgressContainer->begin(), pProgress );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment