mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

svx: sal_Bool->bool

Browse Source 
Change-Id: Ifd9279e7ccc671395caa1e6f3723e86062d2fb08
This commit is contained in:
Noel Grandin
2014-03-04 08:28:38 +02:00
parent d442a6460f
commit 5e36e2cb7b
17 changed files with 144 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cui/source/options/optlingu.cxx
View File

@@ -2081,7 +2081,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
OUString* pChange = aChange.getArray(); OUString* pChange = aChange.getArray();
pChange[nStart] = pData->GetImplName(); pChange[nStart] = pData->GetImplName();
bChanged |= pData->GetIndex() != nLocalIndex || bChanged |= pData->GetIndex() != nLocalIndex ||
pData->IsChecked() != m_pModulesCLB->IsChecked(i); pData->IsChecked() != (m_pModulesCLB->IsChecked(i) ? 1 : 0);
if(m_pModulesCLB->IsChecked(i)) if(m_pModulesCLB->IsChecked(i))
nStart++; nStart++;
++nLocalIndex; ++nLocalIndex;

10
include/svx/charmap.hxx
View File

@@ -49,7 +49,7 @@ public:
void SetFont( const Font& rFont ); 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; sal_UCS4 GetSelectCharacter() const;
Link GetDoubleClickHdl() const { return aDoubleClkHdl; } Link GetDoubleClickHdl() const { return aDoubleClkHdl; }
@@ -66,9 +66,9 @@ public:
int FirstInView( void) const; int FirstInView( void) const;
int LastInView( void) const; int LastInView( void) const;
int PixelToMapIndex( const Point&) const; int PixelToMapIndex( const Point&) const;
void SelectIndex( int index, sal_Bool bFocus = sal_False ); void SelectIndex( int index, bool bFocus = false );
void DeSelect(); void DeSelect();
inline sal_Bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; } inline bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; }
inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); } inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); }
sal_uInt16 GetRowPos(sal_uInt16 _nPos) const; sal_uInt16 GetRowPos(sal_uInt16 _nPos) const;
sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const; sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const;
@@ -109,7 +109,7 @@ private:
long nY; long nY;
long m_nXGap; long m_nXGap;
long m_nYGap; long m_nYGap;
sal_Bool bDrag; bool bDrag;
sal_Int32 nSelectedIndex; sal_Int32 nSelectedIndex;
@@ -118,7 +118,7 @@ private:
private: private:
void DrawChars_Impl( int n1, int n2); 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 // abstraction layers are: Unicode<->MapIndex<->Pixel
Point MapIndexToPixel( int) const; Point MapIndexToPixel( int) const;
DECL_LINK(VscrollHdl, void *); DECL_LINK(VscrollHdl, void *);

6
include/svx/checklbx.hxx
View File

@@ -56,13 +56,13 @@ public:
SvLBoxButtonKind_enabledCheckbox ); SvLBoxButtonKind_enabledCheckbox );
void RemoveEntry ( sal_uLong nPos ); 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; sal_uLong GetSelectEntryPos () const;
OUString GetText ( sal_uLong nPos ) const; OUString GetText ( sal_uLong nPos ) const;
sal_uLong GetCheckedEntryCount() const; sal_uLong GetCheckedEntryCount() const;
void CheckEntryPos ( sal_uLong nPos, sal_Bool bCheck = sal_True ); void CheckEntryPos ( sal_uLong nPos, bool bCheck = true );
sal_Bool IsChecked ( sal_uLong nPos ) const; bool IsChecked ( sal_uLong nPos ) const;
void ToggleCheckButton ( SvTreeListEntry* pEntry ); void ToggleCheckButton ( SvTreeListEntry* pEntry );
void* SetEntryData ( sal_uLong nPos, void* pNewData ); void* SetEntryData ( sal_uLong nPos, void* pNewData );

2
include/svx/clipboardctl.hxx
View File

