diff options
| author | Noel Grandin <noel@peralex.com> | 2014-03-20 11:14:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-03-24 08:12:09 +0200 |
| commit | f661ac03e049844fd529fb6ff02e628b32cac650 (patch) | |
| tree | ec4c4c9ac697df5a3645e1d0c7d426d03968d50c | |
| parent | b1de52241c1c2045ceab4ea3526f51f145be2930 (diff) | |
svtools: sal_Bool->bool
Change-Id: I22d8869551f46d2a0607f670f937853f394b6acf
28 files changed, 286 insertions, 285 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 0a2224cd17d9..7abb9fa7267c 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -1039,7 +1039,7 @@ bool DataBrowser::SeekRow( long nRow ) return true; } -sal_Bool DataBrowser::IsTabAllowed( sal_Bool bForward ) const +bool DataBrowser::IsTabAllowed( bool bForward ) const { long nRow = GetCurRow(); long nCol = GetCurColumnId(); @@ -1055,7 +1055,7 @@ sal_Bool DataBrowser::IsTabAllowed( sal_Bool bForward ) const if( !m_bDataValid ) { const_cast< DataBrowser* >( this )->ShowWarningBox(); - return sal_False; + return false; } return ( nRow != nBadRow || @@ -1134,12 +1134,12 @@ bool DataBrowser::isDateString( const OUString& aInputString, double& fOutDateVa return false; } -sal_Bool DataBrowser::SaveModified() +bool DataBrowser::SaveModified() { if( ! IsModified() ) - return sal_True; + return true; - sal_Bool bChangeValid = sal_True; + bool bChangeValid = true; const sal_Int32 nRow = lcl_getRowInData( GetCurRow()); const sal_Int32 nCol = lcl_getColumnInData( GetCurColumnId()); @@ -1159,7 +1159,7 @@ sal_Bool DataBrowser::SaveModified() if( !aText.isEmpty() && pSvNumberFormatter && ! pSvNumberFormatter->IsNumberFormat( aText, nDummy, fDummy ) ) { - bChangeValid = sal_False; + bChangeValid = false; } else { @@ -1171,8 +1171,8 @@ sal_Bool DataBrowser::SaveModified() case DataBrowserModel::TEXTORDATE: { OUString aText( m_aTextEditField.GetText() ); - double fDateValue=0.0; - bChangeValid = sal_False; + double fDateValue = 0.0; + bChangeValid = false; if( isDateString( aText, fDateValue ) ) bChangeValid = m_apDataBrowserModel->setCellAny( nCol, nRow, uno::makeAny( fDateValue ) ); if(!bChangeValid) diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index c7ad2dd6abe4..5f2f980b0678 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -53,10 +53,10 @@ protected: // EditBrowseBox overridables virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; virtual bool SeekRow( long nRow ); - virtual sal_Bool IsTabAllowed( sal_Bool bForward ) const; + virtual bool IsTabAllowed( bool bForward ) const; virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ); virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol ); - virtual sal_Bool SaveModified(); + virtual bool SaveModified(); virtual void CursorMoved(); // called whenever the control of the current cell has been modified virtual void CellModified(); diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 8af4d6ccb038..b966c033176e 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -72,9 +72,9 @@ namespace offapp virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; virtual bool SeekRow( long nRow ); - virtual sal_Bool SaveModified(); + virtual bool SaveModified(); - virtual sal_Bool IsTabAllowed(sal_Bool _bForward) const; + virtual bool IsTabAllowed(bool _bForward) const; virtual void StateChanged( StateChangedType nStateChange ); @@ -106,10 +106,10 @@ namespace offapp } - sal_Bool DriverListControl::IsTabAllowed(sal_Bool /*_bForward*/) const + bool DriverListControl::IsTabAllowed(bool /*_bForward*/) const { - // no travinling within the fields via RETURN and TAB - return sal_False; + // no travelling within the fields via RETURN and TAB + return false; } @@ -268,9 +268,9 @@ namespace offapp } - sal_Bool DriverListControl::SaveModified() + bool DriverListControl::SaveModified() { - return sal_True; + return true; } diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 58093e8f88e9..64994cc88ef1 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -916,14 +916,14 @@ void SbaGridControl::CursorMoved() FmGridControl::CursorMoved(); } -void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus /*= sal_True*/ ) +void SbaGridControl::ActivateCell(long nRow, sal_uInt16 nCol, bool bSetCellFocus /*= sal_True*/ ) { FmGridControl::ActivateCell(nRow, nCol, bSetCellFocus); if (m_pMasterListener) m_pMasterListener->CellActivated(); } -void SbaGridControl::DeactivateCell(sal_Bool bUpdate /*= sal_True*/) +void SbaGridControl::DeactivateCell(bool bUpdate /*= sal_True*/) { FmGridControl::DeactivateCell(bUpdate); if (m_pMasterListener) @@ -1277,7 +1277,7 @@ sal_Int8 SbaGridControl::AcceptDrop( const BrowserAcceptDropEvent& rEvt ) // no valid cell under the mouse cursor break; - Rectangle aRect = GetCellRect(nRow, nCol, sal_False); + Rectangle aRect = GetCellRect(nRow, nCol, false); if (!aRect.IsInside(rEvt.maPosPixel)) // not dropped within a cell (a cell isn't as wide as the column - the are small spaces) break; diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index babadfef58b8..0b92c7e36e50 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -107,7 +107,7 @@ namespace dbaui virtual Size GetOptimalSize() const; virtual bool PreNotify(NotifyEvent& rNEvt ); - virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; + virtual bool IsTabAllowed(bool bForward) const; virtual void Init(const TTableConnectionData::value_type& _pConnData); virtual void Init() { ORelationControl_Base::Init(); } @@ -115,7 +115,7 @@ namespace dbaui virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol ); virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const; virtual bool SeekRow( long nRow ); - virtual sal_Bool SaveModified(); + virtual bool SaveModified(); virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const; virtual void CellModified(); @@ -218,18 +218,18 @@ namespace dbaui return 0L; } - sal_Bool ORelationControl::IsTabAllowed(sal_Bool bForward) const + bool ORelationControl::IsTabAllowed(bool bForward) const { long nRow = GetCurRow(); sal_uInt16 nCol = GetCurColumnId(); - sal_Bool bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1))) + bool bRet = !(( ( bForward && (nCol == DEST_COLUMN) && (nRow == GetRowCount() - 1))) || (!bForward && (nCol == SOURCE_COLUMN) && (nRow == 0))); return bRet && EditBrowseBox::IsTabAllowed(bForward); } - sal_Bool ORelationControl::SaveModified() + bool ORelationControl::SaveModified() { long nRow = GetCurRow(); if ( nRow != BROWSER_ENDOFSELECTION ) @@ -267,8 +267,9 @@ namespace dbaui m_ops.push_back(make_pair(MODIFY, make_pair(line, newSize))); m_ops.push_back(make_pair(DELETE, make_pair(newSize, oldSize))); - return sal_True; + return true; } + sal_uInt16 ORelationControl::getColumnIdent( sal_uInt16 _nColId ) const { sal_uInt16 nId = _nColId; diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index 438b1d404edd..86504edd8e00 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -175,16 +175,16 @@ IMPL_LINK_NOARG(OTableGrantControl, AsynchDeactivate) return 0L; } -sal_Bool OTableGrantControl::IsTabAllowed(sal_Bool bForward) const +bool OTableGrantControl::IsTabAllowed(bool bForward) const { long nRow = GetCurRow(); sal_uInt16 nCol = GetCurColumnId(); if (bForward && (nCol == 2) && (nRow == GetRowCount() - 1)) - return sal_False; + return false; if (!bForward && (nCol == 1) && (nRow == 0)) - return sal_False; + return false; return EditBrowseBox::IsTabAllowed(bForward); } @@ -195,15 +195,15 @@ sal_Bool OTableGrantControl::IsTabAllowed(sal_Bool bForward) const else \ xAuth->revokePrivileges(sTableName,PrivilegeObject::TABLE,what) -sal_Bool OTableGrantControl::SaveModified() +bool OTableGrantControl::SaveModified() { sal_Int32 nRow = GetCurRow(); if(nRow == -1 || nRow >= m_aTableNames.getLength()) - return sal_False; + return false; OUString sTableName = m_aTableNames[nRow]; - sal_Bool bErg = sal_True; + bool bErg = true; try { @@ -242,7 +242,7 @@ sal_Bool OTableGrantControl::SaveModified() } catch(SQLException& e) { - bErg = sal_False; + bErg = false; ::dbaui::showError(::dbtools::SQLExceptionInfo(e),GetParent(),m_xContext); } if(bErg && Controller().Is()) @@ -396,7 +396,7 @@ void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, if(aFind != m_aPrivMap.end()) PaintTristate(rDev, rRect, isAllowed(nColumnId,aFind->second.nRights) ? TRISTATE_TRUE : TRISTATE_FALSE,isAllowed(nColumnId,aFind->second.nWithGrant)); else - PaintTristate(rDev, rRect, TRISTATE_FALSE,sal_False); + PaintTristate(rDev, rRect, TRISTATE_FALSE, false); } else { diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 1e0268bbe553..286f46cb6bb9 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -51,7 +51,7 @@ namespace dbaui void SetAdditionalModifyHdl(const Link& _rHdl); protected: - virtual sal_Bool WantMouseEvent() const { return sal_True; } + virtual bool WantMouseEvent() const { return true; } virtual void SetModifyHdl(const Link& _rHdl); private: @@ -295,15 +295,15 @@ namespace dbaui return sal_True; } - sal_Bool IndexFieldsControl::IsModified() const + bool IndexFieldsControl::IsModified() const { return EditBrowseBox::IsModified(); } - sal_Bool IndexFieldsControl::SaveModified() + bool IndexFieldsControl::SaveModified() { if (!IsModified()) - return sal_True; + return true; switch (GetCurColumnId()) { @@ -337,12 +337,12 @@ namespace dbaui // invalidate the row to force repaint Invalidate(GetRowRectPixel(nRow)); - return sal_True; + return true; } if (sFieldSelected == aPos->sFieldName) // nothing changed - return sal_True; + return true; aPos->sFieldName = sFieldSelected; } @@ -366,7 +366,7 @@ namespace dbaui default: OSL_FAIL("IndexFieldsControl::SaveModified: invalid column id!"); } - return sal_True; + return true; } void IndexFieldsControl::InitController(CellControllerRef& /*_rController*/, long _nRow, sal_uInt16 _nColumnId) @@ -455,9 +455,9 @@ namespace dbaui } return OUString(); } - sal_Bool IndexFieldsControl::IsTabAllowed(sal_Bool /*bForward*/) const + bool IndexFieldsControl::IsTabAllowed(bool /*bForward*/) const { - return sal_False; + return false; } } // namespace dbaui diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx index 1e6a5f92b494..352fb83c88a1 100644 --- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx +++ b/dbaccess/source/ui/inc/TableGrantCtrl.hxx @@ -84,12 +84,12 @@ protected: virtual bool PreNotify(NotifyEvent& rNEvt ); - virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; + virtual bool IsTabAllowed(bool bForward) const; 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 bool SeekRow( long nRow ); - virtual sal_Bool SaveModified(); + virtual bool SaveModified(); virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const; virtual void CellModified(); diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx index 509223b5e961..b88e0599235a 100644 --- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx +++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx @@ -58,8 +58,8 @@ namespace dbaui void initializeFrom(const IndexFields& _rFields); void commitTo(IndexFields& _rFields); - sal_Bool SaveModified(); - sal_Bool IsModified() const; + bool SaveModified(); + bool IsModified() const; const IndexFields& GetSavedValue() const { return m_aSavedValue; } void SaveValue() { m_aSavedValue = m_aFields; } @@ -73,7 +73,7 @@ namespace dbaui virtual void PaintCell( OutputDevice& _rDev, const Rectangle& _rRect, sal_uInt16 _nColumnId ) const; virtual bool SeekRow(long nRow); virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); - virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; + virtual bool IsTabAllowed(bool bForward) const; ::svt::CellController* GetController(long _nRow, sal_uInt16 _nColumnId); void InitController(::svt::CellControllerRef&, long _nRow, sal_uInt16 _nColumnId); diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx index 84cd557eda03..24fae790b1aa 100644 --- a/dbaccess/source/ui/inc/sbagrid.hxx +++ b/dbaccess/source/ui/inc/sbagrid.hxx @@ -242,8 +242,8 @@ namespace dbaui void SetMasterListener(SbaGridListener* pListener) { m_pMasterListener = pListener; } - virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True); - virtual void DeactivateCell(sal_Bool bUpdate = sal_True); + virtual void ActivateCell(long nRow, sal_uInt16 nCol, bool bSetCellFocus = true); + virtual void DeactivateCell(bool bUpdate = true); void ActivateCell() { FmGridControl::ActivateCell(); } sal_Bool IsAllSelected() const { return (GetSelectRowCount() == GetRowCount()) && (GetRowCount() > 0); } diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 55e2d83fc5c6..4e77e389c174 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -888,7 +888,7 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe return bError; } -sal_Bool OSelectionBrowseBox::SaveModified() +bool OSelectionBrowseBox::SaveModified() { OQueryController& rController = static_cast<OQueryController&>(getDesignView()->getController()); OTableFieldDescRef pEntry = NULL; @@ -956,7 +956,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() OUString sColumnName = aFieldName.copy(sTableAlias.getLength()+1,aFieldName.getLength() - sTableAlias.getLength() -1); Reference<XConnection> xConnection = rController.getConnection(); if ( !xConnection.is() ) - return sal_False; + return false; bError = fillColumnRef( sColumnName, sTableAlias, xConnection->getMetaData(), pEntry, bListAction ); } else @@ -2583,7 +2583,7 @@ void OSelectionBrowseBox::GetFocus() EditBrowseBox::GetFocus(); } -void OSelectionBrowseBox::DeactivateCell(sal_Bool _bUpdate) +void OSelectionBrowseBox::DeactivateCell(bool _bUpdate) { m_bWasEditing = sal_True; EditBrowseBox::DeactivateCell(_bUpdate); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index 3ad4b7cdde8d..750a904c438f 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -130,7 +130,7 @@ namespace dbaui void copy(); virtual void GetFocus(); - virtual void DeactivateCell(sal_Bool bUpdate = sal_True); + virtual void DeactivateCell(bool bUpdate = true); virtual void ColumnMoved( sal_uInt16 nColId ) { ColumnMoved(nColId,sal_True); } void ColumnMoved( sal_uInt16 nColId,sal_Bool _bCreateUndo); @@ -197,7 +197,7 @@ namespace dbaui virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); virtual void CellModified(); - virtual sal_Bool SaveModified(); + virtual bool SaveModified(); virtual void Init(); virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId) const; virtual void ColumnResized( sal_uInt16 nColId ); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 67bbec08d73c..531e0b7006a7 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -596,7 +596,7 @@ sal_Bool OTableEditorCtrl::SaveData(long nRow, sal_uInt16 nColId) return sal_True; } -sal_Bool OTableEditorCtrl::SaveModified() +bool OTableEditorCtrl::SaveModified() { sal_uInt16 nColId = GetCurColumnId(); @@ -610,14 +610,14 @@ sal_Bool OTableEditorCtrl::SaveModified() } break; } - return sal_True; + return true; } -sal_Bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) +bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) { if (!EditBrowseBox::CursorMoving(nNewRow, nNewCol)) - return sal_False; + return false; // Called after SaveModified(), current row is still the old one m_nDataPos = nNewRow; @@ -635,7 +635,7 @@ sal_Bool OTableEditorCtrl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) if( SetDataPtr(m_nDataPos) && pDescrWin) pDescrWin->DisplayData( pActRow->GetActFieldDescr() ); - return sal_True; + return true; } IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, /*EMPTYTAG*/ ) @@ -1683,7 +1683,7 @@ OTableDesignView* OTableEditorCtrl::GetView() const return static_cast<OTableDesignView*>(GetParent()->GetParent()); } -void OTableEditorCtrl::DeactivateCell(sal_Bool bUpdate) +void OTableEditorCtrl::DeactivateCell(bool bUpdate) { OTableRowView::DeactivateCell(bUpdate); // now we have to deactivate the field description diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx index b18ea7b9b67d..0b6ca5856a83 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.hxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx @@ -99,7 +99,7 @@ namespace dbaui virtual void InitController(::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol); virtual void CellModified(); - virtual sal_Bool SaveModified(); // is called before changing a cell (false prevents change) + virtual bool SaveModified(); // is called before changing a cell (false prevents change) virtual void Undo(); virtual void Redo(); @@ -125,7 +125,7 @@ namespace dbaui public: OTableEditorCtrl(Window* pParentWin); virtual ~OTableEditorCtrl(); - virtual sal_Bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); + virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); virtual void UpdateAll(); SfxUndoManager& GetUndoManager() const; @@ -156,7 +156,7 @@ namespace dbaui void SetReadOnly( sal_Bool bRead=sal_True ); virtual void Init(); - virtual void DeactivateCell(sal_Bool bUpdate = sal_True); + virtual void DeactivateCell(bool bUpdate = true); sal_Bool IsCutAllowed( long nRow = -1 ); sal_Bool IsCopyAllowed( long nRow = -1 ); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index cf9b388c465f..7f53e86bdb79 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -99,7 +99,7 @@ namespace svt virtual void SetModified(); virtual void ClearModified() = 0; - virtual sal_Bool IsModified() const = 0; + virtual bool IsModified() const = 0; // commit any current changes. Especially, do any reformatting you need (from input formatting // to output formatting) here @@ -111,9 +111,9 @@ namespace svt inline bool isSuspended( ) const { return bSuspended; } protected: - virtual sal_Bool MoveAllowed(const KeyEvent& rEvt) const; + virtual bool MoveAllowed(const KeyEvent& rEvt) const; virtual void SetModifyHdl(const Link& rLink) = 0; - virtual sal_Bool WantMouseEvent() const; + virtual bool WantMouseEvent() const; }; SV_DECL_IMPL_REF(CellController); @@ -131,8 +131,8 @@ namespace svt virtual OUString GetText( LineEnd aSeparator ) const = 0; virtual void SetText( const OUString& _rStr ) = 0; - virtual sal_Bool IsReadOnly() const = 0; - virtual void SetReadOnly( sal_Bool bReadOnly ) = 0; + virtual bool IsReadOnly() const = 0; + virtual void SetReadOnly( bool bReadOnly ) = 0; virtual sal_Int32 GetMaxTextLen() const = 0; virtual void SetMaxTextLen( sal_Int32 _nMaxLen ) = 0; @@ -145,7 +145,7 @@ namespace svt virtual OUString GetSelected( LineEnd aSeparator ) const = 0; virtual void SetModified() = 0; - virtual sal_Bool IsModified() const = 0; + virtual bool IsModified() const = 0; virtual void ClearModified() = 0; virtual void SetModifyHdl( const Link& _rLink ) = 0; }; @@ -167,8 +167,8 @@ namespace svt virtual OUString GetText( LineEnd aSeparator ) const; virtual void SetText( const OUString& _rStr ); - virtual sal_Bool IsReadOnly() const; - virtual void SetReadOnly( sal_Bool bReadOnly ); + virtual bool IsReadOnly() const; + virtual void SetReadOnly( bool bReadOnly ); virtual sal_Int32 GetMaxTextLen() const; virtual void SetMaxTextLen( sal_Int32 _nMaxLen ); @@ -181,7 +181,7 @@ namespace svt virtual OUString GetSelected( LineEnd aSeparator ) const; virtual void SetModified(); - virtual sal_Bool IsModified() const; + virtual bool IsModified() const; virtual void ClearModified(); virtual void SetModifyHdl( const Link& _rLink ); }; @@ -209,7 +209,7 @@ namespace svt virtual void Modify(); private: - sal_Bool dispatchKeyEvent( const KeyEvent& _rEvent ); + bool dispatchKeyEvent( const KeyEvent& _rEvent ); }; @@ -235,7 +235,7 @@ namespace svt class SVT_DLLPUBLIC EditCellController : public CellController { IEditImplementation* m_pEditImplementation; - sal_Bool m_bOwnImplementation; // did we create m_pEditImplementation? + bool m_bOwnImplementation; // did we create m_pEditImplementation? public: TYPEINFO(); @@ -247,11 +247,11 @@ namespace svt IEditImplementation* GetEditImplementation( ) { return m_pEditImplementation; } virtual void SetModified(); - virtual sal_Bool IsModified() const; + virtual bool IsModified() const; virtual void ClearModified(); protected: - virtual sal_Bool MoveAllowed(const KeyEvent& rEvt) const; + virtual bool MoveAllowed(const KeyEvent& rEvt) const; virtual void SetModifyHdl(const Link& rLink); }; @@ -266,11 +266,11 @@ namespace svt SpinField& GetSpinWindow() const {return (SpinField &)GetWindow();} virtual void SetModified(); - virtual sal_Bool IsModified() const; + virtual bool IsModified() const; virtual void ClearModified(); protected: - virtual sal_Bool MoveAllowed(const KeyEvent& rEvt) const; + virtual bool MoveAllowed(const KeyEvent& rEvt) const; virtual void SetModifyHdl(const Link& rLink); }; @@ -318,12 +318,12 @@ namespace svt CheckBoxCellController(CheckBoxControl* pWin):CellController(pWin){} CheckBox& GetCheckBox() const; - virtual sal_Bool IsModified() const; + virtual bool IsModified() const; virtual void ClearModified(); protected: virtual void SetModifyHdl(const Link& rLink); - virtual sal_Bool WantMouseEvent() const; + virtual bool WantMouseEvent() const; }; @@ -351,11 +351,11 @@ namespace svt ComboBoxCellController(ComboBoxControl* pParent); ComboBoxControl& GetComboBox() const {return (ComboBoxControl &)GetWindow();} - virtual sal_Bool IsModified() const; + virtual bool IsModified() const; virtual void ClearModified(); protected: - virtual sal_Bool MoveAllowed(const KeyEvent& rEvt) const; + virtual bool MoveAllowed(const KeyEvent& rEvt) const; virtual void SetModifyHdl(const Link& rLink); }; @@ -384,11 +384,11 @@ namespace svt ListBoxCellController(ListBoxControl* pParent); ListBoxControl& GetListBox() const {return (ListBoxControl &)GetWindow();} - virtual sal_Bool IsModified() const; + virtual bool IsModified() const; virtual void ClearModified(); protected: - virtual sal_Bool MoveAllowed(const KeyEvent& rEvt) const; + virtual bool MoveAllowed(const KeyEvent& rEvt) const; virtual void SetModifyHdl(const Link& rLink); }; @@ -456,19 +456,19 @@ namespace svt class BrowserMouseEventPtr { BrowserMouseEvent* pEvent; - sal_Bool bDown; + bool bDown; public: BrowserMouseEventPtr():pEvent(NULL){} ~BrowserMouseEventPtr(){Clear();} - sal_Bool Is() const {return pEvent != NULL;} - sal_Bool IsDown() const {return bDown;} + bool Is() const {return pEvent != NULL;} + bool IsDown() const {return bDown;} const BrowserMouseEvent* operator->() const {return pEvent;} const BrowserMouseEvent& operator*() const {return *pEvent;} SVT_DLLPUBLIC void Clear(); - void Set(const BrowserMouseEvent* pEvt, sal_Bool bIsDown); + void Set(const BrowserMouseEvent* pEvt, bool bIsDown); } aMouseEvent; CellControllerRef aController, @@ -483,9 +483,9 @@ namespace svt long nEditRow, nOldEditRow; sal_uInt16 nEditCol, nOldEditCol; - sal_Bool bHasFocus : 1; - mutable sal_Bool bPaintStatus : 1; // paint a status (image) in the handle column - sal_Bool bActiveBeforeTracking; + bool bHasFocus : 1; + mutable bool bPaintStatus : 1; // paint a status (image) in the handle column + bool bActiveBeforeTracking; CheckBoxControl* pCheckBoxPaint; @@ -496,7 +496,7 @@ namespace svt protected: BrowserHeader* pHeader; - sal_Bool isGetCellFocusPending() const { return nStartEvent != 0; } + bool isGetCellFocusPending() const { return nStartEvent != 0; } void cancelGetCellFocus() { if (nStartEvent) Application::RemoveUserEvent(nStartEvent); nStartEvent = 0; } void forceGetCellFocus() { cancelGetCellFocus(); LINK(this, EditBrowseBox, StartEditHdl).Call((void*)NULL); } @@ -533,7 +533,7 @@ namespace svt virtual void EndScroll(); // should be used instead of GetFieldRectPixel, 'cause this method here takes into account the borders - Rectangle GetCellRect(long nRow, sal_uInt16 nColId, sal_Bool bRelToBrowser = sal_True) const; + Rectangle GetCellRect(long nRow, sal_uInt16 nColId, bool bRelToBrowser = true) const; virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); virtual sal_uInt32 GetAutoColumnWidth(sal_uInt16 nColId); @@ -551,17 +551,17 @@ namespace svt // when changing a row: // CursorMoving: cursor is beeing moved, but GetCurRow() still provides the old row - virtual sal_Bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); + virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); // cursor has been moved virtual void CursorMoved(); virtual void CellModified(); // called whenever a cell has been modified - virtual sal_Bool SaveModified(); // called whenever a cell should be left, and it's content should be saved + virtual bool SaveModified(); // called whenever a cell should be left, and it's content should be saved // return sal_False prevents leaving the cell - virtual sal_Bool SaveRow(); // commit the current row + virtual bool SaveRow(); // commit the current row - virtual sal_Bool IsModified() const {return aController.Is() && aController->IsModified();} + virtual bool IsModified() const {return aController.Is() && aController->IsModified();} virtual CellController* GetController(long nRow, sal_uInt16 nCol); virtual void InitController(CellControllerRef& rController, long nRow, sal_uInt16 nCol); @@ -581,11 +581,11 @@ namespace svt // called whenever (Shift)Tab or Enter is pressed. If true is returned, these keys // result in traveling to the next or to th previous cell - virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; + virtual bool IsTabAllowed(bool bForward) 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; + void PaintTristate(OutputDevice& rDev, const Rectangle& rRect, const TriState& eState, bool _bEnabled=true) const; void AsynchGetFocus(); // secure starting of StartEditHdl @@ -595,7 +595,7 @@ namespace svt EditBrowseBox(Window* pParent, const ResId& rId, sal_Int32 nBrowserFlags = EBBF_NONE, BrowserMode nMode = 0 ); ~EditBrowseBox(); - sal_Bool IsEditing() const {return aController.Is();} + bool IsEditing() const {return aController.Is();} void InvalidateStatusCell(long nRow) {RowModified(nRow, 0);} void InvalidateHandleColumn(); @@ -608,8 +608,8 @@ namespace svt sal_Int32 GetBrowserFlags() const { return m_nBrowserFlags; } void SetBrowserFlags(sal_Int32 nFlags); - virtual void ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bSetCellFocus = sal_True); - virtual void DeactivateCell(sal_Bool bUpdate = sal_True); + virtual void ActivateCell(long nRow, sal_uInt16 nCol, bool bSetCellFocus = true); + virtual void DeactivateCell(bool bUpdate = true); // Children --------------------------------------------------------------- /** Creates the accessible object of a data table cell. @@ -660,12 +660,12 @@ namespace svt virtual void PaintField(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId ) const; using Control::ImplInitSettings; - SVT_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SVT_DLLPRIVATE void DetermineFocus( const sal_uInt16 _nGetFocusFlags = 0); inline void HideAndDisable(CellControllerRef& rController); inline void EnableAndShow() const; - SVT_DLLPRIVATE void implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, sal_Bool _bUp); + SVT_DLLPRIVATE void implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp); SVT_DLLPRIVATE void impl_construct(); DECL_DLLPRIVATE_LINK(ModifyHdl, void* ); diff --git a/include/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx index 96eaf50964a0..edf3e8f22369 100644 --- a/include/svtools/editimplementation.hxx +++ b/include/svtools/editimplementation.hxx @@ -66,14 +66,14 @@ void GenericEditImplementation< EDIT >::SetSelection( const Selection& _rSelecti template <class EDIT> -void GenericEditImplementation< EDIT >::SetReadOnly( sal_Bool bReadOnly ) +void GenericEditImplementation< EDIT >::SetReadOnly( bool bReadOnly ) { m_rEdit.SetReadOnly( bReadOnly ); } template <class EDIT> -sal_Bool GenericEditImplementation< EDIT >::IsReadOnly() const +bool GenericEditImplementation< EDIT >::IsReadOnly() const { return m_rEdit.IsReadOnly(); } @@ -122,7 +122,7 @@ void GenericEditImplementation< EDIT >::SetModified() template <class EDIT> -sal_Bool GenericEditImplementation< EDIT >::IsModified() const +bool GenericEditImplementation< EDIT >::IsModified() const { return m_rEdit.IsModified(); } diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 402dbc8759de..0f5a4dbae228 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -54,19 +54,19 @@ public: ~SfxErrorHandler(); protected: - virtual sal_Bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const; - virtual sal_Bool GetMessageString(sal_uLong lErrId, OUString &, sal_uInt16&) const; + virtual bool GetErrorString(sal_uLong lErrId, OUString &, sal_uInt16&) const; + virtual bool GetMessageString(sal_uLong lErrId, OUString &, sal_uInt16&) const; private: sal_uLong lStart; sal_uLong lEnd; sal_uInt16 nId; - ResMgr *pMgr; - ResMgr *pFreeMgr; + ResMgr *pMgr; + ResMgr *pFreeMgr; - SVT_DLLPRIVATE sal_Bool GetClassString(sal_uLong lErrId, OUString &) const; - virtual bool CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const; + SVT_DLLPRIVATE bool GetClassString(sal_uLong lErrId, OUString &) const; + virtual bool CreateString( const ErrorInfo *, OUString &, sal_uInt16 &) const; }; #endif diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index 2649188d0a80..c30b72078fd1 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -36,7 +36,7 @@ private: protected: virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual void ObjectReleased(); public: diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index cc20bea1a09f..495ced772ffd 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -27,9 +27,10 @@ #include <svl/lstner.hxx> -namespace svtools{ +namespace svtools { class ExtendedColorConfig_Impl; + class ExtendedColorConfigValue { OUString m_sName; @@ -48,14 +49,14 @@ public: ,m_nDefaultColor(_nDefaultColor) {} - inline OUString getName() const { return m_sName; } - inline OUString getDisplayName() const { return m_sDisplayName; } + inline OUString getName() const { return m_sName; } + inline OUString getDisplayName() const { return m_sDisplayName; } inline sal_Int32 getColor() const { return m_nColor; } inline sal_Int32 getDefaultColor() const { return m_nDefaultColor; } - inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } + inline void setColor(sal_Int32 _nColor) { m_nColor = _nColor; } - sal_Bool operator !=(const ExtendedColorConfigValue& rCmp) const + bool operator !=(const ExtendedColorConfigValue& rCmp) const { return m_nColor != rCmp.m_nColor;} }; @@ -68,13 +69,13 @@ public: ExtendedColorConfig(); ~ExtendedColorConfig(); - virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); + virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); // get the configured value ExtendedColorConfigValue GetColorValue(const OUString& _sComponentName,const OUString& _sName)const; sal_Int32 GetComponentCount() const; - OUString GetComponentName(sal_uInt32 _nPos) const; - OUString GetComponentDisplayName(const OUString& _sComponentName) const; + OUString GetComponentName(sal_uInt32 _nPos) const; + OUString GetComponentDisplayName(const OUString& _sComponentName) const; sal_Int32 GetComponentColorCount(const OUString& _sName) const; ExtendedColorConfigValue GetComponentColorConfigValue(const OUString& _sComponentName,sal_uInt32 _nPos) const; }; @@ -82,24 +83,24 @@ public: class SVT_DLLPUBLIC EditableExtendedColorConfig { ExtendedColorConfig_Impl* m_pImpl; - sal_Bool m_bModified; + bool m_bModified; public: EditableExtendedColorConfig(); ~EditableExtendedColorConfig(); - void DeleteScheme(const OUString& rScheme ); - void AddScheme(const OUString& rScheme ); - sal_Bool LoadScheme(const OUString& rScheme ); + void DeleteScheme(const OUString& rScheme ); + void AddScheme(const OUString& rScheme ); + bool LoadScheme(const OUString& rScheme ); void SetCurrentSchemeName(const OUString& rScheme); sal_Int32 GetComponentCount() const; - OUString GetComponentName(sal_uInt32 _nPos) const; + OUString GetComponentName(sal_uInt32 _nPos) const; sal_Int32 GetComponentColorCount(const OUString& _sName) const; ExtendedColorConfigValue GetComponentColorConfigValue(const OUString& _sName,sal_uInt32 _nPos) const; void SetColorValue(const OUString& _sComponentName, const ExtendedColorConfigValue& rValue); void SetModified(); - void ClearModified(){m_bModified = sal_False;} - sal_Bool IsModified()const{return m_bModified;} + void ClearModified() {m_bModified = false;} + bool IsModified() const {return m_bModified;} void Commit(); void DisableBroadcast(); diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 44b7fc18c362..998abd5e4e00 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -304,7 +304,7 @@ protected: virtual void PaintStatusCell(OutputDevice& rDev, const Rectangle& rRect) const; virtual void PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId) const; virtual RowStatus GetRowStatus(long nRow) const; - virtual sal_Bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); + virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); virtual void CursorMoved(); virtual void ArrangeControls(sal_uInt16& nX, sal_uInt16 nY); virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId); @@ -318,15 +318,15 @@ protected: virtual ::svt::CellController* GetController(long nRow, sal_uInt16 nCol); virtual void CellModified(); - virtual sal_Bool SaveModified(); - virtual sal_Bool IsModified() const; + virtual bool SaveModified(); + virtual bool IsModified() const; virtual sal_uInt16 AppendColumn(const OUString& rName, sal_uInt16 nWidth = 0, sal_uInt16 nPos = HEADERBAR_APPEND, sal_uInt16 nId = (sal_uInt16)-1); virtual void RemoveColumn(sal_uInt16 nId); virtual DbGridColumn* CreateColumn(sal_uInt16 nId) const; virtual void ColumnMoved(sal_uInt16 nId); - virtual sal_Bool SaveRow(); - virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; + virtual bool SaveRow(); + virtual bool IsTabAllowed(bool bForward) const; /// hide a column virtual void HideColumn(sal_uInt16 nId); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 51f0ae8d36fb..5d26f5095ab5 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -130,16 +130,16 @@ public: */ void moveGroups(const uno::Sequence<uno::Any>& _aGroups,sal_Int32 _nRow,sal_Bool _bSelect = sal_True); - virtual sal_Bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); + virtual bool CursorMoving(long nNewRow, sal_uInt16 nNewCol); using OFieldExpressionControl_Base::GetRowCount; protected: - virtual sal_Bool IsTabAllowed(sal_Bool bForward) const; + virtual bool IsTabAllowed(bool bForward) const; 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 bool SeekRow( long nRow ); - virtual sal_Bool SaveModified(); + virtual bool SaveModified(); virtual OUString GetCellText( long nRow, sal_uInt16 nColId ) const; virtual RowStatus GetRowStatus(long nRow) const; @@ -392,13 +392,13 @@ IMPL_LINK( OFieldExpressionControl, CBChangeHdl, ComboBox*, /*pComboBox*/ ) } -sal_Bool OFieldExpressionControl::IsTabAllowed(sal_Bool /*bForward*/) const +bool OFieldExpressionControl::IsTabAllowed(bool /*bForward*/) const { - return sal_False; + return false; } -sal_Bool OFieldExpressionControl::SaveModified() +bool OFieldExpressionControl::SaveModified() { return SaveModified(true); } @@ -519,11 +519,11 @@ void OFieldExpressionControl::InitController( CellControllerRef& /*rController*/ m_pComboCell->SetText( GetCellText( nRow, nColumnId ) ); } -sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) +bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) { if (!EditBrowseBox::CursorMoving(nNewRow, nNewCol)) - return sal_False; + return false; m_nDataPos = nNewRow; long nOldDataPos = GetCurRow(); InvalidateStatusCell( m_nDataPos ); @@ -531,7 +531,7 @@ sal_Bool OFieldExpressionControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) m_pParent->SaveData( nOldDataPos ); m_pParent->DisplayData( m_nDataPos ); - return sal_True; + return true; } CellController* OFieldExpressionControl::GetController( long /*nRow*/, sal_uInt16 /*nColumnId*/ ) diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 20f6cfc6fcb7..4b952c35f0d9 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -89,7 +89,7 @@ namespace svt } - sal_Bool ComboBoxCellController::MoveAllowed(const KeyEvent& rEvt) const + bool ComboBoxCellController::MoveAllowed(const KeyEvent& rEvt) const { ComboBoxControl& rBox = GetComboBox(); switch (rEvt.GetKeyCode().GetCode()) @@ -109,25 +109,25 @@ namespace svt case KEY_UP: case KEY_DOWN: if (rBox.IsInDropDown()) - return sal_False; + return false; if (!rEvt.GetKeyCode().IsShift() && rEvt.GetKeyCode().IsMod1()) - return sal_False; + return false; // drop down the list box else if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN) - return sal_False; + return false; case KEY_PAGEUP: case KEY_PAGEDOWN: case KEY_RETURN: if (rBox.IsInDropDown()) - return sal_False; + return false; default: - return sal_True; + return true; } } - sal_Bool ComboBoxCellController::IsModified() const + bool ComboBoxCellController::IsModified() const { return GetComboBox().GetSavedValue() != GetComboBox().GetText(); } @@ -199,7 +199,7 @@ namespace svt } - sal_Bool ListBoxCellController::MoveAllowed(const KeyEvent& rEvt) const + bool ListBoxCellController::MoveAllowed(const KeyEvent& rEvt) const { ListBoxControl& rBox = GetListBox(); switch (rEvt.GetKeyCode().GetCode()) @@ -208,22 +208,22 @@ namespace svt case KEY_DOWN: if (!rEvt.GetKeyCode().IsShift() && rEvt.GetKeyCode().IsMod1()) - return sal_False; + return false; // drop down the list box else if (rEvt.GetKeyCode().IsMod2() && rEvt.GetKeyCode().GetCode() == KEY_DOWN) - return sal_False; + return false; case KEY_PAGEUP: case KEY_PAGEDOWN: if (rBox.IsTravelSelect()) - return sal_False; + return false; default: - return sal_True; + return true; } } - sal_Bool ListBoxCellController::IsModified() const + bool ListBoxCellController::IsModified() const { return GetListBox().GetSelectEntryPos() != GetListBox().GetSavedValue(); } @@ -339,9 +339,9 @@ namespace svt //= CheckBoxCellController - sal_Bool CheckBoxCellController::WantMouseEvent() const + bool CheckBoxCellController::WantMouseEvent() const { - return sal_True; + return true; } @@ -351,7 +351,7 @@ namespace svt } - sal_Bool CheckBoxCellController::IsModified() const + bool CheckBoxCellController::IsModified() const { return GetCheckBox().GetSavedValue() != GetCheckBox().GetState(); } @@ -390,7 +390,7 @@ namespace svt EditCellController::EditCellController( Edit* _pEdit ) :CellController( _pEdit ) ,m_pEditImplementation( new EditImplementation( *_pEdit ) ) - ,m_bOwnImplementation( sal_True ) + ,m_bOwnImplementation( true ) { } @@ -398,7 +398,7 @@ namespace svt EditCellController::EditCellController( IEditImplementation* _pImplementation ) :CellController( &_pImplementation->GetControl() ) ,m_pEditImplementation( _pImplementation ) - ,m_bOwnImplementation( sal_False ) + ,m_bOwnImplementation( false ) { } @@ -422,9 +422,9 @@ namespace svt } - sal_Bool EditCellController::MoveAllowed(const KeyEvent& rEvt) const + bool EditCellController::MoveAllowed(const KeyEvent& rEvt) const { - sal_Bool bResult; + bool bResult; switch (rEvt.GetKeyCode().GetCode()) { case KEY_END: @@ -440,13 +440,13 @@ namespace svt bResult = !aSel && aSel.Min() == 0; } break; default: - bResult = sal_True; + bResult = true; } return bResult; } - sal_Bool EditCellController::IsModified() const + bool EditCellController::IsModified() const { return m_pEditImplementation->IsModified(); } @@ -479,9 +479,9 @@ namespace svt } - sal_Bool SpinCellController::MoveAllowed(const KeyEvent& rEvt) const + bool SpinCellController::MoveAllowed(const KeyEvent& rEvt) const { - sal_Bool bResult; + bool bResult; switch (rEvt.GetKeyCode().GetCode()) { case KEY_END: @@ -497,13 +497,13 @@ namespace svt bResult = !aSel && aSel.Min() == 0; } break; default: - bResult = sal_True; + bResult = true; } return bResult; } - sal_Bool SpinCellController::IsModified() const + bool SpinCellController::IsModified() const { return GetSpinWindow().IsModified(); } @@ -540,16 +540,16 @@ namespace svt } - sal_Bool MultiLineTextCell::dispatchKeyEvent( const KeyEvent& _rEvent ) + bool MultiLineTextCell::dispatchKeyEvent( const KeyEvent& _rEvent ) { Selection aOldSelection( GetSelection() ); - sal_Bool bWasModified = IsModified(); + bool bWasModified = IsModified(); ClearModifyFlag( ); - sal_Bool bHandled = GetTextView()->KeyInput( _rEvent ); + bool bHandled = GetTextView()->KeyInput( _rEvent ); - sal_Bool bIsModified = IsModified(); + bool bIsModified = IsModified(); if ( bWasModified && !bIsModified ) // not sure whether this can really happen SetModifyFlag(); @@ -562,9 +562,9 @@ namespace svt if ( aNewSelection != aOldSelection // selection changed || bIsModified // or some other modification ) - return sal_True; + return true; } - return sal_False; + return false; } diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index fdaf88196f5b..d32da66e7771 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -97,7 +97,7 @@ namespace svt } - void EditBrowseBox::BrowserMouseEventPtr::Set(const BrowserMouseEvent* pEvt, sal_Bool bIsDown) + void EditBrowseBox::BrowserMouseEventPtr::Set(const BrowserMouseEvent* pEvt, bool bIsDown) { if (pEvt == pEvent) { @@ -125,7 +125,7 @@ namespace svt SetCompoundControl(true); SetGridLineColor( Color( COL_LIGHTGRAY ) ); - ImplInitSettings(sal_True, sal_True, sal_True); + ImplInitSettings(true, true, true); pCheckBoxPaint = new CheckBoxControl(&GetDataWindow()); pCheckBoxPaint->SetPaintTransparent( true ); @@ -144,9 +144,9 @@ namespace svt ,nOldEditRow(-1) ,nEditCol(0) ,nOldEditCol(0) - ,bHasFocus(sal_False) - ,bPaintStatus(sal_True) - ,bActiveBeforeTracking( sal_False ) + ,bHasFocus(false) + ,bPaintStatus(true) + ,bActiveBeforeTracking( false ) ,m_nBrowserFlags(nBrowserFlags) ,pHeader(NULL) { @@ -165,9 +165,9 @@ namespace svt ,nOldEditRow(-1) ,nEditCol(0) ,nOldEditCol(0) - ,bHasFocus(sal_False) - ,bPaintStatus(sal_True) - ,bActiveBeforeTracking( sal_False ) + ,bHasFocus(false) + ,bPaintStatus(true) + ,bActiveBeforeTracking( false ) ,m_nBrowserFlags(nBrowserFlags) ,pHeader(NULL) { @@ -403,7 +403,7 @@ namespace svt { if ( bActiveBeforeTracking ) ActivateCell(); - bActiveBeforeTracking = sal_False; + bActiveBeforeTracking = false; BrowseBox::ImplEndTracking(); } @@ -413,7 +413,7 @@ namespace svt { if ( IsEditing() ) { - Rectangle aRect( GetCellRect( nEditRow, nEditCol, sal_False ) ); + Rectangle aRect( GetCellRect( nEditRow, nEditCol, false ) ); CellControllerRef aCellController( Controller() ); ResizeController( aCellController, aRect ); aCellController->GetWindow().GrabFocus(); @@ -432,13 +432,13 @@ namespace svt void EditBrowseBox::KeyInput( const KeyEvent& rEvt ) { sal_uInt16 nCode = rEvt.GetKeyCode().GetCode(); - sal_Bool bShift = rEvt.GetKeyCode().IsShift(); - sal_Bool bCtrl = rEvt.GetKeyCode().IsMod1(); + bool bShift = rEvt.GetKeyCode().IsShift(); + bool bCtrl = rEvt.GetKeyCode().IsMod1(); switch (nCode) { case KEY_RETURN: - if (!bCtrl && !bShift && IsTabAllowed(sal_True)) + if (!bCtrl && !bShift && IsTabAllowed(true)) { Dispatch(BROWSER_CURSORRIGHT); } @@ -448,7 +448,7 @@ namespace svt case KEY_TAB: if (!bCtrl && !bShift) { - if (IsTabAllowed(sal_True)) + if (IsTabAllowed(true)) Dispatch(BROWSER_CURSORRIGHT); else // do NOT call BrowseBox::KeyInput : this would handle the tab, but we already now @@ -458,7 +458,7 @@ namespace svt } else if (!bCtrl && bShift) { - if (IsTabAllowed(sal_False)) + if (IsTabAllowed(false)) Dispatch(BROWSER_CURSORLEFT); else // do NOT call BrowseBox::KeyInput : this would handle the tab, but we already now @@ -504,7 +504,7 @@ namespace svt SaveModified(); } - aMouseEvent.Set(&rEvt,sal_True); + aMouseEvent.Set(&rEvt,true); BrowseBox::MouseButtonDown(rEvt); aMouseEvent.Clear(); @@ -513,7 +513,7 @@ namespace svt // the base class does not travel upon MouseButtonDown, but implActivateCellOnMouseEvent assumes we traveled ... GoToRowColumnId( rEvt.GetRow(), rEvt.GetColumnId() ); if (rEvt.GetRow() >= 0) - implActivateCellOnMouseEvent(rEvt, sal_False); + implActivateCellOnMouseEvent(rEvt, false); } } @@ -524,17 +524,17 @@ namespace svt if (rEvt.GetClicks() > 1 && rEvt.GetRow() >= 0) return; - aMouseEvent.Set(&rEvt,sal_False); + aMouseEvent.Set(&rEvt,false); BrowseBox::MouseButtonUp(rEvt); aMouseEvent.Clear(); if (0 == (m_nBrowserFlags & EBBF_ACTIVATE_ON_BUTTONDOWN)) if (rEvt.GetRow() >= 0) - implActivateCellOnMouseEvent(rEvt, sal_True); + implActivateCellOnMouseEvent(rEvt, true); } - void EditBrowseBox::implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, sal_Bool _bUp) + void EditBrowseBox::implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp) { if (!IsEditing()) ActivateCell(); @@ -620,11 +620,11 @@ namespace svt { const KeyEvent* pKeyEvent = rEvt.GetKeyEvent(); sal_uInt16 nCode = pKeyEvent->GetKeyCode().GetCode(); - sal_Bool bShift = pKeyEvent->GetKeyCode().IsShift(); - sal_Bool bCtrl = pKeyEvent->GetKeyCode().IsMod1(); - sal_Bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); - sal_Bool bLocalSelect= sal_False; - sal_Bool bNonEditOnly = sal_False; + bool bShift = pKeyEvent->GetKeyCode().IsShift(); + bool bCtrl = pKeyEvent->GetKeyCode().IsMod1(); + bool bAlt = pKeyEvent->GetKeyCode().IsMod2(); + bool bLocalSelect = false; + bool bNonEditOnly = false; sal_uInt16 nId = BROWSER_NONE; if (!bAlt && !bCtrl && !bShift ) @@ -639,7 +639,7 @@ namespace svt case KEY_TAB: // ask if traveling to the next cell is allowed - if (IsTabAllowed(sal_True)) + if (IsTabAllowed(true)) nId = BROWSER_CURSORRIGHT; break; @@ -653,24 +653,24 @@ namespace svt return true; } // ask if traveling to the next cell is allowed - if (IsTabAllowed(sal_True)) + if (IsTabAllowed(true)) nId = BROWSER_CURSORRIGHT; break; case KEY_RIGHT: nId = BROWSER_CURSORRIGHT; break; case KEY_LEFT: nId = BROWSER_CURSORLEFT; break; - case KEY_SPACE: nId = BROWSER_SELECT; bNonEditOnly = bLocalSelect = sal_True;break; + case KEY_SPACE: nId = BROWSER_SELECT; bNonEditOnly = bLocalSelect = true; break; } if ( !bAlt && !bCtrl && bShift ) switch ( nCode ) { - case KEY_DOWN: nId = BROWSER_SELECTDOWN; bLocalSelect = sal_True;break; - case KEY_UP: nId = BROWSER_SELECTUP; bLocalSelect = sal_True;break; - case KEY_HOME: nId = BROWSER_SELECTHOME; bLocalSelect = sal_True;break; - case KEY_END: nId = BROWSER_SELECTEND; bLocalSelect = sal_True;break; + case KEY_DOWN: nId = BROWSER_SELECTDOWN; bLocalSelect = true; break; + case KEY_UP: nId = BROWSER_SELECTUP; bLocalSelect = true; break; + case KEY_HOME: nId = BROWSER_SELECTHOME; bLocalSelect = true; break; + case KEY_END: nId = BROWSER_SELECTEND; bLocalSelect = true; break; case KEY_TAB: - if (IsTabAllowed(sal_False)) + if (IsTabAllowed(false)) nId = BROWSER_CURSORLEFT; break; } @@ -678,7 +678,7 @@ namespace svt if ( !bAlt && bCtrl && bShift ) switch ( nCode ) { - case KEY_SPACE: nId = BROWSER_SELECTCOLUMN; bLocalSelect = sal_True; break; + case KEY_SPACE: nId = BROWSER_SELECTCOLUMN; bLocalSelect = true; break; } @@ -691,7 +691,7 @@ namespace svt case KEY_PAGEUP: nId = BROWSER_CURSORTOPOFFILE; break; case KEY_HOME: nId = BROWSER_CURSORTOPOFSCREEN; break; case KEY_END: nId = BROWSER_CURSORENDOFSCREEN; break; - case KEY_SPACE: nId = BROWSER_ENHANCESELECTION; bLocalSelect = sal_True;break; + case KEY_SPACE: nId = BROWSER_ENHANCESELECTION; bLocalSelect = true; break; } @@ -727,9 +727,9 @@ namespace svt } - sal_Bool EditBrowseBox::IsTabAllowed(sal_Bool) const + bool EditBrowseBox::IsTabAllowed(bool) const { - return sal_True; + return true; } @@ -760,22 +760,22 @@ namespace svt } else if ( nType == STATE_CHANGE_ZOOM ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); bNeedCellReActivation = true; } else if ( nType == STATE_CHANGE_CONTROLFONT ) { - ImplInitSettings( sal_True, sal_False, sal_False ); + ImplInitSettings( true, false, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLFOREGROUND ) { - ImplInitSettings( sal_False, sal_True, sal_False ); + ImplInitSettings( false, true, false ); Invalidate(); } else if ( nType == STATE_CHANGE_CONTROLBACKGROUND ) { - ImplInitSettings( sal_False, sal_False, sal_True ); + ImplInitSettings( false, false, true ); Invalidate(); } else if (nType == STATE_CHANGE_STYLE) @@ -805,13 +805,13 @@ namespace svt ( rDCEvt.GetType() == DATACHANGED_DISPLAY )) && ( rDCEvt.GetFlags() & SETTINGS_STYLE )) { - ImplInitSettings( sal_True, sal_True, sal_True ); + ImplInitSettings( true, true, true ); Invalidate(); } } - void EditBrowseBox::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) + void EditBrowseBox::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -922,10 +922,9 @@ namespace svt // 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 - pTHIS->bPaintStatus = static_cast< sal_Bool > - (( GetBrowserFlags() & EBBF_HANDLE_COLUMN_TEXT ) == EBBF_HANDLE_COLUMN_TEXT ); + pTHIS->bPaintStatus = ( GetBrowserFlags() & EBBF_HANDLE_COLUMN_TEXT ) == EBBF_HANDLE_COLUMN_TEXT; rWindow.Invalidate(aRect); - pTHIS->bPaintStatus = sal_True; + pTHIS->bPaintStatus = true; } // don't paint during row change @@ -954,7 +953,7 @@ namespace svt BrowseBox::ColumnMoved(nId); if (IsEditing()) { - Rectangle aRect( GetCellRect(nEditRow, nEditCol, sal_False)); + Rectangle aRect( GetCellRect(nEditRow, nEditCol, false)); CellControllerRef aControllerRef = Controller(); ResizeController(aControllerRef, aRect); Controller()->GetWindow().GrabFocus(); @@ -962,16 +961,16 @@ namespace svt } - sal_Bool EditBrowseBox::SaveRow() + bool EditBrowseBox::SaveRow() { - return sal_True; + return true; } - sal_Bool EditBrowseBox::CursorMoving(long, sal_uInt16) + bool EditBrowseBox::CursorMoving(long, sal_uInt16) { - ((EditBrowseBox *) this)->DeactivateCell(sal_False); - return sal_True; + ((EditBrowseBox *) this)->DeactivateCell(false); + return true; } @@ -995,7 +994,7 @@ namespace svt { if (IsEditing()) { - Rectangle aRect = GetCellRect(nEditRow, nEditCol, sal_False); + Rectangle aRect = GetCellRect(nEditRow, nEditCol, false); ResizeController(aController,aRect); AsynchGetFocus(); } @@ -1003,7 +1002,7 @@ namespace svt } - void EditBrowseBox::ActivateCell(long nRow, sal_uInt16 nCol, sal_Bool bCellFocus) + void EditBrowseBox::ActivateCell(long nRow, sal_uInt16 nCol, bool bCellFocus) { if (IsEditing()) return; @@ -1021,7 +1020,7 @@ namespace svt aController = GetController(nRow, nCol); if (aController.Is()) { - Rectangle aRect( GetCellRect(nEditRow, nEditCol, sal_False)); + Rectangle aRect( GetCellRect(nEditRow, nEditCol, false)); ResizeController(aController, aRect); InitController(aController, nEditRow, nEditCol); @@ -1053,7 +1052,7 @@ namespace svt } - void EditBrowseBox::DeactivateCell(sal_Bool bUpdate) + void EditBrowseBox::DeactivateCell(bool bUpdate) { if (IsEditing()) { @@ -1089,7 +1088,7 @@ namespace svt } - Rectangle EditBrowseBox::GetCellRect(long nRow, sal_uInt16 nColId, sal_Bool bRel) const + Rectangle EditBrowseBox::GetCellRect(long nRow, sal_uInt16 nColId, bool bRel) const { Rectangle aRect( GetFieldRectPixel(nRow, nColId, bRel)); if ((GetMode() & BROWSER_CURSOR_WO_FOCUS) == BROWSER_CURSOR_WO_FOCUS) @@ -1135,7 +1134,7 @@ namespace svt { if (IsEditing()) { - Rectangle aRect( GetCellRect(nEditRow, nEditCol, sal_False)); + Rectangle aRect( GetCellRect(nEditRow, nEditCol, false)); CellControllerRef aControllerRef = Controller(); ResizeController(aControllerRef, aRect); Controller()->GetWindow().GrabFocus(); @@ -1226,9 +1225,9 @@ namespace svt - sal_Bool EditBrowseBox::SaveModified() + bool EditBrowseBox::SaveModified() { - return sal_True; + return true; } @@ -1278,7 +1277,7 @@ namespace svt } - void EditBrowseBox::PaintTristate(OutputDevice&, const Rectangle& rRect,const TriState& eState,sal_Bool _bEnabled) const + void EditBrowseBox::PaintTristate(OutputDevice&, const Rectangle& rRect, const TriState& eState, bool _bEnabled) const { pCheckBoxPaint->GetBox().SetState(eState); pCheckBoxPaint->SetPosSizePixel(rRect.TopLeft(), rRect.GetSize()); @@ -1314,7 +1313,7 @@ namespace svt if (m_nBrowserFlags == nFlags) return; - sal_Bool RowPicturesChanges = ((m_nBrowserFlags & EBBF_NO_HANDLE_COLUMN_CONTENT) != + bool RowPicturesChanges = ((m_nBrowserFlags & EBBF_NO_HANDLE_COLUMN_CONTENT) != (nFlags & EBBF_NO_HANDLE_COLUMN_CONTENT)); m_nBrowserFlags = nFlags; @@ -1381,9 +1380,9 @@ namespace svt } - sal_Bool CellController::WantMouseEvent() const + bool CellController::WantMouseEvent() const { - return sal_False; + return false; } @@ -1392,9 +1391,9 @@ namespace svt } - sal_Bool CellController::MoveAllowed(const KeyEvent&) const + bool CellController::MoveAllowed(const KeyEvent&) const { - return sal_True; + return true; } } // namespace svt diff --git a/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx index f8fb910d3839..b55404b65c90 100644 --- a/svtools/source/brwbox/editbrowsebox2.cxx +++ b/svtools/source/brwbox/editbrowsebox2.cxx @@ -135,7 +135,7 @@ void EditBrowseBox::GrabTableFocus() void EditBrowseBox::DetermineFocus( const sal_uInt16 _nGetFocusFlags ) { - sal_Bool bFocus = sal_False; + bool bFocus = false; for (Window* pWindow = Application::GetFocusWindow(); pWindow && !bFocus; pWindow = pWindow->GetParent()) diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index 3e14d99b7515..10dea024ee0c 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -621,7 +621,7 @@ void ExtendedColorConfig::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint EditableExtendedColorConfig::EditableExtendedColorConfig() : m_pImpl(new ExtendedColorConfig_Impl), - m_bModified(sal_False) + m_bModified(false) { m_pImpl->LockBroadcast(); } @@ -646,17 +646,17 @@ void EditableExtendedColorConfig::AddScheme(const OUString& rScheme ) m_pImpl->AddScheme(rScheme); } -sal_Bool EditableExtendedColorConfig::LoadScheme(const OUString& rScheme ) +bool EditableExtendedColorConfig::LoadScheme(const OUString& rScheme ) { if(m_bModified) m_pImpl->SetModified(); if(m_pImpl->IsModified()) m_pImpl->Commit(); - m_bModified = sal_False; + m_bModified = false; m_pImpl->Load(rScheme); //the name of the loaded scheme has to be committed separately m_pImpl->CommitCurrentSchemeName(); - return sal_True; + return true; } // Changes the name of the current scheme but doesn't load it! @@ -671,12 +671,12 @@ void EditableExtendedColorConfig::SetColorValue( { m_pImpl->SetColorConfigValue(_sName, rValue); m_pImpl->ClearModified(); - m_bModified = sal_True; + m_bModified = true; } void EditableExtendedColorConfig::SetModified() { - m_bModified = sal_True; + m_bModified = true; } void EditableExtendedColorConfig::Commit() @@ -685,7 +685,7 @@ void EditableExtendedColorConfig::Commit() m_pImpl->SetModified(); if(m_pImpl->IsModified()) m_pImpl->Commit(); - m_bModified = sal_False; + m_bModified = false; } void EditableExtendedColorConfig::DisableBroadcast() diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 75d82484dd23..1f650c94b58c 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -267,7 +267,7 @@ struct ErrorResource_Impl : private Resource }; -sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const +bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) const /* [Description] @@ -277,7 +277,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) con */ { - sal_Bool bRet = sal_False; + bool bRet = false; ResMgr* pResMgr = ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ); if( pResMgr ) { @@ -286,7 +286,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) con if(aEr) { rStr=((ResString)aEr).GetString(); - bRet = sal_True; + bRet = true; } } delete pResMgr; @@ -295,7 +295,7 @@ sal_Bool SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) con -sal_Bool SfxErrorHandler::GetMessageString( +bool SfxErrorHandler::GetMessageString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const /* [Description] @@ -305,7 +305,7 @@ sal_Bool SfxErrorHandler::GetMessageString( */ { - sal_Bool bRet = sal_False; + bool bRet = false; ResId *pResId= new ResId(nId, *pMgr); ErrorResource_Impl aEr(*pResId, (sal_uInt16)lErrId); @@ -316,7 +316,7 @@ sal_Bool SfxErrorHandler::GetMessageString( if( nResFlags ) nFlags=aErrorString.GetFlags(); rStr = aErrorString.GetString(); - bRet = sal_True; + bRet = true; } delete pResId; @@ -325,7 +325,7 @@ sal_Bool SfxErrorHandler::GetMessageString( -sal_Bool SfxErrorHandler::GetErrorString( +bool SfxErrorHandler::GetErrorString( sal_uLong lErrId, OUString &rStr, sal_uInt16 &nFlags) const /* [Description] @@ -338,8 +338,8 @@ sal_Bool SfxErrorHandler::GetErrorString( { SolarMutexGuard aGuard; - sal_Bool bRet = sal_False; - rStr=SvtResId(RID_ERRHDL_CLASS).toString(); + bool bRet = false; + rStr = SvtResId(RID_ERRHDL_CLASS).toString(); ResId aResId(nId, *pMgr); { @@ -352,10 +352,10 @@ sal_Bool SfxErrorHandler::GetErrorString( if ( nResFlags ) nFlags = nResFlags; rStr = rStr.replaceAll(OUString("$(ERROR)"), aErrorString.GetString()); - bRet = sal_True; + bRet = true; } else - bRet = sal_False; + bRet = false; } if( bRet ) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index b5e9dcd8f437..c083f5a7c16b 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1976,10 +1976,10 @@ void DbGridControl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uI } } -sal_Bool DbGridControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) +bool DbGridControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) { - DeactivateCell( sal_False ); + DeactivateCell( false ); if ( m_pDataCursor && ( m_nCurrentPos != nNewRow ) @@ -1987,13 +1987,13 @@ sal_Bool DbGridControl::CursorMoving(long nNewRow, sal_uInt16 nNewCol) ) { ActivateCell(); - return sal_False; + return false; } if ( !DbGridControl_Base::CursorMoving( nNewRow, nNewCol ) ) - return sal_False; + return false; - return sal_True; + return true; } bool DbGridControl::SetCurrent(long nNewRow) @@ -2087,7 +2087,7 @@ void DbGridControl::CursorMoved() // cursor movement due to deletion or insertion of rows if (m_pDataCursor && m_nCurrentPos != GetCurRow()) { - DeactivateCell(sal_True); + DeactivateCell(true); SetCurrent(GetCurRow()); } @@ -3047,7 +3047,7 @@ void DbGridControl::RowModified( long nRow, sal_uInt16 /*nColId*/ ) DbGridControl_Base::RowModified(nRow); } -sal_Bool DbGridControl::IsModified() const +bool DbGridControl::IsModified() const { return !IsFilterMode() && IsValid(m_xCurrentRow) && (m_xCurrentRow->IsModified() || DbGridControl_Base::IsModified()); } @@ -3062,21 +3062,21 @@ bool DbGridControl::IsInsertionRow(long nRow) const return (m_nOptions & OPT_INSERT) && m_nTotalCount >= 0 && (nRow == GetRowCount() - 1); } -sal_Bool DbGridControl::SaveModified() +bool DbGridControl::SaveModified() { SAL_INFO("svx.fmcomp", "DbGridControl::SaveModified"); DBG_ASSERT(IsValid(m_xCurrentRow), "GridControl:: Invalid row"); if (!IsValid(m_xCurrentRow)) - return sal_True; + return true; // accept input for this field // Where there changes at the current input field? if (!DbGridControl_Base::IsModified()) - return sal_True; + return true; size_t Location = GetModelColumnPos( GetCurColumnId() ); DbGridColumn* pColumn = ( Location < m_aColumns.size() ) ? m_aColumns[ Location ] : NULL; - sal_Bool bOK = pColumn ? pColumn->Commit() : sal_False; + bool bOK = pColumn && pColumn->Commit(); DBG_ASSERT( Controller().Is(), "DbGridControl::SaveModified: was modified, by have no controller?!" ); if ( !Controller().Is() ) // this might happen if the callbacks implicitly triggered by Commit @@ -3111,17 +3111,17 @@ sal_Bool DbGridControl::SaveModified() return bOK; } -sal_Bool DbGridControl::SaveRow() +bool DbGridControl::SaveRow() { SAL_INFO("svx.fmcomp", "DbGridControl::SaveRow"); // valid row if (!IsValid(m_xCurrentRow) || !IsModified()) - return sal_True; + return true; // value of the controller was not saved, yet else if (Controller().Is() && Controller()->IsModified()) { if (!SaveModified()) - return sal_False; + return false; } m_bUpdating = true; @@ -3141,7 +3141,7 @@ sal_Bool DbGridControl::SaveRow() { EndCursorAction(); m_bUpdating = false; - return sal_False; + return false; } try @@ -3181,7 +3181,7 @@ sal_Bool DbGridControl::SaveRow() // which results in a "return sal_False" (see above). If no exception is thrown, everything is fine. If nRecords // is zero, this simply means all fields had their original values. // FS - 06.12.99 - 70502 - return sal_True; + return true; } bool DbGridControl::PreNotify(NotifyEvent& rEvt) @@ -3239,7 +3239,7 @@ bool DbGridControl::PreNotify(NotifyEvent& rEvt) } } -sal_Bool DbGridControl::IsTabAllowed(sal_Bool bRight) const +bool DbGridControl::IsTabAllowed(bool bRight) const { if (bRight) // Tab only if not on the _last_ row diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index b6fa4bfe2bfb..bd7ee9670470 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -170,7 +170,7 @@ protected: 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); - virtual sal_Bool SaveModified(); + virtual bool SaveModified(); std::vector<long> GetOptimalColWidths() const; @@ -179,7 +179,7 @@ public: void ReadEntries(SvStream& rInStr); void WriteEntries(SvStream& rOutStr); - sal_Bool IsModified()const; + bool IsModified()const; virtual OUString GetCellText( long nRow, sal_uInt16 nColumn ) const; virtual void Resize(); @@ -3940,7 +3940,7 @@ void SwEntryBrowseBox::PaintCell(OutputDevice& rDev, return nCol < ITEM_CASE ? xController : xCheckController; } -sal_Bool SwEntryBrowseBox::SaveModified() +bool SwEntryBrowseBox::SaveModified() { SetModified(); sal_uInt16 nRow = static_cast< sal_uInt16 >(GetCurRow()); @@ -3981,7 +3981,7 @@ sal_Bool SwEntryBrowseBox::SaveModified() GoToRow( nRow ); } } - return sal_True; + return true; } void SwEntryBrowseBox::InitController( @@ -4094,10 +4094,10 @@ void SwEntryBrowseBox::WriteEntries(SvStream& rOutStr) } } -sal_Bool SwEntryBrowseBox::IsModified()const +bool SwEntryBrowseBox::IsModified()const { if(bModified) - return sal_True; + return true; //check if the current controller is modified sal_uInt16 nCol = GetCurColumnId(); @@ -4106,7 +4106,7 @@ sal_Bool SwEntryBrowseBox::IsModified()const pController = xController; else pController = xCheckController; - return pController ->IsModified(); + return pController->IsModified(); } SwAutoMarkDlg_Impl::SwAutoMarkDlg_Impl(Window* pParent, const OUString& rAutoMarkURL, |