diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:02:35 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-28 20:26:29 +0100 |
commit | 9cc60839f3f3a9dfcf52d5eb76b7d36c1fbc751a (patch) | |
tree | 6995b212a06737f908c59fbadbc64f2b0c493c78 /dbaccess | |
parent | e1dc859bebc0ce9ec0d61ce7948aff60f94cb0e8 (diff) |
bool improvements
Change-Id: I294b930214ce82033402afecf2b3eb2d04299505
Diffstat (limited to 'dbaccess')
42 files changed, 135 insertions, 135 deletions
diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index f2a965f6e685..47845b2b5435 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -573,7 +573,7 @@ void ORowSetCache::updateNull(sal_Int32 columnIndex,ORowSetValueVector::Vector& ORowSetValueVector::Vector& rInsert = ((*m_aInsertRow)->get()); if ( !rInsert[columnIndex].isNull() ) { - rInsert[columnIndex].setBound(sal_True); + rInsert[columnIndex].setBound(true); rInsert[columnIndex].setNull(); rInsert[columnIndex].setModified(); io_aRow[columnIndex].setNull(); @@ -593,7 +593,7 @@ void ORowSetCache::updateValue(sal_Int32 columnIndex,const ORowSetValue& x ORowSetValueVector::Vector& rInsert = ((*m_aInsertRow)->get()); if ( rInsert[columnIndex] != x ) { - rInsert[columnIndex].setBound(sal_True); + rInsert[columnIndex].setBound(true); rInsert[columnIndex] = x; rInsert[columnIndex].setModified(); io_aRow[columnIndex] = rInsert[columnIndex]; @@ -615,7 +615,7 @@ void ORowSetCache::updateCharacterStream( sal_Int32 columnIndex, const Reference x->readBytes(aSeq,length); ORowSetValueVector::Vector& rInsert = ((*m_aInsertRow)->get()); - rInsert[columnIndex].setBound(sal_True); + rInsert[columnIndex].setBound(true); rInsert[columnIndex] = aSeq; rInsert[columnIndex].setModified(); io_aRow[columnIndex] = makeAny(x); @@ -636,7 +636,7 @@ void ORowSetCache::updateObject( sal_Int32 columnIndex, const Any& x aTemp.fill(x); if ( rInsert[columnIndex] != aTemp ) { - rInsert[columnIndex].setBound(sal_True); + rInsert[columnIndex].setBound(true); rInsert[columnIndex] = aTemp; rInsert[columnIndex].setModified(); io_aRow[columnIndex] = rInsert[columnIndex]; @@ -658,7 +658,7 @@ void ORowSetCache::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal aTemp.fill(x); if ( rInsert[columnIndex] != aTemp ) { - rInsert[columnIndex].setBound(sal_True); + rInsert[columnIndex].setBound(true); rInsert[columnIndex] = aTemp; rInsert[columnIndex].setModified(); io_aRow[columnIndex] = rInsert[columnIndex]; @@ -1441,8 +1441,8 @@ void ORowSetCache::moveToInsertRow( ) ORowSetValueVector::Vector::iterator aEnd = (*m_aInsertRow)->get().end(); for(sal_Int32 i = 1;aIter != aEnd;++aIter,++i) { - aIter->setBound(sal_False); - aIter->setModified(sal_False); + aIter->setBound(false); + aIter->setModified(false); aIter->setNull(); aIter->setTypeKind(m_xMetaData->getColumnType(i)); } @@ -1511,7 +1511,7 @@ void ORowSetCache::setUpdateIterator(const ORowSetMatrix::iterator& _rOriginalRo ORowSetValueVector::Vector::iterator aIter = (*m_aInsertRow)->get().begin(); ORowSetValueVector::Vector::iterator aEnd = (*m_aInsertRow)->get().end(); for(;aIter != aEnd;++aIter) - aIter->setModified(sal_False); + aIter->setModified(false); } void ORowSetCache::checkPositionFlags() @@ -1616,7 +1616,7 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, OUString sTableRange = OSQLParseNode::getTableRange(pTableRef); if(sTableRange.isEmpty()) - pTableRef->getChild(0)->parseNodeToStr( sTableRange, _xConnection, NULL, sal_False, sal_False ); + pTableRef->getChild(0)->parseNodeToStr( sTableRange, _xConnection, NULL, false, false ); bOk = sTableRange == _sUpdateTableName; } } @@ -1640,8 +1640,8 @@ void ORowSetCache::clearInsertRow() ORowSetValueVector::Vector::iterator aEnd = (*m_aInsertRow)->get().end(); for(;aIter != aEnd;++aIter) { - aIter->setBound(sal_False); - aIter->setModified(sal_False); + aIter->setBound(false); + aIter->setModified(false); aIter->setNull(); } } diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index cb7e65ea2aa8..f56d0c40e716 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -111,7 +111,7 @@ namespace dbaccess } } OSL_FAIL( "OColumnSettings::isDefaulted: illegal property handle!" ); - return sal_False; + return false; } bool OColumnSettings::hasDefaultSettings( const Reference< XPropertySet >& _rxColumn ) diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index aeb36cbdd5f1..ef5614632514 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -232,7 +232,7 @@ void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) thro } catch(Exception&) { - m_bInElementRemoved = sal_False; + m_bInElementRemoved = false; throw; } m_bInElementRemoved = false; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index d17fd8cade12..5e621fd9e948 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -1690,7 +1690,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ const Reference< XModel > xModel( getComponent(), UNO_QUERY_THROW ); const Sequence< PropertyValue > aArgs = xModel->getArgs(); ::comphelper::NamedValueCollection aExistentMediaDesc( aArgs ); - aExistentMediaDesc.merge( aNewMediaDesc, sal_False ); + aExistentMediaDesc.merge( aNewMediaDesc, false ); lcl_putLoadArgs( aExistentMediaDesc, optional_bool(), optional_bool() ); // don't put _bSuppressMacros and _bReadOnly here - if the document was already diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 157743582fd3..b7c9caf272e2 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -302,7 +302,7 @@ namespace { sal_Bool lcl_urlAllowsInteraction( const Reference<XComponentContext> & _rContext, const OUString& _rURL ) { - bool bDoesAllow = sal_False; + bool bDoesAllow = false; try { Reference< XURLTransformer > xTransformer( URLTransformer::create(_rContext) ); diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index a204280be9d3..b325e3485790 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -116,7 +116,7 @@ namespace dbaxml } catch (const uno::Exception&) { - OSL_ASSERT(0); + OSL_ASSERT(false); } } #endif @@ -161,7 +161,7 @@ namespace dbaxml } catch (const uno::Exception&) { - OSL_ASSERT(0); + OSL_ASSERT(false); } } } diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index 5a218c3533b7..4b80f9bc29f2 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.cxx @@ -92,7 +92,7 @@ namespace sdbtools { EntryGuard aGuard( *this ); dbtools::StatementComposer aComposer(getConnection(), command, commandType, sal_True ); - aComposer.setDisposeComposer(sal_False); + aComposer.setDisposeComposer(false); return aComposer.getComposer(); } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 919d25c82f6d..6211f5502d38 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -145,7 +145,7 @@ namespace } IMPL_LINK_NOARG(OTablePreviewWindow, OnDisableInput) { - EnableInput(sal_False); + EnableInput(false); return 0L; } void OTablePreviewWindow::DataChanged( const DataChangedEvent& rDCEvt ) @@ -203,7 +203,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _r m_aTBPreview.SetHelpId(HID_APP_VIEW_PREVIEW_CB); m_aTBPreview.SetDropdownClickHdl( LINK( this, OAppDetailPageHelper, OnDropdownClickHdl ) ); m_aTBPreview.EnableMenuStrings(); - m_aTBPreview.Enable(sal_True); + m_aTBPreview.Enable(true); m_aBorder.SetUniqueId(UID_APP_VIEW_PREVIEW_1); diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx index 17107ca38bc8..48921a10700b 100644 --- a/dbaccess/source/ui/browser/brwctrlr.cxx +++ b/dbaccess/source/ui/browser/brwctrlr.cxx @@ -1643,7 +1643,7 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const } else { - aReturn.bChecked = sal_False; + aReturn.bChecked = false; aReturn.bEnabled = sal_False; } } diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index eba8139a5849..8a3d7a7dda2c 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -127,7 +127,7 @@ namespace dbaui const KeyCode& aKeyCode = pKeyEvent->GetKeyCode(); if ( m_pAccel.get() && m_pAccel->execute( aKeyCode ) ) // the accelerator consumed the event - return 1L; + return true; } // NO break case EVENT_KEYUP: diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index c31e70550e6e..74edd00a0504 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -38,7 +38,7 @@ DBTreeView::DBTreeView( Window* pParent, WinBits nBits) m_pTreeListBox = new DBTreeListBox(this, WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT); m_pTreeListBox->EnableCheckButton(NULL); m_pTreeListBox->SetDragDropMode( 0 ); - m_pTreeListBox->EnableInplaceEditing( sal_True ); + m_pTreeListBox->EnableInplaceEditing( true ); m_pTreeListBox->SetHelpId(HID_TLB_TREELISTBOX); m_pTreeListBox->Show(); } diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index c318ea352d4e..f86f7fea660f 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -248,7 +248,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/) { SAL_WARN("dbaccess.ui","OGenericUnoController::Construct: could not create (or start listening at) the database context!"); // at least notify the user. Though the whole component does not make any sense without the database context ... - ShowServiceNotAvailableError(getView(), OUString("com.sun.star.sdb.DatabaseContext"), sal_True); + ShowServiceNotAvailableError(getView(), OUString("com.sun.star.sdb.DatabaseContext"), true); } return sal_True; @@ -310,7 +310,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen throw RuntimeException("unable to create a view", *this ); if ( m_bReadOnly || m_bPreview ) - pView->EnableInput( sal_False ); + pView->EnableInput( false ); impl_initialize(); } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 68510332ca43..aa502ff4564c 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -585,7 +585,7 @@ void SbaTableQueryBrowser::initializePreviewMode() if ( getBrowserView() && getBrowserView()->getVclControl() ) { getBrowserView()->getVclControl()->AlwaysEnableInput( sal_False ); - getBrowserView()->getVclControl()->EnableInput( sal_False ); + getBrowserView()->getVclControl()->EnableInput( false ); getBrowserView()->getVclControl()->ForceHideScrollbars( sal_True ); } Reference< XPropertySet > xDataSourceSet(getRowSet(), UNO_QUERY); diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index f242fec4210e..0c4e4505c327 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -953,7 +953,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) pFormatSample = new OPropEditCtrl( this, STR_HELP_FORMAT_CODE, -1, WB_BORDER ); pFormatSample->SetReadOnly(sal_True); - pFormatSample->Enable(sal_False); + pFormatSample->Enable(false); InitializeControl(pFormatSample,HID_TAB_ENT_FORMAT_SAMPLE,false); pFormat = new PushButton( this, ModuleRes(PB_FORMAT) ); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index bec832a98d40..baa120e64c1d 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -127,7 +127,7 @@ void OTableGrantControl::Init() m_pEdit = new Edit( &GetDataWindow() ); m_pEdit->SetReadOnly(); - m_pEdit->Enable(sal_False); + m_pEdit->Enable(false); } UpdateTables(); diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 76edcddbfe97..12a2e3270e09 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -521,7 +521,7 @@ namespace } if ( xFrame.is() ) - _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,sal_False)); + _rMenu.SetItemImage(nId,framework::GetImageFromURL(xFrame,aCommand,false)); } } // SelectionSupplier diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index b8b06cdc0e8e..53e2fe5a90e9 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -206,7 +206,7 @@ ODbDataSourceAdministrationHelper::ODbDataSourceAdministrationHelper(const Refer } catch(const Exception&) { - ShowServiceNotAvailableError(_pParent->GetParent(), OUString("com.sun.star.sdb.DatabaseContext"), sal_True); + ShowServiceNotAvailableError(_pParent->GetParent(), OUString("com.sun.star.sdb.DatabaseContext"), true); } } diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index f9a4782b5020..e1f9bc779590 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -127,7 +127,7 @@ namespace dbaui // MySQLNativeSettings MySQLNativeSettings::MySQLNativeSettings( Window& _rParent, const Link& _rControlModificationLink ) - :Control( &_rParent, ModuleRes( RID_MYSQL_NATIVE_SETTINGS ).SetAutoRelease( sal_False ) ) + :Control( &_rParent, ModuleRes( RID_MYSQL_NATIVE_SETTINGS ).SetAutoRelease( false ) ) ,m_aDatabaseNameLabel ( this, ModuleRes( FT_MYSQL_DATABASE_NAME ) ) ,m_aDatabaseName ( this, ModuleRes( ED_MYSQL_DATABASE_NAME ) ) ,m_aHostPortRadio ( this, ModuleRes( RB_MYSQL_HOST_PORT ) ) diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 90674e9ff148..f9621cd1398e 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -343,14 +343,14 @@ OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext ) m_aQueryList.SetDoubleClickHdl( LINK( this, OAddTableDlg, TableListDoubleClickHdl ) ); m_aQueryList.SetSelectHdl( LINK( this, OAddTableDlg, TableListSelectHdl ) ); - m_aTableList.EnableInplaceEditing( sal_False ); + m_aTableList.EnableInplaceEditing( false ); m_aTableList.SetStyle(m_aTableList.GetStyle() | WB_BORDER | WB_HASLINES |WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINESATROOT | WB_SORT | WB_HSCROLL ); m_aTableList.EnableCheckButton( NULL ); // do not show any buttons m_aTableList.SetSelectionMode( SINGLE_SELECTION ); m_aTableList.notifyHiContrastChanged(); m_aTableList.suppressEmptyFolders(); - m_aQueryList.EnableInplaceEditing( sal_False ); + m_aQueryList.EnableInplaceEditing( false ); m_aQueryList.SetSelectionMode( SINGLE_SELECTION ); if ( !m_rContext.allowQueries() ) @@ -384,15 +384,15 @@ void OAddTableDlg::impl_switchTo( ObjectList _eList ) switch ( _eList ) { case Tables: - m_aTableList.Show( sal_True ); m_aCaseTables.Check( sal_True ); - m_aQueryList.Show( sal_False ); m_aCaseQueries.Check( sal_False ); + m_aTableList.Show( true ); m_aCaseTables.Check( sal_True ); + m_aQueryList.Show( false ); m_aCaseQueries.Check( sal_False ); m_pCurrentList.reset( new TableListFacade( m_aTableList, m_rContext.getConnection() ) ); m_aTableList.GrabFocus(); break; case Queries: - m_aTableList.Show( sal_False ); m_aCaseTables.Check( sal_False ); - m_aQueryList.Show( sal_True ); m_aCaseQueries.Check( sal_True ); + m_aTableList.Show( false ); m_aCaseTables.Check( sal_False ); + m_aQueryList.Show( true ); m_aCaseQueries.Check( sal_True ); m_pCurrentList.reset( new QueryListFacade( m_aQueryList, m_rContext.getConnection() ) ); m_aQueryList.GrabFocus(); break; diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx index d3053724bcf2..03acc00bf489 100644 --- a/dbaccess/source/ui/dlg/dbadmin.cxx +++ b/dbaccess/source/ui/dlg/dbadmin.cxx @@ -318,62 +318,62 @@ SfxItemSet* ODbAdminDialog::createItemSet(SfxItemSet*& _rpSet, SfxItemPool*& _rp *pCounter++ = new SfxStringItem(DSID_CONNECTURL, OUString()); *pCounter++ = new OStringListItem(DSID_TABLEFILTER, Sequence< OUString >(&sFilterAll, 1)); *pCounter++ = new DbuTypeCollectionItem(DSID_TYPECOLLECTION, _pTypeCollection); - *pCounter++ = new SfxBoolItem(DSID_INVALID_SELECTION, sal_False); - *pCounter++ = new SfxBoolItem(DSID_READONLY, sal_False); + *pCounter++ = new SfxBoolItem(DSID_INVALID_SELECTION, false); + *pCounter++ = new SfxBoolItem(DSID_READONLY, false); *pCounter++ = new SfxStringItem(DSID_USER, OUString()); *pCounter++ = new SfxStringItem(DSID_PASSWORD, OUString()); *pCounter++ = new SfxStringItem(DSID_ADDITIONALOPTIONS, OUString()); *pCounter++ = new SfxStringItem(DSID_CHARSET, OUString()); - *pCounter++ = new SfxBoolItem(DSID_PASSWORDREQUIRED, sal_False); - *pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, sal_False); - *pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, sal_False); + *pCounter++ = new SfxBoolItem(DSID_PASSWORDREQUIRED, false); + *pCounter++ = new SfxBoolItem(DSID_SHOWDELETEDROWS, false); + *pCounter++ = new SfxBoolItem(DSID_ALLOWLONGTABLENAMES, false); *pCounter++ = new SfxStringItem(DSID_JDBCDRIVERCLASS, OUString()); *pCounter++ = new SfxStringItem(DSID_FIELDDELIMITER, OUString(',')); *pCounter++ = new SfxStringItem(DSID_TEXTDELIMITER, OUString('"')); *pCounter++ = new SfxStringItem(DSID_DECIMALDELIMITER, OUString('.')); *pCounter++ = new SfxStringItem(DSID_THOUSANDSDELIMITER, OUString()); *pCounter++ = new SfxStringItem(DSID_TEXTFILEEXTENSION, OUString("txt")); - *pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, sal_True); - *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, sal_False); + *pCounter++ = new SfxBoolItem(DSID_TEXTFILEHEADER, true); + *pCounter++ = new SfxBoolItem(DSID_PARAMETERNAMESUBST, false); *pCounter++ = new SfxInt32Item(DSID_CONN_PORTNUMBER, 8100); - *pCounter++ = new SfxBoolItem(DSID_SUPPRESSVERSIONCL, sal_False); + *pCounter++ = new SfxBoolItem(DSID_SUPPRESSVERSIONCL, false); *pCounter++ = new OPropertySetItem(DSID_DATASOURCE_UNO); - *pCounter++ = new SfxBoolItem(DSID_CONN_SHUTSERVICE, sal_False); + *pCounter++ = new SfxBoolItem(DSID_CONN_SHUTSERVICE, false); *pCounter++ = new SfxInt32Item(DSID_CONN_DATAINC, 20); *pCounter++ = new SfxInt32Item(DSID_CONN_CACHESIZE, 20); *pCounter++ = new SfxStringItem(DSID_CONN_CTRLUSER, OUString()); *pCounter++ = new SfxStringItem(DSID_CONN_CTRLPWD, OUString()); - *pCounter++ = new SfxBoolItem(DSID_USECATALOG, sal_False); + *pCounter++ = new SfxBoolItem(DSID_USECATALOG, false); *pCounter++ = new SfxStringItem(DSID_CONN_HOSTNAME, OUString()); *pCounter++ = new SfxStringItem(DSID_CONN_LDAP_BASEDN, OUString()); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_PORTNUMBER, 389); *pCounter++ = new SfxInt32Item(DSID_CONN_LDAP_ROWCOUNT, 100); - *pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, sal_False); + *pCounter++ = new SfxBoolItem(DSID_SQL92CHECK, false); *pCounter++ = new SfxStringItem(DSID_AUTOINCREMENTVALUE, OUString()); *pCounter++ = new SfxStringItem(DSID_AUTORETRIEVEVALUE, OUString()); - *pCounter++ = new SfxBoolItem(DSID_AUTORETRIEVEENABLED, sal_False); - *pCounter++ = new SfxBoolItem(DSID_APPEND_TABLE_ALIAS, sal_False); + *pCounter++ = new SfxBoolItem(DSID_AUTORETRIEVEENABLED, false); + *pCounter++ = new SfxBoolItem(DSID_APPEND_TABLE_ALIAS, false); *pCounter++ = new SfxInt32Item(DSID_MYSQL_PORTNUMBER, 3306); - *pCounter++ = new SfxBoolItem(DSID_IGNOREDRIVER_PRIV, sal_True); + *pCounter++ = new SfxBoolItem(DSID_IGNOREDRIVER_PRIV, true); *pCounter++ = new SfxInt32Item(DSID_BOOLEANCOMPARISON, 0); *pCounter++ = new SfxInt32Item(DSID_ORACLE_PORTNUMBER, 1521); - *pCounter++ = new SfxBoolItem(DSID_ENABLEOUTERJOIN, sal_True); - *pCounter++ = new SfxBoolItem(DSID_CATALOG, sal_True); - *pCounter++ = new SfxBoolItem(DSID_SCHEMA, sal_True); - *pCounter++ = new SfxBoolItem(DSID_INDEXAPPENDIX, sal_True); - *pCounter++ = new SfxBoolItem(DSID_CONN_LDAP_USESSL, sal_False); + *pCounter++ = new SfxBoolItem(DSID_ENABLEOUTERJOIN, true); + *pCounter++ = new SfxBoolItem(DSID_CATALOG, true); + *pCounter++ = new SfxBoolItem(DSID_SCHEMA, true); + *pCounter++ = new SfxBoolItem(DSID_INDEXAPPENDIX, true); + *pCounter++ = new SfxBoolItem(DSID_CONN_LDAP_USESSL, false); *pCounter++ = new SfxStringItem(DSID_DOCUMENT_URL, OUString()); - *pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, sal_False); + *pCounter++ = new SfxBoolItem(DSID_DOSLINEENDS, false); *pCounter++ = new SfxStringItem(DSID_DATABASENAME, OUString()); - *pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, sal_True); - *pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, sal_True); - *pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, sal_False); + *pCounter++ = new SfxBoolItem(DSID_AS_BEFORE_CORRNAME, true); + *pCounter++ = new SfxBoolItem(DSID_CHECK_REQUIRED_FIELDS, true); + *pCounter++ = new SfxBoolItem(DSID_IGNORECURRENCY, false); *pCounter++ = new SfxStringItem(DSID_CONN_SOCKET, OUString()); - *pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, sal_True); + *pCounter++ = new SfxBoolItem(DSID_ESCAPE_DATETIME, true); *pCounter++ = new SfxStringItem(DSID_NAMED_PIPE, OUString()); *pCounter++ = new OptionalBoolItem( DSID_PRIMARY_KEY_SUPPORT ); *pCounter++ = new SfxInt32Item(DSID_MAX_ROW_SCAN, 100); - *pCounter++ = new SfxBoolItem( DSID_RESPECTRESULTSETTYPE,sal_False ); + *pCounter++ = new SfxBoolItem( DSID_RESPECTRESULTSETTYPE,false ); // create the pool static SfxItemInfo const aItemInfos[DSID_LAST_ITEM_ID - DSID_FIRST_ITEM_ID + 1] = diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 827be420a46e..2cc4d585491c 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -326,9 +326,9 @@ void ODbTypeWizDialogSetup::activateDatabasePath() if ( nCreateNewDBIndex == -1 ) nCreateNewDBIndex = m_pCollection->getIndexOf( OUString("sdbc:dbase:") ); OSL_ENSURE( nCreateNewDBIndex != -1, "ODbTypeWizDialogSetup::activateDatabasePath: the GeneralPage should have prevented this!" ); - activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), sal_True ); + activatePath( static_cast< PathId >( nCreateNewDBIndex + 1 ), true ); - enableState(PAGE_DBSETUPWIZARD_FINAL, sal_True ); + enableState(PAGE_DBSETUPWIZARD_FINAL, true ); enableButtons( WZB_FINISH, sal_True); } break; @@ -341,13 +341,13 @@ void ODbTypeWizDialogSetup::activateDatabasePath() if (eType == ::dbaccess::DST_UNKNOWN) eType = m_pCollection->determineType(m_sOldURL); - activatePath( static_cast<PathId>(m_pCollection->getIndexOf(m_sURL) + 1), sal_True); + activatePath( static_cast<PathId>(m_pCollection->getIndexOf(m_sURL) + 1), true); updateTypeDependentStates(); } break; case OGeneralPageWizard::eOpenExisting: { - activatePath( static_cast<PathId>(m_pCollection->size() + 1), sal_True ); + activatePath( static_cast<PathId>(m_pCollection->size() + 1), true ); enableButtons( WZB_FINISH, !m_pGeneralPage->GetSelectedDocument().sURL.isEmpty() ); } break; @@ -603,7 +603,7 @@ IMPL_LINK(ODbTypeWizDialogSetup, ImplClickHdl, OMySQLIntroPageSetup*, _pMySQLInt sURLPrefix = "sdbc:mysql:mysqlc:"; break; } - activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), sal_True); + activatePath( static_cast<PathId>(m_pCollection->getIndexOf(sURLPrefix) + 1), true); return sal_True; } diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index fe4afacbb944..d3976f9f6845 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -466,9 +466,9 @@ namespace dbaui else { m_bUseClass = false; - m_aFTDriverClass.Show(sal_False); - m_aEDDriverClass.Show(sal_False); - m_aTestJavaDriver.Show(sal_False); + m_aFTDriverClass.Show(false); + m_aEDDriverClass.Show(false); + m_aTestJavaDriver.Show(false); } m_aFTSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 3dcea07934ef..e87dfe0ef764 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -549,7 +549,7 @@ namespace dbaui OSL_ENSURE(!m_bEditAgain, "DbaIndexDialog::OnCloseDialog: somebody was faster than hell!"); // this means somebody entered a new name, which was invalid, which cause us to posted us an event, // and before the event arrived the user clicked onto "close". VERY fast, this user .... - m_aIndexes.EndEditing(sal_False); + m_aIndexes.EndEditing(false); if (m_bEditAgain) // could not commit the new name (started a new - asynchronous - edit trial) return 1L; @@ -762,7 +762,7 @@ namespace dbaui m_aIndexes.EndSelection(); if (m_aIndexes.IsEditingActive()) - m_aIndexes.EndEditing(sal_False); + m_aIndexes.EndEditing(false); // commit the old data if (m_aIndexes.FirstSelected() != m_pPreviousSelection) diff --git a/dbaccess/source/ui/dlg/optionalboolitem.cxx b/dbaccess/source/ui/dlg/optionalboolitem.cxx index f00a2951b0ff..76086d9ddc4f 100644 --- a/dbaccess/source/ui/dlg/optionalboolitem.cxx +++ b/dbaccess/source/ui/dlg/optionalboolitem.cxx @@ -40,12 +40,12 @@ namespace dbaui { const OptionalBoolItem* pCompare = PTR_CAST( OptionalBoolItem, &_rItem ); if ( !pCompare ) - return 0; + return false; if ( m_aValue == pCompare->m_aValue ) - return 1; + return true; - return 0; + return false; } SfxPoolItem* OptionalBoolItem::Clone( SfxItemPool* /*_pPool*/ ) const diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 3e6b657ac8a0..3a3c08d32e80 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -143,7 +143,7 @@ namespace dbaui if (m_aAllParams.GetEntryCount() == 1) { - m_aTravelNext.Enable(sal_False); + m_aTravelNext.Enable(false); } if (m_aAllParams.GetEntryCount() > 1) diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index d8ce76949ead..eb3424c5e676 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -331,7 +331,7 @@ OExceptionChainDialog::OExceptionChainDialog( Window* pParent, const ExceptionDi m_aExceptionList.SetSelectionMode(SINGLE_SELECTION); m_aExceptionList.SetDragDropMode(0); - m_aExceptionList.EnableInplaceEditing(sal_False); + m_aExceptionList.EnableInplaceEditing(false); m_aExceptionList.SetStyle(m_aExceptionList.GetStyle() | WB_HASLINES | WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HSCROLL); m_aExceptionList.SetSelectHdl(LINK(this, OExceptionChainDialog, OnExceptionSelected)); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index cddc248d7f7c..6e5a59151e66 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -88,7 +88,7 @@ namespace dbaui // initialize the TabListBox m_pTablesList->SetSelectionMode( MULTIPLE_SELECTION ); m_pTablesList->SetDragDropMode( 0 ); - m_pTablesList->EnableInplaceEditing( sal_False ); + m_pTablesList->EnableInplaceEditing( false ); m_pTablesList->SetStyle(m_pTablesList->GetStyle() | WB_BORDER | WB_HASLINES | WB_HASLINESATROOT | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT); m_pTablesList->Clear(); diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx index 0ee5e2c63e51..71f778935346 100644 --- a/dbaccess/source/ui/misc/DExport.cxx +++ b/dbaccess/source/ui/misc/DExport.cxx @@ -90,7 +90,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows, sal_Bool _bAutoIncrementEnabled, SvStream& _rInputStream) :m_vColumns(_rColumnPositions) - ,m_aDestColumns(sal_True) + ,m_aDestColumns(true) ,m_xFormatter(_rxNumberF) ,m_xContext(_rxContext) ,m_pFormatter(NULL) diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx index 9fbf253181e9..2a6a0f83bca6 100644 --- a/dbaccess/source/ui/misc/TableCopyHelper.cxx +++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx @@ -283,7 +283,7 @@ sal_Bool OTableCopyHelper::copyTagTable(const TransferableDataHelper& _aDroppedD { // now we need to copy the stream ::utl::TempFile aTmp; - aTmp.EnableKillingFile(sal_False); + aTmp.EnableKillingFile(false); _rAsyncDrop.aUrl = aTmp.GetURL(); SotStorageStreamRef aNew = new SotStorageStream( aTmp.GetFileName() ); _rAsyncDrop.aHtmlRtfStorage->Seek(STREAM_SEEK_TO_BEGIN); diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx index e12d111b392c..d9e5c58ab58e 100644 --- a/dbaccess/source/ui/misc/TokenWriter.cxx +++ b/dbaccess/source/ui/misc/TokenWriter.cxx @@ -88,7 +88,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& ,m_xFormatter(_rxNumberF) ,m_xContext(_rM) ,m_nCommandType(CommandType::TABLE) - ,m_bNeedToReInitialize(sal_False) + ,m_bNeedToReInitialize(false) ,m_pReader(NULL) ,m_pRowMarker(NULL) ,m_bInInitialize(sal_False) @@ -119,7 +119,7 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection& ,m_xFormatter(_rxNumberF) ,m_xContext(_rM) ,m_nCommandType(::com::sun::star::sdb::CommandType::TABLE) - ,m_bNeedToReInitialize(sal_False) + ,m_bNeedToReInitialize(false) ,m_pReader(NULL) ,m_pRowMarker(NULL) ,m_bInInitialize(sal_False) diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 8fd95f244831..0545cd68f1a0 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -816,7 +816,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, new SfxRangeItem(SBA_DEF_RANGEFORMAT, SBA_DEF_FMTVALUE, SBA_ATTR_ALIGN_HOR_JUSTIFY), new SfxUInt32Item(SBA_DEF_FMTVALUE), new SvxHorJustifyItem(SVX_HOR_JUSTIFY_STANDARD, SBA_ATTR_ALIGN_HOR_JUSTIFY), - new SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, sal_False), + new SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, false), new SvxNumberInfoItem(SID_ATTR_NUMBERFORMAT_INFO) }; @@ -834,7 +834,7 @@ sal_Bool callColumnFormatDialog(Window* _pParent, if ((DataType::CHAR == _nDataType) || (DataType::VARCHAR == _nDataType) || (DataType::LONGVARCHAR == _nDataType) || (DataType::CLOB == _nDataType)) { bText = sal_True; - pFormatDescriptor->Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, sal_True)); + pFormatDescriptor->Put(SfxBoolItem(SID_ATTR_NUMBERFORMAT_ONE_AREA, true)); if (!_pFormatter->IsTextFormat(_nFormatKey)) // text fields can only have text formats _nFormatKey = _pFormatter->GetStandardFormat(NUMBERFORMAT_TEXT,_pParent->GetSettings().GetLanguageTag().getLanguageType()); diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index ae2d42216130..608956e5176d 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -89,8 +89,8 @@ OCopyTable::OCopyTable( Window * pParent ) m_aCB_PrimaryColumn.SetClickHdl(LINK( this, OCopyTable, KeyClickHdl ) ); - m_aFT_KeyName.Enable(sal_False); - m_edKeyName.Enable(sal_False); + m_aFT_KeyName.Enable(false); + m_edKeyName.Enable(false); OUString sKeyName("ID"); sKeyName = m_pParent->createUniqueName(sKeyName); m_edKeyName.SetText(sKeyName); @@ -118,9 +118,9 @@ IMPL_LINK( OCopyTable, AppendDataClickHdl, Button*, /*pButton*/ ) void OCopyTable::SetAppendDataRadio() { m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,sal_True); - m_aFT_KeyName.Enable(sal_False); - m_aCB_PrimaryColumn.Enable(sal_False); - m_edKeyName.Enable(sal_False); + m_aFT_KeyName.Enable(false); + m_aCB_PrimaryColumn.Enable(false); + m_edKeyName.Enable(false); m_pParent->setOperation(CopyTableOperation::AppendData); } @@ -238,7 +238,7 @@ sal_Bool OCopyTable::LeavePage() void OCopyTable::ActivatePage() { - m_pParent->GetOKButton().Enable( sal_True ); + m_pParent->GetOKButton().Enable( true ); m_nOldOperation = m_pParent->getOperation(); m_edTableName.GrabFocus(); m_aCB_UseHeaderLine.Check(m_pParent->UseHeaderLine()); diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index a8b8bfafd662..9ffaa14f4a37 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -960,20 +960,20 @@ void OCopyTableWizard::CheckButtons() if(GetCurLevel() == 0) // the first page has no back button { if(m_nPageCount > 1) - m_pbNext.Enable(sal_True); + m_pbNext.Enable(true); else - m_pbNext.Enable(sal_False); + m_pbNext.Enable(false); - m_pbPrev.Enable(sal_False); + m_pbPrev.Enable(false); } else if(GetCurLevel() == m_nPageCount-1) // the last page has no next button { - m_pbNext.Enable(sal_False); - m_pbPrev.Enable(sal_True); + m_pbNext.Enable(false); + m_pbPrev.Enable(true); } else { - m_pbPrev.Enable(sal_True); + m_pbPrev.Enable(true); // next already has its state } } diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index 284f267cb381..18cab465e9ef 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -345,7 +345,7 @@ OColumnTreeBox::OColumnTreeBox( Window* pParent, const ResId& rResId ) : OMarkableTreeListBox(pParent, rResId) { SetDragDropMode( 0 ); - EnableInplaceEditing( sal_False ); + EnableInplaceEditing( false ); SetStyle(GetStyle() | WB_BORDER | WB_HASBUTTONS | WB_HSCROLL); SetSelectionMode( SINGLE_SELECTION ); } diff --git a/dbaccess/source/ui/misc/propertysetitem.cxx b/dbaccess/source/ui/misc/propertysetitem.cxx index 85a769ced14c..a527faa11da7 100644 --- a/dbaccess/source/ui/misc/propertysetitem.cxx +++ b/dbaccess/source/ui/misc/propertysetitem.cxx @@ -48,9 +48,9 @@ namespace dbaui { const OPropertySetItem* pCompare = PTR_CAST(OPropertySetItem, &_rItem); if ((!pCompare) || (pCompare->m_xSet.get() != m_xSet.get())) - return 0; + return false; - return 1; + return true; } SfxPoolItem* OPropertySetItem::Clone(SfxItemPool* /* _pPool */) const diff --git a/dbaccess/source/ui/misc/stringlistitem.cxx b/dbaccess/source/ui/misc/stringlistitem.cxx index a794011be26a..d375d8669f07 100644 --- a/dbaccess/source/ui/misc/stringlistitem.cxx +++ b/dbaccess/source/ui/misc/stringlistitem.cxx @@ -42,7 +42,7 @@ bool OStringListItem::operator==(const SfxPoolItem& _rItem) const { const OStringListItem* pCompare = PTR_CAST(OStringListItem, &_rItem); if ((!pCompare) || (pCompare->m_aList.getLength() != m_aList.getLength())) - return 0; + return false; // compare all strings individually const OUString* pMyStrings = m_aList.getConstArray(); @@ -50,9 +50,9 @@ bool OStringListItem::operator==(const SfxPoolItem& _rItem) const for (sal_Int32 i=0; i<m_aList.getLength(); ++i, ++pMyStrings, ++pCompareStrings) if (!pMyStrings->equals(*pCompareStrings)) - return 0; + return false; - return 1; + return true; } SfxPoolItem* OStringListItem::Clone(SfxItemPool* /* _pPool */) const diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index 6ae5c32e3637..8fe635a1a312 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -276,7 +276,7 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& if ( m_pAddTableDialog->IsVisible() ) { - m_pAddTableDialog->Show( sal_False ); + m_pAddTableDialog->Show( false ); getView()->GrabFocus(); } else @@ -285,7 +285,7 @@ void OJoinController::Execute(sal_uInt16 _nId, const Sequence< PropertyValue >& WaitObject aWaitCursor( getView() ); m_pAddTableDialog->Update(); } - m_pAddTableDialog->Show( sal_True ); + m_pAddTableDialog->Show( true ); ::dbaui::notifySystemWindow(getView(),m_pAddTableDialog,::comphelper::mem_fun(&TaskPaneList::AddWindow)); } break; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 723e120c4021..dec894f54095 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -119,7 +119,7 @@ namespace { sTableRange = ::connectivity::OSQLParseNode::getTableRange(_pTableRef); if ( sTableRange.isEmpty() ) - _pTableRef->parseNodeToStr(sTableRange,xConnection,NULL,sal_False,sal_False); + _pTableRef->parseNodeToStr(sTableRange,xConnection,NULL,false,false); } return sTableRange; } @@ -804,7 +804,7 @@ namespace pParseNode->getChild(node)->parseNodeToStr( sHavingStr, xConnection, &rContext, - sal_False, + false, !pEntryField->isOtherFunction()); aHavingStr = sHavingStr; } @@ -834,7 +834,7 @@ namespace pParseNode->parseNodeToStr( aWhere, xConnection, &rContext, - sal_False, + false, !pEntryField->isOtherFunction() ); aWhereStr = aWhere; } @@ -1177,7 +1177,7 @@ namespace pParseNode->getChild(0)->parseNodeToStr( sGroupBy, xConnection, &rController.getParser().getContext(), - sal_False, + false, !pEntryField->isOtherFunction()); sGroupByPart += sGroupBy; } @@ -1523,8 +1523,8 @@ namespace pFunction->parseNodeToStr( aColumnName, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function // don't display the column name aCondition = aCondition.copy(aColumnName.getLength()); aCondition = aCondition.trim(); @@ -1722,7 +1722,7 @@ namespace pLhs->parseNodeToStr(aName, xConnection, &rController.getParser().getContext(), - sal_True); + true); // Criteria aCondition = pCondition->getChild(1)->getTokenValue(); pRhs->parseNodeToPredicateStr(aCondition, @@ -2223,8 +2223,8 @@ namespace pParamRef->parseNodeToStr( sFieldName, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function } aInfo->SetDataType(DataType::DOUBLE); aInfo->SetFieldType(TAB_NORMAL_FIELD); @@ -2257,8 +2257,8 @@ namespace pColumnRef->parseNodeToStr( aColumns, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function aInfo->SetTabWindow( NULL ); @@ -2419,8 +2419,8 @@ namespace pArgument->parseNodeToStr( sGroupByExpression, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function _pView->fillFunctionInfo(pArgument,sGroupByExpression,aDragInfo); aDragInfo->SetFunctionType(FKT_OTHER); aDragInfo->SetGroupBy(sal_True); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 3c6442973d8c..3fb10b21430b 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -142,9 +142,9 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) m_pOrderCell->InsertEntry(aTxt.getToken(nIdx, ';')); for(long i=0;i < BROW_ROW_CNT;i++) - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); - m_bVisibleRow[BROW_FUNCTION_ROW] = sal_False; // first hide + m_bVisibleRow[BROW_FUNCTION_ROW] = false; // first hide m_timerInvalidate.SetTimeout(200); m_timerInvalidate.SetTimeoutHdl(LINK(this, OSelectionBrowseBox, OnInvalidateTimer)); @@ -516,7 +516,7 @@ void OSelectionBrowseBox::InitController(CellControllerRef& /*rController*/, lon m_pVisibleCell->GetBox().Check(pEntry->IsVisible()); m_pVisibleCell->GetBox().SaveValue(); m_pVisibleCell->GetBox().Disable(); - m_pVisibleCell->GetBox().EnableInput(sal_False); + m_pVisibleCell->GetBox().EnableInput(false); OUString aMessage(ModuleRes(STR_QRY_ORDERBY_UNRELATED)); OQueryDesignView* paDView = getDesignView(); InfoBox(paDView, aMessage).Execute(); @@ -813,7 +813,7 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe // now parse the parameters OUString sParameters; for(sal_uInt32 function = 2; function < nFunCount; ++function) // we only want to parse the parameters of the function - pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, bQuote ); + pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), true, bQuote ); aSelEntry->SetFunctionType(nFunctionType); aSelEntry->SetField(sParameters); @@ -838,8 +838,8 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe pColumnRef->parseNodeToStr( sFunction, xConnection, &rController.getParser().getContext(), - sal_True, - sal_True); // quote is to true because we need quoted elements inside the function + true, + true); // quote is to true because we need quoted elements inside the function getDesignView()->fillFunctionInfo(pColumnRef,sFunction,aSelEntry); @@ -851,7 +851,7 @@ sal_Bool OSelectionBrowseBox::saveField(OUString& _sFieldName ,OTableFieldDescRe sal_uInt32 nFunCount = pColumnRef->count(); OUString sParameters; for(sal_uInt32 function = 0; function < nFunCount; ++function) - pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), sal_True, sal_True ); + pColumnRef->getChild(function)->parseNodeToStr( sParameters, xConnection, &rParser.getContext(), true, true ); sOldAlias = aSelEntry->GetAlias(); sal_Int32 nNewFunctionType = aSelEntry->GetFunctionType() | FKT_NUMERIC | FKT_OTHER; @@ -1175,7 +1175,7 @@ sal_Bool OSelectionBrowseBox::SaveModified() if ( bAppendRow ) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } @@ -1710,10 +1710,10 @@ void OSelectionBrowseBox::DuplicateConditionLevel( const sal_uInt16 nLevel) if ( nNewLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1) ) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } - m_bVisibleRow[BROW_CRIT1_ROW + nNewLevel] = sal_True; + m_bVisibleRow[BROW_CRIT1_ROW + nNewLevel] = true; } } } @@ -1757,10 +1757,10 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1)) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } - m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = sal_True; + m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = true; break; } if ( _bAddOrOnOneLine ) @@ -1785,10 +1785,10 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1)) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } - m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = sal_True; + m_bVisibleRow[BROW_CRIT1_ROW + nLevel] = true; } else if (aIter == rFields.end()) { @@ -1801,7 +1801,7 @@ void OSelectionBrowseBox::AddCondition( const OTableFieldDescRef& rInfo, const O if(nLevel == (m_nVisibleCount-BROW_CRIT1_ROW-1)) { RowInserted( GetRowCount()-1, 1, sal_True ); - m_bVisibleRow.push_back(sal_True); + m_bVisibleRow.push_back(true); ++m_nVisibleCount; } } diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 28077ea68612..f445c2a6b575 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -923,7 +923,7 @@ void OQueryController::impl_initialize() // more non-legacy rArguments.get_ensureType( (OUString)PROPERTY_GRAPHICAL_DESIGN, m_bGraphicalDesign ); - bool bEscapeProcessing( sal_True ); + bool bEscapeProcessing( true ); if ( rArguments.get_ensureType( (OUString)PROPERTY_ESCAPE_PROCESSING, bEscapeProcessing ) ) { setEscapeProcessing_fireEvent( bEscapeProcessing ); diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 99e1988d9cfa..caf3e433b328 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -217,7 +217,7 @@ IMPL_LINK( DlgQryJoin, LBChangeHdl, ListBox*, /*pListBox*/ ) m_pTableControl->enableRelation(false); OUString sEmpty; m_pConnData->AppendConnLine(sEmpty,sEmpty); - aPB_OK.Enable(sal_True); + aPB_OK.Enable(true); } break; } diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 40f149ce4dae..2a5cd9a90ca1 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -818,7 +818,7 @@ void OTableEditorCtrl::InsertRows( long nRow ) { pRow.reset(new OTableRow()); (*aStreamRef) >> *pRow; - pRow->SetReadOnly( sal_False ); + pRow->SetReadOnly( false ); sal_Int32 nType = pRow->GetActFieldDescr()->GetType(); if ( pRow->GetActFieldDescr() ) pRow->GetActFieldDescr()->SetType(GetView()->getController().getTypeInfoByType(nType)); |