@@ -35,7 +35,7 @@ class SVX_DLLPUBLIC SvxClipBoardControl : public SfxToolBoxControl
{ {
SfxPoolItem* pClipboardFmtItem; SfxPoolItem* pClipboardFmtItem;
PopupMenu* pPopup; PopupMenu* pPopup;
sal_Bool bDisabled; bool bDisabled;
void DelPopup(); void DelPopup();

4
include/svx/contdlg.hxx
View File

@@ -78,13 +78,13 @@ public:
~SvxContourDlg(); ~SvxContourDlg();
const Graphic& GetGraphic() const; const Graphic& GetGraphic() const;
sal_Bool IsGraphicChanged() const; bool IsGraphicChanged() const;
PolyPolygon GetPolyPolygon(); PolyPolygon GetPolyPolygon();
const void* GetEditingObject() const; 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 ); const PolyPolygon* pPolyPoly = NULL, void* pEditingObj = NULL );
static PolyPolygon CreateAutoContour( const Graphic& rGraphic, static PolyPolygon CreateAutoContour( const Graphic& rGraphic,

76
include/svx/ctredlin.hxx
View File

@@ -50,7 +50,7 @@ class SVX_DLLPUBLIC RedlinData
public: public:
RedlinData(); RedlinData();
virtual ~RedlinData(); virtual ~RedlinData();
sal_Bool bDisabled; bool bDisabled;
DateTime aDateTime; DateTime aDateTime;
void* pData; void* pData;
}; };
@@ -87,11 +87,11 @@ class SVX_DLLPUBLIC SvxRedlinTable : public SvSimpleTable
private: private:
sal_Bool bIsCalc; bool bIsCalc;
sal_uInt16 nDatePos; sal_uInt16 nDatePos;
sal_Bool bAuthor; bool bAuthor;
sal_Bool bDate; bool bDate;
sal_Bool bComment; bool bComment;
sal_uInt16 nDaTiMode; sal_uInt16 nDaTiMode;
DateTime aDaTiFirst; DateTime aDaTiFirst;
DateTime aDaTiLast; DateTime aDaTiLast;
@@ -116,21 +116,21 @@ public:
~SvxRedlinTable(); ~SvxRedlinTable();
// For FilterPage only { // For FilterPage only {
void SetFilterDate(sal_Bool bFlag=sal_True); void SetFilterDate(bool bFlag=true);
void SetDateTimeMode(sal_uInt16 nMode); void SetDateTimeMode(sal_uInt16 nMode);
void SetFirstDate(const Date&); void SetFirstDate(const Date&);
void SetLastDate(const Date&); void SetLastDate(const Date&);
void SetFirstTime(const Time&); void SetFirstTime(const Time&);
void SetLastTime(const Time&); void SetLastTime(const Time&);
void SetFilterAuthor(sal_Bool bFlag=sal_True); void SetFilterAuthor(bool bFlag=true);
void SetAuthor(const OUString &); void SetAuthor(const OUString &);
void SetFilterComment(sal_Bool bFlag=sal_True); void SetFilterComment(bool bFlag=true);
void SetCommentParams( const utl::SearchParam* pSearchPara ); void SetCommentParams( const utl::SearchParam* pSearchPara );
void UpdateFilterTest(); void UpdateFilterTest();
// } For FilterPage only // } 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, const OUString &rComment);
bool IsValidEntry(const OUString &rAuthor, const DateTime &rDateTime); bool IsValidEntry(const OUString &rAuthor, const DateTime &rDateTime);
@@ -185,7 +185,7 @@ private:
ListBox* m_pLbAction; ListBox* m_pLbAction;
CheckBox* m_pCbComment; CheckBox* m_pCbComment;
Edit* m_pEdComment; Edit* m_pEdComment;
sal_Bool bModified; bool bModified;
DECL_LINK( SelDateHdl, ListBox* ); DECL_LINK( SelDateHdl, ListBox* );
DECL_LINK( RowEnableHdl, CheckBox* ); DECL_LINK( RowEnableHdl, CheckBox* );
@@ -198,8 +198,8 @@ private:
protected: protected:
void ShowDateFields(sal_uInt16 nKind); void ShowDateFields(sal_uInt16 nKind);
void EnableDateLine1(sal_Bool bFlag); void EnableDateLine1(bool bFlag);
void EnableDateLine2(sal_Bool bFlag); void EnableDateLine2(bool bFlag);
public: public:
SvxTPFilter( Window * pParent); SvxTPFilter( Window * pParent);
@@ -232,25 +232,25 @@ public:
// Methods for Calc { // Methods for Calc {
void SetRange(const OUString& rString); void SetRange(const OUString& rString);
OUString GetRange() const; OUString GetRange() const;
void HideRange(sal_Bool bHide=sal_True); void HideRange(bool bHide=true);
void SetFocusToRange(); void SetFocusToRange();
// } Methods for Calc // } Methods for Calc
void DisableRef(sal_Bool bFlag); void DisableRef(bool bFlag);
sal_Bool IsDate(); bool IsDate();
sal_Bool IsAuthor(); bool IsAuthor();
sal_Bool IsRange(); bool IsRange();
sal_Bool IsAction(); bool IsAction();
sal_Bool IsComment(); bool IsComment();
void ShowAction(sal_Bool bShow=sal_True); void ShowAction(bool bShow=true);
void CheckDate(sal_Bool bFlag=sal_True); void CheckDate(bool bFlag=true);
void CheckAuthor(sal_Bool bFlag=sal_True); void CheckAuthor(bool bFlag=true);
void CheckRange(sal_Bool bFlag=sal_True); void CheckRange(bool bFlag=true);
void CheckAction(sal_Bool bFlag=sal_True); void CheckAction(bool bFlag=true);
void CheckComment(sal_Bool bFlag=sal_True); void CheckComment(bool bFlag=true);
ListBox* GetLbAction(); ListBox* GetLbAction();
@@ -321,21 +321,21 @@ public:
void InsertCalcHeader(); void InsertCalcHeader();
SvxRedlinTable* GetTableControl(); SvxRedlinTable* GetTableControl();
void EnableAccept(sal_Bool nFlag=sal_True); void EnableAccept(bool nFlag=true);
void EnableAcceptAll(sal_Bool nFlag=sal_True); void EnableAcceptAll(bool nFlag=true);
void EnableReject(sal_Bool nFlag=sal_True); void EnableReject(bool nFlag=true);
void EnableRejectAll(sal_Bool nFlag=sal_True); void EnableRejectAll(bool nFlag=true);
void EnableUndo(sal_Bool nFlag=sal_True); void EnableUndo(bool nFlag=true);
void DisableAccept() {EnableAccept(sal_False);} void DisableAccept() {EnableAccept(false);}
void DisableAcceptAll() {EnableAcceptAll(sal_False);} void DisableAcceptAll() {EnableAcceptAll(false);}
void DisableReject() {EnableReject(sal_False);} void DisableReject() {EnableReject(false);}
void DisableRejectAll() {EnableRejectAll(sal_False);} void DisableRejectAll() {EnableRejectAll(false);}
void DisableUndo() {EnableUndo(sal_False);} void DisableUndo() {EnableUndo(false);}
void ShowUndo(sal_Bool nFlag=sal_True); void ShowUndo(bool nFlag=true);
void HideUndo() {ShowUndo(sal_False);} void HideUndo() {ShowUndo(false);}
sal_Bool IsUndoVisible(); bool IsUndoVisible();
void SetAcceptClickHdl( const Link& rLink ) { AcceptClickLk = rLink; } void SetAcceptClickHdl( const Link& rLink ) { AcceptClickLk = rLink; }
const Link& GetAcceptClickHdl() const { return AcceptClickLk; } const Link& GetAcceptClickHdl() const { return AcceptClickLk; }

