diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-04 08:28:38 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-11 08:18:14 +0200 |
commit | 5e36e2cb7b9a8e52f198525949da257acd87d8c6 (patch) | |
tree | a593fa2d0e02f5304aa401b4f9cfe166ed338654 /svx | |
parent | d442a6460f5f1c897358a0e51727c90cd6746ae2 (diff) |
svx: sal_Bool->bool
Change-Id: Ifd9279e7ccc671395caa1e6f3723e86062d2fb08
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/accessibility/charmapacc.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/_contdlg.cxx | 4 | ||||
-rw-r--r-- | svx/source/dialog/charmap.cxx | 32 | ||||
-rw-r--r-- | svx/source/dialog/checklbx.cxx | 8 | ||||
-rw-r--r-- | svx/source/dialog/ctredlin.cxx | 102 | ||||
-rw-r--r-- | svx/source/engine3d/cube3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/mnuctrls/clipboardctl.cxx | 4 |
7 files changed, 77 insertions, 77 deletions
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index edccdedde759..9c878065b704 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -329,7 +329,7 @@ void SvxShowCharSetAcc::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bS if ( m_pParent ) { if ( bSelect ) - m_pParent->getCharSetControl()->SelectIndex(nAccessibleChildIndex,sal_True); + m_pParent->getCharSetControl()->SelectIndex(nAccessibleChildIndex, true); else m_pParent->getCharSetControl()->DeSelect(); } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 5565606745e3..8a1fb17830bd 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -185,7 +185,7 @@ const Graphic& SvxContourDlg::GetGraphic() const return pSuperClass->GetGraphic(); } -sal_Bool SvxContourDlg::IsGraphicChanged() const +bool SvxContourDlg::IsGraphicChanged() const { return pSuperClass->IsGraphicChanged(); } @@ -200,7 +200,7 @@ const void* SvxContourDlg::GetEditingObject() const return pSuperClass->GetEditingObject(); } -void SvxContourDlg::Update( const Graphic& rGraphic, sal_Bool bGraphicLinked, +void SvxContourDlg::Update( const Graphic& rGraphic, bool bGraphicLinked, const PolyPolygon* pPolyPoly, void* pEditingObj ) { pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index b959d40d5e58..57fbd08efea9 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -61,7 +61,7 @@ SvxShowCharSet::SvxShowCharSet(Window* pParent, const ResId& rResId) , aVscrollSB(this, WB_VERT) { init(); - InitSettings( sal_True, sal_True ); + InitSettings( true, true ); } SvxShowCharSet::SvxShowCharSet(Window* pParent) @@ -70,7 +70,7 @@ SvxShowCharSet::SvxShowCharSet(Window* pParent) , aVscrollSB( this, WB_VERT) { init(); - InitSettings( sal_True, sal_True ); + InitSettings( true, true ); } void SvxShowCharSet::init() @@ -84,7 +84,7 @@ void SvxShowCharSet::init() aVscrollSB.EnableDrag( true ); // other settings like aVscroll depend on selected font => see SetFont - bDrag = sal_False; + bDrag = false; } void SvxShowCharSet::Resize() @@ -103,7 +103,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowCharSet(Window *pPar void SvxShowCharSet::GetFocus() { Control::GetFocus(); - SelectIndex( nSelectedIndex, sal_True ); + SelectIndex( nSelectedIndex, true ); } @@ -111,7 +111,7 @@ void SvxShowCharSet::GetFocus() void SvxShowCharSet::LoseFocus() { Control::LoseFocus(); - SelectIndex( nSelectedIndex, sal_False ); + SelectIndex( nSelectedIndex, false ); } @@ -119,9 +119,9 @@ void SvxShowCharSet::LoseFocus() void SvxShowCharSet::StateChanged( StateChangedType nType ) { if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) - InitSettings( sal_True, sal_False ); + InitSettings( true, false ); else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) - InitSettings( sal_False, sal_True ); + InitSettings( false, true ); Control::StateChanged( nType ); } @@ -132,7 +132,7 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt ) { if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) - InitSettings( sal_True, sal_True ); + InitSettings( true, true ); else Control::DataChanged( rDCEvt ); } @@ -146,12 +146,12 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt ) if ( rMEvt.GetClicks() == 1 ) { GrabFocus(); - bDrag = sal_True; + bDrag = true; CaptureMouse(); int nIndex = PixelToMapIndex( rMEvt.GetPosPixel() ); // Fire the focus event - SelectIndex( nIndex , sal_True); + SelectIndex( nIndex, true); } if ( !(rMEvt.GetClicks() % 2) ) @@ -169,7 +169,7 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt ) if ( Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel())) aSelectHdl.Call( this ); ReleaseMouse(); - bDrag = sal_False; + bDrag = false; } } @@ -193,7 +193,7 @@ void SvxShowCharSet::MouseMove( const MouseEvent& rMEvt ) int nIndex = PixelToMapIndex( aPos ); // Fire the focus event. - SelectIndex( nIndex , sal_True ); + SelectIndex( nIndex, true ); } } @@ -322,7 +322,7 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt ) if ( tmpSelected >= 0 ) { - SelectIndex( tmpSelected, sal_True ); + SelectIndex( tmpSelected, true ); aPreSelectHdl.Call( this ); } } @@ -482,7 +482,7 @@ void SvxShowCharSet::DrawChars_Impl( int n1, int n2 ) -void SvxShowCharSet::InitSettings( sal_Bool bForeground, sal_Bool bBackground ) +void SvxShowCharSet::InitSettings( bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -562,7 +562,7 @@ void SvxShowCharSet::SetFont( const Font& rFont ) -void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool bFocus ) +void SvxShowCharSet::SelectIndex( int nNewIndex, bool bFocus ) { if( nNewIndex < 0 ) { @@ -656,7 +656,7 @@ void SvxShowCharSet::SelectIndex( int nNewIndex, sal_Bool bFocus ) -void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, sal_Bool bFocus ) +void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew, bool bFocus ) { // get next available char of current font sal_UCS4 cNext = maFontCharMap.GetNextChar( (cNew > 0) ? cNew - 1 : cNew ); diff --git a/svx/source/dialog/checklbx.cxx b/svx/source/dialog/checklbx.cxx index 005e1b136d53..c10def8df75a 100644 --- a/svx/source/dialog/checklbx.cxx +++ b/svx/source/dialog/checklbx.cxx @@ -103,7 +103,7 @@ void SvxCheckListBox::RemoveEntry( sal_uLong nPos ) -void SvxCheckListBox::SelectEntryPos( sal_uLong nPos, sal_Bool bSelect ) +void SvxCheckListBox::SelectEntryPos( sal_uLong nPos, bool bSelect ) { if ( nPos < GetEntryCount() ) Select( GetEntry( nPos ), bSelect ); @@ -148,7 +148,7 @@ sal_uLong SvxCheckListBox::GetCheckedEntryCount() const -void SvxCheckListBox::CheckEntryPos( sal_uLong nPos, sal_Bool bCheck ) +void SvxCheckListBox::CheckEntryPos( sal_uLong nPos, bool bCheck ) { if ( nPos < GetEntryCount() ) SetCheckButtonState( @@ -158,12 +158,12 @@ void SvxCheckListBox::CheckEntryPos( sal_uLong nPos, sal_Bool bCheck ) -sal_Bool SvxCheckListBox::IsChecked( sal_uLong nPos ) const +bool SvxCheckListBox::IsChecked( sal_uLong nPos ) const { if ( nPos < GetEntryCount() ) return (GetCheckButtonState( GetEntry( nPos ) ) == SV_BUTTON_CHECKED); else - return sal_False; + return false; } diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 25f6a20f4f1a..ca7122118861 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -51,7 +51,7 @@ RedlinData::RedlinData() : aDateTime( DateTime::EMPTY ) { - bDisabled=sal_False; + bDisabled=false; pData=NULL; } RedlinData::~RedlinData() @@ -124,11 +124,11 @@ void SvLBoxColorString::Paint( SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits) : SvSimpleTable(rParent,nBits) - , bIsCalc(sal_False) + , bIsCalc(false) , nDatePos(WRITER_DATE) - , bAuthor(sal_False) - , bDate(sal_False) - , bComment(sal_False) + , bAuthor(false) + , bDate(false) + , bComment(false) , nDaTiMode(0) , aDaTiFirst( DateTime::EMPTY ) , aDaTiLast( DateTime::EMPTY ) @@ -185,7 +185,7 @@ sal_Int32 SvxRedlinTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRi return nCompare; } -void SvxRedlinTable::SetCalcView(sal_Bool bFlag) +void SvxRedlinTable::SetCalcView(bool bFlag) { bIsCalc=bFlag; if(bFlag) @@ -243,7 +243,7 @@ void SvxRedlinTable::UpdateFilterTest() } -void SvxRedlinTable::SetFilterDate(sal_Bool bFlag) +void SvxRedlinTable::SetFilterDate(bool bFlag) { bDate=bFlag; } @@ -273,7 +273,7 @@ void SvxRedlinTable::SetLastTime(const Time& aTime) aDaTiLast.SetTime(aTime.GetTime()); } -void SvxRedlinTable::SetFilterAuthor(sal_Bool bFlag) +void SvxRedlinTable::SetFilterAuthor(bool bFlag) { bAuthor=bFlag; } @@ -283,7 +283,7 @@ void SvxRedlinTable::SetAuthor(const OUString &aString) aAuthor=aString; } -void SvxRedlinTable::SetFilterComment(sal_Bool bFlag) +void SvxRedlinTable::SetFilterComment(bool bFlag) { bComment=bFlag; } @@ -475,36 +475,36 @@ void SvxTPView::InsertCalcHeader() m_pViewData->InsertHeaderEntry(aString); } -void SvxTPView::EnableAccept(sal_Bool nFlag) +void SvxTPView::EnableAccept(bool nFlag) { bEnableAccept = nFlag; m_pAccept->Enable(nFlag); } -void SvxTPView::EnableAcceptAll(sal_Bool nFlag) +void SvxTPView::EnableAcceptAll(bool nFlag) { bEnableAcceptAll = nFlag; m_pAcceptAll->Enable(nFlag); } -void SvxTPView::EnableReject(sal_Bool nFlag) +void SvxTPView::EnableReject(bool nFlag) { bEnableReject = nFlag; m_pReject->Enable(nFlag); } -void SvxTPView::EnableRejectAll(sal_Bool nFlag) +void SvxTPView::EnableRejectAll(bool nFlag) { bEnableRejectAll = nFlag; m_pRejectAll->Enable(nFlag); } -void SvxTPView::ShowUndo(sal_Bool nFlag) +void SvxTPView::ShowUndo(bool nFlag) { m_pUndo->Show(nFlag); } -void SvxTPView::EnableUndo(sal_Bool nFlag) +void SvxTPView::EnableUndo(bool nFlag) { bEnableUndo = nFlag; m_pUndo->Enable(nFlag); @@ -617,7 +617,7 @@ SvxTPFilter::SvxTPFilter( Window * pParent) m_pTfDate2->SetTime(aTime); HideRange(); ShowAction(); - bModified=sal_False; + bModified=false; } void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable) @@ -630,37 +630,37 @@ void SvxTPFilter::ShowDateFields(sal_uInt16 nKind) switch(nKind) { case FLT_DATE_BEFORE: - EnableDateLine1(sal_True); - EnableDateLine2(sal_False); + EnableDateLine1(true); + EnableDateLine2(false); break; case FLT_DATE_SINCE: - EnableDateLine1(sal_True); - EnableDateLine2(sal_False); + EnableDateLine1(true); + EnableDateLine2(false); break; case FLT_DATE_EQUAL: - EnableDateLine1(sal_True); + EnableDateLine1(true); m_pTfDate->Disable(); m_pTfDate->SetText(OUString()); - EnableDateLine2(sal_False); + EnableDateLine2(false); break; case FLT_DATE_NOTEQUAL: - EnableDateLine1(sal_True); + EnableDateLine1(true); m_pTfDate->Disable(); m_pTfDate->SetText(OUString()); - EnableDateLine2(sal_False); + EnableDateLine2(false); break; case FLT_DATE_BETWEEN: - EnableDateLine1(sal_True); - EnableDateLine2(sal_True); + EnableDateLine1(true); + EnableDateLine2(true); break; case FLT_DATE_SAVE: - EnableDateLine1(sal_False); - EnableDateLine2(sal_False); + EnableDateLine1(false); + EnableDateLine2(false); break; } } -void SvxTPFilter::EnableDateLine1(sal_Bool bFlag) +void SvxTPFilter::EnableDateLine1(bool bFlag) { if(bFlag && m_pCbDate->IsChecked()) { @@ -675,7 +675,7 @@ void SvxTPFilter::EnableDateLine1(sal_Bool bFlag) m_pIbClock->Disable(); } } -void SvxTPFilter::EnableDateLine2(sal_Bool bFlag) +void SvxTPFilter::EnableDateLine2(bool bFlag) { if(bFlag && m_pCbDate->IsChecked()) { @@ -787,7 +787,7 @@ void SvxTPFilter::SetFocusToRange() m_pEdRange->GrabFocus(); } -void SvxTPFilter::HideRange(sal_Bool bHide) +void SvxTPFilter::HideRange(bool bHide) { if (bHide) { @@ -814,67 +814,67 @@ OUString SvxTPFilter::GetComment()const return m_pEdComment->GetText(); } -sal_Bool SvxTPFilter::IsDate() +bool SvxTPFilter::IsDate() { return m_pCbDate->IsChecked(); } -sal_Bool SvxTPFilter::IsAuthor() +bool SvxTPFilter::IsAuthor() { return m_pCbAuthor->IsChecked(); } -sal_Bool SvxTPFilter::IsRange() +bool SvxTPFilter::IsRange() { return m_pCbRange->IsChecked(); } -sal_Bool SvxTPFilter::IsAction() +bool SvxTPFilter::IsAction() { return m_pCbAction->IsChecked(); } -sal_Bool SvxTPFilter::IsComment() +bool SvxTPFilter::IsComment() { return m_pCbComment->IsChecked(); } -void SvxTPFilter::CheckDate(sal_Bool bFlag) +void SvxTPFilter::CheckDate(bool bFlag) { m_pCbDate->Check(bFlag); RowEnableHdl(m_pCbDate); - bModified=sal_False; + bModified=false; } -void SvxTPFilter::CheckAuthor(sal_Bool bFlag) +void SvxTPFilter::CheckAuthor(bool bFlag) { m_pCbAuthor->Check(bFlag); RowEnableHdl(m_pCbAuthor); - bModified=sal_False; + bModified=false; } -void SvxTPFilter::CheckRange(sal_Bool bFlag) +void SvxTPFilter::CheckRange(bool bFlag) { m_pCbRange->Check(bFlag); RowEnableHdl(m_pCbRange); - bModified=sal_False; + bModified=false; } -void SvxTPFilter::CheckAction(sal_Bool bFlag) +void SvxTPFilter::CheckAction(bool bFlag) { m_pCbAction->Check(bFlag); RowEnableHdl(m_pCbAction); - bModified=sal_False; + bModified=false; } -void SvxTPFilter::CheckComment(sal_Bool bFlag) +void SvxTPFilter::CheckComment(bool bFlag) { m_pCbComment->Check(bFlag); RowEnableHdl(m_pCbComment); - bModified=sal_False; + bModified=false; } -void SvxTPFilter::ShowAction(sal_Bool bShow) +void SvxTPFilter::ShowAction(bool bShow) { if(!bShow) { @@ -907,8 +907,8 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB ) { m_pLbDate->Enable(m_pCbDate->IsChecked()); m_pLbDate->Invalidate(); - EnableDateLine1(sal_False); - EnableDateLine2(sal_False); + EnableDateLine1(false); + EnableDateLine2(false); if(m_pCbDate->IsChecked()) SelDateHdl(m_pLbDate); } else if (pCB == m_pCbAuthor) @@ -980,7 +980,7 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr) aModifyComLink.Call(this); } - bModified=sal_True; + bModified=true; aModifyLink.Call(this); } return 0; @@ -1013,7 +1013,7 @@ void SvxTPFilter::DeactivatePage() aReadyLink.Call(this); } - bModified=sal_False; + bModified=false; TabPage::DeactivatePage(); } diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index b14c46deb82d..25ab29476f2b 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -99,7 +99,7 @@ void E3dCubeObj::SetCubeSize(const basegfx::B3DVector& rNew) } } -void E3dCubeObj::SetPosIsCenter(sal_Bool bNew) +void E3dCubeObj::SetPosIsCenter(bool bNew) { if(bPosIsCenter != bNew) { diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index df4b83ac1c44..94f197f5e6bd 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -44,8 +44,8 @@ SvxClipBoardControl::SvxClipBoardControl( SfxToolBoxControl( nSlotId, nId, rTbx ), pClipboardFmtItem( 0 ), - pPopup (0), - bDisabled( sal_False ) + pPopup( 0 ), + bDisabled( false ) { addStatusListener( OUString( ".uno:ClipboardFormatItems" )); ToolBox& rBox = GetToolBox(); |