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 | |
parent | d442a6460f5f1c897358a0e51727c90cd6746ae2 (diff) |
svx: sal_Bool->bool
Change-Id: Ifd9279e7ccc671395caa1e6f3723e86062d2fb08
-rw-r--r-- | cui/source/options/optlingu.cxx | 2 | ||||
-rw-r--r-- | include/svx/charmap.hxx | 16 | ||||
-rw-r--r-- | include/svx/checklbx.hxx | 6 | ||||
-rw-r--r-- | include/svx/clipboardctl.hxx | 2 | ||||
-rw-r--r-- | include/svx/contdlg.hxx | 4 | ||||
-rw-r--r-- | include/svx/ctredlin.hxx | 84 | ||||
-rw-r--r-- | include/svx/cube3d.hxx | 8 | ||||
-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 | ||||
-rw-r--r-- | sw/source/core/uibase/misc/redlndlg.cxx | 6 | ||||
-rw-r--r-- | sw/source/ui/config/optcomp.cxx | 2 | ||||
-rw-r--r-- | sw/source/ui/misc/swmodalredlineacceptdlg.cxx | 8 |
17 files changed, 146 insertions, 146 deletions
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 53f8dba2002f..590cf022930c 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -2081,7 +2081,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) OUString* pChange = aChange.getArray(); pChange[nStart] = pData->GetImplName(); bChanged |= pData->GetIndex() != nLocalIndex || - pData->IsChecked() != m_pModulesCLB->IsChecked(i); + pData->IsChecked() != (m_pModulesCLB->IsChecked(i) ? 1 : 0); if(m_pModulesCLB->IsChecked(i)) nStart++; ++nLocalIndex; diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 61b66a077cbe..c55684e979b0 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -49,7 +49,7 @@ public: void SetFont( const Font& rFont ); - void SelectCharacter( sal_uInt32 cNew, sal_Bool bFocus = sal_False ); + void SelectCharacter( sal_uInt32 cNew, bool bFocus = false ); sal_UCS4 GetSelectCharacter() const; Link GetDoubleClickHdl() const { return aDoubleClkHdl; } @@ -66,12 +66,12 @@ public: int FirstInView( void) const; int LastInView( void) const; int PixelToMapIndex( const Point&) const; - void SelectIndex( int index, sal_Bool bFocus = sal_False ); + void SelectIndex( int index, bool bFocus = false ); void DeSelect(); - inline sal_Bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } - inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } - sal_uInt16 GetRowPos(sal_uInt16 _nPos) const; - sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const; + inline bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } + inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } + sal_uInt16 GetRowPos(sal_uInt16 _nPos) const; + sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const; ScrollBar* getScrollBar(); void ReleaseAccessible(); @@ -109,7 +109,7 @@ private: long nY; long m_nXGap; long m_nYGap; - sal_Bool bDrag; + bool bDrag; sal_Int32 nSelectedIndex; @@ -118,7 +118,7 @@ private: private: void DrawChars_Impl( int n1, int n2); - void InitSettings( sal_Bool bForeground, sal_Bool bBackground); + void InitSettings( bool bForeground, bool bBackground); // abstraction layers are: Unicode<->MapIndex<->Pixel Point MapIndexToPixel( int) const; DECL_LINK(VscrollHdl, void *); diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index 697f139b54ab..386e68383e2a 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -56,13 +56,13 @@ public: SvLBoxButtonKind_enabledCheckbox ); void RemoveEntry ( sal_uLong nPos ); - void SelectEntryPos ( sal_uLong nPos, sal_Bool bSelect = sal_True ); + void SelectEntryPos ( sal_uLong nPos, bool bSelect = true ); sal_uLong GetSelectEntryPos () const; OUString GetText ( sal_uLong nPos ) const; sal_uLong GetCheckedEntryCount() const; - void CheckEntryPos ( sal_uLong nPos, sal_Bool bCheck = sal_True ); - sal_Bool IsChecked ( sal_uLong nPos ) const; + void CheckEntryPos ( sal_uLong nPos, bool bCheck = true ); + bool IsChecked ( sal_uLong nPos ) const; void ToggleCheckButton ( SvTreeListEntry* pEntry ); void* SetEntryData ( sal_uLong nPos, void* pNewData ); diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx index 10a625d99c62..eccf2b90213e 100644 --- a/include/svx/clipboardctl.hxx +++ b/include/svx/clipboardctl.hxx @@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl { SfxPoolItem* pClipboardFmtItem; PopupMenu* pPopup; - sal_Bool bDisabled; + bool bDisabled; void DelPopup(); diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 2dc86e64ec12..d1eef56d2fe7 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -78,13 +78,13 @@ public: ~SvxContourDlg(); const Graphic& GetGraphic() const; - sal_Bool IsGraphicChanged() const; + bool IsGraphicChanged() const; PolyPolygon GetPolyPolygon(); const void* GetEditingObject() const; - void Update( const Graphic& rGraphic, sal_Bool bGraphicLinked, + void Update( const Graphic& rGraphic, bool bGraphicLinked, const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL ); static PolyPolygon CreateAutoContour( const Graphic& rGraphic, diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index f74829bf87c0..95f4124dd89c 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -50,7 +50,7 @@ class SVX_DLLPUBLIC RedlinData public: RedlinData(); virtual ~RedlinData(); - sal_Bool bDisabled; + bool bDisabled; DateTime aDateTime; void* pData; }; @@ -87,12 +87,12 @@ class SVX_DLLPUBLIC SvxRedlinTable : public SvSimpleTable private: - sal_Bool bIsCalc; - sal_uInt16 nDatePos; - sal_Bool bAuthor; - sal_Bool bDate; - sal_Bool bComment; - sal_uInt16 nDaTiMode; + bool bIsCalc; + sal_uInt16 nDatePos; + bool bAuthor; + bool bDate; + bool bComment; + sal_uInt16 nDaTiMode; DateTime aDaTiFirst; DateTime aDaTiLast; DateTime aDaTiFilterFirst; @@ -116,21 +116,21 @@ public: ~SvxRedlinTable(); // For FilterPage only { - void SetFilterDate(sal_Bool bFlag=sal_True); + void SetFilterDate(bool bFlag=true); void SetDateTimeMode(sal_uInt16 nMode); void SetFirstDate(const Date&); void SetLastDate(const Date&); void SetFirstTime(const Time&); void SetLastTime(const Time&); - void SetFilterAuthor(sal_Bool bFlag=sal_True); + void SetFilterAuthor(bool bFlag=true); void SetAuthor(const OUString &); - void SetFilterComment(sal_Bool bFlag=sal_True); + void SetFilterComment(bool bFlag=true); void SetCommentParams( const utl::SearchParam* pSearchPara ); void UpdateFilterTest(); // } For FilterPage only - void SetCalcView(sal_Bool bFlag=sal_True); + void SetCalcView(bool bFlag=true); bool IsValidEntry(const OUString &rAuthor, const DateTime &rDateTime, const OUString &rComment); bool IsValidEntry(const OUString &rAuthor, const DateTime &rDateTime); @@ -185,7 +185,7 @@ private: ListBox* m_pLbAction; CheckBox* m_pCbComment; Edit* m_pEdComment; - sal_Bool bModified; + bool bModified; DECL_LINK( SelDateHdl, ListBox* ); DECL_LINK( RowEnableHdl, CheckBox* ); @@ -198,8 +198,8 @@ private: protected: void ShowDateFields(sal_uInt16 nKind); - void EnableDateLine1(sal_Bool bFlag); - void EnableDateLine2(sal_Bool bFlag); + void EnableDateLine1(bool bFlag); + void EnableDateLine2(bool bFlag); public: SvxTPFilter( Window * pParent); @@ -232,25 +232,25 @@ public: // Methods for Calc { void SetRange(const OUString& rString); OUString GetRange() const; - void HideRange(sal_Bool bHide=sal_True); + void HideRange(bool bHide=true); void SetFocusToRange(); // } Methods for Calc - void DisableRef(sal_Bool bFlag); + void DisableRef(bool bFlag); - sal_Bool IsDate(); - sal_Bool IsAuthor(); - sal_Bool IsRange(); - sal_Bool IsAction(); - sal_Bool IsComment(); + bool IsDate(); + bool IsAuthor(); + bool IsRange(); + bool IsAction(); + bool IsComment(); - void ShowAction(sal_Bool bShow=sal_True); + void ShowAction(bool bShow=true); - void CheckDate(sal_Bool bFlag=sal_True); - void CheckAuthor(sal_Bool bFlag=sal_True); - void CheckRange(sal_Bool bFlag=sal_True); - void CheckAction(sal_Bool bFlag=sal_True); - void CheckComment(sal_Bool bFlag=sal_True); + void CheckDate(bool bFlag=true); + void CheckAuthor(bool bFlag=true); + void CheckRange(bool bFlag=true); + void CheckAction(bool bFlag=true); + void CheckComment(bool bFlag=true); ListBox* GetLbAction(); @@ -321,21 +321,21 @@ public: void InsertCalcHeader(); SvxRedlinTable* GetTableControl(); - void EnableAccept(sal_Bool nFlag=sal_True); - void EnableAcceptAll(sal_Bool nFlag=sal_True); - void EnableReject(sal_Bool nFlag=sal_True); - void EnableRejectAll(sal_Bool nFlag=sal_True); - void EnableUndo(sal_Bool nFlag=sal_True); - - void DisableAccept() {EnableAccept(sal_False);} - void DisableAcceptAll() {EnableAcceptAll(sal_False);} - void DisableReject() {EnableReject(sal_False);} - void DisableRejectAll() {EnableRejectAll(sal_False);} - void DisableUndo() {EnableUndo(sal_False);} - - void ShowUndo(sal_Bool nFlag=sal_True); - void HideUndo() {ShowUndo(sal_False);} - sal_Bool IsUndoVisible(); + void EnableAccept(bool nFlag=true); + void EnableAcceptAll(bool nFlag=true); + void EnableReject(bool nFlag=true); + void EnableRejectAll(bool nFlag=true); + void EnableUndo(bool nFlag=true); + + void DisableAccept() {EnableAccept(false);} + void DisableAcceptAll() {EnableAcceptAll(false);} + void DisableReject() {EnableReject(false);} + void DisableRejectAll() {EnableRejectAll(false);} + void DisableUndo() {EnableUndo(false);} + + void ShowUndo(bool nFlag=true); + void HideUndo() {ShowUndo(false);} + bool IsUndoVisible(); void SetAcceptClickHdl( const Link& rLink ) { AcceptClickLk = rLink; } const Link& GetAcceptClickHdl() const { return AcceptClickLk; } diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx index cb9b2f7e6363..e03866e16d4f 100644 --- a/include/svx/cube3d.hxx +++ b/include/svx/cube3d.hxx @@ -47,10 +47,10 @@ private: // Parameter basegfx::B3DPoint aCubePos; basegfx::B3DVector aCubeSize; - sal_uInt16 nSideFlags; + sal_uInt16 nSideFlags; // BOOLeans - unsigned bPosIsCenter : 1; + bool bPosIsCenter : 1; protected: void SetDefaultAttributes(E3dDefaultAttributes& rDefault); @@ -73,8 +73,8 @@ public: void SetCubeSize(const basegfx::B3DVector& rNew); const basegfx::B3DVector& GetCubeSize() { return aCubeSize; } - void SetPosIsCenter(sal_Bool bNew); - sal_Bool GetPosIsCenter() { return (sal_Bool)bPosIsCenter; } + void SetPosIsCenter(bool bNew); + bool GetPosIsCenter() { return bPosIsCenter; } sal_uInt16 GetSideFlags() { return nSideFlags; } 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(); diff --git a/sw/source/core/uibase/misc/redlndlg.cxx b/sw/source/core/uibase/misc/redlndlg.cxx index f6ceee69026d..a46e9dce2e95 100644 --- a/sw/source/core/uibase/misc/redlndlg.cxx +++ b/sw/source/core/uibase/misc/redlndlg.cxx @@ -180,7 +180,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt) : { pActLB->InsertEntry(sFmtCollSet); pActLB->InsertEntry(sAutoFormat); - pTPView->ShowUndo(sal_True); + pTPView->ShowUndo(true); pTPView->DisableUndo(); // no UNDO events yet } @@ -583,7 +583,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa { RedlinData *pData = new RedlinData; pData->pData = pRedlineChild; - pData->bDisabled = sal_True; + pData->bDisabled = true; sChild = GetRedlineText(rRedln, pData->aDateTime, nStack); SvTreeListEntry* pChild = pTable->InsertEntry(sChild, pData, pParent->pTLBParent); @@ -729,7 +729,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd) pData = new RedlinData; pData->pData = pRedlineParent; - pData->bDisabled = sal_False; + pData->bDisabled = false; sParent = GetRedlineText(rRedln, pData->aDateTime); pParent = pTable->InsertEntry(sParent, pData, 0, i); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index fc66dd61ed2d..f0cd71a01815 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -325,7 +325,7 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl) sal_uInt16 nCount = static_cast< sal_uInt16 >( m_pOptionsLB->GetEntryCount() ); for ( sal_uInt16 i = 0; i < nCount; ++i ) { - bool bChecked = ( m_pOptionsLB->IsChecked(i) != sal_False ); + bool bChecked = m_pOptionsLB->IsChecked(i); CompatibilityOptions eOption = static_cast< CompatibilityOptions >(i); switch ( eOption ) { diff --git a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx index 45ac31c15c75..81d3c18c6623 100644 --- a/sw/source/ui/misc/swmodalredlineacceptdlg.cxx +++ b/sw/source/ui/misc/swmodalredlineacceptdlg.cxx @@ -71,10 +71,10 @@ void SwModalRedlineAcceptDlg::AcceptAll( sal_Bool bAccept ) if (pFilterTP->IsDate() || pFilterTP->IsAuthor() || pFilterTP->IsRange() || pFilterTP->IsAction()) { - pFilterTP->CheckDate(sal_False); // turn off all filters - pFilterTP->CheckAuthor(sal_False); - pFilterTP->CheckRange(sal_False); - pFilterTP->CheckAction(sal_False); + pFilterTP->CheckDate(false); // turn off all filters + pFilterTP->CheckAuthor(false); + pFilterTP->CheckRange(false); + pFilterTP->CheckAction(false); pImplDlg->FilterChangedHdl(); } |