6
include/svx/cube3d.hxx
View File

@@ -50,7 +50,7 @@ private:
sal_uInt16 nSideFlags; sal_uInt16 nSideFlags;
// BOOLeans // BOOLeans
unsigned bPosIsCenter : 1; bool bPosIsCenter : 1;
protected: protected:
void SetDefaultAttributes(E3dDefaultAttributes& rDefault); void SetDefaultAttributes(E3dDefaultAttributes& rDefault);
@@ -73,8 +73,8 @@ public:
void SetCubeSize(const basegfx::B3DVector& rNew); void SetCubeSize(const basegfx::B3DVector& rNew);
const basegfx::B3DVector& GetCubeSize() { return aCubeSize; } const basegfx::B3DVector& GetCubeSize() { return aCubeSize; }
void SetPosIsCenter(sal_Bool bNew); void SetPosIsCenter(bool bNew);
sal_Bool GetPosIsCenter() { return (sal_Bool)bPosIsCenter; } bool GetPosIsCenter() { return bPosIsCenter; }
sal_uInt16 GetSideFlags() { return nSideFlags; } sal_uInt16 GetSideFlags() { return nSideFlags; }

2
svx/source/accessibility/charmapacc.cxx
View File

@@ -329,7 +329,7 @@ void SvxShowCharSetAcc::implSelect( sal_Int32 nAccessibleChildIndex, sal_Bool bS
if ( m_pParent ) if ( m_pParent )
{ {
if ( bSelect ) if ( bSelect )
m_pParent->getCharSetControl()->SelectIndex(nAccessibleChildIndex,sal_True); m_pParent->getCharSetControl()->SelectIndex(nAccessibleChildIndex, true);
else else
m_pParent->getCharSetControl()->DeSelect(); m_pParent->getCharSetControl()->DeSelect();
} }

4
svx/source/dialog/_contdlg.cxx
View File

@@ -185,7 +185,7 @@ const Graphic& SvxContourDlg::GetGraphic() const
return pSuperClass->GetGraphic(); return pSuperClass->GetGraphic();
} }
sal_Bool SvxContourDlg::IsGraphicChanged() const bool SvxContourDlg::IsGraphicChanged() const
{ {
return pSuperClass->IsGraphicChanged(); return pSuperClass->IsGraphicChanged();
} }
@@ -200,7 +200,7 @@ const void* SvxContourDlg::GetEditingObject() const
return pSuperClass->GetEditingObject(); 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 ) const PolyPolygon* pPolyPoly, void* pEditingObj )
{ {
pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj ); pSuperClass->UpdateGraphic( rGraphic, bGraphicLinked, pPolyPoly, pEditingObj );

32
svx/source/dialog/charmap.cxx
View File

@@ -61,7 +61,7 @@ SvxShowCharSet::SvxShowCharSet(Window* pParent, const ResId& rResId)
, aVscrollSB(this, WB_VERT) , aVscrollSB(this, WB_VERT)
{ {
init(); init();
InitSettings( sal_True, sal_True ); InitSettings( true, true );
} }
SvxShowCharSet::SvxShowCharSet(Window* pParent) SvxShowCharSet::SvxShowCharSet(Window* pParent)
@@ -70,7 +70,7 @@ SvxShowCharSet::SvxShowCharSet(Window* pParent)
, aVscrollSB( this, WB_VERT) , aVscrollSB( this, WB_VERT)
{ {
init(); init();
InitSettings( sal_True, sal_True ); InitSettings( true, true );
} }
void SvxShowCharSet::init() void SvxShowCharSet::init()
@@ -84,7 +84,7 @@ void SvxShowCharSet::init()
aVscrollSB.EnableDrag( true ); aVscrollSB.EnableDrag( true );
// other settings like aVscroll depend on selected font => see SetFont // other settings like aVscroll depend on selected font => see SetFont
bDrag = sal_False; bDrag = false;
} }
void SvxShowCharSet::Resize() void SvxShowCharSet::Resize()
@@ -103,7 +103,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxShowCharSet(Window *pPar
void SvxShowCharSet::GetFocus() void SvxShowCharSet::GetFocus()
{ {
Control::GetFocus(); Control::GetFocus();
SelectIndex( nSelectedIndex, sal_True ); SelectIndex( nSelectedIndex, true );
} }
@@ -111,7 +111,7 @@ void SvxShowCharSet::GetFocus()
void SvxShowCharSet::LoseFocus() void SvxShowCharSet::LoseFocus()
{ {
Control::LoseFocus(); Control::LoseFocus();
SelectIndex( nSelectedIndex, sal_False ); SelectIndex( nSelectedIndex, false );
} }
@@ -119,9 +119,9 @@ void SvxShowCharSet::LoseFocus()
void SvxShowCharSet::StateChanged( StateChangedType nType ) void SvxShowCharSet::StateChanged( StateChangedType nType )
{ {
if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) if ( nType == STATE_CHANGE_CONTROLFOREGROUND )
InitSettings( sal_True, sal_False ); InitSettings( true, false );
else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) else if ( nType == STATE_CHANGE_CONTROLBACKGROUND )
InitSettings( sal_False, sal_True ); InitSettings( false, true );
Control::StateChanged( nType ); Control::StateChanged( nType );
} }
@@ -132,7 +132,7 @@ void SvxShowCharSet::DataChanged( const DataChangedEvent& rDCEvt )
{ {
if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS ) if ( ( rDCEvt.GetType() == DATACHANGED_SETTINGS )
&& ( rDCEvt.GetFlags() & SETTINGS_STYLE ) ) && ( rDCEvt.GetFlags() & SETTINGS_STYLE ) )
InitSettings( sal_True, sal_True ); InitSettings( true, true );
else else
Control::DataChanged( rDCEvt ); Control::DataChanged( rDCEvt );
} }
@@ -146,12 +146,12 @@ void SvxShowCharSet::MouseButtonDown( const MouseEvent& rMEvt )
if ( rMEvt.GetClicks() == 1 ) if ( rMEvt.GetClicks() == 1 )
{ {
GrabFocus(); GrabFocus();
bDrag = sal_True; bDrag = true;
CaptureMouse(); CaptureMouse();
int nIndex = PixelToMapIndex( rMEvt.GetPosPixel() ); int nIndex = PixelToMapIndex( rMEvt.GetPosPixel() );
// Fire the focus event // Fire the focus event
SelectIndex( nIndex , sal_True); SelectIndex( nIndex, true);
} }
if ( !(rMEvt.GetClicks() % 2) ) if ( !(rMEvt.GetClicks() % 2) )
@@ -169,7 +169,7 @@ void SvxShowCharSet::MouseButtonUp( const MouseEvent& rMEvt )
if ( Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel())) if ( Rectangle(Point(), GetOutputSize()).IsInside(rMEvt.GetPosPixel()))
aSelectHdl.Call( this ); aSelectHdl.Call( this );
ReleaseMouse(); ReleaseMouse();
bDrag = sal_False; bDrag = false;
} }
} }
@@ -193,7 +193,7 @@ void SvxShowCharSet::MouseMove( const MouseEvent& rMEvt )
int nIndex = PixelToMapIndex( aPos ); int nIndex = PixelToMapIndex( aPos );
// Fire the focus event. // Fire the focus event.
SelectIndex( nIndex , sal_True ); SelectIndex( nIndex, true );
} }
} }
@@ -322,7 +322,7 @@ void SvxShowCharSet::KeyInput( const KeyEvent& rKEvt )
if ( tmpSelected >= 0 ) if ( tmpSelected >= 0 )
{ {
SelectIndex( tmpSelected, sal_True ); SelectIndex( tmpSelected, true );
aPreSelectHdl.Call( this ); 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(); 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 ) 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 // get next available char of current font
sal_UCS4 cNext = maFontCharMap.GetNextChar( (cNew > 0) ? cNew - 1 : cNew ); sal_UCS4 cNext = maFontCharMap.GetNextChar( (cNew > 0) ? cNew - 1 : cNew );

8
svx/source/dialog/checklbx.cxx
View File

@@ -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() ) if ( nPos < GetEntryCount() )
Select( GetEntry( nPos ), bSelect ); 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() ) if ( nPos < GetEntryCount() )
SetCheckButtonState( 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() ) if ( nPos < GetEntryCount() )
return (GetCheckButtonState( GetEntry( nPos ) ) == SV_BUTTON_CHECKED); return (GetCheckButtonState( GetEntry( nPos ) ) == SV_BUTTON_CHECKED);
else else
return sal_False; return false;
} }

