diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-06 14:38:36 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-11 08:18:24 +0200 |
commit | d1bffe3596d21f205cb7a2697bb5142f190b5627 (patch) | |
tree | d0e8e310bb9574fac992118739019c8c30c5b185 /svx | |
parent | 53c91a6db1cdaf3a91fba6ea328acdcc33c4088a (diff) |
svx: sal_Bool->bool
Change-Id: I64d9c1bbe6ed85108783bf6a97329fcdc167ca62
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShape2d.cxx | 6 | ||||
-rw-r--r-- | svx/source/customshapes/EnhancedCustomShapeFontWork.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/srchdlg.cxx | 66 | ||||
-rw-r--r-- | svx/source/svdraw/svdattr.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdedtv2.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdoashp.cxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdotext.cxx | 6 |
7 files changed, 44 insertions, 44 deletions
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 6289eddbea26..299cc4c39433 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -1988,7 +1988,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm aClosedPolyPolygon.setClosed(true); SdrPathObj* pFill = new SdrPathObj(OBJ_POLY, aClosedPolyPolygon, dBrightness); SfxItemSet aTempSet(*this); - aTempSet.Put(SdrShadowItem(sal_False)); + aTempSet.Put(SdrShadowItem(false)); aTempSet.Put(XLineStyleItem(XLINE_NONE)); pFill->SetMergedItemSet(aTempSet); rObjectList.push_back(pFill); @@ -2004,7 +2004,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm aNewB2DPolyPolygon.isClosed() ? OBJ_POLY : OBJ_PLIN, aNewB2DPolyPolygon, dBrightness); SfxItemSet aTempSet(*this); - aTempSet.Put(SdrShadowItem(sal_False)); + aTempSet.Put(SdrShadowItem(false)); aTempSet.Put(XFillStyleItem(XFILL_NONE)); pStroke->SetMergedItemSet(aTempSet); rObjectList.push_back(pStroke); @@ -2014,7 +2014,7 @@ void EnhancedCustomShape2d::CreateSubPath( sal_uInt16& rSrcPt, sal_uInt16& rSegm { SdrPathObj* pObj = 0; SfxItemSet aTempSet(*this); - aTempSet.Put(SdrShadowItem(sal_False)); + aTempSet.Put(SdrShadowItem(false)); if(bNoFill) { diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 14b4685ffe81..e5278e3997d8 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -812,7 +812,7 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd SfxItemSet aSet( pCustomShape->GetMergedItemSet() ); aSet.ClearItem( SDRATTR_TEXTDIRECTION ); //SJ: vertical writing is not required, by removing this item no outliner is created - aSet.Put(SdrShadowItem(sal_False)); // #i37011# NO shadow for FontWork geometry + aSet.Put(SdrShadowItem(false)); // #i37011# NO shadow for FontWork geometry pRet->SetMergedItemSet( aSet ); // * otherwise we would crash, because the outliner tries to create a Paraobject, but there is no model } return pRet; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 8c490febd7cd..51e32d39f200 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -105,7 +105,7 @@ namespace struct SearchDlg_Impl { - sal_Bool bSaveToModule : 1, + bool bSaveToModule : 1, bFocusOnSearch : 1; sal_uInt16* pRanges; Timer aSelectionTimer; @@ -546,7 +546,7 @@ void SvxSearchDialog::SetSaveToModule(bool b) void SvxSearchDialog::ApplyTransliterationFlags_Impl( sal_Int32 nSettings ) { nTransliterationFlags = nSettings; - sal_Bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); + bool bVal = 0 != (nSettings & TransliterationModules_IGNORE_CASE); m_pMatchCaseCB->Check(!bVal ); bVal = 0 != (nSettings & TransliterationModules_IGNORE_WIDTH); m_pJapMatchFullHalfWidthCB->Check( !bVal ); @@ -849,7 +849,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) if ( pViewShell ) { - sal_Bool bText = !bSearchPattern; + bool bText = !bSearchPattern; if ( pViewShell->HasSelection( bText ) ) EnableControl_Impl(m_pSelectionBtn); @@ -984,9 +984,9 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern ) if ( m_pLayoutBtn->IsChecked() ) { - pImpl->bSaveToModule = sal_False; + pImpl->bSaveToModule = false; TemplateHdl_Impl(m_pLayoutBtn); - pImpl->bSaveToModule = sal_True; + pImpl->bSaveToModule = true; } } @@ -1026,10 +1026,10 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, { pSearchList->Put( *pSSet ); - m_pSearchAttrText->SetText( BuildAttrText_Impl( aDesc, sal_True ) ); + m_pSearchAttrText->SetText( BuildAttrText_Impl( aDesc, true ) ); if ( !aDesc.isEmpty() ) - bFormat |= sal_True; + bFormat |= true; } } @@ -1042,10 +1042,10 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, { pReplaceList->Put( *pRSet ); - m_pReplaceAttrText->SetText( BuildAttrText_Impl( aDesc, sal_False ) ); + m_pReplaceAttrText->SetText( BuildAttrText_Impl( aDesc, false ) ); if ( !aDesc.isEmpty() ) - bFormat |= sal_True; + bFormat |= true; } } } @@ -1061,7 +1061,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) if (pCtrl == m_pSimilarityBox) { - sal_Bool bIsChecked = m_pSimilarityBox->IsChecked(); + bool bIsChecked = m_pSimilarityBox->IsChecked(); if ( bIsChecked ) { @@ -1159,7 +1159,7 @@ IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Control *, pCtrl ) if (m_pJapOptionsCB == pCtrl) { - sal_Bool bEnableJapOpt = m_pJapOptionsCB->IsChecked(); + bool bEnableJapOpt = m_pJapOptionsCB->IsChecked(); m_pMatchCaseCB->Enable(!bEnableJapOpt ); m_pJapMatchFullHalfWidthCB->Enable(!bEnableJapOpt ); m_pJapOptionsBtn->Enable( bEnableJapOpt ); @@ -1192,13 +1192,13 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) pSearchItem->SetReplaceString( m_pReplaceLB->GetText() ); if ( pBtn == m_pReplaceBtn ) - Remember_Impl( m_pReplaceLB->GetText(), sal_False ); + Remember_Impl( m_pReplaceLB->GetText(), false ); else { - Remember_Impl( m_pSearchLB->GetText(), sal_True ); + Remember_Impl( m_pSearchLB->GetText(), true ); if ( pBtn == m_pReplaceAllBtn ) - Remember_Impl( m_pReplaceLB->GetText(), sal_False ); + Remember_Impl( m_pReplaceLB->GetText(), false ); } } @@ -1261,11 +1261,11 @@ IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn ) OUString aStr( m_pSearchLB->GetText() ); if ( !aStr.isEmpty() ) - Remember_Impl( aStr, sal_True ); + Remember_Impl( aStr, true ); aStr = m_pReplaceLB->GetText(); if ( !aStr.isEmpty() ) - Remember_Impl( aStr, sal_False ); + Remember_Impl( aStr, false ); } SaveToModule_Impl(); Close(); @@ -1449,8 +1449,8 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl) m_pSearchTmplLB->Hide(); m_pReplaceTmplLB->Hide(); - m_pSearchAttrText->SetText( BuildAttrText_Impl( sDesc, sal_True ) ); - m_pReplaceAttrText->SetText( BuildAttrText_Impl( sDesc, sal_False ) ); + m_pSearchAttrText->SetText( BuildAttrText_Impl( sDesc, true ) ); + m_pReplaceAttrText->SetText( BuildAttrText_Impl( sDesc, false ) ); EnableControl_Impl(m_pFormatBtn); EnableControl_Impl(m_pAttributeBtn); @@ -1459,15 +1459,15 @@ IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl) FocusHdl_Impl( bSearch ? m_pSearchLB : m_pReplaceLB ); } bSet = true; - pImpl->bSaveToModule = sal_False; + pImpl->bSaveToModule = false; FlagHdl_Impl(m_pLayoutBtn); - pImpl->bSaveToModule = sal_True; + pImpl->bSaveToModule = true; return 0; } -void SvxSearchDialog::Remember_Impl( const OUString &rStr, sal_Bool _bSearch ) +void SvxSearchDialog::Remember_Impl( const OUString &rStr, bool _bSearch ) { if ( rStr.isEmpty() ) return; @@ -1555,7 +1555,7 @@ void SvxSearchDialog::EnableControls_Impl( const sal_uInt16 nFlags ) Show(); bool bNoSearch = true; - sal_Bool bEnableSearch = ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0; + bool bEnableSearch = ( SEARCH_OPTIONS_SEARCH & nOptions ) != 0; m_pSearchBtn->Enable(bEnableSearch); if( bEnableSearch ) @@ -1762,9 +1762,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) if ( pCtrl == m_pSearchLB ) { if ( pCtrl->HasChildPathFocus() ) - pImpl->bFocusOnSearch = sal_True; + pImpl->bFocusOnSearch = true; pCtrl = m_pSearchLB; - bSearch = sal_True; + bSearch = true; if( nTxtLen ) EnableControl_Impl(m_pNoFormatBtn); @@ -1774,9 +1774,9 @@ IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control *, pCtrl ) } else { - pImpl->bFocusOnSearch = sal_False; + pImpl->bFocusOnSearch = false; pCtrl = m_pReplaceLB; - bSearch = sal_False; + bSearch = false; if (!m_pReplaceAttrText->GetText().isEmpty()) EnableControl_Impl(m_pNoFormatBtn); @@ -1939,7 +1939,7 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) m_pLayoutBtn->SetText( aStylesStr ); } - bFormat = sal_False; + bFormat = false; m_pLayoutBtn->Check( false ); if ( bSearch ) @@ -1952,9 +1952,9 @@ IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl) m_pReplaceAttrText->SetText( "" ); pReplaceList->Clear(); } - pImpl->bSaveToModule = sal_False; + pImpl->bSaveToModule = false; TemplateHdl_Impl(m_pLayoutBtn); - pImpl->bSaveToModule = sal_True; + pImpl->bSaveToModule = true; m_pNoFormatBtn->Disable(); return 0; } @@ -2002,7 +2002,7 @@ IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer ) OUString& SvxSearchDialog::BuildAttrText_Impl( OUString& rStr, - sal_Bool bSrchFlag ) const + bool bSrchFlag ) const { if ( !rStr.isEmpty() ) rStr = ""; @@ -2078,7 +2078,7 @@ void SvxSearchDialog::PaintAttrText_Impl() BuildAttrText_Impl( aDesc, bSearch ); if ( !bFormat && !aDesc.isEmpty() ) - bFormat = sal_True; + bFormat = true; if ( bSearch ) { @@ -2146,7 +2146,7 @@ void SvxSearchDialog::SaveToModule_Impl() { pSearchItem->SetSearchString ( m_pSearchLB->GetText() ); pSearchItem->SetReplaceString( m_pReplaceLB->GetText() ); - Remember_Impl( m_pSearchLB->GetText(), sal_True ); + Remember_Impl( m_pSearchLB->GetText(), true ); } pSearchItem->SetRegExp( false ); @@ -2241,7 +2241,7 @@ SvxSearchDialog *SvxSearchDialogWrapper::getDialog () SfxChildWinInfo SvxSearchDialogWrapper::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); - aInfo.bVisible = sal_False; + aInfo.bVisible = false; return aInfo; } diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index cd5326b1aff2..570d5f4c75e6 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -1387,7 +1387,7 @@ SfxItemPresentation SdrTextAniAmountItem::GetPresentation( } TYPEINIT1_AUTOFACTORY( SdrTextFixedCellHeightItem, SfxBoolItem ); -SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( sal_Bool bUseFixedCellHeight ) +SdrTextFixedCellHeightItem::SdrTextFixedCellHeightItem( bool bUseFixedCellHeight ) : SfxBoolItem( SDRATTR_TEXT_USEFIXEDCELLHEIGHT, bUseFixedCellHeight ) { } diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index c6e53420dea7..0a3bb17adc4a 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -1543,7 +1543,7 @@ void SdrEditView::ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, { if(pReplacement->ISA(SdrObjGroup)) { - pCandidate->SetMergedItem(SdrShadowItem(sal_True)); + pCandidate->SetMergedItem(SdrShadowItem(true)); } } diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 2562697f6c42..db996ba1ef13 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -279,7 +279,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS aTempSet.Put( SvxWritingModeItem( com::sun::star::text::WritingMode_LR_TB, SDRATTR_TEXTDIRECTION ) ); // no shadow - aTempSet.Put(SdrShadowItem(sal_False)); + aTempSet.Put(SdrShadowItem(false)); aTempSet.Put(SdrShadowXDistItem(0L)); aTempSet.Put(SdrShadowYDistItem(0L)); @@ -2886,7 +2886,7 @@ SdrObject* SdrObjCustomShape::DoConvertToPolyObj(sal_Bool bBezier, bool bAddText const sal_Bool bShadow(((SdrShadowItem&)GetMergedItem(SDRATTR_SHADOW)).GetValue()); if(bShadow) { - pRetval->SetMergedItem(SdrShadowItem(sal_True)); + pRetval->SetMergedItem(SdrShadowItem(true)); } } diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index ec701aa5bd69..61779a33237a 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -553,7 +553,7 @@ bool SdrTextObj::NbcSetMinTextFrameHeight(long nHgt) if(IsVerticalWriting() && bDisableAutoWidthOnDragging) { bDisableAutoWidthOnDragging = sal_False; - SetObjectItem(SdrTextAutoGrowHeightItem(sal_False)); + SetObjectItem(SdrTextAutoGrowHeightItem(false)); } return true; @@ -572,7 +572,7 @@ bool SdrTextObj::NbcSetMinTextFrameWidth(long nWdt) if(!IsVerticalWriting() && bDisableAutoWidthOnDragging) { bDisableAutoWidthOnDragging = sal_False; - SetObjectItem(SdrTextAutoGrowWidthItem(sal_False)); + SetObjectItem(SdrTextAutoGrowWidthItem(false)); } return true; @@ -615,7 +615,7 @@ void SdrTextObj::ImpSetContourPolygon( SdrOutliner& rOutliner, Rectangle& rAncho { // force shadow off SdrObject* pCopy = Clone(); - pCopy->SetMergedItem(SdrShadowItem(sal_False)); + pCopy->SetMergedItem(SdrShadowItem(false)); *pContourPolyPolygon = pCopy->TakeContour(); SdrObject::Free( pCopy ); } |