summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-19 12:54:33 +0200
committerNoel Grandin <noel@peralex.com>2014-03-24 08:12:07 +0200
commit9f12e4a351cdaf7d22bf1699914cd58e3642e808 (patch)
tree56e5cc1c2bfa0dd2438867bf1eadef055e031e63 /svtools
parent83d807ba78bfc0b1648e0b574af0d490352bc469 (diff)
svtools: sal_Bool->bool
Change-Id: Ic765d1a28960dbeca9501852b5e84cfdfe6ac47e
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/brwbox/brwbox1.cxx2
-rw-r--r--svtools/source/brwbox/brwbox2.cxx38
-rw-r--r--svtools/source/brwbox/brwbox3.cxx33
-rw-r--r--svtools/source/brwbox/editbrowsebox2.cxx2
-rw-r--r--svtools/source/config/accessibilityoptions.cxx124
-rw-r--r--svtools/source/contnr/svtabbx.cxx52
-rw-r--r--svtools/source/misc/svtaccessiblefactory.cxx2
-rw-r--r--svtools/source/table/tablecontrol.cxx24
8 files changed, 138 insertions, 139 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index a9ad6baf9c17..90dabe17e69e 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -1742,7 +1742,7 @@ void BrowseBox::SelectAll()
-void BrowseBox::SelectRow( long nRow, sal_Bool _bSelect, sal_Bool bExpand )
+void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand )
{
if ( !bMultiSelection )
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index c813386717aa..e350e6819dc9 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -494,12 +494,12 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
// down and up
while ( rEvt.GetRow() < aSelRange.Max() )
{ // ZTC/Mac bug - don't put these statements together!
- SelectRow( aSelRange.Max(), bSelectThis, sal_True );
+ SelectRow( aSelRange.Max(), bSelectThis, true );
--aSelRange.Max();
}
while ( rEvt.GetRow() > aSelRange.Max() )
{ // ZTC/Mac bug - don't put these statements together!
- SelectRow( aSelRange.Max(), bSelectThis, sal_True );
+ SelectRow( aSelRange.Max(), bSelectThis, true );
++aSelRange.Max();
}
}
@@ -513,7 +513,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
--aSelRange.Max();
if ( !IsRowSelected( aSelRange.Max() ) )
{
- SelectRow( aSelRange.Max(), bSelectThis, sal_True );
+ SelectRow( aSelRange.Max(), bSelectThis, true );
bSelect = true;
}
}
@@ -522,7 +522,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
++aSelRange.Max();
if ( !IsRowSelected( aSelRange.Max() ) )
{
- SelectRow( aSelRange.Max(), bSelectThis, sal_True );
+ SelectRow( aSelRange.Max(), bSelectThis, true );
bSelect = true;
}
}
@@ -533,7 +533,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt )
}
else
if ( !bMultiSelection || !IsRowSelected( rEvt.GetRow() ) )
- SelectRow( rEvt.GetRow(), sal_True );
+ SelectRow( rEvt.GetRow(), true );
GoToRow( rEvt.GetRow(), sal_False );
DoShowCursor( "ExpandRowSelection" );
@@ -1577,7 +1577,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
if ( rEvt.GetRow() >= 0 )
{
GoToRow( rEvt.GetRow() );
- SelectRow( rEvt.GetRow(), sal_True, sal_False );
+ SelectRow( rEvt.GetRow(), true, false );
}
else
{
@@ -1668,7 +1668,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt )
// select directly
SetNoSelection();
GoToRow( rEvt.GetRow() );
- SelectRow( rEvt.GetRow(), sal_True );
+ SelectRow( rEvt.GetRow(), true );
aSelRange = Range( rEvt.GetRow(), rEvt.GetRow() );
bSelect = true;
}
@@ -1727,7 +1727,7 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt )
{
aSelRange = Range( rEvt.GetRow(), rEvt.GetRow() );
if ( bExtendedMode )
- SelectRow( rEvt.GetRow(), sal_False );
+ SelectRow( rEvt.GetRow(), false );
else
{
SetNoSelection();
@@ -1736,7 +1736,7 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt )
else
{
GoToRow( rEvt.GetRow() );
- SelectRow( rEvt.GetRow(), sal_True );
+ SelectRow( rEvt.GetRow(), true );
}
}
bSelect = true;
@@ -1886,10 +1886,10 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
long nRow = GetCurRow();
sal_Bool bLocalSelect = ( !IsRowSelected( nRow ) ||
GetSelectRowCount() == 1 || IsRowSelected( nRow - 1 ) );
- SelectRow( nRow, bLocalSelect, sal_True );
+ SelectRow( nRow, bLocalSelect, true );
bDone = GoToRow( GetCurRow() + 1 , sal_False );
if ( bDone )
- SelectRow( GetCurRow(), sal_True, sal_True );
+ SelectRow( GetCurRow(), true, true );
}
else
bDone = ScrollRows( 1 ) != 0;
@@ -1903,10 +1903,10 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
long nRow = GetCurRow();
sal_Bool bLocalSelect = ( !IsRowSelected( nRow ) ||
GetSelectRowCount() == 1 || IsRowSelected( nRow + 1 ) );
- SelectRow( nCurRow, bLocalSelect, sal_True );
+ SelectRow( nCurRow, bLocalSelect, true );
bDone = GoToRow( nRow - 1 , sal_False );
if ( bDone )
- SelectRow( GetCurRow(), sal_True, sal_True );
+ SelectRow( GetCurRow(), true, true );
}
break;
case BROWSER_CURSORPAGEDOWN:
@@ -1976,12 +1976,12 @@ void BrowseBox::Dispatch( sal_uInt16 nId )
break;
case BROWSER_ENHANCESELECTION:
if ( GetRowCount() )
- SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), sal_True );
+ SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), true );
bDone = sal_True;
break;
case BROWSER_SELECT:
if ( GetRowCount() )
- SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), sal_False );
+ SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), false );
bDone = sal_True;
break;
case BROWSER_MOVECOLUMNLEFT:
@@ -2034,7 +2034,7 @@ void BrowseBox::SetCursorColor(const Color& _rCol)
DoShowCursor("SetCursorColor");
}
-Rectangle BrowseBox::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen)
+Rectangle BrowseBox::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen)
{
Window* pParent = NULL;
if ( !_bOnScreen )
@@ -2058,14 +2058,14 @@ Rectangle BrowseBox::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen)
return Rectangle(aTopLeft,Size(nWidth,nHeight));
}
-Rectangle BrowseBox::calcTableRect(sal_Bool _bOnScreen)
+Rectangle BrowseBox::calcTableRect(bool _bOnScreen)
{
Window* pParent = NULL;
if ( !_bOnScreen )
pParent = GetAccessibleParentWindow();
Rectangle aRect( GetWindowExtentsRelative( pParent ) );
- Rectangle aRowBar = calcHeaderRect(sal_False,pParent == NULL);
+ Rectangle aRowBar = calcHeaderRect(false, pParent == NULL);
long nX = aRowBar.Right() - aRect.Left();
long nY = aRowBar.Top() - aRect.Top();
@@ -2074,7 +2074,7 @@ Rectangle BrowseBox::calcTableRect(sal_Bool _bOnScreen)
return Rectangle(aRowBar.TopRight(), Size(aSize.A() - nX, aSize.B() - nY - aHScroll.GetSizePixel().Height()) );
}
-Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId,sal_uInt16 _nColId, sal_Bool /*_bIsHeader*/, sal_Bool _bOnScreen )
+Rectangle BrowseBox::GetFieldRectPixelAbs( sal_Int32 _nRowId, sal_uInt16 _nColId, bool /*_bIsHeader*/, bool _bOnScreen )
{
Window* pParent = NULL;
if ( !_bOnScreen )
diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index 91720a3dfdf9..1d7d3d15a9aa 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.cxx
@@ -168,7 +168,7 @@ Reference< XAccessible > BrowseBox::CreateAccessibleControl( sal_Int32 )
// Conversions ----------------------------------------------------------------
-sal_Bool BrowseBox::ConvertPointToCellAddress(
+bool BrowseBox::ConvertPointToCellAddress(
sal_Int32& rnRow, sal_uInt16& rnColumnPos, const Point& rPoint )
{
//! TODO has to be checked
@@ -178,7 +178,7 @@ sal_Bool BrowseBox::ConvertPointToCellAddress(
}
-sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint )
+bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoint )
{
rnRow = GetRowAtYPosPixel(rPoint.Y());
// sal_uInt16 nColumnId = GetColumnAtXPosPixel(rPoint.X());
@@ -186,19 +186,19 @@ sal_Bool BrowseBox::ConvertPointToRowHeader( sal_Int32& rnRow, const Point& rPoi
}
-sal_Bool BrowseBox::ConvertPointToColumnHeader( sal_uInt16& _rnColumnPos, const Point& _rPoint )
+bool BrowseBox::ConvertPointToColumnHeader( sal_uInt16& _rnColumnPos, const Point& _rPoint )
{
_rnColumnPos = GetColumnAtXPosPixel(_rPoint.X());
return _rnColumnPos != BROWSER_INVALIDID;
}
-sal_Bool BrowseBox::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )
+bool BrowseBox::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )
{
//! TODO has to be checked
sal_Int32 nRow = 0;
sal_uInt16 nColumn = 0;
- sal_Bool bRet = ConvertPointToCellAddress(nRow,nColumn,_rPoint);
+ bool bRet = ConvertPointToCellAddress(nRow,nColumn,_rPoint);
if ( bRet )
_rnIndex = nRow * ColCount() + nColumn;
@@ -450,31 +450,30 @@ sal_uInt16 BrowseBox::GetCurrColumn() const
return GetColumnPos( GetCurColumnId() );
}
-sal_Bool BrowseBox::HasRowHeader() const
+bool BrowseBox::HasRowHeader() const
{
return ( GetColumnId( 0 ) == HandleColumnId ); // HandleColumn == RowHeader
}
-sal_Bool BrowseBox::IsCellFocusable() const
+bool BrowseBox::IsCellFocusable() const
{
- return sal_True;
+ return true;
}
-sal_Bool BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
+bool BrowseBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
{
return GoToRowColumnId( _nRow, GetColumnId( _nColumn ) );
}
-void BrowseBox::SelectColumn( sal_uInt16 _nColumn, sal_Bool _bSelect )
+void BrowseBox::SelectColumn( sal_uInt16 _nColumn, bool _bSelect )
{
SelectColumnPos( _nColumn, _bSelect );
}
-sal_Bool BrowseBox::IsColumnSelected( long _nColumn ) const
+bool BrowseBox::IsColumnSelected( long _nColumn ) const
{
- return ( pColSel && (0 <= _nColumn) && (_nColumn <= 0xFFF) ) ?
- pColSel->IsSelected( static_cast< sal_uInt16 >( _nColumn ) ) :
- sal_False;
+ return ( pColSel && (0 <= _nColumn) && (_nColumn <= 0xFFF) ) &&
+ pColSel->IsSelected( static_cast< sal_uInt16 >( _nColumn ) );
}
sal_Int32 BrowseBox::GetSelectedRowCount() const
@@ -527,7 +526,7 @@ void BrowseBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence< sal_Int3
}
}
-sal_Bool BrowseBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const
+bool BrowseBox::IsCellVisible( sal_Int32 _nRow, sal_uInt16 _nColumnPos ) const
{
return IsFieldVisible( _nRow, GetColumnId( _nColumnPos ) );
}
@@ -538,7 +537,7 @@ OUString BrowseBox::GetAccessibleCellText(long _nRow, sal_uInt16 _nColPos) const
}
-sal_Bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector )
+bool BrowseBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector )
{
return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector );
}
@@ -553,7 +552,7 @@ void BrowseBox::GrabFocus()
Control::GrabFocus();
}
-Reference< XAccessible > BrowseBox::GetAccessible( sal_Bool bCreate )
+Reference< XAccessible > BrowseBox::GetAccessible( bool bCreate )
{
return Control::GetAccessible( bCreate );
}
diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index 89e2405f0b73..f8fb910d3839 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.cxx
@@ -49,7 +49,7 @@ Reference< XAccessible > EditBrowseBox::CreateAccessibleCheckBoxCell(long _nRow,
_nRow,
_nColumnPos,
eState,
- sal_True
+ true
);
}
return xReturn;
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 8904a0a36800..45779996415d 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -68,38 +68,38 @@ class SvtAccessibilityOptions_Impl
{
private:
css::uno::Reference< css::container::XNameAccess > m_xCfg;
- sal_Bool bIsModified;
+ bool bIsModified;
public:
SvtAccessibilityOptions_Impl();
~SvtAccessibilityOptions_Impl();
void SetVCLSettings();
- sal_Bool GetAutoDetectSystemHC();
- sal_Bool GetIsForPagePreviews() const;
- sal_Bool GetIsHelpTipsDisappear() const;
- sal_Bool GetIsAllowAnimatedGraphics() const;
- sal_Bool GetIsAllowAnimatedText() const;
- sal_Bool GetIsAutomaticFontColor() const;
- bool GetIsSystemFont() const;
+ bool GetAutoDetectSystemHC();
+ bool GetIsForPagePreviews() const;
+ bool GetIsHelpTipsDisappear() const;
+ bool GetIsAllowAnimatedGraphics() const;
+ bool GetIsAllowAnimatedText() const;
+ bool GetIsAutomaticFontColor() const;
+ bool GetIsSystemFont() const;
sal_Int16 GetHelpTipSeconds() const;
- sal_Bool IsSelectionInReadonly() const;
+ bool IsSelectionInReadonly() const;
sal_Int16 GetEdgeBlending() const;
sal_Int16 GetListBoxMaximumLineCount() const;
sal_Int16 GetColorValueSetColumnCount() const;
- sal_Bool GetPreviewUsesCheckeredBackground() const;
-
- void SetAutoDetectSystemHC(sal_Bool bSet);
- void SetIsForPagePreviews(sal_Bool bSet);
- void SetIsHelpTipsDisappear(sal_Bool bSet);
- void SetIsAllowAnimatedGraphics(sal_Bool bSet);
- void SetIsAllowAnimatedText(sal_Bool bSet);
- void SetIsAutomaticFontColor(sal_Bool bSet);
- void SetIsSystemFont(sal_Bool bSet);
+ bool GetPreviewUsesCheckeredBackground() const;
+
+ void SetAutoDetectSystemHC(bool bSet);
+ void SetIsForPagePreviews(bool bSet);
+ void SetIsHelpTipsDisappear(bool bSet);
+ void SetIsAllowAnimatedGraphics(bool bSet);
+ void SetIsAllowAnimatedText(bool bSet);
+ void SetIsAutomaticFontColor(bool bSet);
+ void SetIsSystemFont(bool bSet);
void SetHelpTipSeconds(sal_Int16 nSet);
- void SetSelectionInReadonly(sal_Bool bSet);
+ void SetSelectionInReadonly(bool bSet);
- sal_Bool IsModified() const { return bIsModified; };
+ bool IsModified() const { return bIsModified; };
};
// initialization of static members --------------------------------------
@@ -127,7 +127,7 @@ SvtAccessibilityOptions_Impl::SvtAccessibilityOptions_Impl()
::comphelper::ConfigurationHelper::E_STANDARD),
css::uno::UNO_QUERY);
- bIsModified = sal_False;
+ bIsModified = false;
}
catch(const css::uno::Exception& ex)
{
@@ -141,7 +141,7 @@ SvtAccessibilityOptions_Impl::~SvtAccessibilityOptions_Impl()
}
-sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
+bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
sal_Bool bRet = sal_True;
@@ -159,7 +159,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetAutoDetectSystemHC()
return bRet;
}
-sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
+bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
sal_Bool bRet = sal_True;
@@ -176,7 +176,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsForPagePreviews() const
return bRet;
}
-sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
+bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
sal_Bool bRet = sal_True;
@@ -194,7 +194,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsHelpTipsDisappear() const
return bRet;
}
-sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
+bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
sal_Bool bRet = sal_True;
@@ -212,7 +212,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedGraphics() const
return bRet;
}
-sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
+bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
sal_Bool bRet = sal_True;
@@ -230,7 +230,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetIsAllowAnimatedText() const
return bRet;
}
-sal_Bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
+bool SvtAccessibilityOptions_Impl::GetIsAutomaticFontColor() const
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
sal_Bool bRet = sal_False;
@@ -284,7 +284,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetHelpTipSeconds() const
return nRet;
}
-sal_Bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
+bool SvtAccessibilityOptions_Impl::IsSelectionInReadonly() const
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
sal_Bool bRet = sal_False;
@@ -356,7 +356,7 @@ sal_Int16 SvtAccessibilityOptions_Impl::GetColorValueSetColumnCount() const
return nRet;
}
-sal_Bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
+bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
sal_Bool bRet = sal_False;
@@ -374,7 +374,7 @@ sal_Bool SvtAccessibilityOptions_Impl::GetPreviewUsesCheckeredBackground() const
return bRet;
}
-void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
+void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -385,7 +385,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
xNode->setPropertyValue(s_sAutoDetectSystemHC, css::uno::makeAny(bSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
svtools::ColorConfig().Reload();
- bIsModified = sal_True;
+ bIsModified = true;
}
}
catch(const css::uno::Exception& ex)
@@ -394,7 +394,7 @@ void SvtAccessibilityOptions_Impl::SetAutoDetectSystemHC(sal_Bool bSet)
}
}
-void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet)
+void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -405,7 +405,7 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet)
xNode->setPropertyValue(s_sIsForPagePreviews, css::uno::makeAny(bSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
- bIsModified = sal_True;
+ bIsModified = true;
}
}
catch(const css::uno::Exception& ex)
@@ -414,7 +414,7 @@ void SvtAccessibilityOptions_Impl::SetIsForPagePreviews(sal_Bool bSet)
}
}
-void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet)
+void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -425,7 +425,7 @@ void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet)
xNode->setPropertyValue(s_sIsHelpTipsDisappear, css::uno::makeAny(bSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
- bIsModified = sal_True;
+ bIsModified = true;
}
}
catch(const css::uno::Exception& ex)
@@ -434,7 +434,7 @@ void SvtAccessibilityOptions_Impl::SetIsHelpTipsDisappear(sal_Bool bSet)
}
}
-void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet)
+void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -445,7 +445,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet)
xNode->setPropertyValue(s_sIsAllowAnimatedGraphics, css::uno::makeAny(bSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
- bIsModified = sal_True;
+ bIsModified = true;
}
}
catch(const css::uno::Exception& ex)
@@ -454,7 +454,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedGraphics(sal_Bool bSet)
}
}
-void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet)
+void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -465,7 +465,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet)
xNode->setPropertyValue(s_sIsAllowAnimatedText, css::uno::makeAny(bSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
- bIsModified = sal_True;
+ bIsModified = true;
}
}
catch(const css::uno::Exception& ex)
@@ -474,7 +474,7 @@ void SvtAccessibilityOptions_Impl::SetIsAllowAnimatedText(sal_Bool bSet)
}
}
-void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet)
+void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -485,7 +485,7 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet)
xNode->setPropertyValue(s_sIsAutomaticFontColor, css::uno::makeAny(bSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
- bIsModified = sal_True;
+ bIsModified = true;
}
}
catch(const css::uno::Exception& ex)
@@ -494,7 +494,7 @@ void SvtAccessibilityOptions_Impl::SetIsAutomaticFontColor(sal_Bool bSet)
}
}
-void SvtAccessibilityOptions_Impl::SetIsSystemFont(sal_Bool bSet)
+void SvtAccessibilityOptions_Impl::SetIsSystemFont(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -505,7 +505,7 @@ void SvtAccessibilityOptions_Impl::SetIsSystemFont(sal_Bool bSet)
xNode->setPropertyValue(s_sIsSystemFont, css::uno::makeAny(bSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
- bIsModified = sal_True;
+ bIsModified = true;
}
}
catch(const css::uno::Exception& ex)
@@ -525,7 +525,7 @@ void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet)
xNode->setPropertyValue(s_sHelpTipSeconds, css::uno::makeAny(nSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
- bIsModified = sal_True;
+ bIsModified = true;
}
}
catch(const css::uno::Exception& ex)
@@ -534,7 +534,7 @@ void SvtAccessibilityOptions_Impl::SetHelpTipSeconds(sal_Int16 nSet)
}
}
-void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(sal_Bool bSet)
+void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(bool bSet)
{
css::uno::Reference< css::beans::XPropertySet > xNode(m_xCfg, css::uno::UNO_QUERY);
@@ -545,7 +545,7 @@ void SvtAccessibilityOptions_Impl::SetSelectionInReadonly(sal_Bool bSet)
xNode->setPropertyValue(s_sIsSelectionInReadonly, css::uno::makeAny(bSet));
::comphelper::ConfigurationHelper::flush(m_xCfg);
- bIsModified = sal_True;
+ bIsModified = true;
}
}
catch(const css::uno::Exception& ex)
@@ -661,7 +661,7 @@ void SvtAccessibilityOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
-sal_Bool SvtAccessibilityOptions::IsModified() const
+bool SvtAccessibilityOptions::IsModified() const
{
return sm_pSingleImplConfig->IsModified();
}
@@ -672,27 +672,27 @@ void SvtAccessibilityOptions::Commit()
-sal_Bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const
+bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const
{
return sm_pSingleImplConfig->GetAutoDetectSystemHC();
}
-sal_Bool SvtAccessibilityOptions::GetIsForPagePreviews() const
+bool SvtAccessibilityOptions::GetIsForPagePreviews() const
{
return sm_pSingleImplConfig->GetIsForPagePreviews();
}
-sal_Bool SvtAccessibilityOptions::GetIsHelpTipsDisappear() const
+bool SvtAccessibilityOptions::GetIsHelpTipsDisappear() const
{
return sm_pSingleImplConfig->GetIsHelpTipsDisappear();
}
-sal_Bool SvtAccessibilityOptions::GetIsAllowAnimatedGraphics() const
+bool SvtAccessibilityOptions::GetIsAllowAnimatedGraphics() const
{
return sm_pSingleImplConfig->GetIsAllowAnimatedGraphics();
}
-sal_Bool SvtAccessibilityOptions::GetIsAllowAnimatedText() const
+bool SvtAccessibilityOptions::GetIsAllowAnimatedText() const
{
return sm_pSingleImplConfig->GetIsAllowAnimatedText();
}
-sal_Bool SvtAccessibilityOptions::GetIsAutomaticFontColor() const
+bool SvtAccessibilityOptions::GetIsAutomaticFontColor() const
{
return sm_pSingleImplConfig->GetIsAutomaticFontColor();
}
@@ -704,37 +704,37 @@ sal_Int16 SvtAccessibilityOptions::GetHelpTipSeconds() const
{
return sm_pSingleImplConfig->GetHelpTipSeconds();
}
-sal_Bool SvtAccessibilityOptions::IsSelectionInReadonly() const
+bool SvtAccessibilityOptions::IsSelectionInReadonly() const
{
return sm_pSingleImplConfig->IsSelectionInReadonly();
}
-void SvtAccessibilityOptions::SetAutoDetectSystemHC(sal_Bool bSet)
+void SvtAccessibilityOptions::SetAutoDetectSystemHC(bool bSet)
{
sm_pSingleImplConfig->SetAutoDetectSystemHC(bSet);
}
-void SvtAccessibilityOptions::SetIsForPagePreviews(sal_Bool bSet)
+void SvtAccessibilityOptions::SetIsForPagePreviews(bool bSet)
{
sm_pSingleImplConfig->SetIsForPagePreviews(bSet);
}
-void SvtAccessibilityOptions::SetIsHelpTipsDisappear(sal_Bool bSet)
+void SvtAccessibilityOptions::SetIsHelpTipsDisappear(bool bSet)
{
sm_pSingleImplConfig->SetIsHelpTipsDisappear(bSet);
}
-void SvtAccessibilityOptions::SetIsAllowAnimatedGraphics(sal_Bool bSet)
+void SvtAccessibilityOptions::SetIsAllowAnimatedGraphics(bool bSet)
{
sm_pSingleImplConfig->SetIsAllowAnimatedGraphics(bSet);
}
-void SvtAccessibilityOptions::SetIsAllowAnimatedText(sal_Bool bSet)
+void SvtAccessibilityOptions::SetIsAllowAnimatedText(bool bSet)
{
sm_pSingleImplConfig->SetIsAllowAnimatedText(bSet);
}
-void SvtAccessibilityOptions::SetIsAutomaticFontColor(sal_Bool bSet)
+void SvtAccessibilityOptions::SetIsAutomaticFontColor(bool bSet)
{
sm_pSingleImplConfig->SetIsAutomaticFontColor(bSet);
}
-void SvtAccessibilityOptions::SetIsSystemFont(sal_Bool bSet)
+void SvtAccessibilityOptions::SetIsSystemFont(bool bSet)
{
sm_pSingleImplConfig->SetIsSystemFont(bSet);
}
@@ -742,7 +742,7 @@ void SvtAccessibilityOptions::SetHelpTipSeconds(sal_Int16 nSet)
{
sm_pSingleImplConfig->SetHelpTipSeconds(nSet);
}
-void SvtAccessibilityOptions::SetSelectionInReadonly(sal_Bool bSet)
+void SvtAccessibilityOptions::SetSelectionInReadonly(bool bSet)
{
sm_pSingleImplConfig->SetSelectionInReadonly(bSet);
}
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index b707015ecd07..c07ca6ec4d4f 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -756,19 +756,19 @@ OUString SvHeaderTabListBox::GetColumnDescription( sal_uInt16 _nColumn ) const
return OUString( m_pImpl->m_pHeaderBar->GetItemText( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) ) );
}
-sal_Bool SvHeaderTabListBox::HasRowHeader() const
+bool SvHeaderTabListBox::HasRowHeader() const
{
- return sal_False;
+ return false;
}
-sal_Bool SvHeaderTabListBox::IsCellFocusable() const
+bool SvHeaderTabListBox::IsCellFocusable() const
{
return IsCellFocusEnabled();
}
-sal_Bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
+bool SvHeaderTabListBox::GoToCell( sal_Int32 _nRow, sal_uInt16 _nColumn )
{
- sal_Bool bRet = ( IsCellFocusEnabled() == sal_True );
+ bool bRet = ( IsCellFocusEnabled() == sal_True );
if ( bRet )
{
// first set cursor to _nRow
@@ -796,12 +796,12 @@ void SvHeaderTabListBox::SelectAll( sal_Bool bSelect, sal_Bool bPaint )
}
-void SvHeaderTabListBox::SelectRow( long _nRow, sal_Bool _bSelect, sal_Bool )
+void SvHeaderTabListBox::SelectRow( long _nRow, bool _bSelect, bool )
{
Select( GetEntry( _nRow ), _bSelect );
}
-void SvHeaderTabListBox::SelectColumn( sal_uInt16, sal_Bool )
+void SvHeaderTabListBox::SelectColumn( sal_uInt16, bool )
{
}
@@ -821,9 +821,9 @@ bool SvHeaderTabListBox::IsRowSelected( long _nRow ) const
return ( pEntry && IsSelected( pEntry ) );
}
-sal_Bool SvHeaderTabListBox::IsColumnSelected( long ) const
+bool SvHeaderTabListBox::IsColumnSelected( long ) const
{
- return sal_False;
+ return false;
}
void SvHeaderTabListBox::GetAllSelectedRows( ::com::sun::star::uno::Sequence< sal_Int32 >& ) const
@@ -834,9 +834,9 @@ void SvHeaderTabListBox::GetAllSelectedColumns( ::com::sun::star::uno::Sequence<
{
}
-sal_Bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const
+bool SvHeaderTabListBox::IsCellVisible( sal_Int32, sal_uInt16 ) const
{
- return sal_True;
+ return true;
}
OUString SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nColumnPos ) const
@@ -844,7 +844,7 @@ OUString SvHeaderTabListBox::GetAccessibleCellText( long _nRow, sal_uInt16 _nCol
return GetTabEntryText(_nRow, _nColumnPos);
}
-Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _bOnScreen )
+Rectangle SvHeaderTabListBox::calcHeaderRect( bool _bIsColumnBar, bool _bOnScreen )
{
Rectangle aRect;
if ( _bIsColumnBar )
@@ -858,7 +858,7 @@ Rectangle SvHeaderTabListBox::calcHeaderRect( sal_Bool _bIsColumnBar, sal_Bool _
return aRect;
}
-Rectangle SvHeaderTabListBox::calcTableRect( sal_Bool _bOnScreen )
+Rectangle SvHeaderTabListBox::calcTableRect( bool _bOnScreen )
{
Window* pParent = NULL;
if ( !_bOnScreen )
@@ -868,14 +868,14 @@ Rectangle SvHeaderTabListBox::calcTableRect( sal_Bool _bOnScreen )
return aRect;
}
-Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, sal_Bool _bIsHeader, sal_Bool _bOnScreen )
+Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16 _nColumn, bool _bIsHeader, bool _bOnScreen )
{
DBG_ASSERT( !_bIsHeader || 0 == _nRow, "invalid parameters" );
Rectangle aRect;
SvTreeListEntry* pEntry = GetEntry( _nRow );
if ( pEntry )
{
- aRect = _bIsHeader ? calcHeaderRect( sal_True, sal_False ) : GetBoundingRect( pEntry );
+ aRect = _bIsHeader ? calcHeaderRect( true, false ) : GetBoundingRect( pEntry );
Point aTopLeft = aRect.TopLeft();
DBG_ASSERT( m_pImpl->m_pHeaderBar->GetItemCount() > _nColumn, "invalid column" );
Rectangle aItemRect = m_pImpl->m_pHeaderBar->GetItemRect( m_pImpl->m_pHeaderBar->GetItemId( _nColumn ) );
@@ -921,7 +921,7 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleCell( sal_Int32 _nR
sal_Bool bIsCheckBox = IsCellCheckBox( _nRow, _nColumnPos, eState );
if ( bIsCheckBox )
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleCheckBoxCell(
- m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, eState, sal_False );
+ m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, eState, false );
else
xChild = m_pImpl->m_aFactoryAccess.getFactory().createAccessibleBrowseBoxTableCell(
m_pAccessible->getAccessibleChild( 0 ), *this, NULL, _nRow, _nColumnPos, OFFSET_NONE );
@@ -980,24 +980,24 @@ Reference< XAccessible > SvHeaderTabListBox::CreateAccessibleControl( sal_Int32
return xControl;
}
-sal_Bool SvHeaderTabListBox::ConvertPointToControlIndex( sal_Int32&, const Point& )
+bool SvHeaderTabListBox::ConvertPointToControlIndex( sal_Int32&, const Point& )
{
- return sal_False;
+ return false;
}
-sal_Bool SvHeaderTabListBox::ConvertPointToCellAddress( sal_Int32&, sal_uInt16&, const Point& )
+bool SvHeaderTabListBox::ConvertPointToCellAddress( sal_Int32&, sal_uInt16&, const Point& )
{
- return sal_False;
+ return false;
}
-sal_Bool SvHeaderTabListBox::ConvertPointToRowHeader( sal_Int32&, const Point& )
+bool SvHeaderTabListBox::ConvertPointToRowHeader( sal_Int32&, const Point& )
{
- return sal_False;
+ return false;
}
-sal_Bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Point& )
+bool SvHeaderTabListBox::ConvertPointToColumnHeader( sal_uInt16&, const Point& )
{
- return sal_False;
+ return false;
}
OUString SvHeaderTabListBox::GetAccessibleObjectName( ::svt::AccessibleBrowseBoxObjType _eType, sal_Int32 _nPos ) const
@@ -1158,7 +1158,7 @@ void SvHeaderTabListBox::GrabTableFocus()
GrabFocus();
}
-sal_Bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector )
+bool SvHeaderTabListBox::GetGlyphBoundRects( const Point& rOrigin, const OUString& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector )
{
return Control::GetGlyphBoundRects( rOrigin, rStr, nIndex, nLen, nBase, rVector );
}
@@ -1173,7 +1173,7 @@ void SvHeaderTabListBox::GrabFocus()
Control::GrabFocus();
}
-Reference< XAccessible > SvHeaderTabListBox::GetAccessible( sal_Bool bCreate )
+Reference< XAccessible > SvHeaderTabListBox::GetAccessible( bool bCreate )
{
return Control::GetAccessible( bCreate );
}
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 313389b5da73..f24683e49f7a 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -182,7 +182,7 @@ namespace svt
sal_Int32 /*_nRowPos*/,
sal_uInt16 /*_nColPos*/,
const TriState& /*_eState*/,
- sal_Bool /*_bIsTriState*/
+ bool /*_bIsTriState*/
) const
{
return NULL;
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 5f40bad82b1a..b8d845144b26 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -187,7 +187,7 @@ namespace svt { namespace table
}
- sal_Bool TableControl::GoToCell(sal_Int32 _nColPos, sal_Int32 _nRowPos)
+ bool TableControl::GoToCell(sal_Int32 _nColPos, sal_Int32 _nRowPos)
{
return m_pImpl->goTo( _nColPos, _nRowPos );
}
@@ -512,7 +512,7 @@ namespace svt { namespace table
}
- Reference< XAccessible > TableControl::GetAccessible( sal_Bool bCreate )
+ Reference< XAccessible > TableControl::GetAccessible( bool bCreate )
{
return Control::GetAccessible( bCreate );
}
@@ -530,13 +530,13 @@ namespace svt { namespace table
}
- sal_Bool TableControl::HasRowHeader()
+ bool TableControl::HasRowHeader()
{
return GetModel()->hasRowHeaders();
}
- sal_Bool TableControl::HasColHeader()
+ bool TableControl::HasColHeader()
{
return GetModel()->hasColumnHeaders();
}
@@ -554,12 +554,12 @@ namespace svt { namespace table
}
- sal_Bool TableControl::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )
+ bool TableControl::ConvertPointToControlIndex( sal_Int32& _rnIndex, const Point& _rPoint )
{
sal_Int32 nRow = m_pImpl->getRowAtPoint( _rPoint );
sal_Int32 nCol = m_pImpl->getColAtPoint( _rPoint );
_rnIndex = nRow * GetColumnCount() + nCol;
- return nRow >= 0 ? sal_True : sal_False;
+ return nRow >= 0;
}
@@ -575,17 +575,17 @@ namespace svt { namespace table
}
- sal_Bool TableControl::HasRowHeader() const
+ bool TableControl::HasRowHeader() const
{
return GetModel()->hasRowHeaders();
}
- sal_Bool TableControl::ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )
+ bool TableControl::ConvertPointToCellAddress( sal_Int32& _rnRow, sal_Int32& _rnColPos, const Point& _rPoint )
{
_rnRow = m_pImpl->getRowAtPoint( _rPoint );
_rnColPos = m_pImpl->getColAtPoint( _rPoint );
- return _rnRow >= 0 ? sal_True : sal_False;
+ return _rnRow >= 0;
}
@@ -624,20 +624,20 @@ namespace svt { namespace table
}
- Rectangle TableControl::calcHeaderRect(sal_Bool _bIsColumnBar,sal_Bool _bOnScreen)
+ Rectangle TableControl::calcHeaderRect(bool _bIsColumnBar, bool _bOnScreen)
{
(void)_bOnScreen;
return m_pImpl->calcHeaderRect( _bIsColumnBar ? false : true );
}
- Rectangle TableControl::calcHeaderCellRect( sal_Bool _bIsColumnBar, sal_Int32 nPos )
+ Rectangle TableControl::calcHeaderCellRect( bool _bIsColumnBar, sal_Int32 nPos )
{
return m_pImpl->calcHeaderCellRect( _bIsColumnBar, nPos );
}
- Rectangle TableControl::calcTableRect(sal_Bool _bOnScreen)
+ Rectangle TableControl::calcTableRect(bool _bOnScreen)
{
(void)_bOnScreen;
return m_pImpl->calcTableRect();