summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-06 09:04:06 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:23 +0200
commit53c91a6db1cdaf3a91fba6ea328acdcc33c4088a (patch)
treefb7570b10ce13b37b3d0c866fb9576b9c1fd90ab
parentef61173187d99e75fd5ce0a70994325a17e2c21a (diff)
svx: sal_Bool->bool
Change-Id: Ib562c23af0ca853165b63750695615578cd55d03
-rw-r--r--include/svx/sdr/table/tablecontroller.hxx16
-rw-r--r--svx/source/table/tablecontroller.cxx44
2 files changed, 30 insertions, 30 deletions
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 908c5318fcd6..1a011ecea434 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -101,14 +101,14 @@ public:
SVX_DLLPRIVATE void onTableModified();
- sal_Bool selectRow( sal_Int32 row );
- sal_Bool selectColumn( sal_Int32 column );
- sal_Bool deselectRow( sal_Int32 row );
- sal_Bool deselectColumn( sal_Int32 column );
- sal_Bool isRowSelected( sal_Int32 nRow );
- sal_Bool isColumnSelected( sal_Int32 nColumn );
- sal_Bool isRowHeader();
- sal_Bool isColumnHeader();
+ bool selectRow( sal_Int32 row );
+ bool selectColumn( sal_Int32 column );
+ bool deselectRow( sal_Int32 row );
+ bool deselectColumn( sal_Int32 column );
+ bool isRowSelected( sal_Int32 nRow );
+ bool isColumnSelected( sal_Int32 nColumn );
+ bool isRowHeader();
+ bool isColumnHeader();
::sdr::table::SdrTableObj* GetTableObj() { return dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() ); }
//declare event notification method
void NotifySelection( const CellPos& firstPos, const CellPos& lastPos, const CellPos& newPos );
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index d096b47332bc..659bf3c8e59d 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -2843,90 +2843,90 @@ void SvxTableController::FillCommonBorderAttrFromSelectedCells( SvxBoxItem& rBox
}
}
-sal_Bool SvxTableController::selectRow( sal_Int32 row )
+bool SvxTableController::selectRow( sal_Int32 row )
{
if( !mxTable.is() )
- return sal_False;
+ return false;
CellPos aStart( 0, row ), aEnd( mxTable->getColumnCount() - 1, row );
StartSelection( aEnd );
gotoCell( aStart, true, 0 );
- return sal_True;
+ return true;
}
-sal_Bool SvxTableController::selectColumn( sal_Int32 column )
+bool SvxTableController::selectColumn( sal_Int32 column )
{
if( !mxTable.is() )
- return sal_False;
+ return false;
CellPos aStart( column, 0 ), aEnd( column, mxTable->getRowCount() - 1 );
StartSelection( aEnd );
gotoCell( aStart, true, 0 );
- return sal_True;
+ return true;
}
-sal_Bool SvxTableController::deselectRow( sal_Int32 row )
+bool SvxTableController::deselectRow( sal_Int32 row )
{
if( !mxTable.is() )
- return sal_False;
+ return false;
CellPos aStart( 0, row ), aEnd( mxTable->getColumnCount() - 1, row );
StartSelection( aEnd );
gotoCell( aStart, false, 0 );
- return sal_True;
+ return true;
}
-sal_Bool SvxTableController::deselectColumn( sal_Int32 column )
+bool SvxTableController::deselectColumn( sal_Int32 column )
{
if( !mxTable.is() )
- return sal_False;
+ return false;
CellPos aStart( column, 0 ), aEnd( column, mxTable->getRowCount() - 1 );
StartSelection( aEnd );
gotoCell( aStart, false, 0 );
- return sal_True;
+ return true;
}
-sal_Bool SvxTableController::isRowSelected( sal_Int32 nRow )
+bool SvxTableController::isRowSelected( sal_Int32 nRow )
{
if( hasSelectedCells() )
{
CellPos aFirstPos, aLastPos;
getSelectedCells( aFirstPos, aLastPos );
if( (aFirstPos.mnCol == 0) && (nRow >= aFirstPos.mnRow && nRow <= aLastPos.mnRow) && (mxTable->getColumnCount() - 1 == aLastPos.mnCol) )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool SvxTableController::isColumnSelected( sal_Int32 nColumn )
+bool SvxTableController::isColumnSelected( sal_Int32 nColumn )
{
if( hasSelectedCells() )
{
CellPos aFirstPos, aLastPos;
getSelectedCells( aFirstPos, aLastPos );
if( (aFirstPos.mnRow == 0) && (nColumn >= aFirstPos.mnCol && nColumn <= aLastPos.mnCol) && (mxTable->getRowCount() - 1 == aLastPos.mnRow) )
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-sal_Bool SvxTableController::isRowHeader()
+bool SvxTableController::isRowHeader()
{
SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() );
SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0;
if( !pTableObj || !pModel )
- return sal_False;
+ return false;
TableStyleSettings aSettings( pTableObj->getTableStyleSettings() );
return aSettings.mbUseFirstRow;
}
-sal_Bool SvxTableController::isColumnHeader()
+bool SvxTableController::isColumnHeader()
{
SdrTableObj* pTableObj = dynamic_cast< ::sdr::table::SdrTableObj* >( mxTableObj.get() );
SdrModel* pModel = pTableObj ? pTableObj->GetModel() : 0;
if( !pTableObj || !pModel )
- return sal_False;
+ return false;
TableStyleSettings aSettings( pTableObj->getTableStyleSettings() );