diff options
31 files changed, 358 insertions, 363 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 7c4c98b05dc5..0a2224cd17d9 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -565,7 +565,7 @@ void DataBrowser::RenewTable() sal_uInt16 nOldColId = GetCurColumnId(); sal_Bool bLastUpdateMode = GetUpdateMode(); - SetUpdateMode( sal_False ); + SetUpdateMode( false ); if( IsModified() ) SaveModified(); @@ -719,7 +719,7 @@ double DataBrowser::GetCellNumber( long nRow, sal_uInt16 nColumnId ) const void DataBrowser::Resize() { sal_Bool bLastUpdateMode = GetUpdateMode(); - SetUpdateMode( sal_False ); + SetUpdateMode( false ); ::svt::EditBrowseBox::Resize(); ImplAdjustHeaderControls(); @@ -1026,17 +1026,17 @@ void DataBrowser::PaintCell( rDev.SetClipRegion(); } -sal_Bool DataBrowser::SeekRow( long nRow ) +bool DataBrowser::SeekRow( long nRow ) { if( ! EditBrowseBox::SeekRow( nRow )) - return sal_False; + return false; if( nRow < 0 ) m_nSeekRow = - 1; else m_nSeekRow = nRow; - return sal_True; + return true; } sal_Bool DataBrowser::IsTabAllowed( sal_Bool bForward ) const @@ -1222,7 +1222,7 @@ sal_Int16 DataBrowser::GetFirstVisibleColumNumber() const void DataBrowser::ColumnResized( sal_uInt16 nColId ) { sal_Bool bLastUpdateMode = GetUpdateMode(); - SetUpdateMode( sal_False ); + SetUpdateMode( false ); EditBrowseBox::ColumnResized( nColId ); ImplAdjustHeaderControls(); @@ -1232,7 +1232,7 @@ void DataBrowser::ColumnResized( sal_uInt16 nColId ) void DataBrowser::EndScroll() { sal_Bool bLastUpdateMode = GetUpdateMode(); - SetUpdateMode( sal_False ); + SetUpdateMode( false ); EditBrowseBox::EndScroll(); RenewSeriesHeaders(); diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 231772799edb..c7ad2dd6abe4 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -52,7 +52,7 @@ class DataBrowser : public ::svt::EditBrowseBox protected: // EditBrowseBox overridables virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; - virtual sal_Bool SeekRow( long nRow ); + virtual bool SeekRow( long nRow ); virtual sal_Bool IsTabAllowed( sal_Bool bForward ) const; virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ); virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 874b8c7f7fe9..8af4d6ccb038 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -71,7 +71,7 @@ namespace offapp virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; - virtual sal_Bool SeekRow( long nRow ); + virtual bool SeekRow( long nRow ); virtual sal_Bool SaveModified(); virtual sal_Bool IsTabAllowed(sal_Bool _bForward) const; @@ -194,10 +194,10 @@ namespace offapp { m_aSettings = _rSettings; - SetUpdateMode(sal_False); + SetUpdateMode(false); RowRemoved(0, GetRowCount()); RowInserted(0, m_aSettings.size()); - SetUpdateMode(sal_True); + SetUpdateMode(true); ActivateCell(1, 0); } @@ -274,7 +274,7 @@ namespace offapp } - sal_Bool DriverListControl::SeekRow( long _nRow ) + bool DriverListControl::SeekRow( long _nRow ) { EditBrowseBox::SeekRow(_nRow); diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 11dbe6ef06b9..58093e8f88e9 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -1264,8 +1264,8 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) // without an empty row we're not in update mode break; - long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); - sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); + long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), false); + sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), false); long nCorrectRowCount = GetRowCount(); if (GetOptions() & OPT_INSERT) @@ -1358,8 +1358,8 @@ sal_Int8 SbaGridControl::ExecuteDrop( const BrowserExecuteDropEvent& rEvt ) if ( IsDropFormatSupported( FORMAT_STRING ) ) { - long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); - sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), sal_False); + long nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), false); + sal_uInt16 nCol = GetColumnAtXPosPixel(rEvt.maPosPixel.X(), false); long nCorrectRowCount = GetRowCount(); if (GetOptions() & OPT_INSERT) diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 15ccdfbc3833..babadfef58b8 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -114,7 +114,7 @@ namespace dbaui virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ); virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ); virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; - virtual sal_Bool SeekRow( long nRow ); + virtual bool SeekRow( long nRow ); virtual sal_Bool SaveModified(); virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const; @@ -185,7 +185,7 @@ namespace dbaui // not the first call RowRemoved(0, GetRowCount()); - RowInserted(0, m_pConnData->GetConnLineDataList()->size() + 1, sal_True); // add one extra row + RowInserted(0, m_pConnData->GetConnLineDataList()->size() + 1, true); // add one extra row } void ORelationControl::Resize() @@ -337,10 +337,10 @@ namespace dbaui return new ListBoxCellController( m_pListCell.get() ); } - sal_Bool ORelationControl::SeekRow( long nRow ) + bool ORelationControl::SeekRow( long nRow ) { m_nDataPos = nRow; - return sal_True; + return true; } void ORelationControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index b15854de2281..438b1d404edd 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -380,7 +380,7 @@ CellController* OTableGrantControl::GetController( long nRow, sal_uInt16 nColumn return pController; } -sal_Bool OTableGrantControl::SeekRow( long nRow ) +bool OTableGrantControl::SeekRow( long nRow ) { m_nDataPos = nRow; diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 81ab05eca45e..1e0268bbe553 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -109,10 +109,10 @@ namespace dbaui } - sal_Bool IndexFieldsControl::SeekRow(long nRow) + bool IndexFieldsControl::SeekRow(long nRow) { if (!EditBrowseBox::SeekRow(nRow)) - return sal_False; + return false; if (nRow < 0) { @@ -124,7 +124,7 @@ namespace dbaui OSL_ENSURE(m_aSeekRow <= m_aFields.end(), "IndexFieldsControl::SeekRow: invalid row!"); } - return sal_True; + return true; } void IndexFieldsControl::PaintCell( OutputDevice& _rDev, const Rectangle& _rRect, sal_uInt16 _nColumnId ) const @@ -163,14 +163,14 @@ namespace dbaui m_aFields = _rFields; m_aSeekRow = m_aFields.end(); - SetUpdateMode(sal_False); + SetUpdateMode(false); // remove all rows RowRemoved(1, GetRowCount()); // insert rows for the fields - RowInserted(GetRowCount(), m_aFields.size(), sal_False); + RowInserted(GetRowCount(), m_aFields.size(), false); // insert an additional row for a new field for that index - RowInserted(GetRowCount(), 1, sal_False); - SetUpdateMode(sal_True); + RowInserted(GetRowCount(), 1, false); + SetUpdateMode(true); GoToRowColumnId(0, COLUMN_ID_FIELDNAME); } @@ -319,7 +319,7 @@ namespace dbaui OIndexField aNewField; aNewField.sFieldName = sFieldSelected; m_aFields.push_back(aNewField); - RowInserted(GetRowCount(), 1, sal_True); + RowInserted(GetRowCount(), 1, true); } } else diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 63901b4cf167..1e6a5f92b494 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -88,7 +88,7 @@ protected: virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ); virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ); virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; - virtual sal_Bool SeekRow( long nRow ); + virtual bool SeekRow( long nRow ); virtual sal_Bool SaveModified(); virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const; diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index cbad3b8dd248..509223b5e961 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -71,7 +71,7 @@ namespace dbaui protected: // EditBrowseBox overridables virtual void PaintCell( OutputDevice& _rDev, const Rectangle& _rRect, sal_uInt16 _nColumnId ) const; - virtual sal_Bool SeekRow(long nRow); + virtual bool SeekRow(long nRow); virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 2291b683d057..55e2d83fc5c6 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -351,7 +351,7 @@ void OSelectionBrowseBox::Init() if(m_bVisibleRow[i]) m_nVisibleCount++; } - RowInserted(0, m_nVisibleCount, sal_False); + RowInserted(0, m_nVisibleCount, false); try { Reference< XConnection> xConnection = static_cast<OQueryController&>(getDesignView()->getController()).getConnection(); @@ -373,7 +373,7 @@ void OSelectionBrowseBox::Init() void OSelectionBrowseBox::PreFill() { - SetUpdateMode(sal_False); + SetUpdateMode(false); if (GetCurRow() != 0) GoToRow(0); @@ -384,12 +384,12 @@ void OSelectionBrowseBox::PreFill() RemoveColumns(); InsertHandleColumn( HANDLE_COLUMN_WITDH ); - SetUpdateMode(sal_True); + SetUpdateMode(true); } void OSelectionBrowseBox::ClearAll() { - SetUpdateMode(sal_False); + SetUpdateMode(false); OTableFields::reverse_iterator aIter = getFields().rbegin(); for ( ;aIter != getFields().rend(); ++aIter ) @@ -401,7 +401,7 @@ void OSelectionBrowseBox::ClearAll() } } m_nLastSortColumn = SORT_COLUMN_NONE; - SetUpdateMode(sal_True); + SetUpdateMode(true); } void OSelectionBrowseBox::SetReadOnly(sal_Bool bRO) @@ -1177,7 +1177,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() if ( bAppendRow ) { - RowInserted( GetRowCount()-1, 1, sal_True ); + RowInserted( GetRowCount()-1, 1, true ); m_bVisibleRow.push_back(true); ++m_nVisibleCount; } @@ -1209,15 +1209,10 @@ sal_Bool OSelectionBrowseBox::SaveModified() return pEntry != NULL && !bError; } -sal_Bool OSelectionBrowseBox::SeekRow(long nRow) +bool OSelectionBrowseBox::SeekRow(long nRow) { - sal_Bool bRet = sal_False; - m_nSeekRow = nRow; - if (nRow < m_nVisibleCount ) - bRet = sal_True; - - return bRet; + return nRow < m_nVisibleCount; } void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const @@ -1712,7 +1707,7 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel) pEntry->SetCriteria( nNewLevel, sValue); if ( nNewLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1) ) { - RowInserted( GetRowCount()-1, 1, sal_True ); + RowInserted( GetRowCount()-1, 1, true ); m_bVisibleRow.push_back(true); ++m_nVisibleCount; } @@ -1759,7 +1754,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O pEntry->SetCriteria( nLevel, rValue); if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1)) { - RowInserted( GetRowCount()-1, 1, sal_True ); + RowInserted( GetRowCount()-1, 1, true ); m_bVisibleRow.push_back(true); ++m_nVisibleCount; } @@ -1787,7 +1782,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O pLastEntry->SetCriteria( nLevel, sCriteria); if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1)) { - RowInserted( GetRowCount()-1, 1, sal_True ); + RowInserted( GetRowCount()-1, 1, true ); m_bVisibleRow.push_back(true); ++m_nVisibleCount; } @@ -1803,7 +1798,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O pTmp->SetCriteria( nLevel, rValue); if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1)) { - RowInserted( GetRowCount()-1, 1, sal_True ); + RowInserted( GetRowCount()-1, 1, true ); m_bVisibleRow.push_back(true); ++m_nVisibleCount; } @@ -1938,7 +1933,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt) sal_uInt16 nSelId = GetColumnId( sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) ); - ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) ); + ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) ); aMenuPos = aColRect.TopCenter(); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index d3b5c30fe988..3ad4b7cdde8d 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -180,7 +180,7 @@ namespace dbaui virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessibleCell( sal_Int32 nRow, sal_uInt16 nColumnId ); protected: - virtual sal_Bool SeekRow( long nRow ); + virtual bool SeekRow( long nRow ); virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 9d7ac5ce5d1e..67bbec08d73c 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -131,12 +131,12 @@ void OTableEditorCtrl::Init() InitCellController(); // Insert the rows - RowInserted(0, m_pRowList->size(), sal_True); + RowInserted(0, m_pRowList->size(), true); } void OTableEditorCtrl::UpdateAll() { - RowRemoved(0, GetRowCount(), sal_False); + RowRemoved(0, GetRowCount(), false); m_nDataPos = 0; InvalidateFeatures(); @@ -306,7 +306,7 @@ sal_Bool OTableEditorCtrl::SetDataPtr( long nRow ) return pActRow != 0; } -sal_Bool OTableEditorCtrl::SeekRow(long _nRow) +bool OTableEditorCtrl::SeekRow(long _nRow) { // Call the Base class to remember which row must be repainted EditBrowseBox::SeekRow(_nRow); @@ -835,7 +835,7 @@ void OTableEditorCtrl::InsertRows( long nRow ) // RowInserted calls CursorMoved. // The UI data should not be stored here. bSaveOnMove = sal_False; - RowInserted( nRow,vInsertedUndoRedoRows.size(),sal_True ); + RowInserted( nRow,vInsertedUndoRedoRows.size(), true ); bSaveOnMove = sal_True; // Create the Undo-Action @@ -859,11 +859,11 @@ void OTableEditorCtrl::DeleteRows() { // Remove rows m_pRowList->erase( m_pRowList->begin()+nIndex ); - RowRemoved( nIndex, 1, sal_True ); + RowRemoved( nIndex, 1, true ); // Insert the empty row at the end m_pRowList->push_back( ::boost::shared_ptr<OTableRow>(new OTableRow())); - RowInserted( GetRowCount()-1, 1, sal_True ); + RowInserted( GetRowCount()-1, 1, true ); nIndex = FirstSelectedRow(); } @@ -892,7 +892,7 @@ void OTableEditorCtrl::InsertNewRows( long nRow ) // Insert the number of of selected rows for( long i=nRow; i<(nRow+nInsertRows); i++ ) m_pRowList->insert( m_pRowList->begin()+i ,::boost::shared_ptr<OTableRow>(new OTableRow())); - RowInserted( nRow, nInsertRows, sal_True ); + RowInserted( nRow, nInsertRows, true ); GetView()->getController().setModified( sal_True ); InvalidateFeatures(); @@ -1379,13 +1379,13 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt) sal_uInt16 nSelId = GetColumnId( sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) ); - ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) ); + ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) ); aMenuPos = aColRect.TopCenter(); } else if ( GetSelectRowCount() > 0 ) { - ::Rectangle aColRect( GetFieldRectPixel( FirstSelectedRow(), HANDLE_ID, sal_True ) ); + ::Rectangle aColRect( GetFieldRectPixel( FirstSelectedRow(), HANDLE_ID, true ) ); aMenuPos = aColRect.TopCenter(); } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index 02c4c1d66518..b18ea7b9b67d 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -88,7 +88,7 @@ namespace dbaui protected: virtual void Command( const CommandEvent& rEvt ); - virtual sal_Bool SeekRow(long nRow); + virtual bool SeekRow(long nRow); virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; diff --git a/dbaccess/source/ui/tabledesign/TableUndo.cxx b/dbaccess/source/ui/tabledesign/TableUndo.cxx index b4ef8f109513..43349f41f6b9 100644 --- a/dbaccess/source/ui/tabledesign/TableUndo.cxx +++ b/dbaccess/source/ui/tabledesign/TableUndo.cxx @@ -254,7 +254,7 @@ void OTableEditorInsUndoAct::Undo() pOriginalRows->erase(pOriginalRows->begin()+i); } - pTabEdCtrl->RowRemoved( m_nInsPos, m_vInsertedRows.size(), sal_True ); + pTabEdCtrl->RowRemoved( m_nInsPos, m_vInsertedRows.size(), true ); pTabEdCtrl->InvalidateHandleColumn(); OTableEditorUndoAct::Undo(); @@ -275,7 +275,7 @@ void OTableEditorInsUndoAct::Redo() nInsertRow++; } - pTabEdCtrl->RowInserted( m_nInsPos, m_vInsertedRows.size(), sal_True ); + pTabEdCtrl->RowInserted( m_nInsPos, m_vInsertedRows.size(), true ); pTabEdCtrl->InvalidateHandleColumn(); OTableEditorUndoAct::Redo(); @@ -303,7 +303,7 @@ void OTableEditorInsNewUndoAct::Undo() pOriginalRows->erase(pOriginalRows->begin()+i); } - pTabEdCtrl->RowRemoved( m_nInsPos, m_nInsRows, sal_True ); + pTabEdCtrl->RowRemoved( m_nInsPos, m_nInsRows, true ); pTabEdCtrl->InvalidateHandleColumn(); OTableEditorUndoAct::Undo(); @@ -317,7 +317,7 @@ void OTableEditorInsNewUndoAct::Redo() for( long i=m_nInsPos; i<(m_nInsPos+m_nInsRows); i++ ) pRowList->insert( pRowList->begin()+i,::boost::shared_ptr<OTableRow>(new OTableRow()) ); - pTabEdCtrl->RowInserted( m_nInsPos, m_nInsRows, sal_True ); + pTabEdCtrl->RowInserted( m_nInsPos, m_nInsRows, true ); pTabEdCtrl->InvalidateHandleColumn(); OTableEditorUndoAct::Redo(); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index db5cd37d92b9..154f6462d0a6 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -226,45 +226,45 @@ private: ScrollBar aHScroll; // horizontal scrollbar long nDataRowHeight; // height of a single data-row - sal_uInt16 nTitleLines; // number of lines in title row - sal_uLong nControlAreaWidth; // width of fixed area beneeth hscroll - sal_Bool bThumbDragging; // handle thumb dragging - sal_Bool bColumnCursor; // single columns and fields selectable - sal_Bool bMultiSelection;// allow multiple selected rows - sal_Bool bKeepHighlight; // don't hide selection on LoseFocus - - sal_Bool bHLines; // draw lines between rows - sal_Bool bVLines; // draw lines between columns - sal_Bool bHDots; // draw lines between rows dotted - sal_Bool bVDots; // draw lines between columns dotted + sal_uInt16 nTitleLines; // number of lines in title row + sal_uLong nControlAreaWidth; // width of fixed area beneeth hscroll + bool bThumbDragging; // handle thumb dragging + bool bColumnCursor; // single columns and fields selectable + bool bMultiSelection;// allow multiple selected rows + bool bKeepHighlight; // don't hide selection on LoseFocus + + bool bHLines; // draw lines between rows + bool bVLines; // draw lines between columns + bool bHDots; // draw lines between rows dotted + bool bVDots; // draw lines between columns dotted Color aGridLineColor; // color for lines, default dark grey - sal_Bool bBootstrapped; // child windows resized etc. + bool bBootstrapped; // child windows resized etc. long nTopRow; // no. of first visible row (0...) long nCurRow; // no. of row with cursor long nRowCount; // total number of rows in model - sal_uInt16 nFirstCol; // no. of first visible scrollable column - sal_uInt16 nCurColId; // column id of cursor + sal_uInt16 nFirstCol; // no. of first visible scrollable column + sal_uInt16 nCurColId; // column id of cursor - sal_Bool bSelecting; - sal_Bool bRowDividerDrag; - sal_Bool bHit; - sal_Bool mbInteractiveRowHeight; + bool bSelecting; + bool bRowDividerDrag; + bool bHit; + bool mbInteractiveRowHeight; Point a1stPoint; Point a2ndPoint; long nResizeX; // mouse position at start of resizing long nMinResizeX; // never drag more left long nDragX; // last dragged column (MouseMove) - sal_uInt16 nResizeCol; // resize this column in MouseMove - sal_Bool bResizing; // mouse captured for column resizing - - bool bSelect; /// select or deselect - sal_Bool bSelectionIsVisible; // depending on focus - sal_Bool bScrolling; // hidden cursor while scrolling - sal_Bool bNotToggleSel; // set while in ToggleSelection() etc. - sal_Bool bHasFocus; // set/unset in Get/LoseFocus - sal_Bool bHideSelect; // hide selection (highlight) - TriState bHideCursor; // hide cursor (frame) + sal_uInt16 nResizeCol; // resize this column in MouseMove + bool bResizing; // mouse captured for column resizing + + bool bSelect; /// select or deselect + bool bSelectionIsVisible; // depending on focus + bool bScrolling; // hidden cursor while scrolling + bool bNotToggleSel; // set while in ToggleSelection() etc. + bool bHasFocus; // set/unset in Get/LoseFocus + bool bHideSelect; // hide selection (highlight) + TriState bHideCursor; // hide cursor (frame) Range aSelRange; // for selection expansion BrowserColumns* pCols; // array of column-descriptions @@ -277,14 +277,14 @@ private: ::std::auto_ptr< ::svt::BrowseBoxImpl > m_pImpl; // impl structure of the BrowseBox object - sal_Bool m_bFocusOnlyCursor; // hide cursor if we don't have the focus + bool m_bFocusOnlyCursor; // hide cursor if we don't have the focus Color m_aCursorColor; // special color for cursor, COL_TRANSPARENT for usual (VCL-painted) "inverted" cursor BrowserMode m_nCurrentMode; // last argument of SetMode (redundant, as our other members represent the current settings, too) private: SVT_DLLPRIVATE void ConstructImpl(BrowserMode nMode); SVT_DLLPRIVATE void ExpandRowSelection( const BrowserMouseEvent& rEvt ); - SVT_DLLPRIVATE void ToggleSelection( sal_Bool bForce = sal_False ); + SVT_DLLPRIVATE void ToggleSelection( bool bForce = false ); SVT_DLLPRIVATE void UpdateScrollbars(); SVT_DLLPRIVATE void AutoSizeLastColumn(); @@ -301,18 +301,18 @@ private: SVT_DLLPRIVATE long GetFrozenWidth() const; - sal_Bool GoToRow(long nRow, sal_Bool bRowColMove, sal_Bool bDoNotModifySelection = sal_False ); + bool GoToRow(long nRow, bool bRowColMove, bool bDoNotModifySelection = false ); - sal_Bool GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_Bool bRowColMove = sal_False); - void SelectColumnPos( sal_uInt16 nCol, sal_Bool _bSelect, sal_Bool bMakeVisible); - void SelectColumnId( sal_uInt16 nColId, sal_Bool _bSelect, sal_Bool bMakeVisible) + bool GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowColMove = false); + void SelectColumnPos( sal_uInt16 nCol, bool _bSelect, bool bMakeVisible); + void SelectColumnId( sal_uInt16 nColId, bool _bSelect, bool bMakeVisible) { SelectColumnPos( GetColumnPos(nColId), _bSelect, bMakeVisible); } - void ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_Bool _bForeignDevice, sal_Bool _bDrawSelections); + void ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections); - sal_Bool PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); } + bool PaintCursorIfHiddenOnce() const { return !m_bFocusOnlyCursor && !HasFocus(); } - sal_uInt16 ToggleSelectedColumn(); + sal_uInt16 ToggleSelectedColumn(); void SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId); protected: @@ -340,7 +340,7 @@ protected: @param nRow nRow starts at 0 */ - virtual sal_Bool SeekRow( long nRow ) = 0; + virtual bool SeekRow( long nRow ) = 0; virtual void DrawCursor(); virtual void PaintRow( OutputDevice &rDev, const Rectangle &rRect ); virtual void PaintData( Window& rWin, const Rectangle& rRect ); @@ -386,11 +386,11 @@ protected: inline const DataFlavorExVector& GetDataFlavors() const; - sal_Bool IsDropFormatSupported( SotFormatStringId nFormat ); // need this because the base class' IsDropFormatSupported is not const ... - sal_Bool IsDropFormatSupported( SotFormatStringId nFormat ) const; + bool IsDropFormatSupported( SotFormatStringId nFormat ); // need this because the base class' IsDropFormatSupported is not const ... + bool IsDropFormatSupported( SotFormatStringId nFormat ) const; - sal_Bool IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ); // need this because the base class' IsDropFormatSupported is not const ... - sal_Bool IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ) const; + bool IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ); // need this because the base class' IsDropFormatSupported is not const ... + bool IsDropFormatSupported( const css::datatransfer::DataFlavor& _rFlavor ) const; private: void* implGetDataFlavors() const; @@ -438,7 +438,7 @@ public: virtual void EndScroll(); virtual void Select(); virtual void DoubleClick( const BrowserMouseEvent& rEvt ); - virtual sal_Bool IsCursorMoveAllowed( long nNewRow, sal_uInt16 nNewColId ) const; + virtual bool IsCursorMoveAllowed( long nNewRow, sal_uInt16 nNewColId ) const; virtual void CursorMoved(); virtual void ColumnMoved( sal_uInt16 nColId ); virtual void ColumnResized( sal_uInt16 nColId ); @@ -448,8 +448,8 @@ public: virtual long QueryMinimumRowHeight(); // Window-Control (pass to DataWindow) - void SetUpdateMode( sal_Bool bUpdate ); - sal_Bool GetUpdateMode() const; + void SetUpdateMode( bool bUpdate ); + bool GetUpdateMode() const; // map-mode and font control void SetFont( const Font& rNewFont ); @@ -470,7 +470,7 @@ public: void SetColumnTitle( sal_uInt16 nColumnId, const OUString &rTitle ); void SetColumnWidth( sal_uInt16 nColumnId, sal_uLong nWidth ); void SetColumnPos( sal_uInt16 nColumnId, sal_uInt16 nPos ); - void FreezeColumn( sal_uInt16 nColumnId, sal_Bool bFreeze = sal_True ); + void FreezeColumn( sal_uInt16 nColumnId, bool bFreeze = true ); void UnfreezeColumns(); void RemoveColumn( sal_uInt16 nColumnId ); void RemoveColumns(); @@ -485,37 +485,37 @@ public: // access to dynamic values of cursor row OUString GetColumnTitle( sal_uInt16 nColumnId ) const; Rectangle GetFieldRect( sal_uInt16 nColumnId ) const; - sal_uLong GetColumnWidth( sal_uInt16 nColumnId ) const; - sal_uInt16 GetColumnId( sal_uInt16 nPos ) const; - sal_uInt16 GetColumnPos( sal_uInt16 nColumnId ) const; - sal_Bool IsFrozen( sal_uInt16 nColumnId ) const; + sal_uLong GetColumnWidth( sal_uInt16 nColumnId ) const; + sal_uInt16 GetColumnId( sal_uInt16 nPos ) const; + sal_uInt16 GetColumnPos( sal_uInt16 nColumnId ) const; + bool IsFrozen( sal_uInt16 nColumnId ) const; // movement of visible area void ResetScroll(); long ScrollColumns( long nColumns ); long ScrollRows( long nRows ); - sal_Bool MakeFieldVisible( long nRow, sal_uInt16 nColId, sal_Bool bComplete = sal_False ); + bool MakeFieldVisible( long nRow, sal_uInt16 nColId, bool bComplete = false ); // access and movement of cursor long GetCurRow() const { return nCurRow; } - sal_uInt16 GetCurColumnId() const { return nCurColId; } - sal_Bool GoToRow( long nRow ); - sal_Bool GoToColumnId( sal_uInt16 nColId ); - sal_Bool GoToRowColumnId( long nRow, sal_uInt16 nColId ); + sal_uInt16 GetCurColumnId() const { return nCurColId; } + bool GoToRow( long nRow ); + bool GoToColumnId( sal_uInt16 nColId ); + bool GoToRowColumnId( long nRow, sal_uInt16 nColId ); // selections virtual void SetNoSelection(); virtual void SelectAll(); virtual void SelectRow( long nRow, bool _bSelect = true, bool bExpand = true ); - void SelectColumnPos( sal_uInt16 nCol, sal_Bool _bSelect = sal_True ) - { SelectColumnPos( nCol, _bSelect, sal_True); } - void SelectColumnId( sal_uInt16 nColId, sal_Bool _bSelect = sal_True ) - { SelectColumnPos( GetColumnPos(nColId), _bSelect, sal_True); } + void SelectColumnPos( sal_uInt16 nCol, bool _bSelect = true ) + { SelectColumnPos( nCol, _bSelect, true); } + void SelectColumnId( sal_uInt16 nColId, bool _bSelect = true ) + { SelectColumnPos( GetColumnPos(nColId), _bSelect, true); } long GetSelectRowCount() const; sal_uInt16 GetSelectColumnCount() const; virtual bool IsRowSelected( long nRow ) const; bool IsColumnSelected( sal_uInt16 nColumnId ) const; - long FirstSelectedRow( sal_Bool bInverse = sal_False ); + long FirstSelectedRow( bool bInverse = false ); long LastSelectedRow(); long NextSelectedRow(); const MultiSelection* GetColumnSelection() const { return pColSel; } @@ -524,38 +524,38 @@ public: long FirstSelectedColumn( ) const; - sal_Bool IsResizing() const { return bResizing; } + bool IsResizing() const { return bResizing; } // access to positions of fields, column and rows Window& GetDataWindow() const { return *pDataWin; } Rectangle GetRowRectPixel( long nRow, - sal_Bool bRelToBrowser = sal_True ) const; + bool bRelToBrowser = true ) const; Rectangle GetFieldRectPixel( long nRow, sal_uInt16 nColId, - sal_Bool bRelToBrowser = sal_True) const; - sal_Bool IsFieldVisible( long nRow, sal_uInt16 nColId, - sal_Bool bComplete = sal_False ) const; + bool bRelToBrowser = true) const; + bool IsFieldVisible( long nRow, sal_uInt16 nColId, + bool bComplete = false ) const; long GetRowAtYPosPixel( long nY, - sal_Bool bRelToBrowser = sal_True ) const; + bool bRelToBrowser = true ) const; sal_uInt16 GetColumnAtXPosPixel( long nX, - sal_Bool bRelToBrowser = sal_True ) const; + bool bRelToBrowser = true ) const; // invalidations void Clear(); - void RowRemoved( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True ); + void RowRemoved( long nRow, long nNumRows = 1, bool bDoPaint = true ); void RowModified( long nRow, sal_uInt16 nColId = BROWSER_INVALIDID ); - void RowInserted( long nRow, long nNumRows = 1, sal_Bool bDoPaint = sal_True, sal_Bool bKeepSelection = sal_False ); + void RowInserted( long nRow, long nNumRows = 1, bool bDoPaint = true, bool bKeepSelection = false ); // miscellanous void ReserveControlArea( sal_uInt16 nWidth = USHRT_MAX ); Rectangle GetControlArea() const; - sal_Bool ProcessKey( const KeyEvent& rEvt ); + bool ProcessKey( const KeyEvent& rEvt ); void Dispatch( sal_uInt16 nId ); void SetMode( BrowserMode nMode = 0 ); BrowserMode GetMode( ) const { return m_nCurrentMode; } void SetCursorColor(const Color& _rCol); Color GetCursorColor() const { return m_aCursorColor; } - void ResetSelecting() { bSelecting = sal_False; } + void ResetSelecting() { bSelecting = false; } /** specifies that the user is allowed to interactively change the height of a row, by simply dragging an arbitrary row separator. @@ -563,8 +563,8 @@ public: Note that this works only if there's a handle column, since only in this case, there *is* something for the user to click onto */ - void EnableInteractiveRowHeight( sal_Bool _bEnable = sal_True ) { mbInteractiveRowHeight = _bEnable; } - sal_Bool IsInteractiveRowHeightEnabled( ) const { return mbInteractiveRowHeight; } + void EnableInteractiveRowHeight( bool _bEnable = true ) { mbInteractiveRowHeight = _bEnable; } + bool IsInteractiveRowHeightEnabled( ) const { return mbInteractiveRowHeight; } /// access to selected methods, to be granted to the BrowserColumn struct BrowserColumnAccess { friend class BrowserColumn; private: BrowserColumnAccess() { } }; @@ -630,7 +630,7 @@ public: void commitHeaderBarEvent(sal_Int16 nEventId, const css::uno::Any& rNewValue, const css::uno::Any& rOldValue, - sal_Bool _bColumnHeaderBar + bool _bColumnHeaderBar ); /** returns the Rectangle for either the column header bar ot the row header bar @@ -664,7 +664,7 @@ public: virtual Rectangle GetFieldRectPixelAbs(sal_Int32 _nRowId, sal_uInt16 _nColId, bool _bIsHeader, bool _bOnScreen = true); /// return <TRUE/> if and only if the accessible object for this instance has been created and is alive - sal_Bool isAccessibleAlive( ) const; + bool isAccessibleAlive( ) const; // ACCESSIBILITY ========================================================== public: diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 62fa3343c145..cf9b388c465f 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -514,7 +514,7 @@ namespace svt virtual void ColumnResized(sal_uInt16 nColId); virtual void Resize(); virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); - virtual sal_Bool SeekRow(long nRow); + virtual bool SeekRow(long nRow); virtual void GetFocus(); virtual void LoseFocus(); @@ -583,7 +583,7 @@ namespace svt // result in traveling to the next or to th previous cell virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; - virtual sal_Bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const; + virtual bool IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const; void PaintTristate(OutputDevice& rDev, const Rectangle& rRect,const TriState& eState,sal_Bool _bEnabled=sal_True) const; diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 7d82db02830f..b18c677dddd5 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -126,7 +126,7 @@ private: void InitSettings(); // BrowseBox - virtual sal_Bool SeekRow( long nRow ); + virtual bool SeekRow( long nRow ); virtual void PaintField( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; virtual void DoubleClick( const BrowserMouseEvent& rEvt ); virtual void Select(); diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 7fb5626f9698..44b7fc18c362 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -299,7 +299,7 @@ protected: bool m_bUpdating : 1; // are any updates being executed right now? protected: - virtual sal_Bool SeekRow(long nRow); + virtual bool SeekRow(long nRow); virtual void VisibleRowsChanged( long nNewTopRow, sal_uInt16 nNumRows); virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index c7040626985d..51f0ae8d36fb 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -138,7 +138,7 @@ protected: virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ); virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ); virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; - virtual sal_Bool SeekRow( long nRow ); + virtual bool SeekRow( long nRow ); virtual sal_Bool SaveModified(); virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const; virtual RowStatus GetRowStatus(long nRow) const; @@ -270,7 +270,7 @@ sal_Int8 OFieldExpressionControl::ExecuteDrop( const BrowserExecuteDropEvent& rE sal_Int8 nAction = DND_ACTION_NONE; if ( IsDropFormatSupported( OGroupExchange::getReportGroupId() ) ) { - sal_Int32 nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), sal_False); + sal_Int32 nRow = GetRowAtYPosPixel(rEvt.maPosPixel.Y(), false); SetNoSelection(); TransferableDataHelper aDropped( rEvt.maDropEvent.Transferable ); @@ -380,7 +380,7 @@ void OFieldExpressionControl::lateInit() // not the first call RowRemoved(0, GetRowCount()); - RowInserted(0, m_aGroupPositions.size(), sal_True); + RowInserted(0, m_aGroupPositions.size(), true); } @@ -542,12 +542,12 @@ CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt1 } -sal_Bool OFieldExpressionControl::SeekRow( long _nRow ) +bool OFieldExpressionControl::SeekRow( long _nRow ) { // die Basisklasse braucht den Aufruf, da sie sich dort merkt, welche Zeile gepainted wird EditBrowseBox::SeekRow(_nRow); m_nCurrentPos = _nRow; - return sal_True; + return true; } @@ -909,7 +909,7 @@ void OFieldExpressionControl::InsertRows( long nRow ) } } - RowInserted( nRow,nSize,sal_True ); + RowInserted( nRow, nSize, true ); } diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 90dabe17e69e..051ce1a17394 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -63,7 +63,7 @@ namespace void BrowseBox::ConstructImpl( BrowserMode nMode ) { OSL_TRACE( "BrowseBox: %p->ConstructImpl", this ); - bMultiSelection = sal_False; + bMultiSelection = false; pColSel = 0; pDataWin = 0; pVScroll = 0; @@ -76,26 +76,26 @@ void BrowseBox::ConstructImpl( BrowserMode nMode ) InitSettings_Impl( this ); InitSettings_Impl( pDataWin ); - bBootstrapped = sal_False; + bBootstrapped = false; nDataRowHeight = 0; nTitleLines = 1; nFirstCol = 0; nTopRow = 0; nCurRow = BROWSER_ENDOFSELECTION; nCurColId = 0; - bResizing = sal_False; + bResizing = false; bSelect = false; - bSelecting = sal_False; - bScrolling = sal_False; - bSelectionIsVisible = sal_False; - bNotToggleSel = sal_False; - bRowDividerDrag = sal_False; - bHit = sal_False; - mbInteractiveRowHeight = sal_False; - bHideSelect = sal_False; + bSelecting = false; + bScrolling = false; + bSelectionIsVisible = false; + bNotToggleSel = false; + bRowDividerDrag = false; + bHit = false; + mbInteractiveRowHeight = false; + bHideSelect = false; bHideCursor = TRISTATE_FALSE; nRowCount = 0; - m_bFocusOnlyCursor = sal_True; + m_bFocusOnlyCursor = true; m_aCursorColor = COL_TRANSPARENT; m_nCurrentMode = 0; nControlAreaWidth = USHRT_MAX; @@ -324,7 +324,7 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId) } } -void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze ) +void BrowseBox::FreezeColumn( sal_uInt16 nItemId, bool bFreeze ) { // never unfreeze the handle-column @@ -338,7 +338,7 @@ void BrowseBox::FreezeColumn( sal_uInt16 nItemId, sal_Bool bFreeze ) return; // doesn't the state change? - if ( (*pCols)[ nItemPos ]->IsFrozen() == bFreeze ) + if ( (*pCols)[ nItemPos ]->IsFrozen() == (bFreeze ? 1 : 0) ) return; // remark the column selection @@ -602,7 +602,7 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) return; // do we want to display the change immediately? - sal_Bool bUpdate = GetUpdateMode() && + bool bUpdate = GetUpdateMode() && ( (*pCols)[ nItemPos ]->IsFrozen() || nItemPos >= nFirstCol ); if ( bUpdate ) @@ -631,8 +631,8 @@ void BrowseBox::SetColumnWidth( sal_uInt16 nItemId, sal_uLong nWidth ) // actually scroll+invalidate pDataWin->SetClipRegion(); - sal_Bool bSelVis = bSelectionIsVisible; - bSelectionIsVisible = sal_False; + bool bSelVis = bSelectionIsVisible; + bSelectionIsVisible = false; if( GetBackground().IsScrollable() ) { @@ -764,7 +764,7 @@ void BrowseBox::RemoveColumn( sal_uInt16 nItemId ) CHILD, Any(), makeAny( CreateAccessibleColumnHeader( nPos ) ), - sal_True + true ); } } @@ -907,9 +907,9 @@ long BrowseBox::ScrollColumns( long nCols ) // implicitly hides cursor while scrolling StartScroll(); - bScrolling = sal_True; - sal_Bool bScrollable = pDataWin->GetBackground().IsScrollable(); - sal_Bool bInvalidateView = sal_False; + bScrolling = true; + bool bScrollable = pDataWin->GetBackground().IsScrollable(); + bool bInvalidateView = false; // scrolling one column to the right? if ( nCols == 1 ) @@ -920,7 +920,7 @@ long BrowseBox::ScrollColumns( long nCols ) if ( !bScrollable ) { - bInvalidateView = sal_True; + bInvalidateView = true; } else { @@ -966,7 +966,7 @@ long BrowseBox::ScrollColumns( long nCols ) if ( !bScrollable ) { - bInvalidateView = sal_True; + bInvalidateView = true; } else { @@ -1033,7 +1033,7 @@ long BrowseBox::ScrollColumns( long nCols ) getDataWindow()->Update(); Update(); } - bScrolling = sal_False; + bScrolling = false; EndScroll(); return nCols; @@ -1112,7 +1112,7 @@ void BrowseBox::RowModified( long nRow, sal_uInt16 nColId ) else { // invalidate the specific field - aRect = GetFieldRectPixel( nRow, nColId, sal_False ); + aRect = GetFieldRectPixel( nRow, nColId, false ); } getDataWindow()->Invalidate( aRect ); } @@ -1183,7 +1183,7 @@ void BrowseBox::Clear() } } -void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bool bKeepSelection ) +void BrowseBox::RowInserted( long nRow, long nNumRows, bool bDoPaint, bool bKeepSelection ) { if (nRow < 0) @@ -1195,7 +1195,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo return; // adjust total row count - sal_Bool bLastRow = nRow >= nRowCount; + bool bLastRow = nRow >= nRowCount; nRowCount += nNumRows; DoHideCursor( "RowInserted" ); @@ -1239,9 +1239,9 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo // adjust the cursor if ( nCurRow == BROWSER_ENDOFSELECTION ) - GoToRow( 0, sal_False, bKeepSelection ); + GoToRow( 0, false, bKeepSelection ); else if ( nRow <= nCurRow ) - GoToRow( nCurRow += nNumRows, sal_False, bKeepSelection ); + GoToRow( nCurRow += nNumRows, false, bKeepSelection ); // adjust the vertical scrollbar if ( bDoPaint ) @@ -1273,7 +1273,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo CHILD, makeAny( CreateAccessibleRowHeader( i ) ), Any(), - sal_False + false ); } } @@ -1288,7 +1288,7 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, sal_Bool bDoPaint, sal_Bo -void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint ) +void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint ) { if ( nRow < 0 ) @@ -1444,7 +1444,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint ) CHILD, Any(), makeAny( CreateAccessibleRowHeader( i ) ), - sal_False + false ); } } @@ -1460,29 +1460,29 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, sal_Bool bDoPaint ) -sal_Bool BrowseBox::GoToRow( long nRow) +bool BrowseBox::GoToRow( long nRow) { - return GoToRow(nRow, sal_False, sal_False); + return GoToRow(nRow, false, false); } -sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSelection ) +bool BrowseBox::GoToRow( long nRow, bool bRowColMove, bool bKeepSelection ) { long nOldCurRow = nCurRow; // nothing to do? if ( nRow == nCurRow && ( bMultiSelection || uRow.nSel == nRow ) ) - return sal_True; + return true; // out of range? if ( nRow < 0 || nRow >= nRowCount ) - return sal_False; + return false; // not allowed? if ( ( !bRowColMove && !IsCursorMoveAllowed( nRow, nCurColId ) ) ) - return sal_False; + return false; if ( getDataWindow()->bNoScrollBack && nRow < nTopRow ) nRow = nTopRow; @@ -1501,11 +1501,11 @@ sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSele DoHideCursor( "GoToRow" ); // must we scroll? - sal_Bool bWasVisible = bSelectionIsVisible; + bool bWasVisible = bSelectionIsVisible; if (! bMultiSelection) { if( !bKeepSelection ) - bSelectionIsVisible = sal_False; + bSelectionIsVisible = false; } if ( nRow < nTopRow ) ScrollRows( nRow - nTopRow ); @@ -1549,34 +1549,34 @@ sal_Bool BrowseBox::GoToRow( long nRow, sal_Bool bRowColMove, sal_Bool bKeepSele else bSelect = true; } - return sal_True; + return true; } -sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId) +bool BrowseBox::GoToColumnId( sal_uInt16 nColId) { - return GoToColumnId(nColId,sal_True,sal_False); + return GoToColumnId(nColId, true, false); } -sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_Bool bRowColMove) +bool BrowseBox::GoToColumnId( sal_uInt16 nColId, bool bMakeVisible, bool bRowColMove) { if (!bColumnCursor) - return sal_False; + return false; // allowed? if (!bRowColMove && !IsCursorMoveAllowed( nCurRow, nColId ) ) - return sal_False; + return false; - if ( nColId != nCurColId || (bMakeVisible && !IsFieldVisible(nCurRow, nColId, sal_True))) + if ( nColId != nCurColId || (bMakeVisible && !IsFieldVisible(nCurRow, nColId, true))) { sal_uInt16 nNewPos = GetColumnPos(nColId); BrowserColumn* pColumn = (nNewPos < pCols->size()) ? (*pCols)[ nNewPos ] : NULL; DBG_ASSERT( pColumn, "no column object - invalid id?" ); if ( !pColumn ) - return sal_False; + return false; DoHideCursor( "GoToColumnId" ); nCurColId = nColId; @@ -1584,7 +1584,7 @@ sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_ sal_uInt16 nFirstPos = nFirstCol; sal_uInt16 nWidth = (sal_uInt16)pColumn->Width(); sal_uInt16 nLastPos = GetColumnAtXPosPixel( - pDataWin->GetSizePixel().Width()-nWidth, sal_False ); + pDataWin->GetSizePixel().Width()-nWidth, false ); sal_uInt16 nFrozen = FrozenColCount(); if ( bMakeVisible && nLastPos && nNewPos >= nFrozen && ( nNewPos < nFirstPos || nNewPos > nLastPos ) ) @@ -1598,34 +1598,34 @@ sal_Bool BrowseBox::GoToColumnId( sal_uInt16 nColId, sal_Bool bMakeVisible, sal_ DoShowCursor( "GoToColumnId" ); if (!bRowColMove) CursorMoved(); - return sal_True; + return true; } - return sal_True; + return true; } -sal_Bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId ) +bool BrowseBox::GoToRowColumnId( long nRow, sal_uInt16 nColId ) { // out of range? if ( nRow < 0 || nRow >= nRowCount ) - return sal_False; + return false; if (!bColumnCursor) - return sal_False; + return false; // nothing to do ? if ( nRow == nCurRow && ( bMultiSelection || uRow.nSel == nRow ) && - nColId == nCurColId && IsFieldVisible(nCurRow, nColId, sal_True)) - return sal_True; + nColId == nCurColId && IsFieldVisible(nCurRow, nColId, true)) + return true; // allowed? if (!IsCursorMoveAllowed(nRow, nColId)) - return sal_False; + return false; DoHideCursor( "GoToRowColumnId" ); - sal_Bool bMoved = GoToRow(nRow, sal_True) && GoToColumnId(nColId, sal_True, sal_True); + bool bMoved = GoToRow(nRow, true) && GoToColumnId(nColId, true, true); DoShowCursor( "GoToRowColumnId" ); if (bMoved) @@ -1728,14 +1728,14 @@ void BrowseBox::SelectAll() SELECTION_CHANGED, Any(), Any(), - sal_True + true ); // column header event commitHeaderBarEvent( SELECTION_CHANGED, Any(), Any(), - sal_False + false ); // row header event } } @@ -1749,7 +1749,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand ) { // deselecting is impossible, selecting via cursor if ( _bSelect ) - GoToRow(nRow, sal_False); + GoToRow(nRow, false); return; } @@ -1808,7 +1808,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand ) SELECTION_CHANGED, Any(), Any(), - sal_False + false ); // row header event } } @@ -1824,7 +1824,7 @@ long BrowseBox::GetSelectRowCount() const -void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_Bool bMakeVisible ) +void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMakeVisible ) { if ( !bColumnCursor || nNewColPos == BROWSER_INVALIDID ) @@ -1856,7 +1856,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B // only highlight painted areas pDataWin->Update(); - Rectangle aFieldRectPix( GetFieldRectPixel( nCurRow, nCurColId, sal_False ) ); + Rectangle aFieldRectPix( GetFieldRectPixel( nCurRow, nCurColId, false ) ); Rectangle aRect( Point( aFieldRectPix.Left() - MIN_COLUMNWIDTH, 0 ), Size( (*pCols)[ nNewColPos ]->Width(), @@ -1878,7 +1878,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, sal_Bool _bSelect, sal_B SELECTION_CHANGED, Any(), Any(), - sal_True + true ); // column header event } } @@ -1905,7 +1905,7 @@ long BrowseBox::FirstSelectedColumn( ) const -long BrowseBox::FirstSelectedRow( sal_Bool bInverse ) +long BrowseBox::FirstSelectedRow( bool bInverse ) { return bMultiSelection ? uRow.pSel->FirstSelected(bInverse) : uRow.nSel; @@ -1946,11 +1946,11 @@ bool BrowseBox::IsColumnSelected( sal_uInt16 nColumnId ) const -sal_Bool BrowseBox::MakeFieldVisible +bool BrowseBox::MakeFieldVisible ( long nRow, // line number of the field (starting with 0) sal_uInt16 nColId, // column ID of the field - sal_Bool bComplete // (== sal_False), sal_True => make visible in its entirety + bool bComplete // (== false), true => make visible in its entirety ) /* [Description] @@ -1961,10 +1961,10 @@ sal_Bool BrowseBox::MakeFieldVisible [Returned Value] - sal_Bool sal_True + bool true The given field is already visible or was already visible. - sal_False + false The given field could not be made visible or in the case of 'bComplete' could not be made visible in its entirety. */ @@ -1974,16 +1974,16 @@ sal_Bool BrowseBox::MakeFieldVisible if ( !bBootstrapped || ( aTestSize.Width() == 0 && aTestSize.Height() == 0 ) ) - return sal_False; + return false; // is it visible already? - sal_Bool bVisible = IsFieldVisible( nRow, nColId, bComplete ); + bool bVisible = IsFieldVisible( nRow, nColId, bComplete ); if ( bVisible ) - return sal_True; + return true; // calculate column position, field rectangle and painting area sal_uInt16 nColPos = GetColumnPos( nColId ); - Rectangle aFieldRect = GetFieldRectPixel( nRow, nColId, sal_False ); + Rectangle aFieldRect = GetFieldRectPixel( nRow, nColId, false ); Rectangle aDataRect = Rectangle( Point(0, 0), pDataWin->GetSizePixel() ); // positioned outside on the left? @@ -2000,7 +2000,7 @@ sal_Bool BrowseBox::MakeFieldVisible if ( ScrollColumns( 1 ) != 1 ) // no more need to scroll break; - aFieldRect = GetFieldRectPixel( nRow, nColId, sal_False ); + aFieldRect = GetFieldRectPixel( nRow, nColId, false ); } // positioned outside above? @@ -2026,18 +2026,18 @@ sal_Bool BrowseBox::MakeFieldVisible -sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId, - sal_Bool bCompletely ) const +bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId, + bool bCompletely ) const { // hidden by frozen column? sal_uInt16 nColPos = GetColumnPos( nColumnId ); if ( nColPos >= FrozenColCount() && nColPos < nFirstCol ) - return sal_False; + return false; Rectangle aRect( ImplFieldRectPixel( nRow, nColumnId ) ); if ( aRect.IsEmpty() ) - return sal_False; + return false; // get the visible area Rectangle aOutRect( Point(0, 0), pDataWin->GetOutputSizePixel() ); @@ -2053,7 +2053,7 @@ sal_Bool BrowseBox::IsFieldVisible( long nRow, sal_uInt16 nColumnId, Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId, - sal_Bool bRelToBrowser) const + bool bRelToBrowser) const { // get the rectangle relative to DataWin @@ -2074,7 +2074,7 @@ Rectangle BrowseBox::GetFieldRectPixel( long nRow, sal_uInt16 nColumnId, -Rectangle BrowseBox::GetRowRectPixel( long nRow, sal_Bool bRelToBrowser ) const +Rectangle BrowseBox::GetRowRectPixel( long nRow, bool bRelToBrowser ) const { // get the rectangle relative to DataWin @@ -2132,7 +2132,7 @@ Rectangle BrowseBox::ImplFieldRectPixel( long nRow, sal_uInt16 nColumnId ) const -long BrowseBox::GetRowAtYPosPixel( long nY, sal_Bool bRelToBrowser ) const +long BrowseBox::GetRowAtYPosPixel( long nY, bool bRelToBrowser ) const { // compute the Y-coordinate @@ -2160,7 +2160,7 @@ Rectangle BrowseBox::GetFieldRect( sal_uInt16 nColumnId ) const -sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, sal_Bool ) const +sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const { // accumulate the widths of the visible columns @@ -2340,17 +2340,17 @@ void BrowseBox::VisibleRowsChanged( long, sal_uInt16 ) // old behavior: automatically correct NumRows: if ( nRowCount < GetRowCount() ) { - RowInserted(nRowCount,GetRowCount() - nRowCount,sal_False); + RowInserted(nRowCount,GetRowCount() - nRowCount, false); } else if ( nRowCount > GetRowCount() ) { - RowRemoved(nRowCount-(nRowCount - GetRowCount()),nRowCount - GetRowCount(),sal_False); + RowRemoved(nRowCount-(nRowCount - GetRowCount()),nRowCount - GetRowCount(), false); } } -sal_Bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const +bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const /* [Description] @@ -2361,11 +2361,11 @@ sal_Bool BrowseBox::IsCursorMoveAllowed( long, sal_uInt16 ) const This method is not called, if the cursor movement results from removing or deleting a row/column (thus, in cases where only a "cursor correction" happens). - The base implementation currently always returns sal_True. + The base implementation currently always returns true. */ { - return sal_True; + return true; } @@ -2467,10 +2467,10 @@ void BrowseBox::LoseFocus() if ( !bKeepHighlight ) { ToggleSelection(); - bSelectionIsVisible = sal_False; + bSelectionIsVisible = false; } - bHasFocus = sal_False; + bHasFocus = false; } Control::LoseFocus(); } @@ -2485,12 +2485,12 @@ void BrowseBox::GetFocus() { if ( !bSelectionIsVisible ) { - bSelectionIsVisible = sal_True; + bSelectionIsVisible = true; if ( bBootstrapped ) ToggleSelection(); } - bHasFocus = sal_True; + bHasFocus = true; DoShowCursor( "GetFocus" ); } Control::GetFocus(); diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index e350e6819dc9..ef7bcd41c779 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -93,7 +93,7 @@ void* BrowseBox::implGetDataFlavors() const -sal_Bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat ) +bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat ) { if ( static_cast< BrowserDataWin* >( pDataWin )->bCallingDropCallback ) return static_cast< BrowserDataWin* >( pDataWin )->IsDropFormatSupported( _nFormat ); @@ -103,14 +103,14 @@ sal_Bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat ) -sal_Bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat ) const +bool BrowseBox::IsDropFormatSupported( SotFormatStringId _nFormat ) const { return const_cast< BrowseBox* >( this )->IsDropFormatSupported( _nFormat ); } -sal_Bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor ) +bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor ) { if ( static_cast< BrowserDataWin* >( pDataWin )->bCallingDropCallback ) return static_cast< BrowserDataWin* >( pDataWin )->IsDropFormatSupported( _rFlavor ); @@ -120,7 +120,7 @@ sal_Bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor ) -sal_Bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor ) const +bool BrowseBox::IsDropFormatSupported( const DataFlavor& _rFlavor ) const { return const_cast< BrowseBox* >( this )->IsDropFormatSupported( _rFlavor ); } @@ -153,7 +153,7 @@ void BrowseBox::StateChanged( StateChangedType nStateChange ) } else if ( STATE_CHANGE_INITSHOW == nStateChange ) { - bBootstrapped = sal_True; // must be set first! + bBootstrapped = true; // must be set first! Resize(); if ( bMultiSelection ) @@ -166,8 +166,8 @@ void BrowseBox::StateChanged( StateChangedType nStateChange ) if ( HasFocus() ) { - bSelectionIsVisible = sal_True; - bHasFocus = sal_True; + bSelectionIsVisible = true; + bHasFocus = true; } UpdateScrollbars(); AutoSizeLastColumn(); @@ -194,9 +194,9 @@ void BrowseBox::StateChanged( StateChangedType nStateChange ) else if (STATE_CHANGE_ENABLE == nStateChange) { // do we have a handle column? - sal_Bool bHandleCol = !pCols->empty() && (0 == (*pCols)[ 0 ]->GetId()); + bool bHandleCol = !pCols->empty() && (0 == (*pCols)[ 0 ]->GetId()); // do we have a header bar? - sal_Bool bHeaderBar = (NULL != static_cast<BrowserDataWin&>(GetDataWindow()).pHeaderBar); + bool bHeaderBar = (NULL != static_cast<BrowserDataWin&>(GetDataWindow()).pHeaderBar); if ( nTitleLines && ( !bHeaderBar @@ -289,7 +289,7 @@ void BrowseBox::EndScroll() -void BrowseBox::ToggleSelection( sal_Bool bForce ) +void BrowseBox::ToggleSelection( bool bForce ) { // selection highlight-toggling allowed? @@ -300,7 +300,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce ) return; // only highlight painted areas! - bNotToggleSel = sal_True; + bNotToggleSel = true; if ( false && !getDataWindow()->bInPaint ) pDataWin->Update(); @@ -350,7 +350,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce ) { Rectangle aRect( GetFieldRectPixel(nCurRow, (*pCols)[ nColId ]->GetId(), - sal_False ) ); + false ) ); aRect.Left() -= MIN_COLUMNWIDTH; aRect.Right() += MIN_COLUMNWIDTH; aRect.Top() = 0; @@ -358,7 +358,7 @@ void BrowseBox::ToggleSelection( sal_Bool bForce ) pDataWin->Invalidate( aRect ); } - bNotToggleSel = sal_False; + bNotToggleSel = false; } @@ -391,7 +391,7 @@ void BrowseBox::DrawCursor() Rectangle aCursor; if ( bColumnCursor ) { - aCursor = GetFieldRectPixel( nCurRow, nCurColId, sal_False ); + aCursor = GetFieldRectPixel( nCurRow, nCurColId, false ); aCursor.Left() -= MIN_COLUMNWIDTH; aCursor.Right() += 1; aCursor.Bottom() += 1; @@ -465,13 +465,13 @@ sal_uInt16 BrowseBox::GetColumnPos( sal_uInt16 nId ) const -sal_Bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const +bool BrowseBox::IsFrozen( sal_uInt16 nColumnId ) const { for ( size_t nPos = 0; nPos < pCols->size(); ++nPos ) if ( (*pCols)[ nPos ]->GetId() == nColumnId ) return (*pCols)[ nPos ]->IsFrozen(); - return sal_False; + return false; } @@ -487,7 +487,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) Range aJustifiedRange( aSelRange ); aJustifiedRange.Justify(); - sal_Bool bSelectThis = ( bSelect != aJustifiedRange.IsInside( rEvt.GetRow() ) ); + bool bSelectThis = ( bSelect != aJustifiedRange.IsInside( rEvt.GetRow() ) ); if ( aJustifiedRange.IsInside( rEvt.GetRow() ) ) { @@ -506,8 +506,8 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) else { // up and down - sal_Bool bOldSelecting = bSelecting; - bSelecting = sal_True; + bool bOldSelecting = bSelecting; + bSelecting = true; while ( rEvt.GetRow() < aSelRange.Max() ) { // ZTC/Mac bug - don't put these statements together! --aSelRange.Max(); @@ -535,7 +535,7 @@ void BrowseBox::ExpandRowSelection( const BrowserMouseEvent& rEvt ) if ( !bMultiSelection || !IsRowSelected( rEvt.GetRow() ) ) SelectRow( rEvt.GetRow(), true ); - GoToRow( rEvt.GetRow(), sal_False ); + GoToRow( rEvt.GetRow(), false ); DoShowCursor( "ExpandRowSelection" ); } @@ -629,8 +629,8 @@ void BrowseBox::Paint( const Rectangle& rRect ) return; BrowserColumn *pFirstCol = (*pCols)[ 0 ]; - sal_Bool bHandleCol = pFirstCol && pFirstCol->GetId() == 0; - sal_Bool bHeaderBar = getDataWindow()->pHeaderBar != NULL; + bool bHandleCol = pFirstCol && pFirstCol->GetId() == 0; + bool bHeaderBar = getDataWindow()->pHeaderBar != NULL; // draw delimitational lines if ( !getDataWindow()->bNoHScroll ) @@ -721,7 +721,7 @@ void BrowseBox::PaintRow( OutputDevice&, const Rectangle& ) void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { - sal_Bool bDrawSelection = (nFlags & WINDOW_DRAW_NOSELECTION) == 0; + bool bDrawSelection = (nFlags & WINDOW_DRAW_NOSELECTION) == 0; // we need pixel coordinates Size aRealSize = pDev->LogicToPixel(rSize); @@ -833,7 +833,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->SetClipRegion( pDev->PixelToLogic( aRegion ) ); // do we have to paint the background - sal_Bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && GetDataWindow().IsControlBackground(); + bool bBackground = !(nFlags & WINDOW_DRAW_NOBACKGROUND) && GetDataWindow().IsControlBackground(); if ( bBackground ) { Rectangle aRect( aRealPos, aRealSize ); @@ -841,7 +841,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, pDev->DrawRect( aRect ); } - ImplPaintData( *pDev, Rectangle( aRealPos, aRealSize ), sal_True, bDrawSelection ); + ImplPaintData( *pDev, Rectangle( aRealPos, aRealSize ), true, bDrawSelection ); // restore the column widths/data row height nDataRowHeight = nOriginalHeight; @@ -862,7 +862,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, -void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_Bool _bForeignDevice, sal_Bool _bDrawSelections) +void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool _bForeignDevice, bool _bDrawSelections) { Point aOverallAreaPos = _bForeignDevice ? _rRect.TopLeft() : Point(0,0); Size aOverallAreaSize = _bForeignDevice ? _rRect.GetSize() : GetDataWindow().GetOutputSizePixel(); @@ -920,7 +920,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_ Size( _rRect.GetSize().Width(), nDataRowHeigt ) ); PaintRow( _rOut, aRowRect ); - sal_Bool bRowSelected = _bDrawSelections + bool bRowSelected = _bDrawSelections && !bHideSelect && IsRowSelected( nRow ); if ( bRowSelected ) @@ -957,7 +957,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, sal_ } // prepare Column-AutoHighlight - sal_Bool bColAutoHighlight = _bDrawSelections + bool bColAutoHighlight = _bDrawSelections && bColumnCursor && IsColumnSelected( pCol->GetId() ); if ( bColAutoHighlight ) @@ -1121,7 +1121,7 @@ void BrowseBox::PaintData( Window& rWin, const Rectangle& rRect ) Resize(); // MI: who was that? Window::Update(); - ImplPaintData(rWin, rRect, sal_False, sal_True); + ImplPaintData(rWin, rRect, false, true); } @@ -1146,7 +1146,7 @@ void BrowseBox::UpdateScrollbars() if (IsZoom()) nCornerSize = (sal_uLong)(nCornerSize * (double)GetZoom()); - sal_Bool bNeedsVScroll = sal_False; + bool bNeedsVScroll = false; long nMaxRows = 0; if (GetDataRowHeight()) { @@ -1178,7 +1178,7 @@ void BrowseBox::UpdateScrollbars() sal_uLong nLastCol = GetColumnAtXPosPixel( aDataWinSize.Width() - 1 ); sal_uInt16 nFrozenCols = FrozenColCount(); - sal_Bool bNeedsHScroll = getDataWindow()->bAutoHScroll + bool bNeedsHScroll = getDataWindow()->bAutoHScroll ? ( nFirstCol > nFrozenCols ) || ( nLastCol <= pCols->size() ) : !getDataWindow()->bNoHScroll; if ( !bNeedsHScroll ) @@ -1300,10 +1300,10 @@ void BrowseBox::UpdateScrollbars() -void BrowseBox::SetUpdateMode( sal_Bool bUpdate ) +void BrowseBox::SetUpdateMode( bool bUpdate ) { - sal_Bool bWasUpdate = IsUpdateMode(); + bool bWasUpdate = IsUpdateMode(); if ( bWasUpdate == bUpdate ) return; @@ -1330,7 +1330,7 @@ void BrowseBox::SetUpdateMode( sal_Bool bUpdate ) -sal_Bool BrowseBox::GetUpdateMode() const +bool BrowseBox::GetUpdateMode() const { return getDataWindow()->IsUpdateMode(); @@ -1443,7 +1443,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) if ( pCol->GetId() && std::abs( nR - rEvtPos.X() ) < 2 ) { // start resizing the column - bResizing = sal_True; + bResizing = true; nResizeCol = nCol; nDragX = nResizeX = rEvtPos.X(); SetPointer( Pointer( POINTER_HSPLIT ) ); @@ -1550,7 +1550,7 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) // end action SetPointer( Pointer() ); ReleaseMouse(); - bResizing = sal_False; + bResizing = false; } else MouseButtonUp( BrowserMouseEvent( (BrowserDataWin*)pDataWin, @@ -1562,8 +1562,8 @@ void BrowseBox::MouseButtonUp( const MouseEvent & rEvt ) -sal_Bool bExtendedMode = sal_False; -sal_Bool bFieldMode = sal_False; +bool bExtendedMode = false; +bool bFieldMode = false; void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) { @@ -1584,7 +1584,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) if ( bColumnCursor && rEvt.GetColumn() != 0 ) { if ( rEvt.GetColumn() < pCols->size() ) - SelectColumnPos( rEvt.GetColumn(), sal_True, sal_False); + SelectColumnPos( rEvt.GetColumn(), true, false); } } DoubleClick( rEvt ); @@ -1596,7 +1596,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) if ( rEvt.GetClicks() == 1 ) { // initialise flags - bHit = sal_False; + bHit = false; a1stPoint = a2ndPoint = PixelToLogic( rEvt.GetPosPixel() ); @@ -1609,7 +1609,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) } // while selecting, no cursor - bSelecting = sal_True; + bSelecting = true; DoHideCursor( "MouseButtonDown" ); // DataRow? @@ -1646,7 +1646,7 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) else if ( IsRowSelected( rEvt.GetRow() ) ) { // wait for Drag&Drop - bHit = sal_True; + bHit = true; bExtendedMode = MOUSE_MULTISELECT == ( rEvt.GetMode() & MOUSE_MULTISELECT ); return; @@ -1678,8 +1678,8 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) if ( IsColumnSelected( rEvt.GetColumn() ) || IsRowSelected( rEvt.GetRow() ) ) { - bHit = sal_True; - bFieldMode = sal_True; + bHit = true; + bFieldMode = true; return; } @@ -1699,11 +1699,11 @@ void BrowseBox::MouseButtonDown( const BrowserMouseEvent& rEvt ) SelectAll(); } else - SelectColumnId( rEvt.GetColumnId(), sal_True, sal_False ); + SelectColumnId( rEvt.GetColumnId(), true, false ); } // turn cursor on again, if necessary - bSelecting = sal_False; + bSelecting = false; DoShowCursor( "MouseButtonDown" ); if ( bSelect ) Select(); @@ -1740,15 +1740,15 @@ void BrowseBox::MouseButtonUp( const BrowserMouseEvent &rEvt ) } } bSelect = true; - bExtendedMode = sal_False; - bFieldMode = sal_False; - bHit = sal_False; + bExtendedMode = false; + bFieldMode = false; + bHit = false; } // activate cursor if ( bSelecting ) { - bSelecting = sal_False; + bSelecting = false; DoShowCursor( "MouseButtonUp" ); if ( bSelect ) Select(); @@ -1765,13 +1765,13 @@ void BrowseBox::KeyInput( const KeyEvent& rEvt ) -sal_Bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) +bool BrowseBox::ProcessKey( const KeyEvent& rEvt ) { sal_uInt16 nCode = rEvt.GetKeyCode().GetCode(); - sal_Bool bShift = rEvt.GetKeyCode().IsShift(); - sal_Bool bCtrl = rEvt.GetKeyCode().IsMod1(); - sal_Bool bAlt = rEvt.GetKeyCode().IsMod2(); + bool bShift = rEvt.GetKeyCode().IsShift(); + bool bCtrl = rEvt.GetKeyCode().IsMod1(); + bool bAlt = rEvt.GetKeyCode().IsMod2(); sal_uInt16 nId = BROWSER_NONE; @@ -1839,7 +1839,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) { long nRowsOnPage = pDataWin->GetSizePixel().Height() / GetDataRowHeight(); - sal_Bool bDone = sal_False; + bool bDone = false; switch ( nId ) { @@ -1850,11 +1850,11 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) case BROWSER_CURSORDOWN: if ( ( GetCurRow() + 1 ) < nRowCount ) - bDone = GoToRow( GetCurRow() + 1, sal_False ); + bDone = GoToRow( GetCurRow() + 1, false ); break; case BROWSER_CURSORUP: if ( GetCurRow() > 0 ) - bDone = GoToRow( GetCurRow() - 1, sal_False ); + bDone = GoToRow( GetCurRow() - 1, false ); break; case BROWSER_SELECTHOME: if ( GetRowCount() ) @@ -1862,7 +1862,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) DoHideCursor( "BROWSER_SELECTHOME" ); for ( long nRow = GetCurRow(); nRow >= 0; --nRow ) SelectRow( nRow ); - GoToRow( 0, sal_True ); + GoToRow( 0, true ); DoShowCursor( "BROWSER_SELECTHOME" ); } break; @@ -1873,7 +1873,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) long nRows = GetRowCount(); for ( long nRow = GetCurRow(); nRow < nRows; ++nRow ) SelectRow( nRow ); - GoToRow( GetRowCount() - 1, sal_True ); + GoToRow( GetRowCount() - 1, true ); DoShowCursor( "BROWSER_SELECTEND" ); } break; @@ -1884,10 +1884,10 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) // deselect the current row, if it isn't the first // and there is no other selected row above long nRow = GetCurRow(); - sal_Bool bLocalSelect = ( !IsRowSelected( nRow ) || + bool bLocalSelect = ( !IsRowSelected( nRow ) || GetSelectRowCount() == 1 || IsRowSelected( nRow - 1 ) ); SelectRow( nRow, bLocalSelect, true ); - bDone = GoToRow( GetCurRow() + 1 , sal_False ); + bDone = GoToRow( GetCurRow() + 1, false ); if ( bDone ) SelectRow( GetCurRow(), true, true ); } @@ -1901,19 +1901,19 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) // deselect the current row, if it isn't the first // and there is no other selected row under long nRow = GetCurRow(); - sal_Bool bLocalSelect = ( !IsRowSelected( nRow ) || + bool bLocalSelect = ( !IsRowSelected( nRow ) || GetSelectRowCount() == 1 || IsRowSelected( nRow + 1 ) ); SelectRow( nCurRow, bLocalSelect, true ); - bDone = GoToRow( nRow - 1 , sal_False ); + bDone = GoToRow( nRow - 1, false ); if ( bDone ) SelectRow( GetCurRow(), true, true ); } break; case BROWSER_CURSORPAGEDOWN: - bDone = (sal_Bool)ScrollRows( nRowsOnPage ); + bDone = ScrollRows( nRowsOnPage ); break; case BROWSER_CURSORPAGEUP: - bDone = (sal_Bool)ScrollRows( -nRowsOnPage ); + bDone = ScrollRows( -nRowsOnPage ); break; case BROWSER_CURSOREND: if ( bColumnCursor ) @@ -1923,7 +1923,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) break; } case BROWSER_CURSORENDOFFILE: - bDone = GoToRow( nRowCount - 1, sal_False ); + bDone = GoToRow( nRowCount - 1, false ); break; case BROWSER_CURSORRIGHT: if ( bColumnCursor ) @@ -1954,7 +1954,7 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) break; } case BROWSER_CURSORTOPOFFILE: - bDone = GoToRow( 0, sal_False ); + bDone = GoToRow( 0, false ); break; case BROWSER_CURSORLEFT: if ( bColumnCursor ) @@ -1977,12 +1977,12 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) case BROWSER_ENHANCESELECTION: if ( GetRowCount() ) SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), true ); - bDone = sal_True; + bDone = true; break; case BROWSER_SELECT: if ( GetRowCount() ) SelectRow( GetCurRow(), !IsRowSelected( GetCurRow() ), false ); - bDone = sal_True; + bDone = true; break; case BROWSER_MOVECOLUMNLEFT: case BROWSER_MOVECOLUMNRIGHT: @@ -1991,19 +1991,19 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) if ( pHeaderBar && pHeaderBar->IsDragable() ) { sal_uInt16 nColId = GetCurColumnId(); - sal_Bool bColumnSelected = IsColumnSelected(nColId); + bool bColumnSelected = IsColumnSelected(nColId); sal_uInt16 nNewPos = GetColumnPos(nColId); - sal_Bool bMoveAllowed = sal_False; + bool bMoveAllowed = false; if ( BROWSER_MOVECOLUMNLEFT == nId && nNewPos > 1 ) - --nNewPos,bMoveAllowed = sal_True; + --nNewPos,bMoveAllowed = true; else if ( BROWSER_MOVECOLUMNRIGHT == nId && nNewPos < (ColCount()-1) ) - ++nNewPos,bMoveAllowed = sal_True; + ++nNewPos,bMoveAllowed = true; if ( bMoveAllowed ) { SetColumnPos( nColId, nNewPos ); ColumnMoved( nColId ); - MakeFieldVisible(GetCurRow(),nColId,sal_True); + MakeFieldVisible(GetCurRow(), nColId, true); if ( bColumnSelected ) SelectColumnId(nColId); } diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index 1d7d3d15a9aa..76f932098db9 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -406,7 +406,7 @@ OUString BrowseBox::GetCellText(long, sal_uInt16 ) const void BrowseBox::commitHeaderBarEvent(sal_Int16 nEventId, - const Any& rNewValue, const Any& rOldValue, sal_Bool _bColumnHeaderBar ) + const Any& rNewValue, const Any& rOldValue, bool _bColumnHeaderBar ) { if ( isAccessibleAlive() ) m_pImpl->m_pAccessible->commitHeaderBarEvent( nEventId, @@ -433,7 +433,7 @@ void BrowseBox::commitBrowseBoxEvent( sal_Int16 _nEventId, const Any& _rNewValue } -sal_Bool BrowseBox::isAccessibleAlive( ) const +bool BrowseBox::isAccessibleAlive( ) const { return ( NULL != m_pImpl->m_pAccessible ) && m_pImpl->m_pAccessible->isAlive(); } diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index cfe0af7fcb9a..2c4170e46c58 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -406,7 +406,7 @@ void BrowserDataWin::Command( const CommandEvent& rEvt ) return; Point aEventPos( rEvt.GetMousePosPixel() ); - long nRow = pBox->GetRowAtYPosPixel( aEventPos.Y(), sal_False); + long nRow = pBox->GetRowAtYPosPixel( aEventPos.Y(), false); MouseEvent aMouseEvt( aEventPos, 1, MOUSE_SELECT, MOUSE_LEFT ); if ( COMMAND_CONTEXTMENU == rEvt.GetCommand() && rEvt.IsMouseEvent() && nRow < pBox->GetRowCount() && !pBox->IsRowSelected(nRow) ) @@ -552,7 +552,7 @@ void BrowserDataWin::StartRowDividerDrag( const Point& _rStartPos ) m_nDragRowDividerLimit = nDragRowDividerCurrentPos - nDataRowHeight; - GetParent()->bRowDividerDrag = sal_True; + GetParent()->bRowDividerDrag = true; GetParent()->ImplStartTracking(); Rectangle aDragSplitRect( 0, m_nDragRowDividerLimit, GetOutputSizePixel().Width(), nDragRowDividerCurrentPos ); @@ -576,7 +576,7 @@ void BrowserDataWin::Tracking( const TrackingEvent& rTEvt ) if ( rTEvt.IsTrackingEnded() ) { HideTracking(); - GetParent()->bRowDividerDrag = sal_False; + GetParent()->bRowDividerDrag = false; GetParent()->ImplEndTracking(); if ( !rTEvt.IsTrackingCanceled() ) diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index ec048feff722..fdaf88196f5b 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -238,10 +238,10 @@ namespace svt } - sal_Bool EditBrowseBox::SeekRow(long nRow) + bool EditBrowseBox::SeekRow(long nRow) { nPaintRow = nRow; - return sal_True; + return true; } @@ -600,7 +600,7 @@ namespace svt while ( GetSelectColumnCount( ) ) SelectColumnPos( sal::static_int_cast< sal_uInt16 >(FirstSelectedColumn()), - sal_False ); + false ); Select(); } } @@ -861,7 +861,7 @@ namespace svt } - sal_Bool EditBrowseBox::IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const + bool EditBrowseBox::IsCursorMoveAllowed(long nNewRow, sal_uInt16 nNewColId) const { sal_uInt16 nInfo = 0; @@ -876,7 +876,7 @@ namespace svt nInfo |= COLCHANGE; if (nInfo == 0) // nothing happened - return sal_True; + return true; // save the cell content if (IsEditing() && aController->IsModified() && !((EditBrowseBox *) this)->SaveModified()) @@ -884,7 +884,7 @@ namespace svt // maybe we're not visible ... EnableAndShow(); aController->GetWindow().GrabFocus(); - return sal_False; + return false; } EditBrowseBox * pTHIS = const_cast<EditBrowseBox *> (this); @@ -910,7 +910,7 @@ namespace svt } aController->GetWindow().GrabFocus(); } - return sal_False; + return false; } if (nNewRow != nEditRow) @@ -918,7 +918,7 @@ namespace svt Window& rWindow = GetDataWindow(); if ((nEditRow >= 0) && (GetBrowserFlags() & EBBF_NO_HANDLE_COLUMN_CONTENT) == 0) { - Rectangle aRect = GetFieldRectPixel(nEditRow, 0, sal_False ); + Rectangle aRect = GetFieldRectPixel(nEditRow, 0, false ); // status cell should be painted if and only if text is displayed // note: bPaintStatus is mutable, but Solaris has problems with assigning // probably because it is part of a bitfield @@ -936,12 +936,12 @@ namespace svt { pTHIS->InvalidateStatusCell(nEditRow); rWindow.EnablePaint(true); - return sal_False; + return false; } else { rWindow.EnablePaint(true); - return sal_True; + return true; } } else diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index c43ba3c91971..0be78fe0c34d 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -57,7 +57,7 @@ private: protected: virtual long GetRowCount() const; - virtual sal_Bool SeekRow(long nRow); + virtual bool SeekRow(long nRow); virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const; virtual void DoubleClick(const BrowserMouseEvent&); virtual void KeyInput(const KeyEvent& rEvt); diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index dfb85780b9c8..db0e85bd962b 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -1025,7 +1025,7 @@ void FmGridControl::Command(const CommandEvent& _rEvt) { sal_uInt16 nSelId = GetColumnId( sal::static_int_cast< sal_uInt16 >( FirstSelectedColumn() ) ); - ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, sal_False ) ); + ::Rectangle aColRect( GetFieldRectPixel( 0, nSelId, false ) ); Point aRelativePos( pMyHeader->ScreenToOutputPixel( OutputToScreenPixel( aColRect.TopCenter() ) ) ); pMyHeader->triggerColumnContextMenu( aRelativePos, FmGridHeader::AccessControl() ); @@ -1159,7 +1159,7 @@ void FmGridControl::DeleteSelectedRows() while( pCursor->next() ) xUpdateCursor->deleteRow(); - SetUpdateMode(sal_False); + SetUpdateMode(false); SetNoSelection(); xUpdateCursor->moveToInsertRow(); @@ -1171,7 +1171,7 @@ void FmGridControl::DeleteSelectedRows() // An den DatenCursor anpassen AdjustDataSource(true); EndCursorAction(); - SetUpdateMode(sal_True); + SetUpdateMode(true); } else { @@ -1230,8 +1230,8 @@ void FmGridControl::DeleteSelectedRows() BeginCursorAction(); // now delete the row - Sequence <sal_Int32> aDeletedRows; - SetUpdateMode( sal_False ); + Sequence<sal_Int32> aDeletedRows; + SetUpdateMode( false ); try { aDeletedRows = xDeleteThem->deleteRows(aBookmarks); @@ -1239,7 +1239,7 @@ void FmGridControl::DeleteSelectedRows() catch(SQLException&) { } - SetUpdateMode( sal_True ); + SetUpdateMode( true ); // how many rows are deleted? sal_Int32 nDeletedRows = 0; @@ -1253,7 +1253,7 @@ void FmGridControl::DeleteSelectedRows() // sind Zeilen geloescht worden? if (nDeletedRows) { - SetUpdateMode(sal_False); + SetUpdateMode(false); SetNoSelection(); try { @@ -1355,7 +1355,7 @@ void FmGridControl::DeleteSelectedRows() } EndCursorAction(); - SetUpdateMode(sal_True); + SetUpdateMode(true); } else // Zeile konnte nicht geloescht werden { @@ -1562,7 +1562,7 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta if (!xColumns.is()) return; - SetUpdateMode(sal_False); + SetUpdateMode(false); // Einfuegen muss sich an den Column Positionen orientieren sal_Int32 i; @@ -1599,7 +1599,7 @@ void FmGridControl::InitColumnsByModels(const Reference< ::com::sun::star::conta HideColumn(GetColumnIdFromModelPos((sal_uInt16)i)); } - SetUpdateMode(sal_True); + SetUpdateMode(true); } void FmGridControl::InitColumnByField( @@ -1786,7 +1786,7 @@ bool FmGridControl::selectBookmarks(const Sequence< Any >& _rBookmarks) Sequence< Any> FmGridControl::getSelectionBookmarks() { // lock our update so no paint-triggered seeks interfere ... - SetUpdateMode(sal_False); + SetUpdateMode(false); sal_Int32 nSelectedRows = GetSelectRowCount(), i = 0; Sequence< Any> aBookmarks(nSelectedRows); @@ -1842,7 +1842,7 @@ Sequence< Any> FmGridControl::getSelectionBookmarks() #endif } } - SetUpdateMode(sal_True); + SetUpdateMode(true); // if one of the SeekCursor-calls failed .... aBookmarks.realloc(i); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 65ddd98f37f3..39dd36cb4aca 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2335,7 +2335,7 @@ void FmXGridPeer::selectionChanged(const EventObject& evt) throw( RuntimeExcepti // if this does not ?hold?catch?, the selectionChanged is cleared by the Control itself if ( i < nColCount ) { - pGrid->SelectColumnPos(pGrid->GetViewColumnPos(pGrid->GetColumnIdFromModelPos( (sal_uInt16)i )) + 1, sal_True); + pGrid->SelectColumnPos(pGrid->GetViewColumnPos(pGrid->GetColumnIdFromModelPos( (sal_uInt16)i )) + 1, true); // SelectColumnPos has led to an implicit ActivateCell again if (pGrid->IsEditing()) pGrid->DeactivateCell(); diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 749f83d14b07..b5e9dcd8f437 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1356,7 +1356,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt // did the data cursor change? sal_uInt16 nCurPos = GetColumnPos(GetCurColumnId()); - SetUpdateMode(sal_False); + SetUpdateMode(false); RemoveRows(); DisconnectFromFields(); @@ -1557,7 +1557,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt RecalcRows(GetTopRow(), GetVisibleRows(), true); m_aBar.InvalidateAll(m_nCurrentPos, true); - SetUpdateMode(sal_True); + SetUpdateMode(true); // start listening on the seek cursor if (m_pSeekCursor) @@ -1732,11 +1732,11 @@ void DbGridControl::ColumnMoved(sal_uInt16 nId) m_aColumns.insert( it, temp ); } -sal_Bool DbGridControl::SeekRow(long nRow) +bool DbGridControl::SeekRow(long nRow) { // in filter mode or in insert only mode we don't have any cursor! if ( !SeekCursor( nRow ) ) - return sal_False; + return false; if ( IsFilterMode() ) { @@ -2559,7 +2559,7 @@ void DbGridControl::SetFilterMode(bool bMode) if (bMode) { - SetUpdateMode(sal_False); + SetUpdateMode(false); // there is no cursor anymore if (IsEditing()) @@ -2578,7 +2578,7 @@ void DbGridControl::SetFilterMode(bool bMode) // one row for filtering RowInserted(0, 1, true); - SetUpdateMode(sal_True); + SetUpdateMode(true); } else setDataSource(Reference< XRowSet > ()); @@ -2774,7 +2774,7 @@ void DbGridControl::Command(const CommandEvent& rEvt) { long nRow = FirstSelectedRow( ); - ::Rectangle aRowRect( GetRowRectPixel( nRow, sal_True ) ); + ::Rectangle aRowRect( GetRowRectPixel( nRow, true ) ); executeRowContextMenu( nRow, aRowRect.LeftCenter() ); // handled diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 4629ed27dd9a..3543bc848b32 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -552,10 +552,10 @@ void GalleryListView::DataChanged( const DataChangedEvent& rDCEvt ) BrowseBox::DataChanged( rDCEvt ); } -sal_Bool GalleryListView::SeekRow( long nRow ) +bool GalleryListView::SeekRow( long nRow ) { mnCurRow = nRow; - return sal_True; + return true; } OUString GalleryListView::GetCellText(long _nRow, sal_uInt16 nColumnId) const diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 593787219958..c1ab90a3eb4d 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -288,10 +288,10 @@ long _SdrItemBrowserControl::GetRowCount() const return aList.size(); } -sal_Bool _SdrItemBrowserControl::SeekRow(long nRow) +bool _SdrItemBrowserControl::SeekRow(long nRow) { - nAktPaintRow=nRow; - return sal_True; + nAktPaintRow = nRow; + return true; } OUString _SdrItemBrowserControl::GetCellText(long _nRow, sal_uInt16 _nColId) const @@ -491,7 +491,7 @@ bool _SdrItemBrowserControl::BegChangeEntry(sal_uIntPtr nPos) if (pEntry!=NULL && !pEntry->bComment) { SetMode(MYBROWSEMODE & ~BROWSER_KEEPHIGHLIGHT); pEditControl=new ImpItemEdit(&GetDataWindow(),this,0); - Rectangle aRect(GetFieldRectPixel(nPos,ITEMBROWSER_VALUECOL_ID,sal_False)); + Rectangle aRect(GetFieldRectPixel(nPos, ITEMBROWSER_VALUECOL_ID, false)); aRect.Left()+=2; // little offset for the Edit, so it's exact to the pixel aRect.Right()--; pEditControl->SetPosSizePixel(aRect.TopLeft(),aRect.GetSize()); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index dcb8bc612338..b6fa4bfe2bfb 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -166,7 +166,7 @@ class SwEntryBrowseBox : public SwEntryBrowseBox_Base void SetModified() {bModified = true;} protected: - virtual sal_Bool SeekRow( long nRow ); + virtual bool SeekRow( long nRow ); virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const; virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); @@ -3901,10 +3901,10 @@ Size SwEntryBrowseBox::GetOptimalSize() const return aSize; } -sal_Bool SwEntryBrowseBox::SeekRow( long nRow ) +bool SwEntryBrowseBox::SeekRow( long nRow ) { nCurrentRow = nRow; - return sal_True; + return true; } OUString SwEntryBrowseBox::GetCellText(long nRow, sal_uInt16 nColumn) const @@ -3974,7 +3974,7 @@ sal_Bool SwEntryBrowseBox::SaveModified() if(nRow >= aEntryArr.size()) { aEntryArr.push_back( pEntry ); - RowInserted(nRow, 1, sal_True, sal_True); + RowInserted(nRow, 1, true, true); if(nCol < ITEM_WORDONLY) { pController->ClearModified(); @@ -4051,7 +4051,7 @@ void SwEntryBrowseBox::ReadEntries(SvStream& rInStr) } if( pToInsert ) aEntryArr.push_back(pToInsert); - RowInserted(0, aEntryArr.size() + 1, sal_True); + RowInserted(0, aEntryArr.size() + 1, true); } void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) @@ -4129,7 +4129,7 @@ SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const OUString& rAutoMar SetText(sTitle); bool bError = false; if( bCreateMode ) - m_pEntriesBB->RowInserted(0, 1, sal_True); + m_pEntriesBB->RowInserted(0, 1, true); else { SfxMedium aMed( sAutoMarkURL, STREAM_STD_READ ); |