diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-12 16:15:27 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-12 16:15:27 +0200 |
commit | b396ae62f7e224dbc5fe71d19d987804a02f398f (patch) | |
tree | f5e0c94211a54295dbb2a8c9ba92d5bda508f4e4 /dbaccess/source/ui | |
parent | 6fb5bf5266e678b6d10fc012fefaad69e2589f3f (diff) |
dbaccess: sal_Bool -> bool
Change-Id: Ifad71823e72be71cbd9f9f58a51f4553ff54e4d4
Diffstat (limited to 'dbaccess/source/ui')
26 files changed, 46 insertions, 46 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index e275b7daa573..96ee1a44b88a 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -2127,7 +2127,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property break; case ID_BROWSER_SAVERECORD: - if ( SaveModified( sal_False ) ) + if ( SaveModified( false ) ) setCurrentModified( false ); break; @@ -2166,7 +2166,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property } } -bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor) +bool SbaXDataBrowserController::SaveModified(bool bAskFor) { if ( bAskFor && GetState(ID_BROWSER_SAVERECORD).bEnabled ) { @@ -2463,7 +2463,7 @@ void SbaXDataBrowserController::criticalFail() m_nRowSetPrivileges = 0; } -void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/) +void SbaXDataBrowserController::LoadFinished(bool /*bWasSynch*/) { m_nRowSetPrivileges = 0; diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index 44b9d1350544..abdaf7c24934 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -374,7 +374,7 @@ void SbaExternalSourceBrowser::Attach(const Reference< XRowSet > & xMaster) } #endif - LoadFinished(sal_True); + LoadFinished(true); Reference< XResultSetUpdate > xUpdate(xMaster, UNO_QUERY); try diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 4e8e4e707617..a088b29feaf6 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1621,7 +1621,7 @@ void SbaTableQueryBrowser::criticalFail() unloadAndCleanup( false ); } -void SbaTableQueryBrowser::LoadFinished(sal_Bool _bWasSynch) +void SbaTableQueryBrowser::LoadFinished(bool _bWasSynch) { SbaXDataBrowserController::LoadFinished(_bWasSynch); @@ -2421,7 +2421,7 @@ bool SbaTableQueryBrowser::implLoadAnything(const OUString& _rDataSourceName, co if ( m_bPreview ) initializePreviewMode(); - LoadFinished(sal_True); + LoadFinished(true); } InvalidateAll(); @@ -3703,7 +3703,7 @@ bool SbaTableQueryBrowser::preReloadForm() void SbaTableQueryBrowser::postReloadForm() { InitializeGridModel(getFormComponent()); - LoadFinished(sal_True); + LoadFinished(true); } Reference< XEmbeddedScripts > SAL_CALL SbaTableQueryBrowser::getScriptContainer() throw (RuntimeException, std::exception) diff --git a/dbaccess/source/ui/control/FieldControls.cxx b/dbaccess/source/ui/control/FieldControls.cxx index a155fe26c067..3a14cdd3d2cf 100644 --- a/dbaccess/source/ui/control/FieldControls.cxx +++ b/dbaccess/source/ui/control/FieldControls.cxx @@ -48,7 +48,7 @@ OPropColumnEditCtrl::OPropColumnEditCtrl(Window* pParent, } void -OPropColumnEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +OPropColumnEditCtrl::SetSpecialReadOnly(bool _bReadOnly) { SetReadOnly(_bReadOnly); lcl_setSpecialReadOnly(_bReadOnly,this); @@ -64,14 +64,14 @@ OPropEditCtrl::OPropEditCtrl(Window* pParent, sal_uInt16 nHelpId, short nPositio } void -OPropEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +OPropEditCtrl::SetSpecialReadOnly(bool _bReadOnly) { SetReadOnly(_bReadOnly); lcl_setSpecialReadOnly(_bReadOnly,this); } void -OPropNumericEditCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +OPropNumericEditCtrl::SetSpecialReadOnly(bool _bReadOnly) { SetReadOnly(_bReadOnly); lcl_setSpecialReadOnly(_bReadOnly,this); @@ -93,7 +93,7 @@ OPropListBoxCtrl::OPropListBoxCtrl(Window* pParent, sal_uInt16 nHelpId, short nP } void -OPropListBoxCtrl::SetSpecialReadOnly(sal_Bool _bReadOnly) +OPropListBoxCtrl::SetSpecialReadOnly(bool _bReadOnly) { SetReadOnly(_bReadOnly); lcl_setSpecialReadOnly(_bReadOnly,this); diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 63d5351ee0e2..28d33723dae6 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -221,7 +221,7 @@ TTableConnectionData::value_type ORelationDialog::getConnectionData() const return m_pConnData; } -void ORelationDialog::setValid(sal_Bool _bValid) +void ORelationDialog::setValid(bool _bValid) { m_pPB_OK->Enable(_bValid); } diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx index 5584549871f6..3d7c3cd45890 100644 --- a/dbaccess/source/ui/inc/FieldControls.hxx +++ b/dbaccess/source/ui/inc/FieldControls.hxx @@ -41,7 +41,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + virtual void SetSpecialReadOnly(bool _bReadOnly); }; @@ -59,7 +59,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + virtual void SetSpecialReadOnly(bool _bReadOnly); }; class OPropNumericEditCtrl : public NumericField @@ -75,7 +75,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + virtual void SetSpecialReadOnly(bool _bReadOnly); }; @@ -92,7 +92,7 @@ namespace dbaui short GetPos() const { return m_nPos; } OUString GetHelp() const { return m_strHelpText; } - virtual void SetSpecialReadOnly(sal_Bool _bReadOnly); + virtual void SetSpecialReadOnly(bool _bReadOnly); }; diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx index ed824bca3261..be666126f457 100644 --- a/dbaccess/source/ui/inc/JoinDesignView.hxx +++ b/dbaccess/source/ui/inc/JoinDesignView.hxx @@ -44,7 +44,7 @@ namespace dbaui virtual ~OJoinDesignView(); // set the view readonly or not - virtual void setReadOnly(sal_Bool _bReadOnly); + virtual void setReadOnly(bool _bReadOnly); // set the statement for representation /// late construction virtual void Construct() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx index aa266ab9f8ca..f3e39b917018 100644 --- a/dbaccess/source/ui/inc/JoinTableView.hxx +++ b/dbaccess/source/ui/inc/JoinTableView.hxx @@ -150,7 +150,7 @@ namespace dbaui @return an iterator to next valid connection, so it can be used in any loop */ - virtual bool RemoveConnection(OTableConnection* _pConnection,sal_Bool _bDelete); + virtual bool RemoveConnection(OTableConnection* _pConnection,bool _bDelete); /** allows to add new connections to join table view diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx index 0bf604a67bc1..c09a01400144 100644 --- a/dbaccess/source/ui/inc/QueryDesignView.hxx +++ b/dbaccess/source/ui/inc/QueryDesignView.hxx @@ -86,7 +86,7 @@ namespace dbaui // clears the whole query virtual void clear() SAL_OVERRIDE; // set the view readonly or not - virtual void setReadOnly(sal_Bool _bReadOnly) SAL_OVERRIDE; + virtual void setReadOnly(bool _bReadOnly) SAL_OVERRIDE; // check if the statement is correct when not returning false virtual bool checkStatement(); // set the statement for representation diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx index 889156e1439a..f42285e4fc01 100644 --- a/dbaccess/source/ui/inc/QueryTableView.hxx +++ b/dbaccess/source/ui/inc/QueryTableView.hxx @@ -75,7 +75,7 @@ namespace dbaui /// base class overwritten: create and delete Connections virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) SAL_OVERRIDE; - virtual bool RemoveConnection( OTableConnection* _pConn ,sal_Bool _bDelete) SAL_OVERRIDE; + virtual bool RemoveConnection( OTableConnection* _pConn ,bool _bDelete) SAL_OVERRIDE; // transfer of connections from and to UndoAction diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx index 178d5db87d1a..f1f7c0422733 100644 --- a/dbaccess/source/ui/inc/QueryTextView.hxx +++ b/dbaccess/source/ui/inc/QueryTextView.hxx @@ -44,7 +44,7 @@ namespace dbaui // clears the whole query virtual void clear(); // set the view readonly or not - virtual void setReadOnly(sal_Bool _bReadOnly); + virtual void setReadOnly(bool _bReadOnly); // check if the statement is correct when not returning false virtual bool checkStatement(); // set the statement for representation diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx index 7a602556ba9b..a499b2120dad 100644 --- a/dbaccess/source/ui/inc/RelControliFace.hxx +++ b/dbaccess/source/ui/inc/RelControliFace.hxx @@ -37,7 +37,7 @@ namespace dbaui /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ - virtual void setValid(sal_Bool _bValid) = 0; + virtual void setValid(bool _bValid) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() = 0; diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 83167ac041fa..18685520d959 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -79,7 +79,7 @@ namespace dbaui /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ - virtual void setValid(sal_Bool _bValid) SAL_OVERRIDE; + virtual void setValid(bool _bValid) SAL_OVERRIDE; /** notifyConnectionChange is callback which is called when the table selection has changed and a new connection exists @param _pConnectionData the connection which exists between the new tables diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx index cbc2b7abc065..aec50985d581 100644 --- a/dbaccess/source/ui/inc/RelationTableView.hxx +++ b/dbaccess/source/ui/inc/RelationTableView.hxx @@ -57,7 +57,7 @@ namespace dbaui virtual void RemoveTabWin( OTableWindow* pTabWin ) SAL_OVERRIDE; virtual void AddConnection(const OJoinExchangeData& jxdSource, const OJoinExchangeData& jxdDest) SAL_OVERRIDE; - virtual bool RemoveConnection(OTableConnection* pConn,sal_Bool _bDelete) SAL_OVERRIDE; + virtual bool RemoveConnection(OTableConnection* pConn,bool _bDelete) SAL_OVERRIDE; virtual void ReSync() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx index 1b72e38e5719..bb2d19c087a6 100644 --- a/dbaccess/source/ui/inc/brwctrlr.hxx +++ b/dbaccess/source/ui/inc/brwctrlr.hxx @@ -278,7 +278,7 @@ namespace dbaui // the default implementation also calls LoadFinished after a syncronous load, so be sure to do the same if you override // this metod and don't call the base class' method - virtual void LoadFinished(sal_Bool bWasSynch); + virtual void LoadFinished(bool bWasSynch); // called if the loading (the _complete_ loading process) is done (no matter if synchron or asynchron). virtual void criticalFail(); @@ -290,7 +290,7 @@ namespace dbaui // empty the frame where our view resides virtual bool CommitCurrent(); // commit the current column (i.e. cell) - virtual bool SaveModified(sal_Bool bAskFor = sal_True); + virtual bool SaveModified(bool bAskFor = true); // save the modified record ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getBoundField(sal_uInt16 nViewPos = (sal_uInt16)-1) const; diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx index 2a1b4037e4a9..467b09f040b0 100644 --- a/dbaccess/source/ui/inc/queryview.hxx +++ b/dbaccess/source/ui/inc/queryview.hxx @@ -39,7 +39,7 @@ namespace dbaui // clears the whole query virtual void clear() = 0; // set the view readonly or not - virtual void setReadOnly(sal_Bool _bReadOnly) SAL_OVERRIDE = 0; + virtual void setReadOnly(bool _bReadOnly) SAL_OVERRIDE = 0; // set the statement for representation virtual void setStatement(const OUString& _rsStatement) = 0; // returns the current sql statement diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx index b86083aab07a..1c004917d8d8 100644 --- a/dbaccess/source/ui/inc/unodatbr.hxx +++ b/dbaccess/source/ui/inc/unodatbr.hxx @@ -217,7 +217,7 @@ namespace dbaui virtual void AddColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol) SAL_OVERRIDE; virtual void RemoveColumnListener(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & xCol) SAL_OVERRIDE; - virtual void LoadFinished(sal_Bool _bWasSynch) SAL_OVERRIDE; + virtual void LoadFinished(bool _bWasSynch) SAL_OVERRIDE; virtual void criticalFail() SAL_OVERRIDE; diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index 6372e154038c..45014975512b 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -91,7 +91,7 @@ void OJoinDesignView::resizeDocumentView(Rectangle& _rPlayground) _rPlayground.SetSize( Size( 0, 0 ) ); } -void OJoinDesignView::setReadOnly(sal_Bool /*_bReadOnly*/) +void OJoinDesignView::setReadOnly(bool /*_bReadOnly*/) { } diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx index e9d7dc8b392d..9a954eaf6750 100644 --- a/dbaccess/source/ui/querydesign/JoinTableView.cxx +++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx @@ -228,7 +228,7 @@ sal_uLong OJoinTableView::GetTabWinCount() return m_aTableMap.size(); } -bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,sal_Bool _bDelete ) +bool OJoinTableView::RemoveConnection( OTableConnection* _pConn,bool _bDelete ) { DeselectConn(_pConn); @@ -349,7 +349,7 @@ void OJoinTableView::RemoveTabWin( OTableWindow* pTabWin ) ( pData == pTabConn->GetData()->getReferencedTable()) ) { - bRemove = RemoveConnection( pTabConn ,sal_True); + bRemove = RemoveConnection( pTabConn ,true); aIter = m_vTableConnection.rbegin(); } else @@ -845,7 +845,7 @@ void OJoinTableView::KeyInput( const KeyEvent& rEvt ) if( !bCtrl && !bShift && (nCode==KEY_DELETE) ) { if (GetSelectedConn()) - RemoveConnection( GetSelectedConn() ,sal_True); + RemoveConnection( GetSelectedConn() ,true); } else Window::KeyInput( rEvt ); @@ -973,7 +973,7 @@ void OJoinTableView::ClearAll() ::std::vector<OTableConnection*>::iterator aIter = m_vTableConnection.begin(); ::std::vector<OTableConnection*>::iterator aEnd = m_vTableConnection.end(); for(;aIter != aEnd;++aIter) - RemoveConnection( *aIter ,sal_True); + RemoveConnection( *aIter ,true); m_vTableConnection.clear(); m_pLastFocusTabWin = NULL; @@ -1122,7 +1122,7 @@ void OJoinTableView::executePopup(const Point& _aPos,OTableConnection* _pSelConn switch (aContextMenu.Execute(this, _aPos)) { case SID_DELETE: - RemoveConnection( _pSelConnection ,sal_True); + RemoveConnection( _pSelConnection ,true); break; case ID_QUERY_EDIT_JOINCONNECTION: ConnDoubleClicked( _pSelConnection ); // is the same as double clicked diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 1049b5d1e648..3601fd0b0127 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -2625,7 +2625,7 @@ void OQueryDesignView::resizeDocumentView(Rectangle& _rPlayground) _rPlayground.SetSize( Size( 0, 0 ) ); } -void OQueryDesignView::setReadOnly(sal_Bool _bReadOnly) +void OQueryDesignView::setReadOnly(bool _bReadOnly) { m_pSelectionBox->SetReadOnly(_bReadOnly); } diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index 4626706c5cc5..0d44b0ded818 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -683,11 +683,11 @@ void OQueryTableView::createNewConnection() } } -bool OQueryTableView::RemoveConnection( OTableConnection* _pConnection,sal_Bool /*_bDelete*/ ) +bool OQueryTableView::RemoveConnection( OTableConnection* _pConnection,bool /*_bDelete*/ ) { // we don't want that our connection will be deleted, we put it in the undo manager - bool bRet = OJoinTableView::RemoveConnection( _pConnection,sal_False); + bool bRet = OJoinTableView::RemoveConnection( _pConnection,false); // add undo action addUndoAction( this, @@ -802,7 +802,7 @@ void OQueryTableView::DropConnection(OQueryTableConnection* pConn) { // Pay attention to the selection // remove from me and the document - RemoveConnection( pConn ,sal_False); + RemoveConnection( pConn ,false); } void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAct* pUndoAction ) @@ -852,7 +852,7 @@ void OQueryTableView::HideTabWin( OQueryTableWindow* pTabWin, OQueryTabWinUndoAc // call base class because we append an undo action // but this time we are in a undo action list - OJoinTableView::RemoveConnection(pTmpEntry,sal_False); + OJoinTableView::RemoveConnection(pTmpEntry,false); aIter2 = rTabConList.begin(); ++nCnt; } diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index b0d8364c986e..3d1f4b0cfcaa 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -79,7 +79,7 @@ OUString OQueryTextView::getStatement() return m_pEdit->GetText(); } -void OQueryTextView::setReadOnly(sal_Bool _bReadOnly) +void OQueryTextView::setReadOnly(bool _bReadOnly) { m_pEdit->SetReadOnly(_bReadOnly); } diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 23db605d8501..6263d0cd52a7 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -276,7 +276,7 @@ TTableConnectionData::value_type DlgQryJoin::getConnectionData() const return m_pConnData; } -void DlgQryJoin::setValid(sal_Bool _bValid) +void DlgQryJoin::setValid(bool _bValid) { m_pPB_OK->Enable(_bValid || eJoinType == CROSS_JOIN ); } diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 6dd08572502c..e8ce875cbdea 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -79,7 +79,7 @@ namespace dbaui /** setValid set the valid inside, can be used for OK buttons @param _bValid true when the using control allows an update */ - virtual void setValid(sal_Bool _bValid) SAL_OVERRIDE; + virtual void setValid(bool _bValid) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > getConnection() SAL_OVERRIDE { return m_xConnection; } diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index e54dcc6add61..84a84f5cc792 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -228,7 +228,7 @@ void ORelationTableView::ConnDoubleClicked( OTableConnection* pConnection ) case RET_NO: // tried at least one update, but did not succeed -> the original connection is lost - RemoveConnection( pConnection ,sal_True); + RemoveConnection( pConnection ,true); break; case RET_CANCEL: @@ -255,13 +255,13 @@ void ORelationTableView::AddNewRelation() } } -bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,sal_Bool /*_bDelete*/) +bool ORelationTableView::RemoveConnection( OTableConnection* pConn ,bool /*_bDelete*/) { ORelationTableConnectionData* pTabConnData = (ORelationTableConnectionData*)pConn->GetData().get(); try { if ( m_bInRemove || pTabConnData->DropRelation()) - return OJoinTableView::RemoveConnection( pConn ,sal_True); + return OJoinTableView::RemoveConnection( pConn ,true); } catch(SQLException& e) { diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index 14f24e6ee3e3..dfdbcf4aa7dc 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -1396,7 +1396,7 @@ void OTableController::assignTable() setEditable( xMeta.is() && !xMeta->isReadOnly() && (isAlterAllowed() || isDropAllowed() || isAddAllowed()) ); if(!isEditable()) { - sal_Bool t( sal_True ); + bool t( true ); ::std::for_each(m_vRowList.begin(),m_vRowList.end(),boost::bind( &OTableRow::SetReadOnly, _1, boost::cref( t ))); } m_bNew = false; |