diff options
author | Noel Grandin <noel@peralex.com> | 2014-04-30 09:02:45 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-05-02 08:49:18 +0200 |
commit | 0376c6dc74bebc6df57a43f4d62e935710d3a5d2 (patch) | |
tree | b714865179fb4500b09f1a8bdf40b70eec2d6368 /uui/source | |
parent | 5371642efdca30e1428b3103b0c30b30be69d278 (diff) |
uui: sal_Bool->bool
Change-Id: Iba9f7586e7742135a3377826c7ab0c83beb30fa5
Diffstat (limited to 'uui/source')
-rw-r--r-- | uui/source/alreadyopen.cxx | 2 | ||||
-rw-r--r-- | uui/source/alreadyopen.hxx | 2 | ||||
-rw-r--r-- | uui/source/iahndl-authentication.cxx | 4 | ||||
-rw-r--r-- | uui/source/iahndl-ioexceptions.cxx | 2 | ||||
-rw-r--r-- | uui/source/iahndl-ssl.cxx | 10 | ||||
-rw-r--r-- | uui/source/iahndl.cxx | 2 | ||||
-rw-r--r-- | uui/source/logindlg.cxx | 4 | ||||
-rw-r--r-- | uui/source/logindlg.hxx | 10 | ||||
-rw-r--r-- | uui/source/loginerr.hxx | 38 | ||||
-rw-r--r-- | uui/source/passwordcontainer.cxx | 2 |
10 files changed, 38 insertions, 38 deletions
diff --git a/uui/source/alreadyopen.cxx b/uui/source/alreadyopen.cxx index b3e8326f95d6..5012508d03ed 100644 --- a/uui/source/alreadyopen.cxx +++ b/uui/source/alreadyopen.cxx @@ -20,7 +20,7 @@ #include "ids.hrc" #include "alreadyopen.hxx" -AlreadyOpenQueryBox::AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage, sal_Bool bIsStoring ) : +AlreadyOpenQueryBox::AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ) : MessBox(pParent, 0, ResId(STR_ALREADYOPEN_TITLE, *pResMgr).toString(), aMessage ) diff --git a/uui/source/alreadyopen.hxx b/uui/source/alreadyopen.hxx index 892d6dc5b6a3..2e7890ec9d6d 100644 --- a/uui/source/alreadyopen.hxx +++ b/uui/source/alreadyopen.hxx @@ -24,7 +24,7 @@ class AlreadyOpenQueryBox : public MessBox { public: - AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage, sal_Bool bIsStoring ); + AlreadyOpenQueryBox( Window* pParent, ResMgr* pResMgr, const OUString& aMessage, bool bIsStoring ); virtual ~AlreadyOpenQueryBox(); }; diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index ae579e6a6661..152aeceff1d0 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -233,7 +233,7 @@ handleAuthenticationRequest_( eAlternateRememberMode); } - sal_Bool bCanUseSystemCredentials; + bool bCanUseSystemCredentials; sal_Bool bDefaultUseSystemCredentials; if (xSupplyAuthentication2.is()) { @@ -243,7 +243,7 @@ handleAuthenticationRequest_( } else { - bCanUseSystemCredentials = sal_False; + bCanUseSystemCredentials = false; bDefaultUseSystemCredentials = sal_False; } diff --git a/uui/source/iahndl-ioexceptions.cxx b/uui/source/iahndl-ioexceptions.cxx index d969e2553592..0406f60929cb 100644 --- a/uui/source/iahndl-ioexceptions.cxx +++ b/uui/source/iahndl-ioexceptions.cxx @@ -63,7 +63,7 @@ getBoolRequestArgument(uno::Sequence< uno::Any > const & rArguments, beans::PropertyValue aProperty; if ((rArguments[i] >>= aProperty) && aProperty.Name == rKey) { - sal_Bool bValue = sal_Bool(); + bool bValue; if (aProperty.Value >>= bValue) { if (pValue) diff --git a/uui/source/iahndl-ssl.cxx b/uui/source/iahndl-ssl.cxx index f51efa156c4a..55d823770893 100644 --- a/uui/source/iahndl-ssl.cxx +++ b/uui/source/iahndl-ssl.cxx @@ -135,7 +135,7 @@ getLocalizedDatTimeStr( return aDateTimeStr; } -sal_Bool +bool executeUnknownAuthDialog( Window * pParent, uno::Reference< uno::XComponentContext > const & xContext, @@ -168,7 +168,7 @@ executeUnknownAuthDialog( } } - return static_cast<sal_Bool> (xDialog->Execute()); + return static_cast<bool>(xDialog->Execute()); } catch (std::bad_alloc const &) { @@ -178,7 +178,7 @@ executeUnknownAuthDialog( } } -sal_Bool +bool executeSSLWarnDialog( Window * pParent, uno::Reference< uno::XComponentContext > const & xContext, @@ -240,7 +240,7 @@ executeSSLWarnDialog( xDialog->SetText( aTitle ); } - return static_cast<sal_Bool> (xDialog->Execute()); + return static_cast<bool>(xDialog->Execute()); } catch (std::bad_alloc const &) { @@ -264,7 +264,7 @@ handleCertificateValidationRequest_( getContinuations(rContinuations, &xApprove, &xAbort); sal_Int32 failures = rRequest.CertificateValidity; - sal_Bool trustCert = sal_True; + bool trustCert = true; if ( ((failures & security::CertificateValidity::UNTRUSTED) == security::CertificateValidity::UNTRUSTED ) || diff --git a/uui/source/iahndl.cxx b/uui/source/iahndl.cxx index 13bbb7e2dd44..12e005295c14 100644 --- a/uui/source/iahndl.cxx +++ b/uui/source/iahndl.cxx @@ -1206,7 +1206,7 @@ UUIInteractionHelper::handleGenericErrorRequest( // required unsigned long value. Otherwhise using as flag field // can fail ... ErrCode nError = static_cast< ErrCode >(nErrorCode); - sal_Bool bWarning = !ERRCODE_TOERROR(nError); + bool bWarning = !ERRCODE_TOERROR(nError); if ( nError == ERRCODE_SFX_BROKENSIGNATURE || nError == ERRCODE_SFX_INCOMPLETE_ENCRYPTION ) diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index dfb061c7142c..4122d5309dbe 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -87,7 +87,7 @@ void LoginDialog::HideControls_Impl( sal_uInt16 nFlags ) } } -void LoginDialog::EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled ) +void LoginDialog::EnableUseSysCredsControls_Impl( bool bUseSysCredsEnabled ) { m_pErrorInfo->Enable( !bUseSysCredsEnabled ); m_pErrorFT->Enable( !bUseSysCredsEnabled ); @@ -187,7 +187,7 @@ LoginDialog::LoginDialog(Window* pParent, sal_uInt16 nFlags, HideControls_Impl( nFlags ); } -void LoginDialog::SetUseSystemCredentials( sal_Bool bUse ) +void LoginDialog::SetUseSystemCredentials( bool bUse ) { if ( m_pUseSysCredsCB->IsVisible() ) { diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index c3f8ecaee2d7..07943b3446da 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -60,7 +60,7 @@ class LoginDialog : public ModalDialog OKButton* m_pOKBtn; void HideControls_Impl( sal_uInt16 nFlags ); - void EnableUseSysCredsControls_Impl( sal_Bool bUseSysCredsEnabled ); + void EnableUseSysCredsControls_Impl( bool bUseSysCredsEnabled ); DECL_LINK(OKHdl_Impl, void *); DECL_LINK(PathHdl_Impl, void *); @@ -78,11 +78,11 @@ public: void SetPassword( const OUString& rNew ) { m_pPasswordED->SetText( rNew ); } OUString GetAccount() const { return m_pAccountED->GetText(); } void SetAccount( const OUString& rNew ) { m_pAccountED->SetText( rNew ); } - sal_Bool IsSavePassword() const { return m_pSavePasswdBtn->IsChecked(); } - void SetSavePassword( sal_Bool bSave ) { m_pSavePasswdBtn->Check( bSave ); } + bool IsSavePassword() const { return m_pSavePasswdBtn->IsChecked(); } + void SetSavePassword( bool bSave ) { m_pSavePasswdBtn->Check( bSave ); } void SetSavePasswordText( const OUString& rTxt ) { m_pSavePasswdBtn->SetText( rTxt ); } - sal_Bool IsUseSystemCredentials() const { return m_pUseSysCredsCB->IsChecked(); } - void SetUseSystemCredentials( sal_Bool bUse ); + bool IsUseSystemCredentials() const { return m_pUseSysCredsCB->IsChecked(); } + void SetUseSystemCredentials( bool bUse ); void SetErrorText( const OUString& rTxt ) { m_pErrorInfo->SetText( rTxt ); } void SetLoginRequestText( const OUString& rTxt ) { m_pRequestInfo->SetText( rTxt ); } void ClearPassword(); diff --git a/uui/source/loginerr.hxx b/uui/source/loginerr.hxx index 1903e8f71ee1..81c3769a2c1c 100644 --- a/uui/source/loginerr.hxx +++ b/uui/source/loginerr.hxx @@ -64,13 +64,13 @@ public: bool IsRecommendToOpenReadonly() const { return m_bRecommendToOpenReadonly; } const OUString& GetPath() const { return m_aPath; } const OUString& GetErrorText() const { return m_aErrorText; } - sal_Bool GetCanRememberPassword() const { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); } - sal_Bool GetIsRememberPersistent() const { return ( m_nFlags & LOGINERROR_FLAG_REMEMBER_PERSISTENT ); } - sal_Bool GetIsRememberPassword() const { return ( m_nFlags & LOGINERROR_FLAG_IS_REMEMBER_PASSWORD ); } + bool GetCanRememberPassword() const { return ( m_nFlags & LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD ); } + bool GetIsRememberPersistent() const { return ( m_nFlags & LOGINERROR_FLAG_REMEMBER_PERSISTENT ); } + bool GetIsRememberPassword() const { return ( m_nFlags & LOGINERROR_FLAG_IS_REMEMBER_PASSWORD ); } - sal_Bool GetCanUseSystemCredentials() const + bool GetCanUseSystemCredentials() const { return ( m_nFlags & LOGINERROR_FLAG_CAN_USE_SYSCREDS ); } - sal_Bool GetIsUseSystemCredentials() const + bool GetIsUseSystemCredentials() const { return ( m_nFlags & LOGINERROR_FLAG_IS_USE_SYSCREDS ) == LOGINERROR_FLAG_IS_USE_SYSCREDS; } sal_uInt8 GetFlags() const { return m_nFlags; } @@ -97,20 +97,20 @@ public: void SetFlags( sal_uInt8 nFlags ) { m_nFlags = nFlags; } - inline void SetCanRememberPassword( sal_Bool bSet ); - inline void SetIsRememberPassword( sal_Bool bSet ); - inline void SetIsRememberPersistent( sal_Bool bSet ); + inline void SetCanRememberPassword( bool bSet ); + inline void SetIsRememberPassword( bool bSet ); + inline void SetIsRememberPersistent( bool bSet ); - inline void SetCanUseSystemCredentials( sal_Bool bSet ); - inline void SetIsUseSystemCredentials( sal_Bool bSet ); - inline void SetModifyAccount( sal_Bool bSet ); - inline void SetModifyUserName( sal_Bool bSet ); + inline void SetCanUseSystemCredentials( bool bSet ); + inline void SetIsUseSystemCredentials( bool bSet ); + inline void SetModifyAccount( bool bSet ); + inline void SetModifyUserName( bool bSet ); void SetResult( sal_uInt16 nRet ) { m_nRet = nRet; } }; -inline void LoginErrorInfo::SetCanRememberPassword( sal_Bool bSet ) +inline void LoginErrorInfo::SetCanRememberPassword( bool bSet ) { if ( bSet ) m_nFlags |= LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD; @@ -118,7 +118,7 @@ inline void LoginErrorInfo::SetCanRememberPassword( sal_Bool bSet ) m_nFlags &= ~LOGINERROR_FLAG_CAN_REMEMBER_PASSWORD; } -inline void LoginErrorInfo::SetIsRememberPassword( sal_Bool bSet ) +inline void LoginErrorInfo::SetIsRememberPassword( bool bSet ) { if ( bSet ) m_nFlags |= LOGINERROR_FLAG_IS_REMEMBER_PASSWORD; @@ -126,7 +126,7 @@ inline void LoginErrorInfo::SetIsRememberPassword( sal_Bool bSet ) m_nFlags &= ~LOGINERROR_FLAG_IS_REMEMBER_PASSWORD; } -inline void LoginErrorInfo::SetIsRememberPersistent( sal_Bool bSet ) +inline void LoginErrorInfo::SetIsRememberPersistent( bool bSet ) { if ( bSet ) m_nFlags |= LOGINERROR_FLAG_REMEMBER_PERSISTENT; @@ -134,7 +134,7 @@ inline void LoginErrorInfo::SetIsRememberPersistent( sal_Bool bSet ) m_nFlags &= ~LOGINERROR_FLAG_REMEMBER_PERSISTENT; } -inline void LoginErrorInfo::SetCanUseSystemCredentials( sal_Bool bSet ) +inline void LoginErrorInfo::SetCanUseSystemCredentials( bool bSet ) { if ( bSet ) m_nFlags |= LOGINERROR_FLAG_CAN_USE_SYSCREDS; @@ -142,7 +142,7 @@ inline void LoginErrorInfo::SetCanUseSystemCredentials( sal_Bool bSet ) m_nFlags &= ~LOGINERROR_FLAG_CAN_USE_SYSCREDS; } -inline void LoginErrorInfo::SetIsUseSystemCredentials( sal_Bool bSet ) +inline void LoginErrorInfo::SetIsUseSystemCredentials( bool bSet ) { if ( bSet ) m_nFlags |= LOGINERROR_FLAG_IS_USE_SYSCREDS; @@ -150,7 +150,7 @@ inline void LoginErrorInfo::SetIsUseSystemCredentials( sal_Bool bSet ) m_nFlags &= ~LOGINERROR_FLAG_IS_USE_SYSCREDS; } -inline void LoginErrorInfo::SetModifyAccount( sal_Bool bSet ) +inline void LoginErrorInfo::SetModifyAccount( bool bSet ) { if ( bSet ) m_nFlags |= LOGINERROR_FLAG_MODIFY_ACCOUNT; @@ -158,7 +158,7 @@ inline void LoginErrorInfo::SetModifyAccount( sal_Bool bSet ) m_nFlags &= ~LOGINERROR_FLAG_MODIFY_ACCOUNT; } -inline void LoginErrorInfo::SetModifyUserName( sal_Bool bSet ) +inline void LoginErrorInfo::SetModifyUserName( bool bSet ) { if ( bSet ) m_nFlags |= LOGINERROR_FLAG_MODIFY_USER_NAME; diff --git a/uui/source/passwordcontainer.cxx b/uui/source/passwordcontainer.cxx index 3a5986df78a3..23f4058fb453 100644 --- a/uui/source/passwordcontainer.cxx +++ b/uui/source/passwordcontainer.cxx @@ -131,7 +131,7 @@ bool PasswordContainerHelper::handleAuthenticationRequest( uno::Reference< ucb::XInteractionSupplyAuthentication2 > xSupplyAuthentication2(xSupplyAuthentication, uno::UNO_QUERY); - sal_Bool bCanUseSystemCredentials = sal_False; + bool bCanUseSystemCredentials = false; if (xSupplyAuthentication2.is()) { sal_Bool bDefaultUseSystemCredentials; |