diff options
Diffstat (limited to 'cui/source/dialogs')
25 files changed, 205 insertions, 207 deletions
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 659cb10d1ac1..0bf1dfff78e6 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -1940,7 +1940,7 @@ void SentenceEditWindow_Impl::ResetUndo() } -void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg ) +void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, bool bTryMerg ) { ::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager(); rUndoMgr.AddUndoAction(pAction, bTryMerg); diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 0985a26e07e0..ff619623c1f8 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -175,7 +175,7 @@ void AboutDialog::SetLogo() // fdo#67401 set AntiAliasing for SVG logo SvtOptionsDrawinglayer aDrawOpt; - sal_Bool bOldAntiAliasSetting = aDrawOpt.IsAntiAliasing(); + bool bOldAntiAliasSetting = aDrawOpt.IsAntiAliasing(); aDrawOpt.SetAntiAliasing(true); // load svg logo, specify desired width, scale height isotrophically diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx index d2b9cacb402b..48aae6864a99 100644 --- a/cui/source/dialogs/commonlingui.cxx +++ b/cui/source/dialogs/commonlingui.cxx @@ -125,7 +125,7 @@ void SvxCommonLinguisticControl::SetButtonHandler( ButtonType _eType, const Link } -void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEnable ) +void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, bool _bEnable ) { Button* pButton = GetButton( _eType ); if ( pButton ) diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 5ad64b05b200..b5598b7cd425 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -104,7 +104,7 @@ public: inline const Link& GetResetWordHdl() const { return aAktWord.GetActivateHdl(); } void SetButtonHandler( ButtonType _eType, const Link& _rHandler ); - void EnableButton( ButtonType _eType, sal_Bool _bEnable ); + void EnableButton( ButtonType _eType, bool _bEnable ); inline PushButton* GetButton( ButtonType _eType ) { return implGetButton( _eType ); } inline const PushButton* GetButton( ButtonType _eType ) const { return implGetButton( _eType ); } diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 207bef33cb98..eaa041eca53e 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -44,7 +44,7 @@ // class SvxCharacterMap ================================================= -SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne_, const SfxItemSet* pSet ) +SvxCharacterMap::SvxCharacterMap( Window* pParent, bool bOne_, const SfxItemSet* pSet ) : SfxModalDialog(pParent, "SpecialCharactersDialog", "cui/ui/specialcharacters.ui") , bOne( bOne_ ) , pSubsetMap( NULL ) @@ -171,7 +171,7 @@ short SvxCharacterMap::Execute() // class SvxShowText ===================================================== -SvxShowText::SvxShowText(Window* pParent, sal_Bool bCenter) +SvxShowText::SvxShowText(Window* pParent, bool bCenter) : Control(pParent) , mnY(0) , mbCenter(bCenter) @@ -455,7 +455,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) pSubsetMap = NULL; m_pSubsetLB->Clear(); - sal_Bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL); + bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL); if( bNeedSubset ) { FontCharMap aFontCharMap; @@ -476,7 +476,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl) bFirst = false; } if( m_pSubsetLB->GetEntryCount() <= 1 ) - bNeedSubset = sal_False; + bNeedSubset = false; } m_pSubsetText->Enable(bNeedSubset); @@ -541,7 +541,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl) { OUString aText; sal_UCS4 cChar = m_pShowSet->GetSelectCharacter(); - sal_Bool bSelect = (cChar > 0); + bool bSelect = (cChar > 0); // show char sample if ( bSelect ) diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 017dff1dc44c..ecbf3ffd4029 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -237,7 +237,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni // initial m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint)); m_aDelayedPaint.SetTimeout(500); - EnableSearchUI(sal_True); + EnableSearchUI(true); if ( m_prbSearchForText->IsChecked() ) m_pcmbSearchText->GrabFocus(); @@ -259,7 +259,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton) { if ((pButton == m_prbSearchForText) || (pButton == m_prbSearchForNull) || (pButton == m_prbSearchForNotNull)) { - EnableSearchForDependees(sal_True); + EnableSearchForDependees(true); } else // en- or disable field list box accordingly @@ -297,7 +297,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain) if (m_pcbStartOver->IsChecked()) { m_pcbStartOver->Check(false); - EnableSearchUI(sal_False); + EnableSearchUI(false); if (m_prbSearchForText->IsChecked()) m_pSearchEngine->StartOver(strThisRoundText); else @@ -305,7 +305,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain) } else { - EnableSearchUI(sal_False); + EnableSearchUI(false); if (m_prbSearchForText->IsChecked()) m_pSearchEngine->SearchNext(strThisRoundText); else @@ -410,7 +410,7 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox) IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) { - sal_Bool bChecked = pBox->IsChecked(); + bool bChecked = pBox->IsChecked(); // formatter or case -> pass on to the engine if (pBox == m_pcbUseFormat) @@ -478,7 +478,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox) m_pSoundsLikeCJKSettings->Enable(bChecked); // two other buttons which depend on this one - sal_Bool bEnable = ( m_prbSearchForText->IsChecked() + bool bEnable = ( m_prbSearchForText->IsChecked() && !m_pSoundsLikeCJK->IsChecked() ) || !SvtCJKOptions().IsJapaneseFindEnabled(); @@ -544,11 +544,11 @@ IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox*, pBox) return 0L; } -void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) +void FmSearchDialog::EnableSearchUI(bool bEnable) { // when the controls shall be disabled their paint is turned off and then turned on again after a delay if (!bEnable) - EnableControlPaint(sal_False); + EnableControlPaint(false); else { if (m_aDelayedPaint.IsActive()) @@ -597,7 +597,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) if (!bEnable) m_aDelayedPaint.Start(); else - EnableControlPaint(sal_True); + EnableControlPaint(true); if ( bEnable ) { // restore focus @@ -615,14 +615,14 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable) } -void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable) +void FmSearchDialog::EnableSearchForDependees(bool bEnable) { - sal_Bool bSearchingForText = m_prbSearchForText->IsChecked(); + bool bSearchingForText = m_prbSearchForText->IsChecked(); m_pbSearchAgain->Enable(bEnable && (!bSearchingForText || (!m_pcmbSearchText->GetText().isEmpty()))); bEnable = bEnable && bSearchingForText; - sal_Bool bEnableRedundants = !m_pSoundsLikeCJK->IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled(); + bool bEnableRedundants = !m_pSoundsLikeCJK->IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled(); m_pcmbSearchText->Enable (bEnable); m_pftPosition->Enable (bEnable && !m_pcbWildCard->IsChecked()); @@ -638,7 +638,7 @@ void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable) m_pcbCase->Enable (bEnable && bEnableRedundants); } -void FmSearchDialog::EnableControlPaint(sal_Bool bEnable) +void FmSearchDialog::EnableControlPaint(bool bEnable) { Control* pAffectedControls[] = { m_prbSearchForText, m_pcmbSearchText, m_prbSearchForNull, m_prbSearchForNotNull, m_prbSearchForText, m_prbAllFields, m_prbSingleField, m_plbField, m_pftPosition, m_plbPosition, @@ -661,7 +661,7 @@ void FmSearchDialog::EnableControlPaint(sal_Bool bEnable) IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint) { - EnableControlPaint(sal_True); + EnableControlPaint(true); return 0L; } @@ -713,7 +713,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) case FmSearchProgress::STATE_SUCCESSFULL: OnFound(pProgress->aBookmark, (sal_Int16)pProgress->nFieldIndex); - EnableSearchUI(sal_True); + EnableSearchUI(true); break; case FmSearchProgress::STATE_ERROR: @@ -726,7 +726,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) } // NO break ! case FmSearchProgress::STATE_CANCELED: - EnableSearchUI(sal_True); + EnableSearchUI(true); if (m_lnkCanceledNotFoundHdl.IsSet()) { FmFoundRecordInformation friInfo; diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 4a802e9c8943..f5f3924d8970 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -118,7 +118,7 @@ void SearchThread::execute() void SearchThread::ImplSearch( const INetURLObject& rStartURL, const ::std::vector< OUString >& rFormats, - sal_Bool bRecursive ) + bool bRecursive ) { { SolarMutexGuard aGuard; @@ -148,17 +148,17 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, INetURLObject aFoundURL( xContentAccess->queryContentIdentifierString() ); DBG_ASSERT( aFoundURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - sal_Bool bFolder = xRow->getBoolean( 1 ); // property "IsFolder" + bool bFolder = xRow->getBoolean( 1 ); // property "IsFolder" if ( xRow->wasNull() ) - bFolder = sal_False; + bFolder = false; if( bRecursive && bFolder ) - ImplSearch( aFoundURL, rFormats, sal_True ); + ImplSearch( aFoundURL, rFormats, true ); else { - sal_Bool bDocument = xRow->getBoolean( 2 ); // property "IsDocument" + bool bDocument = xRow->getBoolean( 2 ); // property "IsDocument" if ( xRow->wasNull() ) - bDocument = sal_False; + bDocument = false; if( bDocument ) { @@ -543,7 +543,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) { Gallery* pGal = pThm->GetParent(); const sal_uLong nId = GetId(); - sal_Bool bDifferentThemeExists = sal_False; + bool bDifferentThemeExists = false; for( sal_uLong i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ ) { @@ -560,7 +560,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl) InfoBox aBox( this, aStr ); aBox.Execute(); m_pLbResName->GrabFocus(); - bDifferentThemeExists = sal_True; + bDifferentThemeExists = true; } } @@ -630,7 +630,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) OUString aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) ); OUString aAccess; OUString aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); - sal_Bool bReadOnly = pThm->IsReadOnly(); + bool bReadOnly = pThm->IsReadOnly(); m_pEdtMSName->SetText( pThm->GetName() ); m_pEdtMSName->SetReadOnly( bReadOnly ); @@ -750,7 +750,7 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh if ( RET_OK == _nDlgResult ) { aURL = INetURLObject( _rFolderURL ); - bSearchRecursive = sal_True; // UI choice no longer possible, windows file picker allows no user controls + bSearchRecursive = true; // UI choice no longer possible, windows file picker allows no user controls SearchFiles(); } @@ -805,7 +805,7 @@ void TPGalleryThemeProperties::FillFilterList() FilterEntry* pFilterEntry; FilterEntry* pTestEntry; sal_uInt16 i, nKeyCount; - sal_Bool bInList; + bool bInList; // graphic filters for( i = 0, nKeyCount = rFilter.GetImportFormatCount(); i < nKeyCount; i++ ) @@ -814,7 +814,7 @@ void TPGalleryThemeProperties::FillFilterList() aName = rFilter.GetImportFormatName( i ); size_t entryIndex = 0; pTestEntry = aFilterEntryList.empty() ? NULL : aFilterEntryList[ entryIndex ]; - bInList = sal_False; + bInList = false; OUString aExtensions; int j = 0; @@ -837,7 +837,7 @@ void TPGalleryThemeProperties::FillFilterList() { if ( pTestEntry->aFilterName == aExt ) { - bInList = sal_True; + bInList = true; break; } pTestEntry = ( ++entryIndex < aFilterEntryList.size() ) @@ -995,7 +995,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl) if( xFolderPicker->execute() == RET_OK ) { aURL = INetURLObject( xFolderPicker->getDirectory() ); - bSearchRecursive = sal_True; // UI choice no longer possible, windows file picker allows no user controls + bSearchRecursive = true; // UI choice no longer possible, windows file picker allows no user controls SearchFiles(); } @@ -1057,7 +1057,7 @@ void TPGalleryThemeProperties::DoPreview() if( aString != aPreviewString ) { INetURLObject _aURL( aFoundList[ m_pLbxFound->GetEntryPos( aString ) ] ); - bInputAllowed = sal_False; + bInputAllowed = false; if ( !m_pWndPreview->SetGraphic( _aURL ) ) { @@ -1072,7 +1072,7 @@ void TPGalleryThemeProperties::DoPreview() xMediaPlayer->start(); } - bInputAllowed = sal_True; + bInputAllowed = true; aPreviewString = aString; } } @@ -1096,7 +1096,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl) } else { - bTakeAll = sal_False; + bTakeAll = false; TakeFiles(); } } @@ -1111,7 +1111,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl) if( bInputAllowed ) { aPreviewTimer.Stop(); - bTakeAll = sal_True; + bTakeAll = true; TakeFiles(); } @@ -1124,7 +1124,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl) { if( bInputAllowed ) { - sal_Bool bPreviewPossible = sal_False; + bool bPreviewPossible = false; aPreviewTimer.Stop(); @@ -1133,7 +1133,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl) if( m_pLbxFound->GetSelectEntryCount() == 1 ) { m_pCbxPreview->Enable(); - bPreviewPossible = sal_True; + bPreviewPossible = true; } else m_pCbxPreview->Disable(); @@ -1184,14 +1184,14 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl) m_pLbxFound->SelectEntryPos( 0 ); m_pBtnTakeAll->Enable(); m_pCbxPreview->Enable(); - bEntriesFound = sal_True; + bEntriesFound = true; } else { m_pLbxFound->InsertEntry( OUString( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) ); m_pBtnTakeAll->Disable(); m_pCbxPreview->Disable(); - bEntriesFound = sal_False; + bEntriesFound = false; } return 0L; } diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index ae2ada60750b..53da9daf4a12 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -183,7 +183,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl) GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic, - sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) + sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges ) : GraphicFilterDialog(pParent, "MosaicDialog", "cui/ui/mosaicdialog.ui", rGraphic) { @@ -292,7 +292,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic, - sal_uInt8 cGreyThreshold, sal_Bool bInvert ) + sal_uInt8 cGreyThreshold, bool bInvert ) : GraphicFilterDialog(pParent, "SolarizeDialog", "cui/ui/solarizedialog.ui", rGraphic) { diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx index 1c7bccbef05e..8d33cc6ce6d5 100644 --- a/cui/source/dialogs/cuihyperdlg.cxx +++ b/cui/source/dialogs/cuihyperdlg.cxx @@ -86,11 +86,11 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) : IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ), maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ), mpBindings ( pBindings ), - mbReadOnly ( sal_False ), - mbIsHTMLDoc ( sal_False ) + mbReadOnly ( false ), + mbIsHTMLDoc ( false ) { SetUniqueId( HID_HYPERLINK_DIALOG ); - mbGrabFocus = sal_True; + mbGrabFocus = true; // insert pages Image aImage; OUString aStrTitle; @@ -123,7 +123,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings) SetInputSet (mpItemSet); // Init Dialog - Start (sal_False); + Start (false); pBindings->Update( SID_READONLY_MODE ); @@ -182,13 +182,13 @@ void SvxHpLinkDlg::Move() // Size of Extrawindow Size aExtraWndSize( pCurrentPage->GetSizeExtraWnd() ); - sal_Bool bDoInvalid ; + bool bDoInvalid ; if( aDlgPos.X()+(1.02*aDlgSize.Width())+aExtraWndSize.Width() > aWindowSize.Width() ) { if( aDlgPos.X() - ( 0.02*aDlgSize.Width() ) - aExtraWndSize.Width() < 0 ) { // Pos Extrawindow anywhere - bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), sal_True ); + bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), true ); } else { @@ -308,7 +308,7 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) if ( mbGrabFocus ) { pCurrentPage->SetInitFocus(); // #92535# grab the focus only once at initialization - mbGrabFocus = sal_False; + mbGrabFocus = false; } return nPageId; } @@ -319,7 +319,7 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem ) |* |************************************************************************/ -void SvxHpLinkDlg::SetReadOnlyMode( sal_Bool bRdOnly ) +void SvxHpLinkDlg::SetReadOnlyMode( bool bRdOnly ) { mbReadOnly = bRdOnly; if ( bRdOnly ) diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index c49446480782..03aedf3d7631 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -420,7 +420,7 @@ namespace svx if( m_bDisplayListBox != bDisplayListBox ) { Control& rOldControl = implGetCurrentControl(); - sal_Bool bHasFocus = rOldControl.HasFocus(); + bool bHasFocus = rOldControl.HasFocus(); m_bDisplayListBox = bDisplayListBox; @@ -729,7 +729,7 @@ namespace svx pOtherBox = &m_aHangulOnly; if (pBox && pOtherBox) { - sal_Bool bBoxChecked = pBox->IsChecked(); + bool bBoxChecked = pBox->IsChecked(); if (bBoxChecked) pOtherBox->Check( false ); pOtherBox->Enable( !bBoxChecked ); diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 28577d74ea3e..c04c81c1ba55 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -60,9 +60,9 @@ struct DocumentTypeData {} }; -sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const +bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const { - sal_Bool bIsValidURL = !rPath.isEmpty(); + bool bIsValidURL = !rPath.isEmpty(); if ( bIsValidURL ) { aURLObject.SetURL( rPath ); @@ -80,7 +80,7 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OU { OUString aBase( aURLObject.getName( INetURLObject::LAST_SEGMENT, false ) ); if ( aBase.isEmpty() || ( aBase[0] == '.' ) ) - bIsValidURL = sal_False; + bIsValidURL = false; } if ( bIsValidURL ) { @@ -261,10 +261,10 @@ void SvxHyperlinkNewDocTp::SetInitFocus() |* \************************************************************************/ -sal_Bool SvxHyperlinkNewDocTp::AskApply() +bool SvxHyperlinkNewDocTp::AskApply() { INetURLObject aINetURLObject; - sal_Bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject ); + bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject ); if ( !bRet ) { WarningBox aWarning( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) ); @@ -310,7 +310,7 @@ void SvxHyperlinkNewDocTp::DoApply () com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler > xHandler; SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, xHandler ); - sal_Bool bOk = pIStm && ( pIStm->GetError() == 0); + bool bOk = pIStm && ( pIStm->GetError() == 0); if( pIStm ) delete pIStm; @@ -407,19 +407,19 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl) utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL ); OUString aStrPath = aStrURL; - sal_Bool bZeroPath = aStrPath.isEmpty(); - sal_Bool bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled + bool bZeroPath = aStrPath.isEmpty(); + bool bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled // as file name, otherwise we do not yet know if( bZeroPath ) aStrPath = SvtPathOptions().GetWorkPath(); else if( !::utl::UCBContentHelper::IsFolder( aStrURL ) ) - bHandleFileName = sal_True; + bHandleFileName = true; xFolderPicker->setDisplayDirectory( aStrPath ); - DisableClose( sal_True ); + DisableClose( true ); sal_Int16 nResult = xFolderPicker->execute(); - DisableClose( sal_False ); + DisableClose( false ); if( ExecutableDialogResults::OK == nResult ) { sal_Char const sSlash[] = "/"; diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index f91f89c29581..f6682485f1bb 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -47,7 +47,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maFtURL ( this, CUI_RES (FT_URL) ), maFtFullURL ( this, CUI_RES (FT_FULL_URL) ), maBtBrowse ( this, CUI_RES (BTN_BROWSE) ), - mbMarkWndOpen ( sal_False ) + mbMarkWndOpen ( false ) { // Disable display of bitmap names. maBtBrowse.EnableTextDisplay (false); @@ -201,9 +201,9 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl) aDlg.SetDisplayDirectory( aOldURL ); } - DisableClose( sal_True ); + DisableClose( true ); ErrCode nError = aDlg.Execute(); - DisableClose( sal_False ); + DisableClose( false ); if ( ERRCODE_NONE == nError ) { diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index d20f4c4891b3..6ef153622e78 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -50,7 +50,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maFtPassword ( this, CUI_RES (FT_PASSWD) ), maEdPassword ( this, CUI_RES (ED_PASSWD) ), maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ), - mbMarkWndOpen ( sal_False ) + mbMarkWndOpen ( false ) { // Disable display of bitmap names. maBtBrowse.EnableTextDisplay (false); @@ -271,8 +271,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl) void SvxHyperlinkInternetTp::SetScheme(const OUString& rScheme) { //if rScheme is empty or unknown the default beaviour is like it where HTTP - sal_Bool bFTP = rScheme.startsWith(sFTPScheme); - sal_Bool bInternet = !(bFTP); + bool bFTP = rScheme.startsWith(sFTPScheme); + bool bInternet = !(bFTP); //update protocol button selection: maRbtLinktypFTP.Check(bFTP); diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index eb7ffba103b5..2e15476f9c64 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -124,7 +124,7 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) maBtApply( this, CUI_RES (BT_APPLY) ), maBtClose( this, CUI_RES (BT_CLOSE) ), maLbTree ( this, CUI_RES (TLB_MARK) ), - mbUserMoved ( sal_False ), + mbUserMoved ( false ), mpParent ( pParent ), mnError ( LERR_NOERROR ) { @@ -172,11 +172,11 @@ sal_uInt16 SvxHlinkDlgMarkWnd::SetError( sal_uInt16 nError) |* |************************************************************************/ -sal_Bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos ) +bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos ) { if ( !mbUserMoved ) { - sal_Bool bOldStatus = mbUserMoved; + bool bOldStatus = mbUserMoved; SetPosPixel ( aNewPos ); mbUserMoved = bOldStatus; } @@ -189,12 +189,12 @@ void SvxHlinkDlgMarkWnd::Move () Window::Move(); if ( IsReallyVisible() ) - mbUserMoved = sal_True; + mbUserMoved = true; } -sal_Bool SvxHlinkDlgMarkWnd::ConnectToDialog( sal_Bool bDoit ) +bool SvxHlinkDlgMarkWnd::ConnectToDialog( bool bDoit ) { - sal_Bool bOldStatus = mbUserMoved; + bool bOldStatus = mbUserMoved; mbUserMoved = !bDoit; @@ -307,7 +307,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree (const OUString& aStrURL) |* |************************************************************************/ -sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL) +bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL) { mnError = LERR_NOERROR; @@ -324,7 +324,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL) { uno::Sequence< beans::PropertyValue > aArg(1); aArg.getArray()[0].Name = "Hidden"; - aArg.getArray()[0].Value <<= (sal_Bool) sal_True; + aArg.getArray()[0].Value <<= true; xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg ); } catch( const io::IOException& ) @@ -387,7 +387,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink uno::Any aAny; OUString aLink( *pNames++ ); - sal_Bool bError = sal_False; + bool bError = false; try { aAny = xLinks->getByName( aLink ); @@ -396,7 +396,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink { // if the name of the target was invalid (like empty headings) // no object can be provided - bError = sal_True; + bError = true; } if(bError) continue; @@ -415,7 +415,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink // is it a target ? uno::Reference< lang::XServiceInfo > xSI( xTarget, uno::UNO_QUERY ); - sal_Bool bIsTarget = xSI->supportsService( aProp_LinkTarget ); + bool bIsTarget = xSI->supportsService( aProp_LinkTarget ); // create userdata TargetData *pData = new TargetData ( aLink, bIsTarget ); @@ -499,14 +499,14 @@ void SvxHlinkDlgMarkWnd::ClearTree() SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry (const OUString& aStrName) { - sal_Bool bFound=sal_False; + bool bFound=false; SvTreeListEntry* pEntry = maLbTree.First(); while ( pEntry && !bFound ) { TargetData* pUserData = ( TargetData * ) pEntry->GetUserData (); if (aStrName == pUserData->aUStrLinkname) - bFound = sal_True; + bFound = true; else pEntry = maLbTree.Next( pEntry ); } diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx index 9d17318b8ec1..f31c0568db27 100644 --- a/cui/source/dialogs/hltpbase.cxx +++ b/cui/source/dialogs/hltpbase.cxx @@ -129,9 +129,9 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent, mpFtText ( NULL ), mpEdText ( NULL ), mpBtScript ( NULL ), - mbIsCloseDisabled ( sal_False ), + mbIsCloseDisabled ( false ), mpDialog ( pParent ), - mbStdControlsInit ( sal_False ), + mbStdControlsInit ( false ), aEmptyStr() { // create bookmark-window @@ -169,7 +169,7 @@ void SvxHyperlinkTabPageBase::DeactivatePage() TabPage::DeactivatePage(); } -sal_Bool SvxHyperlinkTabPageBase::QueryClose() +bool SvxHyperlinkTabPageBase::QueryClose() { return !mbIsCloseDisabled; } @@ -196,16 +196,16 @@ void SvxHyperlinkTabPageBase::InitStdControls () mpBtScript->SetAccessibleRelationLabeledBy( mpFtForm ); } - mbStdControlsInit = sal_True; + mbStdControlsInit = true; } // Move Extra-Window -sal_Bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, sal_Bool bDisConnectDlg ) +bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, bool bDisConnectDlg ) { - sal_Bool bReturn = mpMarkWnd->MoveTo ( aNewPos ); + bool bReturn = mpMarkWnd->MoveTo ( aNewPos ); if( bDisConnectDlg ) - mpMarkWnd->ConnectToDialog( sal_False ); + mpMarkWnd->ConnectToDialog( false ); return ( !bReturn && IsMarkWndVisible() ); } @@ -233,7 +233,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd () { // Pos Extrawindow anywhere MoveToExtraWnd( Point(10,10) ); // very unlikely - mpMarkWnd->ConnectToDialog( sal_False ); + mpMarkWnd->ConnectToDialog( false ); } else { @@ -297,10 +297,10 @@ void SvxHyperlinkTabPageBase::DoApply () } // Ask page whether an insert is possible -sal_Bool SvxHyperlinkTabPageBase::AskApply () +bool SvxHyperlinkTabPageBase::AskApply () { // default-implementation - return sal_True; + return true; } // This method would be called from bookmark-window to set new mark-string @@ -316,7 +316,7 @@ void SvxHyperlinkTabPageBase::SetInitFocus() } // Ask dialog whether the curretn doc is a HTML-doc -sal_Bool SvxHyperlinkTabPageBase::IsHTMLDoc() const +bool SvxHyperlinkTabPageBase::IsHTMLDoc() const { return ((SvxHpLinkDlg*)mpDialog)->IsHTMLDoc(); } @@ -351,7 +351,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) because if no JAVA is installed an error box occurs and then it is possible to close the HyperLinkDlg before its child (MacroAssignDlg) -> GPF */ - sal_Bool bIsInputEnabled = GetParent()->IsInputEnabled(); + bool bIsInputEnabled = GetParent()->IsInputEnabled(); if ( bIsInputEnabled ) GetParent()->EnableInput( false ); SfxMacroAssignDlg aDlg( this, mxDocumentFrame, *pItemSet ); @@ -372,9 +372,9 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl) if ( bIsInputEnabled ) GetParent()->EnableInput( true ); // execute dlg - DisableClose( sal_True ); + DisableClose( true ); short nRet = aDlg.Execute(); - DisableClose( sal_False ); + DisableClose( false ); if ( RET_OK == nRet ) { const SfxItemSet* pOutSet = aDlg.GetOutputItemSet(); @@ -574,9 +574,9 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet) return( LEAVE_PAGE ); } -sal_Bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() +bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd() { - return sal_False; + return false; } void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(sal_Bool) diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index b2d822460ab7..edf181b6a335 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -349,9 +349,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; ContinueHyph_Impl( /*nHyphPos*/nOldPos ); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -367,9 +367,9 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButt xProp->setIsHyphAuto( sal_True ); - bBusy = sal_True; + bBusy = true; ContinueHyph_Impl( /*nHyphPos*/nOldPos ); - bBusy = sal_False; + bBusy = false; xProp->setIsHyphAuto( sal_False ); } @@ -387,9 +387,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; ContinueHyph_Impl(); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -399,9 +399,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; ContinueHyph_Impl( CONTINUE_HYPH ); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -411,10 +411,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; pHyphWrapper->SpellEnd(); EndDialog( RET_CANCEL ); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -424,9 +424,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; SelLeft(); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -436,9 +436,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl) { if( !bBusy ) { - bBusy = sal_True; + bBusy = true; SelRight(); - bBusy = sal_False; + bBusy = false; } return 0; } @@ -467,7 +467,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog( , nHyphPos(0) , nOldPos(0) , nHyphenationPositionsOffset(0) - , bBusy(sal_False) + , bBusy(false) { get(m_pWordEdit, "worded"); get(m_pLeftBtn, "left"); diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 4bdd7216539a..3c5f7946c9d6 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -70,7 +70,7 @@ IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId, const SfxItemSet &rAttrSet ) : TabPage ( pParent, rResId ), pSet ( &rAttrSet ), - bHasExchangeSupport ( sal_False ), + bHasExchangeSupport ( false ), pDialog ( NULL ) { SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE ); @@ -111,16 +111,16 @@ void IconChoicePage::FillUserData() -sal_Bool IconChoicePage::IsReadOnly() const +bool IconChoicePage::IsReadOnly() const { - return sal_False; + return false; } -sal_Bool IconChoicePage::QueryClose() +bool IconChoicePage::QueryClose() { - return sal_True; + return true; } /********************************************************************** @@ -211,11 +211,11 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, pRanges ( NULL ), nResId ( rResId.GetId() ), - bHideResetBtn ( sal_False ), - bModal ( sal_False ), - bInOK ( sal_False ), - bModified ( sal_False ), - bItemsReset ( sal_False ) + bHideResetBtn ( false ), + bModal ( false ), + bInOK ( false ), + bModified ( false ), + bItemsReset ( false ) { maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN ); @@ -245,7 +245,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, aHelpBtn.Show(); aResetBtn.Show(); - SetPosSizeCtrls ( sal_True ); + SetPosSizeCtrls ( true ); } @@ -307,7 +307,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( const Image& rChoiceIcon, CreatePage pCreateFunc /* != 0 */, GetPageRanges pRangesFunc /* darf 0 sein */, - sal_Bool bItemsOnDemand, + bool bItemsOnDemand, sal_uLong /*nPos*/ ) { @@ -439,7 +439,7 @@ void IconChoiceDialog::Resize() } } -void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit ) +void IconChoiceDialog::SetPosSizeCtrls ( bool bInit ) { const Point aCtrlOffset ( LogicToPixel( Point( CTRLS_OFFSET, CTRLS_OFFSET ), MAP_APPFONT ) ); Size aOutSize ( GetOutputSizePixel() ); @@ -665,7 +665,7 @@ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl) IMPL_LINK_NOARG(IconChoiceDialog, OkHdl) { - bInOK = sal_True; + bInOK = true; if ( OK_Impl() ) { @@ -758,7 +758,7 @@ void IconChoiceDialog::ActivatePageImpl () pData->pPage->Reset( *pSet ); } - pData->bRefresh = sal_False; + pData->bRefresh = false; if ( pExampleSet ) pData->pPage->ActivatePage( *pExampleSet ); @@ -776,7 +776,7 @@ void IconChoiceDialog::ActivatePageImpl () -sal_Bool IconChoiceDialog::DeActivatePageImpl () +bool IconChoiceDialog::DeActivatePageImpl () { IconChoicePageData *pData = GetPageData ( mnCurrentPageId ); @@ -828,17 +828,17 @@ sal_Bool IconChoiceDialog::DeActivatePageImpl () { IconChoicePageData* pObj = maPageList[ i ]; if ( pObj->pPage != pPage ) - pObj->bRefresh = sal_True; + pObj->bRefresh = true; else - pObj->bRefresh = sal_False; + pObj->bRefresh = false; } } } if ( nRet & IconChoicePage::LEAVE_PAGE ) - return sal_True; + return true; else - return sal_False; + return false; } @@ -961,11 +961,11 @@ short IconChoiceDialog::Execute() -void IconChoiceDialog::Start( sal_Bool bShow ) +void IconChoiceDialog::Start( bool bShow ) { aCancelBtn.SetClickHdl( LINK( this, IconChoiceDialog, CancelHdl ) ); - bModal = sal_False; + bModal = false; Start_Impl(); @@ -976,15 +976,15 @@ void IconChoiceDialog::Start( sal_Bool bShow ) -sal_Bool IconChoiceDialog::QueryClose() +bool IconChoiceDialog::QueryClose() { - sal_Bool bRet = sal_True; + bool bRet = true; for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i ) { IconChoicePageData* pData = maPageList[i ]; if ( pData->pPage && !pData->pPage->QueryClose() ) { - bRet = sal_False; + bRet = false; break; } } @@ -1064,7 +1064,7 @@ IconChoicePageData* IconChoiceDialog::GetPageData ( sal_uInt16 nId ) | \**********************************************************************/ -sal_Bool IconChoiceDialog::OK_Impl() +bool IconChoiceDialog::OK_Impl() { IconChoicePage* pPage = GetPageData ( mnCurrentPageId )->pPage; @@ -1075,7 +1075,7 @@ sal_Bool IconChoiceDialog::OK_Impl() if ( pSet ) { SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() ); - sal_Bool bRet = sal_False; + bool bRet = false; if ( pPage->HasExchangeSupport() ) nRet = pPage->DeactivatePage( &aTmp ); @@ -1087,7 +1087,7 @@ sal_Bool IconChoiceDialog::OK_Impl() pOutSet->Put( aTmp ); } else if ( bRet ) - bModified |= sal_True; + bModified |= true; } else nRet = pPage->DeactivatePage( NULL ); @@ -1101,7 +1101,7 @@ sal_Bool IconChoiceDialog::OK_Impl() short IconChoiceDialog::Ok() { - bInOK = sal_True; + bInOK = true; if ( !pOutSet ) { diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index ac0645ec8134..fe7dfea399cf 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -82,9 +82,9 @@ static OUString impl_getSvtResString( sal_uInt32 nId ) return aRet; } -sal_Bool InsertObjectDialog_Impl::IsCreateNew() const +bool InsertObjectDialog_Impl::IsCreateNew() const { - return sal_False; + return false; } uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified( OUString* /*pGraphicMediaType*/ ) @@ -216,8 +216,8 @@ short SvInsertOleDlg::Execute() if ( m_xStorage.is() && ( nRet = Dialog::Execute() ) == RET_OK ) { OUString aFileName; - sal_Bool bLink = sal_False; - sal_Bool bCreateNew = IsCreateNew(); + bool bLink = false; + bool bCreateNew = IsCreateNew(); if ( bCreateNew ) { // create and insert new embedded object @@ -523,7 +523,7 @@ void SfxInsertFloatingFrameDialog::Init() short SfxInsertFloatingFrameDialog::Execute() { short nRet = RET_OK; - sal_Bool bOK = sal_False; + bool bOK = false; uno::Reference < beans::XPropertySet > xSet; if ( m_xObj.is() ) { @@ -567,11 +567,11 @@ short SfxInsertFloatingFrameDialog::Execute() else m_pNMMarginHeight->SetText( OUString::number( nSize ) ); - sal_Bool bScrollOn = sal_False; - sal_Bool bScrollOff = sal_False; - sal_Bool bScrollAuto = sal_False; + bool bScrollOn = false; + bool bScrollOff = false; + bool bScrollAuto = false; - sal_Bool bSet = sal_False; + bool bSet = false; aAny = xSet->getPropertyValue( "FrameIsAutoScroll" ); aAny >>= bSet; if ( !bSet ) @@ -582,13 +582,13 @@ short SfxInsertFloatingFrameDialog::Execute() bScrollOff = !bSet; } else - bScrollAuto = sal_True; + bScrollAuto = true; m_pRBScrollingOn->Check( bScrollOn ); m_pRBScrollingOff->Check( bScrollOff ); m_pRBScrollingAuto->Check( bScrollAuto ); - bSet = sal_False; + bSet = false; aAny = xSet->getPropertyValue( "FrameIsAutoBorder" ); aAny >>= bSet; if ( !bSet ) @@ -600,7 +600,7 @@ short SfxInsertFloatingFrameDialog::Execute() } SetUpdateMode( true ); - bOK = sal_True; + bOK = true; } catch ( uno::Exception& ) { @@ -640,7 +640,7 @@ short SfxInsertFloatingFrameDialog::Execute() { try { - sal_Bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE; + bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE; if ( bIPActive ) m_xObj->changeState( embed::EmbedStates::RUNNING ); @@ -653,7 +653,7 @@ short SfxInsertFloatingFrameDialog::Execute() if ( m_pRBScrollingAuto->IsChecked() ) eScroll = ScrollingAuto; - sal_Bool bHasBorder = m_pRBFrameBorderOn->IsChecked(); + bool bHasBorder = m_pRBFrameBorderOn->IsChecked(); long lMarginWidth; if ( !m_pCBMarginWidthDefault->IsChecked() ) @@ -671,9 +671,9 @@ short SfxInsertFloatingFrameDialog::Execute() xSet->setPropertyValue( "FrameName", makeAny( aName ) ); if ( eScroll == ScrollingAuto ) - xSet->setPropertyValue( "FrameIsAutoScroll", makeAny( sal_True ) ); + xSet->setPropertyValue( "FrameIsAutoScroll", makeAny( true ) ); else - xSet->setPropertyValue( "FrameIsScrollingMode", makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) ); + xSet->setPropertyValue( "FrameIsScrollingMode", makeAny( eScroll == ScrollingYes ) ); xSet->setPropertyValue( "FrameIsBorder", makeAny( bHasBorder ) ); xSet->setPropertyValue( "FrameMarginWidth", makeAny( sal_Int32( lMarginWidth ) ) ); diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 74ac8ecc56eb..043de0334822 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -77,7 +77,7 @@ static long nTabs[] = }; -SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bHtml ) +SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml ) : ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ), aFtFiles( this, CUI_RES( FT_FILES ) ), aFtLinks( this, CUI_RES( FT_LINKS ) ), @@ -419,7 +419,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) { (void)pPushButton; - sal_Bool bModified = sal_False; + bool bModified = false; if(Links().GetSelectionCount() <= 1) { sal_uLong nPos; @@ -434,7 +434,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) Links().GetModel()->Remove( Links().GetEntry( nPos ) ); // close object, if it's still existing - sal_Bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType(); + bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType(); // tell the link that it will be resolved! xLink->Closed(); @@ -453,7 +453,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) if( pEntry ) Links().SetCurEntry( pEntry ); } - bModified = sal_True; + bModified = true; } } else @@ -481,7 +481,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) // if somebody has forgotten to deregister himself pLinkMgr->Remove( &xLink ); - bModified = sal_True; + bModified = true; } // then remove all selected entries } @@ -538,11 +538,11 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) // So search for the link in the manager; if it does not exist // anymore, fill the list completely new. Otherwise only the // edited link needs to be refreshed. - sal_Bool bLinkFnd = sal_False; + bool bLinkFnd = false; for( size_t n = pLinkMgr->GetLinks().size(); n; ) if( _pLink == &(*pLinkMgr->GetLinks()[ --n ]) ) { - bLinkFnd = sal_True; + bLinkFnd = true; break; } @@ -551,7 +551,7 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) Links().SetUpdateMode(false); Links().GetModel()->Remove( Links().GetEntry( nPos ) ); SvTreeListEntry* pToUnselect = Links().FirstSelected(); - InsertEntry( *_pLink, nPos, sal_True ); + InsertEntry( *_pLink, nPos, true ); if(pToUnselect) Links().Select(pToUnselect, false); Links().SetUpdateMode(true); @@ -627,7 +627,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) } -void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, sal_Bool bSelect ) +void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, bool bSelect ) { OUString aEntry, sFileNm, sLinkNm, sTypeNm, sFilter; diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index eee728bb1cb3..b353e2dfe747 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -290,7 +290,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath ) { OUString sPath = rPath.getToken( i, cDelim ); OUString sSystemPath; - sal_Bool bIsSystemPath = + bool bIsSystemPath = ::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath ); OUString sEntry( '\t' ); @@ -322,7 +322,7 @@ void SvxPathSelectDialog::SetPath(const OUString& rPath) { OUString sPath = rPath.getToken( i, cDelim ); OUString sSystemPath; - sal_Bool bIsSystemPath = + bool bIsSystemPath = ::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath ); if ( bIsSystemPath ) diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index d430bdb75c45..0b14ca606a92 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -62,7 +62,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, aFont.SetWeight( WEIGHT_LIGHT ); m_pEditED->SetFont( aFont ); - sal_Bool bNew = sal_True; + bool bNew = true; sal_uInt16 nWhich = 0; if ( !bPrevNext ) @@ -76,7 +76,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet, if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE ) { - bNew = sal_False; + bNew = false; const SvxPostItAuthorItem& rAuthor = (const SvxPostItAuthorItem&)rSet.Get( nWhich ); aAuthorStr = rAuthor.GetValue(); @@ -154,7 +154,7 @@ sal_uInt16* SvxPostItDialog::GetRanges() -void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev) +void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev) { m_pPrevBtn->Enable(bPrev); m_pNextBtn->Enable(bNext); diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 9de4ce59be6b..7e7349755e9d 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -839,7 +839,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) } //do we need L10N for this? ie something like: //String aNewStdName( ResId( STR_STDMODULENAME ) ); - sal_Bool bValid = sal_False; + bool bValid = false; sal_Int32 i = 1; Sequence< Reference< browse::XBrowseNode > > childNodes; @@ -849,7 +849,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) if( node->hasChildNodes() == sal_False ) { aNewName = aNewStdName + OUString::number(i); - bValid = sal_True; + bValid = true; } else { @@ -865,7 +865,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) while ( !bValid ) { aNewName = aNewStdName + OUString::number(i); - sal_Bool bFound = sal_False; + bool bFound = false; if(childNodes.getLength() > 0 ) { OUString nodeName = childNodes[0]->getName(); @@ -877,7 +877,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) { if (aNewName+extn == childNodes[index]->getName()) { - bFound = sal_True; + bFound = true; break; } } @@ -887,7 +887,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) } else { - bValid = sal_True; + bValid = true; } } @@ -899,12 +899,12 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry ) if ( xNewDlg->Execute() && !xNewDlg->GetObjectName().isEmpty() ) { OUString aUserSuppliedName = xNewDlg->GetObjectName(); - bValid = sal_True; + bValid = true; for( sal_Int32 index = 0; index < childNodes.getLength(); index++ ) { if (aUserSuppliedName+extn == childNodes[index]->getName()) { - bValid = sal_False; + bValid = false; OUString aError( m_createErrStr ); aError += m_createDupStr; ErrorBox aErrorBox( static_cast<Window*>(this), WB_OK | RET_OK, aError ); @@ -1022,13 +1022,13 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) ); xNewDlg->SetObjectName( aNewName ); - sal_Bool bValid; + bool bValid; do { if ( xNewDlg->Execute() && !xNewDlg->GetObjectName().isEmpty() ) { OUString aUserSuppliedName = xNewDlg->GetObjectName(); - bValid = sal_True; + bValid = true; if( bValid ) aNewName = aUserSuppliedName; } @@ -1077,7 +1077,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry ) } void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) { - sal_Bool result = sal_False; + bool result = false; Reference< browse::XBrowseNode > node = getBrowseNode( pEntry ); // ISSUE L10N string & can we centre list? OUString aQuery = m_delQueryStr + getListOfChildren( node, 0 ); @@ -1108,7 +1108,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) } } - if ( result == sal_True ) + if ( result ) { m_pScriptsBox->deleteTree( pEntry ); m_pScriptsBox->GetModel()->Remove( pEntry ); @@ -1123,15 +1123,13 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry ) } -sal_Bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps, +bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps, OUString& propName ) { - sal_Bool result = false; + bool result = false; try { - sal_Bool bTemp = sal_False; - xProps->getPropertyValue( propName ) >>= bTemp; - result = ( bTemp == sal_True ); + xProps->getPropertyValue( propName ) >>= result; } catch ( Exception& ) { diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index 73b781b87c1f..d0a79b74c153 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -84,7 +84,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com: { sCurName = ""; xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY); - sal_Bool bIsHidden = sal_False; + bool bIsHidden = false; try { ::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN); diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index d13ce270845e..cdaf0090595c 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -106,7 +106,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage ) } else if (nId == m_nBackPageId) { - ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(sal_True); + ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(true); } } @@ -139,14 +139,14 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(Window* pParent, sal_uInt16 nSlot = rPool.GetSlotId( nWhich ); if ( nSlot >= SID_SVX_START ) { - sal_Bool bChecked = sal_False, bFound = sal_False; + bool bChecked = false, bFound = false; for ( sal_uInt16 i = 0; !bFound && i < rList.Count(); ++i ) { if ( nSlot == rList[i].nSlot ) { - bFound = sal_True; + bFound = true; if ( IsInvalidItem( rList[i].pItem ) ) - bChecked = sal_True; + bChecked = true; } } @@ -181,7 +181,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) for ( sal_uInt16 i = 0; i < m_pAttrLB->GetEntryCount(); ++i ) { sal_uInt16 nSlot = (sal_uInt16)(sal_uLong)m_pAttrLB->GetEntryData(i); - sal_Bool bChecked = m_pAttrLB->IsChecked(i); + bool bChecked = m_pAttrLB->IsChecked(i); sal_uInt16 j; for ( j = rList.Count(); j; ) @@ -223,7 +223,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl) SvxSearchSimilarityDialog::SvxSearchSimilarityDialog ( Window* pParent, - sal_Bool bRelax, + bool bRelax, sal_uInt16 nOther, sal_uInt16 nShorter, sal_uInt16 nLonger diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index e369d03ef2fa..28eb9a07ad86 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -297,7 +297,7 @@ SvxZoomDialog::~SvxZoomDialog() IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn ) { - bModified |= sal_True; + bModified = true; if (pBtn == m_pUserBtn) { @@ -315,7 +315,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) { if ( !m_pUserBtn->IsChecked() ) return 0; - bModified |= sal_True; + bModified = true; return 0; } @@ -323,7 +323,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl) IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn ) { - bModified |= sal_True; + bModified = true; if (pBtn == m_pAutomaticBtn) { @@ -366,7 +366,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, NumericField *, pEdt ) m_pBookModeChk->Disable(); } - bModified |= sal_True; + bModified = true; return 0; } @@ -378,7 +378,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutCheckHdl, CheckBox *, pChk ) if (pChk == m_pBookModeChk && !m_pColumnsBtn->IsChecked()) return 0; - bModified |= sal_True; + bModified = true; return 0; } |