102
svx/source/dialog/ctredlin.cxx
View File

@@ -51,7 +51,7 @@ RedlinData::RedlinData()
: :
aDateTime( DateTime::EMPTY ) aDateTime( DateTime::EMPTY )
{ {
bDisabled=sal_False; bDisabled=false;
pData=NULL; pData=NULL;
} }
RedlinData::~RedlinData() RedlinData::~RedlinData()
@@ -124,11 +124,11 @@ void SvLBoxColorString::Paint(
SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits) SvxRedlinTable::SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits)
: SvSimpleTable(rParent,nBits) : SvSimpleTable(rParent,nBits)
, bIsCalc(sal_False) , bIsCalc(false)
, nDatePos(WRITER_DATE) , nDatePos(WRITER_DATE)
, bAuthor(sal_False) , bAuthor(false)
, bDate(sal_False) , bDate(false)
, bComment(sal_False) , bComment(false)
, nDaTiMode(0) , nDaTiMode(0)
, aDaTiFirst( DateTime::EMPTY ) , aDaTiFirst( DateTime::EMPTY )
, aDaTiLast( DateTime::EMPTY ) , aDaTiLast( DateTime::EMPTY )
@@ -185,7 +185,7 @@ sal_Int32 SvxRedlinTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRi
return nCompare; return nCompare;
} }
void SvxRedlinTable::SetCalcView(sal_Bool bFlag) void SvxRedlinTable::SetCalcView(bool bFlag)
{ {
bIsCalc=bFlag; bIsCalc=bFlag;
if(bFlag) if(bFlag)
@@ -243,7 +243,7 @@ void SvxRedlinTable::UpdateFilterTest()
} }
void SvxRedlinTable::SetFilterDate(sal_Bool bFlag) void SvxRedlinTable::SetFilterDate(bool bFlag)
{ {
bDate=bFlag; bDate=bFlag;
} }
@@ -273,7 +273,7 @@ void SvxRedlinTable::SetLastTime(const Time& aTime)
aDaTiLast.SetTime(aTime.GetTime()); aDaTiLast.SetTime(aTime.GetTime());
} }
void SvxRedlinTable::SetFilterAuthor(sal_Bool bFlag) void SvxRedlinTable::SetFilterAuthor(bool bFlag)
{ {
bAuthor=bFlag; bAuthor=bFlag;
} }
@@ -283,7 +283,7 @@ void SvxRedlinTable::SetAuthor(const OUString &aString)
aAuthor=aString; aAuthor=aString;
} }
void SvxRedlinTable::SetFilterComment(sal_Bool bFlag) void SvxRedlinTable::SetFilterComment(bool bFlag)
{ {
bComment=bFlag; bComment=bFlag;
} }
@@ -475,36 +475,36 @@ void SvxTPView::InsertCalcHeader()
m_pViewData->InsertHeaderEntry(aString); m_pViewData->InsertHeaderEntry(aString);
} }
void SvxTPView::EnableAccept(sal_Bool nFlag) void SvxTPView::EnableAccept(bool nFlag)
{ {
bEnableAccept = nFlag; bEnableAccept = nFlag;
m_pAccept->Enable(nFlag); m_pAccept->Enable(nFlag);
} }
void SvxTPView::EnableAcceptAll(sal_Bool nFlag) void SvxTPView::EnableAcceptAll(bool nFlag)
{ {
bEnableAcceptAll = nFlag; bEnableAcceptAll = nFlag;
m_pAcceptAll->Enable(nFlag); m_pAcceptAll->Enable(nFlag);
} }
void SvxTPView::EnableReject(sal_Bool nFlag) void SvxTPView::EnableReject(bool nFlag)
{ {
bEnableReject = nFlag; bEnableReject = nFlag;
m_pReject->Enable(nFlag); m_pReject->Enable(nFlag);
} }
void SvxTPView::EnableRejectAll(sal_Bool nFlag) void SvxTPView::EnableRejectAll(bool nFlag)
{ {
bEnableRejectAll = nFlag; bEnableRejectAll = nFlag;
m_pRejectAll->Enable(nFlag); m_pRejectAll->Enable(nFlag);
} }
void SvxTPView::ShowUndo(sal_Bool nFlag) void SvxTPView::ShowUndo(bool nFlag)
{ {
m_pUndo->Show(nFlag); m_pUndo->Show(nFlag);
} }
void SvxTPView::EnableUndo(sal_Bool nFlag) void SvxTPView::EnableUndo(bool nFlag)
{ {
bEnableUndo = nFlag; bEnableUndo = nFlag;
m_pUndo->Enable(nFlag); m_pUndo->Enable(nFlag);
@@ -617,7 +617,7 @@ SvxTPFilter::SvxTPFilter( Window * pParent)
m_pTfDate2->SetTime(aTime); m_pTfDate2->SetTime(aTime);
HideRange(); HideRange();
ShowAction(); ShowAction();
bModified=sal_False; bModified=false;
} }
void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable) void SvxTPFilter::SetRedlinTable(SvxRedlinTable* pTable)
@@ -630,37 +630,37 @@ void SvxTPFilter::ShowDateFields(sal_uInt16 nKind)
switch(nKind) switch(nKind)
{ {
case FLT_DATE_BEFORE: case FLT_DATE_BEFORE:
EnableDateLine1(sal_True); EnableDateLine1(true);
EnableDateLine2(sal_False); EnableDateLine2(false);
break; break;
case FLT_DATE_SINCE: case FLT_DATE_SINCE:
EnableDateLine1(sal_True); EnableDateLine1(true);
EnableDateLine2(sal_False); EnableDateLine2(false);
break; break;
case FLT_DATE_EQUAL: case FLT_DATE_EQUAL:
EnableDateLine1(sal_True); EnableDateLine1(true);
m_pTfDate->Disable(); m_pTfDate->Disable();
m_pTfDate->SetText(OUString()); m_pTfDate->SetText(OUString());
EnableDateLine2(sal_False); EnableDateLine2(false);
break; break;
case FLT_DATE_NOTEQUAL: case FLT_DATE_NOTEQUAL:
EnableDateLine1(sal_True); EnableDateLine1(true);
m_pTfDate->Disable(); m_pTfDate->Disable();
m_pTfDate->SetText(OUString()); m_pTfDate->SetText(OUString());
EnableDateLine2(sal_False); EnableDateLine2(false);
break; break;
case FLT_DATE_BETWEEN: case FLT_DATE_BETWEEN:
EnableDateLine1(sal_True); EnableDateLine1(true);
EnableDateLine2(sal_True); EnableDateLine2(true);
break; break;
case FLT_DATE_SAVE: case FLT_DATE_SAVE:
EnableDateLine1(sal_False); EnableDateLine1(false);
EnableDateLine2(sal_False); EnableDateLine2(false);
break; break;
} }
} }
void SvxTPFilter::EnableDateLine1(sal_Bool bFlag) void SvxTPFilter::EnableDateLine1(bool bFlag)
{ {
if(bFlag && m_pCbDate->IsChecked()) if(bFlag && m_pCbDate->IsChecked())
{ {
@@ -675,7 +675,7 @@ void SvxTPFilter::EnableDateLine1(sal_Bool bFlag)
m_pIbClock->Disable(); m_pIbClock->Disable();
} }
} }
void SvxTPFilter::EnableDateLine2(sal_Bool bFlag) void SvxTPFilter::EnableDateLine2(bool bFlag)
{ {
if(bFlag && m_pCbDate->IsChecked()) if(bFlag && m_pCbDate->IsChecked())
{ {
@@ -787,7 +787,7 @@ void SvxTPFilter::SetFocusToRange()
m_pEdRange->GrabFocus(); m_pEdRange->GrabFocus();
} }
void SvxTPFilter::HideRange(sal_Bool bHide) void SvxTPFilter::HideRange(bool bHide)
{ {
if (bHide) if (bHide)
{ {
@@ -814,67 +814,67 @@ OUString SvxTPFilter::GetComment()const
return m_pEdComment->GetText(); return m_pEdComment->GetText();
} }
sal_Bool SvxTPFilter::IsDate() bool SvxTPFilter::IsDate()
{ {
return m_pCbDate->IsChecked(); return m_pCbDate->IsChecked();
} }
sal_Bool SvxTPFilter::IsAuthor() bool SvxTPFilter::IsAuthor()
{ {
return m_pCbAuthor->IsChecked(); return m_pCbAuthor->IsChecked();
} }
sal_Bool SvxTPFilter::IsRange() bool SvxTPFilter::IsRange()
{ {
return m_pCbRange->IsChecked(); return m_pCbRange->IsChecked();
} }
sal_Bool SvxTPFilter::IsAction() bool SvxTPFilter::IsAction()
{ {
return m_pCbAction->IsChecked(); return m_pCbAction->IsChecked();
} }
sal_Bool SvxTPFilter::IsComment() bool SvxTPFilter::IsComment()
{ {
return m_pCbComment->IsChecked(); return m_pCbComment->IsChecked();
} }
void SvxTPFilter::CheckDate(sal_Bool bFlag) void SvxTPFilter::CheckDate(bool bFlag)
{ {
m_pCbDate->Check(bFlag); m_pCbDate->Check(bFlag);
RowEnableHdl(m_pCbDate); RowEnableHdl(m_pCbDate);
bModified=sal_False; bModified=false;
} }
void SvxTPFilter::CheckAuthor(sal_Bool bFlag) void SvxTPFilter::CheckAuthor(bool bFlag)
{ {
m_pCbAuthor->Check(bFlag); m_pCbAuthor->Check(bFlag);
RowEnableHdl(m_pCbAuthor); RowEnableHdl(m_pCbAuthor);
bModified=sal_False; bModified=false;
} }
void SvxTPFilter::CheckRange(sal_Bool bFlag) void SvxTPFilter::CheckRange(bool bFlag)
{ {
m_pCbRange->Check(bFlag); m_pCbRange->Check(bFlag);
RowEnableHdl(m_pCbRange); RowEnableHdl(m_pCbRange);
bModified=sal_False; bModified=false;
} }
void SvxTPFilter::CheckAction(sal_Bool bFlag) void SvxTPFilter::CheckAction(bool bFlag)
{ {
m_pCbAction->Check(bFlag); m_pCbAction->Check(bFlag);
RowEnableHdl(m_pCbAction); RowEnableHdl(m_pCbAction);
bModified=sal_False; bModified=false;
} }
void SvxTPFilter::CheckComment(sal_Bool bFlag) void SvxTPFilter::CheckComment(bool bFlag)
{ {
m_pCbComment->Check(bFlag); m_pCbComment->Check(bFlag);
RowEnableHdl(m_pCbComment); RowEnableHdl(m_pCbComment);
bModified=sal_False; bModified=false;
} }
void SvxTPFilter::ShowAction(sal_Bool bShow) void SvxTPFilter::ShowAction(bool bShow)
{ {
if(!bShow) if(!bShow)
{ {
@@ -907,8 +907,8 @@ IMPL_LINK( SvxTPFilter, RowEnableHdl, CheckBox*, pCB )
{ {
m_pLbDate->Enable(m_pCbDate->IsChecked()); m_pLbDate->Enable(m_pCbDate->IsChecked());
m_pLbDate->Invalidate(); m_pLbDate->Invalidate();
EnableDateLine1(sal_False); EnableDateLine1(false);
EnableDateLine2(sal_False); EnableDateLine2(false);
if(m_pCbDate->IsChecked()) SelDateHdl(m_pLbDate); if(m_pCbDate->IsChecked()) SelDateHdl(m_pLbDate);
} }
else if (pCB == m_pCbAuthor) else if (pCB == m_pCbAuthor)
@@ -980,7 +980,7 @@ IMPL_LINK( SvxTPFilter, ModifyHdl, void*, pCtr)
aModifyComLink.Call(this); aModifyComLink.Call(this);
} }
bModified=sal_True; bModified=true;
aModifyLink.Call(this); aModifyLink.Call(this);
} }
return 0; return 0;
@@ -1013,7 +1013,7 @@ void SvxTPFilter::DeactivatePage()
aReadyLink.Call(this); aReadyLink.Call(this);
} }
bModified=sal_False; bModified=false;
TabPage::DeactivatePage(); TabPage::DeactivatePage();
} }

2
svx/source/engine3d/cube3d.cxx
View File

@@ -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) if(bPosIsCenter != bNew)
{ {

2
svx/source/mnuctrls/clipboardctl.cxx
View File

@@ -45,7 +45,7 @@ SvxClipBoardControl::SvxClipBoardControl(
SfxToolBoxControl( nSlotId, nId, rTbx ), SfxToolBoxControl( nSlotId, nId, rTbx ),
pClipboardFmtItem( 0 ), pClipboardFmtItem( 0 ),
pPopup( 0 ), pPopup( 0 ),
bDisabled( sal_False ) bDisabled( false )
{ {
addStatusListener( OUString( ".uno:ClipboardFormatItems" )); addStatusListener( OUString( ".uno:ClipboardFormatItems" ));
ToolBox& rBox = GetToolBox(); ToolBox& rBox = GetToolBox();

6
sw/source/core/uibase/misc/redlndlg.cxx
View File

@@ -180,7 +180,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt) :
{ {
pActLB->InsertEntry(sFmtCollSet); pActLB->InsertEntry(sFmtCollSet);
pActLB->InsertEntry(sAutoFormat); pActLB->InsertEntry(sAutoFormat);
pTPView->ShowUndo(sal_True); pTPView->ShowUndo(true);
pTPView->DisableUndo(); // no UNDO events yet pTPView->DisableUndo(); // no UNDO events yet
} }
@@ -583,7 +583,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRa
{ {
RedlinData *pData = new RedlinData; RedlinData *pData = new RedlinData;
pData->pData = pRedlineChild; pData->pData = pRedlineChild;
pData->bDisabled = sal_True; pData->bDisabled = true;
sChild = GetRedlineText(rRedln, pData->aDateTime, nStack); sChild = GetRedlineText(rRedln, pData->aDateTime, nStack);
SvTreeListEntry* pChild = pTable->InsertEntry(sChild, pData, pParent->pTLBParent); 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 = new RedlinData;
pData->pData = pRedlineParent; pData->pData = pRedlineParent;
pData->bDisabled = sal_False; pData->bDisabled = false;
sParent = GetRedlineText(rRedln, pData->aDateTime); sParent = GetRedlineText(rRedln, pData->aDateTime);
pParent = pTable->InsertEntry(sParent, pData, 0, i); pParent = pTable->InsertEntry(sParent, pData, 0, i);

2
sw/source/ui/config/optcomp.cxx
View File

@@ -325,7 +325,7 @@ IMPL_LINK_NOARG(SwCompatibilityOptPage, UseAsDefaultHdl)
sal_uInt16 nCount = static_cast< sal_uInt16 >( m_pOptionsLB->GetEntryCount() ); sal_uInt16 nCount = static_cast< sal_uInt16 >( m_pOptionsLB->GetEntryCount() );
for ( sal_uInt16 i = 0; i < nCount; ++i ) 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); CompatibilityOptions eOption = static_cast< CompatibilityOptions >(i);
switch ( eOption ) switch ( eOption )
{ {

8
sw/source/ui/misc/swmodalredlineacceptdlg.cxx
View File

@@ -71,10 +71,10 @@ void SwModalRedlineAcceptDlg::AcceptAll( sal_Bool bAccept )
if (pFilterTP->IsDate() || pFilterTP->IsAuthor() || if (pFilterTP->IsDate() || pFilterTP->IsAuthor() ||
pFilterTP->IsRange() || pFilterTP->IsAction()) pFilterTP->IsRange() || pFilterTP->IsAction())
{ {
pFilterTP->CheckDate(sal_False); // turn off all filters pFilterTP->CheckDate(false); // turn off all filters
pFilterTP->CheckAuthor(sal_False); pFilterTP->CheckAuthor(false);
pFilterTP->CheckRange(sal_False); pFilterTP->CheckRange(false);
pFilterTP->CheckAction(sal_False); pFilterTP->CheckAction(false);
pImplDlg->FilterChangedHdl(); pImplDlg->FilterChangedHdl();
} }